From bb21ea32e34e2442dde8d7b201bc68638b67acb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20W=C3=BCrbach?= <johannes.wuerbach@googlemail.com>
Date: Tue, 7 Apr 2020 15:32:33 +0200
Subject: [PATCH] Make prometheus-adapter config a real object
---
.../prometheus-adapter.libsonnet | 71 +++++++++++--------
manifests/prometheus-adapter-configMap.yaml | 54 +++++++-------
2 files changed, 69 insertions(+), 56 deletions(-)
diff --git a/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet b/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet
index 6462d06f..e093c375 100644
--- a/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet
+++ b/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet
@@ -16,34 +16,47 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
name: 'prometheus-adapter',
labels: { name: $._config.prometheusAdapter.name },
prometheusURL: 'http://prometheus-' + $._config.prometheus.name + '.' + $._config.namespace + '.svc:9090/',
- config: |||
- resourceRules:
- cpu:
- containerQuery: sum(irate(container_cpu_usage_seconds_total{<<.LabelMatchers>>,container!="POD",container!="",pod!=""}[5m])) by (<<.GroupBy>>)
- nodeQuery: sum(1 - irate(node_cpu_seconds_total{mode="idle"}[5m]) * on(namespace, pod) group_left(node) node_namespace_pod:kube_pod_info:{<<.LabelMatchers>>}) by (<<.GroupBy>>)
- resources:
- overrides:
- node:
- resource: node
- namespace:
- resource: namespace
- pod:
- resource: pod
- containerLabel: container
- memory:
- 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:
- instance:
- resource: node
- namespace:
- resource: namespace
- pod:
- resource: pod
- containerLabel: container
- window: 5m
- |||,
+ config: {
+ resourceRules: {
+ cpu: {
+ containerQuery: 'sum(irate(container_cpu_usage_seconds_total{<<.LabelMatchers>>,container!="POD",container!="",pod!=""}[5m])) by (<<.GroupBy>>)',
+ nodeQuery: 'sum(1 - irate(node_cpu_seconds_total{mode="idle"}[5m]) * on(namespace, pod) group_left(node) node_namespace_pod:kube_pod_info:{<<.LabelMatchers>>}) by (<<.GroupBy>>)',
+ resources: {
+ overrides: {
+ node: {
+ resource: 'node'
+ },
+ namespace: {
+ resource: 'namespace'
+ },
+ pod: {
+ resource: 'pod'
+ },
+ },
+ },
+ containerLabel: 'container'
+ },
+ memory: {
+ 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: {
+ instance: {
+ resource: 'node'
+ },
+ namespace: {
+ resource: 'namespace'
+ },
+ pod: {
+ resource: 'pod'
+ },
+ },
+ },
+ containerLabel: 'container'
+ },
+ window: 5,
+ },
+ }
},
},
@@ -70,8 +83,8 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet';
configMap:
local configmap = k.core.v1.configMap;
+ configmap.new('adapter-config', { 'config.yaml': std.manifestYamlDoc($._config.prometheusAdapter.config) }) +
- configmap.new('adapter-config', { 'config.yaml': $._config.prometheusAdapter.config }) +
configmap.mixin.metadata.withNamespace($._config.namespace),
service:
diff --git a/manifests/prometheus-adapter-configMap.yaml b/manifests/prometheus-adapter-configMap.yaml
index 89980fcb..7bbe7b14 100644
--- a/manifests/prometheus-adapter-configMap.yaml
+++ b/manifests/prometheus-adapter-configMap.yaml
@@ -1,32 +1,32 @@
apiVersion: v1
data:
- config.yaml: |
- resourceRules:
- cpu:
- containerQuery: sum(irate(container_cpu_usage_seconds_total{<<.LabelMatchers>>,container!="POD",container!="",pod!=""}[5m])) by (<<.GroupBy>>)
- nodeQuery: sum(1 - irate(node_cpu_seconds_total{mode="idle"}[5m]) * on(namespace, pod) group_left(node) node_namespace_pod:kube_pod_info:{<<.LabelMatchers>>}) by (<<.GroupBy>>)
- resources:
- overrides:
- node:
- resource: node
- namespace:
- resource: namespace
- pod:
- resource: pod
- containerLabel: container
- memory:
- 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:
- instance:
- resource: node
- namespace:
- resource: namespace
- pod:
- resource: pod
- containerLabel: container
- window: 5m
+ config.yaml: |-
+ "resourceRules":
+ "cpu":
+ "containerLabel": "container"
+ "containerQuery": "sum(irate(container_cpu_usage_seconds_total{<<.LabelMatchers>>,container!=\"POD\",container!=\"\",pod!=\"\"}[5m])) by (<<.GroupBy>>)"
+ "nodeQuery": "sum(1 - irate(node_cpu_seconds_total{mode=\"idle\"}[5m]) * on(namespace, pod) group_left(node) node_namespace_pod:kube_pod_info:{<<.LabelMatchers>>}) by (<<.GroupBy>>)"
+ "resources":
+ "overrides":
+ "namespace":
+ "resource": "namespace"
+ "node":
+ "resource": "node"
+ "pod":
+ "resource": "pod"
+ "memory":
+ "containerLabel": "container"
+ "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":
+ "instance":
+ "resource": "node"
+ "namespace":
+ "resource": "namespace"
+ "pod":
+ "resource": "pod"
+ "window": 5
kind: ConfigMap
metadata:
name: adapter-config
--
GitLab