From ee7d0d367f68bae637ae515464d0e43741bf0236 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sergiusz.urbaniak@gmail.com>
Date: Fri, 27 Sep 2019 11:02:32 +0200
Subject: [PATCH] jsonnet/prometheus-adapter: Fix query for k8s 1.16
---
.../prometheus-adapter/prometheus-adapter.libsonnet | 12 ++++++------
manifests/prometheus-adapter-configMap.yaml | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet b/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet
index 428a3c3d..a87cd30e 100644
--- a/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet
+++ b/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet
@@ -19,7 +19,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
config: |||
resourceRules:
cpu:
- containerQuery: sum(rate(container_cpu_usage_seconds_total{<<.LabelMatchers>>,container_name!="POD",container_name!="",pod_name!=""}[1m])) by (<<.GroupBy>>)
+ containerQuery: sum(rate(container_cpu_usage_seconds_total{<<.LabelMatchers>>,container!="POD",container!="",pod!=""}[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:
@@ -27,11 +27,11 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
resource: node
namespace:
resource: namespace
- pod_name:
+ pod:
resource: pod
- containerLabel: container_name
+ containerLabel: container
memory:
- containerQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>,container_name!="POD",container_name!="",pod_name!=""}) by (<<.GroupBy>>)
+ containerQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>,container!="POD",container!="",pod!=""}) by (<<.GroupBy>>)
nodeQuery: sum(node_memory_MemTotal_bytes{job="node-exporter",<<.LabelMatchers>>} - node_memory_MemAvailable_bytes{job="node-exporter",<<.LabelMatchers>>}) by (<<.GroupBy>>)
resources:
overrides:
@@ -39,9 +39,9 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
resource: node
namespace:
resource: namespace
- pod_name:
+ pod:
resource: pod
- containerLabel: container_name
+ containerLabel: container
window: 1m
|||,
},
diff --git a/manifests/prometheus-adapter-configMap.yaml b/manifests/prometheus-adapter-configMap.yaml
index 15a613c8..73a1487d 100644
--- a/manifests/prometheus-adapter-configMap.yaml
+++ b/manifests/prometheus-adapter-configMap.yaml
@@ -3,7 +3,7 @@ data:
config.yaml: |
resourceRules:
cpu:
- containerQuery: sum(rate(container_cpu_usage_seconds_total{<<.LabelMatchers>>,container_name!="POD",container_name!="",pod_name!=""}[1m])) by (<<.GroupBy>>)
+ containerQuery: sum(rate(container_cpu_usage_seconds_total{<<.LabelMatchers>>,container!="POD",container!="",pod!=""}[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:
@@ -11,11 +11,11 @@ data:
resource: node
namespace:
resource: namespace
- pod_name:
+ pod:
resource: pod
- containerLabel: container_name
+ containerLabel: container
memory:
- containerQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>,container_name!="POD",container_name!="",pod_name!=""}) by (<<.GroupBy>>)
+ containerQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>,container!="POD",container!="",pod!=""}) by (<<.GroupBy>>)
nodeQuery: sum(node_memory_MemTotal_bytes{job="node-exporter",<<.LabelMatchers>>} - node_memory_MemAvailable_bytes{job="node-exporter",<<.LabelMatchers>>}) by (<<.GroupBy>>)
resources:
overrides:
@@ -23,9 +23,9 @@ data:
resource: node
namespace:
resource: namespace
- pod_name:
+ pod:
resource: pod
- containerLabel: container_name
+ containerLabel: container
window: 1m
kind: ConfigMap
metadata:
--
GitLab