From b9563b9c2d3015cb2d2c031675763c80301a61b1 Mon Sep 17 00:00:00 2001
From: Damien Grisonnet <dgrisonn@redhat.com>
Date: Mon, 5 Jul 2021 15:29:45 +0200
Subject: [PATCH] jsonnet: improve adapter queries readability
Signed-off-by: Damien Grisonnet <dgrisonn@redhat.com>
---
.../components/prometheus-adapter.libsonnet | 39 +++++++++++++++++--
manifests/prometheus-adapter-configMap.yaml | 37 ++++++++++++++++--
2 files changed, 68 insertions(+), 8 deletions(-)
diff --git a/jsonnet/kube-prometheus/components/prometheus-adapter.libsonnet b/jsonnet/kube-prometheus/components/prometheus-adapter.libsonnet
index eb708c0d..864178c4 100644
--- a/jsonnet/kube-prometheus/components/prometheus-adapter.libsonnet
+++ b/jsonnet/kube-prometheus/components/prometheus-adapter.libsonnet
@@ -35,10 +35,26 @@ local defaults = {
resourceRules: {
cpu: {
containerQuery: |||
- sum(irate(container_cpu_usage_seconds_total{<<.LabelMatchers>>,container!="",pod!=""}[%(kubelet)s])) by (<<.GroupBy>>)
+ sum by (<<.GroupBy>>) (
+ irate (
+ container_cpu_usage_seconds_total{<<.LabelMatchers>>,container!="",pod!=""}[%(kubelet)s]
+ )
+ )
||| % $.rangeIntervals,
nodeQuery: |||
- sum(1 - irate(node_cpu_seconds_total{mode="idle"}[%(nodeExporter)s]) * on(namespace, pod) group_left(node) node_namespace_pod:kube_pod_info:{<<.LabelMatchers>>}) by (<<.GroupBy>>) or sum (1- irate(windows_cpu_time_total{mode="idle", job="windows-exporter",<<.LabelMatchers>>}[%(windowsExporter)s])) by (<<.GroupBy>>)
+ sum by (<<.GroupBy>>) (
+ 1 - irate(
+ node_cpu_seconds_total{mode="idle"}[%(nodeExporter)s]
+ )
+ * on(namespace, pod) group_left(node) (
+ node_namespace_pod:kube_pod_info:{<<.LabelMatchers>>}
+ )
+ )
+ or sum by (<<.GroupBy>>) (
+ 1 - irate(
+ windows_cpu_time_total{mode="idle", job="windows-exporter",<<.LabelMatchers>>}[%(windowsExporter)s]
+ )
+ )
||| % $.rangeIntervals,
resources: {
overrides: {
@@ -50,8 +66,23 @@ local defaults = {
containerLabel: 'container',
},
memory: {
- containerQuery: 'sum(container_memory_working_set_bytes{<<.LabelMatchers>>,container!="",pod!=""}) by (<<.GroupBy>>)',
- nodeQuery: 'sum(node_memory_MemTotal_bytes{job="node-exporter",<<.LabelMatchers>>} - node_memory_MemAvailable_bytes{job="node-exporter",<<.LabelMatchers>>}) by (<<.GroupBy>>) or sum(windows_cs_physical_memory_bytes{job="windows-exporter",<<.LabelMatchers>>} - windows_memory_available_bytes{job="windows-exporter",<<.LabelMatchers>>}) by (<<.GroupBy>>)',
+ containerQuery: |||
+ sum by (<<.GroupBy>>) (
+ container_memory_working_set_bytes{<<.LabelMatchers>>,container!="",pod!=""}
+ )
+ |||,
+ nodeQuery: |||
+ sum by (<<.GroupBy>>) (
+ node_memory_MemTotal_bytes{job="node-exporter",<<.LabelMatchers>>}
+ -
+ node_memory_MemAvailable_bytes{job="node-exporter",<<.LabelMatchers>>}
+ )
+ or sum by (<<.GroupBy>>) (
+ windows_cs_physical_memory_bytes{job="windows-exporter",<<.LabelMatchers>>}
+ -
+ windows_memory_available_bytes{job="windows-exporter",<<.LabelMatchers>>}
+ )
+ |||,
resources: {
overrides: {
instance: { resource: 'node' },
diff --git a/manifests/prometheus-adapter-configMap.yaml b/manifests/prometheus-adapter-configMap.yaml
index 899a0e7e..bd6de899 100644
--- a/manifests/prometheus-adapter-configMap.yaml
+++ b/manifests/prometheus-adapter-configMap.yaml
@@ -5,9 +5,25 @@ data:
"cpu":
"containerLabel": "container"
"containerQuery": |
- sum(irate(container_cpu_usage_seconds_total{<<.LabelMatchers>>,container!="",pod!=""}[120s])) by (<<.GroupBy>>)
+ sum by (<<.GroupBy>>) (
+ irate (
+ container_cpu_usage_seconds_total{<<.LabelMatchers>>,container!="",pod!=""}[120s]
+ )
+ )
"nodeQuery": |
- sum(1 - irate(node_cpu_seconds_total{mode="idle"}[60s]) * on(namespace, pod) group_left(node) node_namespace_pod:kube_pod_info:{<<.LabelMatchers>>}) by (<<.GroupBy>>) or sum (1- irate(windows_cpu_time_total{mode="idle", job="windows-exporter",<<.LabelMatchers>>}[4m])) by (<<.GroupBy>>)
+ sum by (<<.GroupBy>>) (
+ 1 - irate(
+ node_cpu_seconds_total{mode="idle"}[60s]
+ )
+ * on(namespace, pod) group_left(node) (
+ node_namespace_pod:kube_pod_info:{<<.LabelMatchers>>}
+ )
+ )
+ or sum by (<<.GroupBy>>) (
+ 1 - irate(
+ windows_cpu_time_total{mode="idle", job="windows-exporter",<<.LabelMatchers>>}[4m]
+ )
+ )
"resources":
"overrides":
"namespace":
@@ -18,8 +34,21 @@ data:
"resource": "pod"
"memory":
"containerLabel": "container"
- "containerQuery": "sum(container_memory_working_set_bytes{<<.LabelMatchers>>,container!=\"\",pod!=\"\"}) by (<<.GroupBy>>)"
- "nodeQuery": "sum(node_memory_MemTotal_bytes{job=\"node-exporter\",<<.LabelMatchers>>} - node_memory_MemAvailable_bytes{job=\"node-exporter\",<<.LabelMatchers>>}) by (<<.GroupBy>>) or sum(windows_cs_physical_memory_bytes{job=\"windows-exporter\",<<.LabelMatchers>>} - windows_memory_available_bytes{job=\"windows-exporter\",<<.LabelMatchers>>}) by (<<.GroupBy>>)"
+ "containerQuery": |
+ sum by (<<.GroupBy>>) (
+ container_memory_working_set_bytes{<<.LabelMatchers>>,container!="",pod!=""}
+ )
+ "nodeQuery": |
+ sum by (<<.GroupBy>>) (
+ node_memory_MemTotal_bytes{job="node-exporter",<<.LabelMatchers>>}
+ -
+ node_memory_MemAvailable_bytes{job="node-exporter",<<.LabelMatchers>>}
+ )
+ or sum by (<<.GroupBy>>) (
+ windows_cs_physical_memory_bytes{job="windows-exporter",<<.LabelMatchers>>}
+ -
+ windows_memory_available_bytes{job="windows-exporter",<<.LabelMatchers>>}
+ )
"resources":
"overrides":
"instance":
--
GitLab