From 87f8b8c9312b883f2dee5d918d6952a9e3bdd408 Mon Sep 17 00:00:00 2001
From: Frederic Branczyk <fbranczyk@gmail.com>
Date: Tue, 2 Apr 2019 15:03:23 +0200
Subject: [PATCH] kube-prometheus: Re-generate
---
jsonnetfile.lock.json | 10 +++++-----
manifests/grafana-deployment.yaml | 2 +-
manifests/prometheus-adapter-configMap.yaml | 4 ++--
manifests/prometheus-prometheus.yaml | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 9b315a0b..9024b9da 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -8,7 +8,7 @@
"subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus"
}
},
- "version": "9faab58c2b1cce4def2cc35045162554b8e4a706"
+ "version": "3623fd0dfc7be15ab2fbe648217f238f614b2d1f"
},
{
"name": "ksonnet",
@@ -38,7 +38,7 @@
"subdir": "grafonnet"
}
},
- "version": "11022f5e920ac1ea960556193e3f0ab57d70d7c5"
+ "version": "d270f529db9eb750425a173188c534ab92532f47"
},
{
"name": "grafana-builder",
@@ -48,7 +48,7 @@
"subdir": "grafana-builder"
}
},
- "version": "5cc4bfab6e2453266e47d01b78cbae0b2643426e"
+ "version": "2c635c3310c6e61720871ac94d6d2572e37b83f7"
},
{
"name": "grafana",
@@ -58,7 +58,7 @@
"subdir": "grafana"
}
},
- "version": "9ddf5a198b0f7c898dc061158ea427112acbae11"
+ "version": "de2ec3f0f9115da2d47dc6b86af9b402e2bf146d"
},
{
"name": "prometheus-operator",
@@ -78,7 +78,7 @@
"subdir": "Documentation/etcd-mixin"
}
},
- "version": "e1ca3b4434945e57e8e3a451cdbde74a903cc8e1"
+ "version": "a621d807f061e1dd635033a8d6bc261461429e27"
}
]
}
diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml
index 2caaca6d..bd6bf678 100644
--- a/manifests/grafana-deployment.yaml
+++ b/manifests/grafana-deployment.yaml
@@ -16,7 +16,7 @@ spec:
app: grafana
spec:
containers:
- - image: grafana/grafana:6.0.0-beta1
+ - image: grafana/grafana:6.0.1
name: grafana
ports:
- containerPort: 3000
diff --git a/manifests/prometheus-adapter-configMap.yaml b/manifests/prometheus-adapter-configMap.yaml
index d6ebd78f..15434fc5 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>>}[1m])) by (<<.GroupBy>>)
+ containerQuery: sum(rate(container_cpu_usage_seconds_total{<<.LabelMatchers>>,container_name!="POD",container_name!="",pod_name!=""}[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:
@@ -15,7 +15,7 @@ data:
resource: pod
containerLabel: container_name
memory:
- containerQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>}) by (<<.GroupBy>>)
+ containerQuery: sum(container_memory_working_set_bytes{<<.LabelMatchers>>,container_name!="POD",container_name!="",pod_name!=""}) by (<<.GroupBy>>)
nodeQuery: sum(node:node_memory_bytes_total:sum{<<.LabelMatchers>>} - node:node_memory_bytes_available:sum{<<.LabelMatchers>>}) by (<<.GroupBy>>)
resources:
overrides:
diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml
index c16914b0..c5952cc7 100644
--- a/manifests/prometheus-prometheus.yaml
+++ b/manifests/prometheus-prometheus.yaml
@@ -29,4 +29,4 @@ spec:
serviceAccountName: prometheus-k8s
serviceMonitorNamespaceSelector: {}
serviceMonitorSelector: {}
- version: v2.5.0
+ version: v2.7.2
--
GitLab