From be2557814d6917f7f4ce6cab7a52a16ab759a03b Mon Sep 17 00:00:00 2001
From: Frederic Branczyk <fbranczyk@gmail.com>
Date: Tue, 26 Feb 2019 17:45:04 +0100
Subject: [PATCH] kube-prometheus: Re-generate
---
jsonnetfile.lock.json | 4 ++--
manifests/prometheus-adapter-configMap.yaml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 57b903f7..5d10866c 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -8,7 +8,7 @@
"subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus"
}
},
- "version": "8191e30cccc28c54b2386aab1b685396bf1ed4ba"
+ "version": "df002d09f7b7a50321786c4f19c70d371494410b"
},
{
"name": "ksonnet",
@@ -78,7 +78,7 @@
"subdir": "Documentation/etcd-mixin"
}
},
- "version": "5effa154b464faa6a9ca88296df831eb7f0b8955"
+ "version": "a7e3bd06b2ef0286e1571836997287a81146c25a"
}
]
}
diff --git a/manifests/prometheus-adapter-configMap.yaml b/manifests/prometheus-adapter-configMap.yaml
index a231de36..d6ebd78f 100644
--- a/manifests/prometheus-adapter-configMap.yaml
+++ b/manifests/prometheus-adapter-configMap.yaml
@@ -4,7 +4,7 @@ data:
resourceRules:
cpu:
containerQuery: sum(rate(container_cpu_usage_seconds_total{<<.LabelMatchers>>}[1m])) by (<<.GroupBy>>)
- nodeQuery: sum(rate(container_cpu_usage_seconds_total{<<.LabelMatchers>>, id='/'}[1m])) by (<<.GroupBy>>)
+ nodeQuery: sum(1 - rate(node_cpu_seconds_total{mode="idle"}[1m]) * on(namespace, pod) group_left(node) node_namespace_pod:kube_pod_info:{<<.LabelMatchers>>}) by (<<.GroupBy>>)
resources:
overrides:
node:
@@ -16,7 +16,7 @@ data:
containerLabel: container_name
memory:
containerQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>}) by (<<.GroupBy>>)
- nodeQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>,id='/'}) by (<<.GroupBy>>)
+ nodeQuery: sum(node:node_memory_bytes_total:sum{<<.LabelMatchers>>} - node:node_memory_bytes_available:sum{<<.LabelMatchers>>}) by (<<.GroupBy>>)
resources:
overrides:
node:
--
GitLab