From ed6a2f0fc72080408cdb8eb2ca894cee7c512b57 Mon Sep 17 00:00:00 2001
From: SUN Haoyu <hasun@redhat.com>
Date: Wed, 15 Mar 2023 12:42:28 +0100
Subject: [PATCH] additional selector for resource queries in Prometheus
Adapter. (#2003)
Signed-off-by: Haoyu Sun <hasun@redhat.com>
---
.../components/prometheus-adapter.libsonnet | 28 +++++++++++--------
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/jsonnet/kube-prometheus/components/prometheus-adapter.libsonnet b/jsonnet/kube-prometheus/components/prometheus-adapter.libsonnet
index bf620fc6..6c603b93 100644
--- a/jsonnet/kube-prometheus/components/prometheus-adapter.libsonnet
+++ b/jsonnet/kube-prometheus/components/prometheus-adapter.libsonnet
@@ -34,20 +34,24 @@ local defaults = {
containerMetricsPrefix:: '',
prometheusURL:: error 'must provide prometheusURL',
+ containerQuerySelector:: '',
+ nodeQuerySelector:: '',
config:: {
+ local containerSelector = if $.containerQuerySelector != '' then ',' + $.containerQuerySelector else '',
+ local nodeSelector = if $.nodeQuerySelector != '' then ',' + $.nodeQuerySelector else '',
resourceRules: {
cpu: {
containerQuery: |||
sum by (<<.GroupBy>>) (
irate (
- %(containerMetricsPrefix)scontainer_cpu_usage_seconds_total{<<.LabelMatchers>>,container!="",pod!=""}[%(kubelet)s]
+ %(containerMetricsPrefix)scontainer_cpu_usage_seconds_total{<<.LabelMatchers>>,container!="",pod!=""%(addtionalSelector)s}[%(kubelet)s]
)
)
- ||| % { kubelet: $.rangeIntervals.kubelet, containerMetricsPrefix: $.containerMetricsPrefix },
+ ||| % { kubelet: $.rangeIntervals.kubelet, containerMetricsPrefix: $.containerMetricsPrefix, addtionalSelector: containerSelector },
nodeQuery: |||
sum by (<<.GroupBy>>) (
1 - irate(
- node_cpu_seconds_total{mode="idle"}[%(nodeExporter)s]
+ node_cpu_seconds_total{mode="idle"%(addtionalSelector)s}[%(nodeExporter)s]
)
* on(namespace, pod) group_left(node) (
node_namespace_pod:kube_pod_info:{<<.LabelMatchers>>}
@@ -55,10 +59,10 @@ local defaults = {
)
or sum by (<<.GroupBy>>) (
1 - irate(
- windows_cpu_time_total{mode="idle", job="windows-exporter",<<.LabelMatchers>>}[%(windowsExporter)s]
+ windows_cpu_time_total{mode="idle", job="windows-exporter",<<.LabelMatchers>>%(addtionalSelector)s}[%(windowsExporter)s]
)
)
- ||| % { nodeExporter: $.rangeIntervals.nodeExporter, windowsExporter: $.rangeIntervals.windowsExporter, containerMetricsPrefix: $.containerMetricsPrefix },
+ ||| % { nodeExporter: $.rangeIntervals.nodeExporter, windowsExporter: $.rangeIntervals.windowsExporter, containerMetricsPrefix: $.containerMetricsPrefix, addtionalSelector: nodeSelector },
resources: {
overrides: {
node: { resource: 'node' },
@@ -71,21 +75,21 @@ local defaults = {
memory: {
containerQuery: |||
sum by (<<.GroupBy>>) (
- %(containerMetricsPrefix)scontainer_memory_working_set_bytes{<<.LabelMatchers>>,container!="",pod!=""}
+ %(containerMetricsPrefix)scontainer_memory_working_set_bytes{<<.LabelMatchers>>,container!="",pod!=""%(addtionalSelector)s}
)
- ||| % { containerMetricsPrefix: $.containerMetricsPrefix },
+ ||| % { containerMetricsPrefix: $.containerMetricsPrefix, addtionalSelector: containerSelector },
nodeQuery: |||
sum by (<<.GroupBy>>) (
- node_memory_MemTotal_bytes{job="node-exporter",<<.LabelMatchers>>}
+ node_memory_MemTotal_bytes{job="node-exporter",<<.LabelMatchers>>%(addtionalSelector)s}
-
- node_memory_MemAvailable_bytes{job="node-exporter",<<.LabelMatchers>>}
+ node_memory_MemAvailable_bytes{job="node-exporter",<<.LabelMatchers>>%(addtionalSelector)s}
)
or sum by (<<.GroupBy>>) (
- windows_cs_physical_memory_bytes{job="windows-exporter",<<.LabelMatchers>>}
+ windows_cs_physical_memory_bytes{job="windows-exporter",<<.LabelMatchers>>%(addtionalSelector)s}
-
- windows_memory_available_bytes{job="windows-exporter",<<.LabelMatchers>>}
+ windows_memory_available_bytes{job="windows-exporter",<<.LabelMatchers>>%(addtionalSelector)s}
)
- ||| % { containerMetricsPrefix: $.containerMetricsPrefix },
+ ||| % { containerMetricsPrefix: $.containerMetricsPrefix, addtionalSelector: nodeSelector },
resources: {
overrides: {
instance: { resource: 'node' },
--
GitLab