From be3bd2c97bafef9f940a08c886d809c830b1b762 Mon Sep 17 00:00:00 2001 From: dgrisonnet <dgrisonnet@users.noreply.github.com> Date: Mon, 11 Oct 2021 07:39:24 +0000 Subject: [PATCH] [bot] [main] Automated version update --- jsonnet/kube-prometheus/versions.json | 6 +- jsonnetfile.lock.json | 28 +- manifests/grafana-config.yaml | 2 +- manifests/grafana-dashboardDatasources.yaml | 2 +- manifests/grafana-dashboardDefinitions.yaml | 260 +++++++++--------- manifests/grafana-dashboardSources.yaml | 2 +- manifests/grafana-deployment.yaml | 12 +- manifests/grafana-service.yaml | 2 +- manifests/grafana-serviceMonitor.yaml | 2 +- manifests/kubernetes-prometheusRule.yaml | 6 +- manifests/prometheus-clusterRole.yaml | 2 +- manifests/prometheus-clusterRoleBinding.yaml | 2 +- .../prometheus-operator-prometheusRule.yaml | 16 +- .../prometheus-operator-serviceMonitor.yaml | 4 +- manifests/prometheus-podDisruptionBudget.yaml | 2 +- manifests/prometheus-prometheus.yaml | 8 +- manifests/prometheus-prometheusRule.yaml | 2 +- manifests/prometheus-roleBindingConfig.yaml | 2 +- ...metheus-roleBindingSpecificNamespaces.yaml | 6 +- manifests/prometheus-roleConfig.yaml | 2 +- .../prometheus-roleSpecificNamespaces.yaml | 6 +- manifests/prometheus-service.yaml | 2 +- manifests/prometheus-serviceAccount.yaml | 2 +- manifests/prometheus-serviceMonitor.yaml | 2 +- ...managerConfigCustomResourceDefinition.yaml | 2 +- ...-0thanosrulerCustomResourceDefinition.yaml | 22 +- .../prometheus-operator-clusterRole.yaml | 2 +- ...rometheus-operator-clusterRoleBinding.yaml | 2 +- .../setup/prometheus-operator-deployment.yaml | 8 +- .../setup/prometheus-operator-service.yaml | 2 +- .../prometheus-operator-serviceAccount.yaml | 2 +- 31 files changed, 225 insertions(+), 195 deletions(-) diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json index e983b213..cba38a90 100644 --- a/jsonnet/kube-prometheus/versions.json +++ b/jsonnet/kube-prometheus/versions.json @@ -1,12 +1,12 @@ { "alertmanager": "0.23.0", "blackboxExporter": "0.19.0", - "grafana": "8.1.5", + "grafana": "8.2.0", "kubeStateMetrics": "2.2.1", "nodeExporter": "1.2.2", - "prometheus": "2.30.2", + "prometheus": "2.30.3", "prometheusAdapter": "0.9.0", - "prometheusOperator": "0.51.1", + "prometheusOperator": "0.51.2", "kubeRbacProxy": "0.11.0", "configmapReload": "0.5.0" } diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 3f4736ea..e105f422 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -18,7 +18,7 @@ "subdir": "contrib/mixin" } }, - "version": "1d73f3c6f20d505ad26303d059fafce4c79d6797", + "version": "5b226e0abf4100253c94bb71f47d6815877ed5a2", "sum": "5XhYOigrKipOWDbIn9hlrz7JcbelzvJnormxSaup9JI=" }, { @@ -38,8 +38,8 @@ "subdir": "grafana-builder" } }, - "version": "37319e21e546579eab2c3ed459e956a262c28f8c", - "sum": "GRf2GvwEU4jhXV+JOonXSZ4wdDv8mnHBPCQ6TUVd+g8=" + "version": "09ddf8eb59edc2dacccf7a96d20d97b240ae170a", + "sum": "/6t6d6lmAaCJmSn2aLEgCGD1fHw2BJ/JvaT/a9IowoY=" }, { "source": { @@ -48,8 +48,8 @@ "subdir": "" } }, - "version": "ff4641bcd83314c955150bea6b147df9ca335c4a", - "sum": "oUVGwcCbmdH8qz9B+lbRawI9s23GY9HeW7MwYZRbZ/0=" + "version": "6c72589035f4f49674a56cf97a3ec1a02f14671a", + "sum": "9T4XbN7fM8PkCe+5UuN9DhWqz8E0aWHxy02s4H3ih4s=" }, { "source": { @@ -58,7 +58,7 @@ "subdir": "lib/promgrafonnet" } }, - "version": "ff4641bcd83314c955150bea6b147df9ca335c4a", + "version": "6c72589035f4f49674a56cf97a3ec1a02f14671a", "sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps=" }, { @@ -68,7 +68,7 @@ "subdir": "jsonnet/kube-state-metrics" } }, - "version": "31b2fff8bda1dc2b73b7b023d3c73c8b6db1a0b2", + "version": "1e9d07bfe1509b04f6f5183c4635da2a88d14cbd", "sum": "U1wzIpTAtOvC1yj43Y8PfvT0JfvnAcMfNH12Wi+ab0Y=" }, { @@ -78,7 +78,7 @@ "subdir": "jsonnet/kube-state-metrics-mixin" } }, - "version": "31b2fff8bda1dc2b73b7b023d3c73c8b6db1a0b2", + "version": "1e9d07bfe1509b04f6f5183c4635da2a88d14cbd", "sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk=" }, { @@ -88,8 +88,8 @@ "subdir": "jsonnet/mixin" } }, - "version": "42fc15967e35e0cca68cf935f844086edbc82d0e", - "sum": "6reUygVmQrLEWQzTKcH8ceDbvM+2ztK3z2VBR2K2l+U=", + "version": "05fce1eb80f57a27b485d1f7b7249fbf0c4cb18a", + "sum": "qZ4WgiweaE6eeKtFK60QUjLO8sf2L9Q8fgafWvDcyfY=", "name": "prometheus-operator-mixin" }, { @@ -99,8 +99,8 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "42fc15967e35e0cca68cf935f844086edbc82d0e", - "sum": "sECNXs/aIEreFUma1BWVyknBygqh3AVJEB3msmrAYYY=" + "version": "05fce1eb80f57a27b485d1f7b7249fbf0c4cb18a", + "sum": "FdL6sE+IEdn6rQx+FoLX4YwTyxS60sEhXb0o/pyh+3A=" }, { "source": { @@ -130,7 +130,7 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "1270b87970baeb926fcce64552db5c744ffaf83f", + "version": "b878527151e6503d24ac5b667b86e8794eb79ff7", "sum": "m4VHwft4fUcxzL4+52lLZG/V5aH5ZEdjaweb88vISL0=", "name": "prometheus" }, @@ -141,7 +141,7 @@ "subdir": "mixin" } }, - "version": "48a068c4e8e5d0d3ef1b31207a4126d45b99087c", + "version": "d5156d8e10f8f6bfc880ccf98b0cbf37dd0b1304", "sum": "Og+wEHfgzXBvBLAeeQvGNoiCw3FY4LQHlJdpsG/owj8=", "name": "thanos-mixin" }, diff --git a/manifests/grafana-config.yaml b/manifests/grafana-config.yaml index 5857371f..1baa02ce 100644 --- a/manifests/grafana-config.yaml +++ b/manifests/grafana-config.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.1.5 + app.kubernetes.io/version: 8.2.0 name: grafana-config namespace: monitoring stringData: diff --git a/manifests/grafana-dashboardDatasources.yaml b/manifests/grafana-dashboardDatasources.yaml index ed442e85..8eec1683 100644 --- a/manifests/grafana-dashboardDatasources.yaml +++ b/manifests/grafana-dashboardDatasources.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.1.5 + app.kubernetes.io/version: 8.2.0 name: grafana-datasources namespace: monitoring stringData: diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml index 0e9d4725..3ff3b844 100644 --- a/manifests/grafana-dashboardDefinitions.yaml +++ b/manifests/grafana-dashboardDefinitions.yaml @@ -596,7 +596,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.1.5 + app.kubernetes.io/version: 8.2.0 name: grafana-dashboard-alertmanager-overview namespace: monitoring - apiVersion: v1 @@ -2332,7 +2332,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.1.5 + app.kubernetes.io/version: 8.2.0 name: grafana-dashboard-apiserver namespace: monitoring - apiVersion: v1 @@ -4203,7 +4203,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.1.5 + app.kubernetes.io/version: 8.2.0 name: grafana-dashboard-cluster-total namespace: monitoring - apiVersion: v1 @@ -5369,7 +5369,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.1.5 + app.kubernetes.io/version: 8.2.0 name: grafana-dashboard-controller-manager namespace: monitoring - apiVersion: v1 @@ -5434,7 +5434,7 @@ items: "steppedLine": false, "targets": [ { - "expr": "1 - avg(rate(node_cpu_seconds_total{mode=\"idle\", cluster=\"$cluster\"}[$__rate_interval]))", + "expr": "1 - avg(rate(node_cpu_seconds_total{mode=~\"idle|iowait|steal\", cluster=\"$cluster\"}[$__rate_interval]))", "format": "time_series", "instant": true, "intervalFactor": 2, @@ -5447,7 +5447,7 @@ items: "title": "CPU Utilisation", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "singlestat", @@ -5531,7 +5531,7 @@ items: "title": "CPU Requests Commitment", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "singlestat", @@ -5615,7 +5615,7 @@ items: "title": "CPU Limits Commitment", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "singlestat", @@ -5699,7 +5699,7 @@ items: "title": "Memory Utilisation", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "singlestat", @@ -5783,7 +5783,7 @@ items: "title": "Memory Requests Commitment", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "singlestat", @@ -5867,7 +5867,7 @@ items: "title": "Memory Limits Commitment", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "singlestat", @@ -5965,7 +5965,7 @@ items: "title": "CPU Usage", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -6293,7 +6293,7 @@ items: "title": "CPU Quota", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "transform": "table", @@ -6392,7 +6392,7 @@ items: "title": "Memory Usage (w/o cache)", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -6720,7 +6720,7 @@ items: "title": "Requests by Namespace", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "transform": "table", @@ -7022,7 +7022,7 @@ items: "title": "Current Network Usage", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "transform": "table", @@ -7121,7 +7121,7 @@ items: "title": "Receive Bandwidth", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -7207,7 +7207,7 @@ items: "title": "Transmit Bandwidth", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -7305,7 +7305,7 @@ items: "title": "Average Container Bandwidth by Namespace: Received", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -7391,7 +7391,7 @@ items: "title": "Average Container Bandwidth by Namespace: Transmitted", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -7489,7 +7489,7 @@ items: "title": "Rate of Received Packets", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -7575,7 +7575,7 @@ items: "title": "Rate of Transmitted Packets", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -7673,7 +7673,7 @@ items: "title": "Rate of Received Packets Dropped", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -7759,7 +7759,7 @@ items: "title": "Rate of Transmitted Packets Dropped", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -7858,7 +7858,7 @@ items: "title": "IOPS(Reads+Writes)", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -7944,7 +7944,7 @@ items: "title": "ThroughPut(Read+Write)", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -8248,7 +8248,7 @@ items: "title": "Current Storage IO", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "transform": "table", @@ -8382,7 +8382,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.1.5 + app.kubernetes.io/version: 8.2.0 name: grafana-dashboard-k8s-resources-cluster namespace: monitoring - apiVersion: v1 @@ -8459,7 +8459,7 @@ items: "title": "CPU Utilisation (from requests)", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "singlestat", @@ -8543,7 +8543,7 @@ items: "title": "CPU Utilisation (from limits)", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "singlestat", @@ -8627,7 +8627,7 @@ items: "title": "Memory Utilisation (from requests)", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "singlestat", @@ -8711,7 +8711,7 @@ items: "title": "Memory Utilisation (from limits)", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "singlestat", @@ -8846,7 +8846,7 @@ items: "title": "CPU Usage", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -9118,7 +9118,7 @@ items: "title": "CPU Quota", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "transform": "table", @@ -9254,7 +9254,7 @@ items: "title": "Memory Usage (w/o cache)", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -9610,7 +9610,7 @@ items: "title": "Memory Quota", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "transform": "table", @@ -9912,7 +9912,7 @@ items: "title": "Current Network Usage", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "transform": "table", @@ -10011,7 +10011,7 @@ items: "title": "Receive Bandwidth", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -10097,7 +10097,7 @@ items: "title": "Transmit Bandwidth", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -10195,7 +10195,7 @@ items: "title": "Rate of Received Packets", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -10281,7 +10281,7 @@ items: "title": "Rate of Transmitted Packets", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -10379,7 +10379,7 @@ items: "title": "Rate of Received Packets Dropped", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -10465,7 +10465,7 @@ items: "title": "Rate of Transmitted Packets Dropped", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -10564,7 +10564,7 @@ items: "title": "IOPS(Reads+Writes)", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -10650,7 +10650,7 @@ items: "title": "ThroughPut(Read+Write)", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -10954,7 +10954,7 @@ items: "title": "Current Storage IO", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "transform": "table", @@ -11115,7 +11115,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.1.5 + app.kubernetes.io/version: 8.2.0 name: grafana-dashboard-k8s-resources-namespace namespace: monitoring - apiVersion: v1 @@ -11194,7 +11194,7 @@ items: "title": "CPU Usage", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -11466,7 +11466,7 @@ items: "title": "CPU Quota", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "transform": "table", @@ -11565,7 +11565,7 @@ items: "title": "Memory Usage (w/o cache)", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -11921,7 +11921,7 @@ items: "title": "Memory Quota", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "transform": "table", @@ -12082,7 +12082,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.1.5 + app.kubernetes.io/version: 8.2.0 name: grafana-dashboard-k8s-resources-node namespace: monitoring - apiVersion: v1 @@ -12194,7 +12194,7 @@ items: "title": "CPU Usage", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -12299,7 +12299,7 @@ items: "title": "CPU Throttling", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -12571,7 +12571,7 @@ items: "title": "CPU Quota", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "transform": "table", @@ -12705,7 +12705,7 @@ items: "title": "Memory Usage (WSS)", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -13061,7 +13061,7 @@ items: "title": "Memory Quota", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "transform": "table", @@ -13161,7 +13161,7 @@ items: "title": "Receive Bandwidth", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -13248,7 +13248,7 @@ items: "title": "Transmit Bandwidth", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -13347,7 +13347,7 @@ items: "title": "Rate of Received Packets", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -13434,7 +13434,7 @@ items: "title": "Rate of Transmitted Packets", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -13533,7 +13533,7 @@ items: "title": "Rate of Received Packets Dropped", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -13620,7 +13620,7 @@ items: "title": "Rate of Transmitted Packets Dropped", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -13727,7 +13727,7 @@ items: "title": "IOPS", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -13821,7 +13821,7 @@ items: "title": "ThroughPut", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -13920,7 +13920,7 @@ items: "title": "IOPS(Reads+Writes)", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -14006,7 +14006,7 @@ items: "title": "ThroughPut(Read+Write)", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -14310,7 +14310,7 @@ items: "title": "Current Storage IO", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "transform": "table", @@ -14498,7 +14498,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.1.5 + app.kubernetes.io/version: 8.2.0 name: grafana-dashboard-k8s-resources-pod namespace: monitoring - apiVersion: v1 @@ -14577,7 +14577,7 @@ items: "title": "CPU Usage", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -14849,7 +14849,7 @@ items: "title": "CPU Quota", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "transform": "table", @@ -14948,7 +14948,7 @@ items: "title": "Memory Usage", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -15220,7 +15220,7 @@ items: "title": "Memory Quota", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "transform": "table", @@ -15522,7 +15522,7 @@ items: "title": "Current Network Usage", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "transform": "table", @@ -15621,7 +15621,7 @@ items: "title": "Receive Bandwidth", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -15707,7 +15707,7 @@ items: "title": "Transmit Bandwidth", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -15805,7 +15805,7 @@ items: "title": "Average Container Bandwidth by Pod: Received", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -15891,7 +15891,7 @@ items: "title": "Average Container Bandwidth by Pod: Transmitted", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -15989,7 +15989,7 @@ items: "title": "Rate of Received Packets", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -16075,7 +16075,7 @@ items: "title": "Rate of Transmitted Packets", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -16173,7 +16173,7 @@ items: "title": "Rate of Received Packets Dropped", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -16259,7 +16259,7 @@ items: "title": "Rate of Transmitted Packets Dropped", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -16473,7 +16473,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.1.5 + app.kubernetes.io/version: 8.2.0 name: grafana-dashboard-k8s-resources-workload namespace: monitoring - apiVersion: v1 @@ -16589,7 +16589,7 @@ items: "title": "CPU Usage", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -16908,7 +16908,7 @@ items: "title": "CPU Quota", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "transform": "table", @@ -17044,7 +17044,7 @@ items: "title": "Memory Usage", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -17363,7 +17363,7 @@ items: "title": "Memory Quota", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "transform": "table", @@ -17684,7 +17684,7 @@ items: "title": "Current Network Usage", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "transform": "table", @@ -17783,7 +17783,7 @@ items: "title": "Receive Bandwidth", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -17869,7 +17869,7 @@ items: "title": "Transmit Bandwidth", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -17967,7 +17967,7 @@ items: "title": "Average Container Bandwidth by Workload: Received", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -18053,7 +18053,7 @@ items: "title": "Average Container Bandwidth by Workload: Transmitted", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -18151,7 +18151,7 @@ items: "title": "Rate of Received Packets", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -18237,7 +18237,7 @@ items: "title": "Rate of Transmitted Packets", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -18335,7 +18335,7 @@ items: "title": "Rate of Received Packets Dropped", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -18421,7 +18421,7 @@ items: "title": "Rate of Transmitted Packets Dropped", "tooltip": { "shared": false, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -18613,7 +18613,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.1.5 + app.kubernetes.io/version: 8.2.0 name: grafana-dashboard-k8s-resources-workloads-namespace namespace: monitoring - apiVersion: v1 @@ -20856,7 +20856,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.1.5 + app.kubernetes.io/version: 8.2.0 name: grafana-dashboard-kubelet namespace: monitoring - apiVersion: v1 @@ -22309,7 +22309,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.1.5 + app.kubernetes.io/version: 8.2.0 name: grafana-dashboard-namespace-by-pod namespace: monitoring - apiVersion: v1 @@ -24034,7 +24034,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.1.5 + app.kubernetes.io/version: 8.2.0 name: grafana-dashboard-namespace-by-workload namespace: monitoring - apiVersion: v1 @@ -25086,7 +25086,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.1.5 + app.kubernetes.io/version: 8.2.0 name: grafana-dashboard-node-cluster-rsrc-use namespace: monitoring - apiVersion: v1 @@ -26164,7 +26164,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.1.5 + app.kubernetes.io/version: 8.2.0 name: grafana-dashboard-node-rsrc-use namespace: monitoring - apiVersion: v1 @@ -27144,7 +27144,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.1.5 + app.kubernetes.io/version: 8.2.0 name: grafana-dashboard-nodes namespace: monitoring - apiVersion: v1 @@ -27710,7 +27710,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.1.5 + app.kubernetes.io/version: 8.2.0 name: grafana-dashboard-persistentvolumesusage namespace: monitoring - apiVersion: v1 @@ -28927,7 +28927,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.1.5 + app.kubernetes.io/version: 8.2.0 name: grafana-dashboard-pod-total namespace: monitoring - apiVersion: v1 @@ -30586,7 +30586,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.1.5 + app.kubernetes.io/version: 8.2.0 name: grafana-dashboard-prometheus-remote-write namespace: monitoring - apiVersion: v1 @@ -30792,8 +30792,8 @@ items: "timeShift": null, "title": "Prometheus Stats", "tooltip": { - "shared": false, - "sort": 0, + "shared": true, + "sort": 2, "value_type": "individual" }, "transform": "table", @@ -30891,8 +30891,8 @@ items: "timeShift": null, "title": "Target Sync", "tooltip": { - "shared": false, - "sort": 0, + "shared": true, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -30977,8 +30977,8 @@ items: "timeShift": null, "title": "Targets", "tooltip": { - "shared": false, - "sort": 0, + "shared": true, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -31075,8 +31075,8 @@ items: "timeShift": null, "title": "Average Scrape Interval Duration", "tooltip": { - "shared": false, - "sort": 0, + "shared": true, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -31193,8 +31193,8 @@ items: "timeShift": null, "title": "Scrape failures", "tooltip": { - "shared": false, - "sort": 0, + "shared": true, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -31279,8 +31279,8 @@ items: "timeShift": null, "title": "Appended Samples", "tooltip": { - "shared": false, - "sort": 0, + "shared": true, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -31377,8 +31377,8 @@ items: "timeShift": null, "title": "Head Series", "tooltip": { - "shared": false, - "sort": 0, + "shared": true, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -31463,8 +31463,8 @@ items: "timeShift": null, "title": "Head Chunks", "tooltip": { - "shared": false, - "sort": 0, + "shared": true, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -31561,8 +31561,8 @@ items: "timeShift": null, "title": "Query Rate", "tooltip": { - "shared": false, - "sort": 0, + "shared": true, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -31647,8 +31647,8 @@ items: "timeShift": null, "title": "Stage Duration", "tooltip": { - "shared": false, - "sort": 0, + "shared": true, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -31810,7 +31810,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.1.5 + app.kubernetes.io/version: 8.2.0 name: grafana-dashboard-prometheus namespace: monitoring - apiVersion: v1 @@ -33056,7 +33056,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.1.5 + app.kubernetes.io/version: 8.2.0 name: grafana-dashboard-proxy namespace: monitoring - apiVersion: v1 @@ -34145,7 +34145,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.1.5 + app.kubernetes.io/version: 8.2.0 name: grafana-dashboard-scheduler namespace: monitoring - apiVersion: v1 @@ -35572,7 +35572,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.1.5 + app.kubernetes.io/version: 8.2.0 name: grafana-dashboard-workload-total namespace: monitoring kind: ConfigMapList diff --git a/manifests/grafana-dashboardSources.yaml b/manifests/grafana-dashboardSources.yaml index f6a116d5..d9c16222 100644 --- a/manifests/grafana-dashboardSources.yaml +++ b/manifests/grafana-dashboardSources.yaml @@ -22,6 +22,6 @@ metadata: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.1.5 + app.kubernetes.io/version: 8.2.0 name: grafana-dashboards namespace: monitoring diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml index 9f1d4a87..6a2151ce 100644 --- a/manifests/grafana-deployment.yaml +++ b/manifests/grafana-deployment.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.1.5 + app.kubernetes.io/version: 8.2.0 name: grafana namespace: monitoring spec: @@ -18,18 +18,18 @@ spec: template: metadata: annotations: - checksum/grafana-config: 2307d606a1c9caa12d09bf2dea10de16 - checksum/grafana-dashboardproviders: 27252928d79782153aa30c5aebd51fb8 - checksum/grafana-datasources: 30e19ebb478699683b228a7c5727860f + checksum/grafana-config: bc42c21856164e7bfdcb92065851d0bf + checksum/grafana-dashboardproviders: 861f4627a6cce3eba350c4b35fb024ff + checksum/grafana-datasources: 54629d3d4c7daa8ec4805ede91f27f0d labels: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.1.5 + app.kubernetes.io/version: 8.2.0 spec: containers: - env: [] - image: grafana/grafana:8.1.5 + image: grafana/grafana:8.2.0 name: grafana ports: - containerPort: 3000 diff --git a/manifests/grafana-service.yaml b/manifests/grafana-service.yaml index 592b24b1..e6a53fb9 100644 --- a/manifests/grafana-service.yaml +++ b/manifests/grafana-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.1.5 + app.kubernetes.io/version: 8.2.0 name: grafana namespace: monitoring spec: diff --git a/manifests/grafana-serviceMonitor.yaml b/manifests/grafana-serviceMonitor.yaml index b85de9e1..2f685979 100644 --- a/manifests/grafana-serviceMonitor.yaml +++ b/manifests/grafana-serviceMonitor.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 8.1.5 + app.kubernetes.io/version: 8.2.0 name: grafana namespace: monitoring spec: diff --git a/manifests/kubernetes-prometheusRule.yaml b/manifests/kubernetes-prometheusRule.yaml index e7f10701..31c81b6c 100644 --- a/manifests/kubernetes-prometheusRule.yaml +++ b/manifests/kubernetes-prometheusRule.yaml @@ -14,13 +14,11 @@ spec: rules: - alert: KubePodCrashLooping annotations: - description: Pod {{ $labels.namespace }}/{{ $labels.pod }} ({{ $labels.container }}) is restarting {{ printf "%.2f" $value }} times / 10 minutes. + description: 'Pod {{ $labels.namespace }}/{{ $labels.pod }} ({{ $labels.container }}) is in waiting state (reason: "CrashLoopBackOff").' runbook_url: https://runbooks.prometheus-operator.dev/runbooks/kubernetes/kubepodcrashlooping summary: Pod is crash looping. expr: | - increase(kube_pod_container_status_restarts_total{job="kube-state-metrics"}[10m]) > 0 - and - kube_pod_container_status_waiting{job="kube-state-metrics"} == 1 + max_over_time(kube_pod_container_status_waiting_reason{reason="CrashLoopBackOff", job="kube-state-metrics"}[5m]) >= 1 for: 15m labels: severity: warning diff --git a/manifests/prometheus-clusterRole.yaml b/manifests/prometheus-clusterRole.yaml index a31a48d4..adb72cbe 100644 --- a/manifests/prometheus-clusterRole.yaml +++ b/manifests/prometheus-clusterRole.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: prometheus app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.30.2 + app.kubernetes.io/version: 2.30.3 name: prometheus-k8s rules: - apiGroups: diff --git a/manifests/prometheus-clusterRoleBinding.yaml b/manifests/prometheus-clusterRoleBinding.yaml index 12c82ea4..3f768af0 100644 --- a/manifests/prometheus-clusterRoleBinding.yaml +++ b/manifests/prometheus-clusterRoleBinding.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: prometheus app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.30.2 + app.kubernetes.io/version: 2.30.3 name: prometheus-k8s roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/manifests/prometheus-operator-prometheusRule.yaml b/manifests/prometheus-operator-prometheusRule.yaml index 7a428aab..30db8193 100644 --- a/manifests/prometheus-operator-prometheusRule.yaml +++ b/manifests/prometheus-operator-prometheusRule.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.51.1 + app.kubernetes.io/version: 0.51.2 prometheus: k8s role: alert-rules name: prometheus-operator-rules @@ -84,3 +84,17 @@ spec: for: 5m labels: severity: warning + - name: config-reloaders + rules: + - alert: ConfigReloaderSidecarErrors + annotations: + description: |- + Errors encountered while the {{$labels.pod}} config-reloader sidecar attempts to sync config in {{$labels.namespace}} namespace. + As a result, configuration for service running in {{$labels.pod}} may be stale and cannot be updated anymore. + runbook_url: https://runbooks.prometheus-operator.dev/runbooks/prometheus-operator/configreloadersidecarerrors + summary: config-reloader sidecar has not had a successful reload for 10m + expr: | + max_over_time(reloader_last_reload_successful{namespace=~".+"}[5m]) == 0 + for: 10m + labels: + severity: warning diff --git a/manifests/prometheus-operator-serviceMonitor.yaml b/manifests/prometheus-operator-serviceMonitor.yaml index edbd1a8a..9f7546ae 100644 --- a/manifests/prometheus-operator-serviceMonitor.yaml +++ b/manifests/prometheus-operator-serviceMonitor.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.51.1 + app.kubernetes.io/version: 0.51.2 name: prometheus-operator namespace: monitoring spec: @@ -21,4 +21,4 @@ spec: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.51.1 + app.kubernetes.io/version: 0.51.2 diff --git a/manifests/prometheus-podDisruptionBudget.yaml b/manifests/prometheus-podDisruptionBudget.yaml index 8cb2004e..8b35948e 100644 --- a/manifests/prometheus-podDisruptionBudget.yaml +++ b/manifests/prometheus-podDisruptionBudget.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: prometheus app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.30.2 + app.kubernetes.io/version: 2.30.3 name: prometheus-k8s namespace: monitoring spec: diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml index d244198d..f9d31637 100644 --- a/manifests/prometheus-prometheus.yaml +++ b/manifests/prometheus-prometheus.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: prometheus app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.30.2 + app.kubernetes.io/version: 2.30.3 prometheus: k8s name: k8s namespace: monitoring @@ -18,7 +18,7 @@ spec: port: web enableFeatures: [] externalLabels: {} - image: quay.io/prometheus/prometheus:v2.30.2 + image: quay.io/prometheus/prometheus:v2.30.3 nodeSelector: kubernetes.io/os: linux podMetadata: @@ -26,7 +26,7 @@ spec: app.kubernetes.io/component: prometheus app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.30.2 + app.kubernetes.io/version: 2.30.3 podMonitorNamespaceSelector: {} podMonitorSelector: {} probeNamespaceSelector: {} @@ -44,4 +44,4 @@ spec: serviceAccountName: prometheus-k8s serviceMonitorNamespaceSelector: {} serviceMonitorSelector: {} - version: 2.30.2 + version: 2.30.3 diff --git a/manifests/prometheus-prometheusRule.yaml b/manifests/prometheus-prometheusRule.yaml index c565bdb8..6951b6a5 100644 --- a/manifests/prometheus-prometheusRule.yaml +++ b/manifests/prometheus-prometheusRule.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: prometheus app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.30.2 + app.kubernetes.io/version: 2.30.3 prometheus: k8s role: alert-rules name: prometheus-k8s-prometheus-rules diff --git a/manifests/prometheus-roleBindingConfig.yaml b/manifests/prometheus-roleBindingConfig.yaml index 00e83c74..73539a71 100644 --- a/manifests/prometheus-roleBindingConfig.yaml +++ b/manifests/prometheus-roleBindingConfig.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: prometheus app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.30.2 + app.kubernetes.io/version: 2.30.3 name: prometheus-k8s-config namespace: monitoring roleRef: diff --git a/manifests/prometheus-roleBindingSpecificNamespaces.yaml b/manifests/prometheus-roleBindingSpecificNamespaces.yaml index ae175e47..d16ba49a 100644 --- a/manifests/prometheus-roleBindingSpecificNamespaces.yaml +++ b/manifests/prometheus-roleBindingSpecificNamespaces.yaml @@ -7,7 +7,7 @@ items: app.kubernetes.io/component: prometheus app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.30.2 + app.kubernetes.io/version: 2.30.3 name: prometheus-k8s namespace: default roleRef: @@ -25,7 +25,7 @@ items: app.kubernetes.io/component: prometheus app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.30.2 + app.kubernetes.io/version: 2.30.3 name: prometheus-k8s namespace: kube-system roleRef: @@ -43,7 +43,7 @@ items: app.kubernetes.io/component: prometheus app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.30.2 + app.kubernetes.io/version: 2.30.3 name: prometheus-k8s namespace: monitoring roleRef: diff --git a/manifests/prometheus-roleConfig.yaml b/manifests/prometheus-roleConfig.yaml index 9d55fdaa..b769a439 100644 --- a/manifests/prometheus-roleConfig.yaml +++ b/manifests/prometheus-roleConfig.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: prometheus app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.30.2 + app.kubernetes.io/version: 2.30.3 name: prometheus-k8s-config namespace: monitoring rules: diff --git a/manifests/prometheus-roleSpecificNamespaces.yaml b/manifests/prometheus-roleSpecificNamespaces.yaml index 04edf85f..7c8a183d 100644 --- a/manifests/prometheus-roleSpecificNamespaces.yaml +++ b/manifests/prometheus-roleSpecificNamespaces.yaml @@ -7,7 +7,7 @@ items: app.kubernetes.io/component: prometheus app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.30.2 + app.kubernetes.io/version: 2.30.3 name: prometheus-k8s namespace: default rules: @@ -44,7 +44,7 @@ items: app.kubernetes.io/component: prometheus app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.30.2 + app.kubernetes.io/version: 2.30.3 name: prometheus-k8s namespace: kube-system rules: @@ -81,7 +81,7 @@ items: app.kubernetes.io/component: prometheus app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.30.2 + app.kubernetes.io/version: 2.30.3 name: prometheus-k8s namespace: monitoring rules: diff --git a/manifests/prometheus-service.yaml b/manifests/prometheus-service.yaml index 25de9f7a..07126372 100644 --- a/manifests/prometheus-service.yaml +++ b/manifests/prometheus-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: prometheus app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.30.2 + app.kubernetes.io/version: 2.30.3 prometheus: k8s name: prometheus-k8s namespace: monitoring diff --git a/manifests/prometheus-serviceAccount.yaml b/manifests/prometheus-serviceAccount.yaml index 573529f4..fbaa9e0b 100644 --- a/manifests/prometheus-serviceAccount.yaml +++ b/manifests/prometheus-serviceAccount.yaml @@ -5,6 +5,6 @@ metadata: app.kubernetes.io/component: prometheus app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.30.2 + app.kubernetes.io/version: 2.30.3 name: prometheus-k8s namespace: monitoring diff --git a/manifests/prometheus-serviceMonitor.yaml b/manifests/prometheus-serviceMonitor.yaml index 3c8a604a..3fb68dfd 100644 --- a/manifests/prometheus-serviceMonitor.yaml +++ b/manifests/prometheus-serviceMonitor.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: prometheus app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.30.2 + app.kubernetes.io/version: 2.30.3 name: prometheus-k8s namespace: monitoring spec: diff --git a/manifests/setup/prometheus-operator-0alertmanagerConfigCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0alertmanagerConfigCustomResourceDefinition.yaml index 7f879959..f4209787 100644 --- a/manifests/setup/prometheus-operator-0alertmanagerConfigCustomResourceDefinition.yaml +++ b/manifests/setup/prometheus-operator-0alertmanagerConfigCustomResourceDefinition.yaml @@ -161,7 +161,7 @@ spec: description: Whether or not to notify about resolved alerts. type: boolean smarthost: - description: The SMTP host through which emails are sent. + description: The SMTP host and port through which emails are sent. E.g. example.com:25 type: string text: description: The text body of the email notification. diff --git a/manifests/setup/prometheus-operator-0thanosrulerCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0thanosrulerCustomResourceDefinition.yaml index bd9ede43..1d8cf815 100644 --- a/manifests/setup/prometheus-operator-0thanosrulerCustomResourceDefinition.yaml +++ b/manifests/setup/prometheus-operator-0thanosrulerCustomResourceDefinition.yaml @@ -374,13 +374,31 @@ spec: type: object type: object alertDropLabels: - description: AlertDropLabels configure the label names which should be dropped in ThanosRuler alerts. If `labels` field is not provided, `thanos_ruler_replica` will be dropped in alerts by default. + description: AlertDropLabels configure the label names which should be dropped in ThanosRuler alerts. The replica label `thanos_ruler_replica` will always be dropped in alerts. items: type: string type: array alertQueryUrl: description: The external Query URL the Thanos Ruler will set in the 'Source' field of all alerts. Maps to the '--alert.query-url' CLI arg. type: string + alertRelabelConfigFile: + description: AlertRelabelConfigFile specifies the path of the alert relabeling configuration file. When used alongside with AlertRelabelConfigs, alertRelabelConfigFile takes precedence. + type: string + alertRelabelConfigs: + description: 'AlertRelabelConfigs configures alert relabeling in ThanosRuler. Alert relabel configurations must have the form as specified in the official Prometheus documentation: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs Alternative to AlertRelabelConfigFile, and lower order priority.' + properties: + key: + description: The key of the secret to select from. Must be a valid secret key. + type: string + name: + description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + optional: + description: Specify whether the Secret or its key must be defined + type: boolean + required: + - key + type: object alertmanagersConfig: description: Define configuration for connecting to alertmanager. Only available with thanos v0.10.0 and higher. Maps to the `alertmanagers.config` arg. properties: @@ -1956,7 +1974,7 @@ spec: labels: additionalProperties: type: string - description: Labels configure the external label pairs to ThanosRuler. If not provided, default replica label `thanos_ruler_replica` will be added as a label and be dropped in alerts. + description: Labels configure the external label pairs to ThanosRuler. A default replica label `thanos_ruler_replica` will be always added as a label with the value of the pod's name and it will be dropped in the alerts. type: object listenLocal: description: ListenLocal makes the Thanos ruler listen on loopback, so that it does not bind against the Pod IP. diff --git a/manifests/setup/prometheus-operator-clusterRole.yaml b/manifests/setup/prometheus-operator-clusterRole.yaml index 5130c154..9bde9949 100644 --- a/manifests/setup/prometheus-operator-clusterRole.yaml +++ b/manifests/setup/prometheus-operator-clusterRole.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.51.1 + app.kubernetes.io/version: 0.51.2 name: prometheus-operator rules: - apiGroups: diff --git a/manifests/setup/prometheus-operator-clusterRoleBinding.yaml b/manifests/setup/prometheus-operator-clusterRoleBinding.yaml index e6a0cf7f..ee129775 100644 --- a/manifests/setup/prometheus-operator-clusterRoleBinding.yaml +++ b/manifests/setup/prometheus-operator-clusterRoleBinding.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.51.1 + app.kubernetes.io/version: 0.51.2 name: prometheus-operator roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/manifests/setup/prometheus-operator-deployment.yaml b/manifests/setup/prometheus-operator-deployment.yaml index 79872414..5e94591f 100644 --- a/manifests/setup/prometheus-operator-deployment.yaml +++ b/manifests/setup/prometheus-operator-deployment.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.51.1 + app.kubernetes.io/version: 0.51.2 name: prometheus-operator namespace: monitoring spec: @@ -23,13 +23,13 @@ spec: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.51.1 + app.kubernetes.io/version: 0.51.2 spec: containers: - args: - --kubelet-service=kube-system/kubelet - - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.51.1 - image: quay.io/prometheus-operator/prometheus-operator:v0.51.1 + - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.51.2 + image: quay.io/prometheus-operator/prometheus-operator:v0.51.2 name: prometheus-operator ports: - containerPort: 8080 diff --git a/manifests/setup/prometheus-operator-service.yaml b/manifests/setup/prometheus-operator-service.yaml index dbd6cb06..1bbfe135 100644 --- a/manifests/setup/prometheus-operator-service.yaml +++ b/manifests/setup/prometheus-operator-service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.51.1 + app.kubernetes.io/version: 0.51.2 name: prometheus-operator namespace: monitoring spec: diff --git a/manifests/setup/prometheus-operator-serviceAccount.yaml b/manifests/setup/prometheus-operator-serviceAccount.yaml index 4d4b3506..0976be05 100644 --- a/manifests/setup/prometheus-operator-serviceAccount.yaml +++ b/manifests/setup/prometheus-operator-serviceAccount.yaml @@ -5,6 +5,6 @@ metadata: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.51.1 + app.kubernetes.io/version: 0.51.2 name: prometheus-operator namespace: monitoring -- GitLab