From 6190853c1cadd6499e2e2ed75b971264aae18b61 Mon Sep 17 00:00:00 2001
From: PromOperatorBot <85787986+prom-op-bot@users.noreply.github.com>
Date: Tue, 30 Aug 2022 12:34:17 +0200
Subject: [PATCH] [bot] [main] Automated version update (#1854)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* [bot] [main] Automated version update
* jsonnet: drop deprecated KSM metric
Signed-off-by: Paweł Krupa (paulfantom) <pawel@krupa.net.pl>
* jsonnet: Drop deprecated KSM metrics
Signed-off-by: Paweł Krupa (paulfantom) <pawel@krupa.net.pl>
Co-authored-by: Prometheus Operator Bot <prom-op-bot@users.noreply.github.com>
Co-authored-by: Paweł Krupa (paulfantom) <pawel@krupa.net.pl>
Co-authored-by: Philip Gough <philip.p.gough@gmail.com>
---
.../components/kube-state-metrics.libsonnet | 8 +++
jsonnet/kube-prometheus/versions.json | 4 +-
jsonnetfile.lock.json | 26 +++++-----
manifests/grafana-config.yaml | 2 +-
manifests/grafana-dashboardDatasources.yaml | 2 +-
manifests/grafana-dashboardDefinitions.yaml | 52 +++++++++----------
manifests/grafana-dashboardSources.yaml | 2 +-
manifests/grafana-deployment.yaml | 12 ++---
manifests/grafana-networkPolicy.yaml | 2 +-
manifests/grafana-prometheusRule.yaml | 2 +-
manifests/grafana-service.yaml | 2 +-
manifests/grafana-serviceAccount.yaml | 2 +-
manifests/grafana-serviceMonitor.yaml | 2 +-
manifests/kubeStateMetrics-clusterRole.yaml | 2 +-
.../kubeStateMetrics-clusterRoleBinding.yaml | 2 +-
manifests/kubeStateMetrics-deployment.yaml | 6 +--
manifests/kubeStateMetrics-networkPolicy.yaml | 2 +-
.../kubeStateMetrics-prometheusRule.yaml | 2 +-
manifests/kubeStateMetrics-service.yaml | 2 +-
.../kubeStateMetrics-serviceAccount.yaml | 2 +-
.../kubeStateMetrics-serviceMonitor.yaml | 7 ++-
...kubernetesControlPlane-prometheusRule.yaml | 2 +-
22 files changed, 79 insertions(+), 66 deletions(-)
diff --git a/jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet b/jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet
index 5893588f..a58c738f 100644
--- a/jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet
+++ b/jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet
@@ -195,6 +195,14 @@ function(params) (import 'github.com/kubernetes/kube-state-metrics/jsonnet/kube-
action: 'labeldrop',
},
],
+ metricRelabelings: [
+ {
+ // Dropping metric deprecated from kube-state-metrics 2.6.0 version
+ sourceLabels: ['__name__'],
+ regex: 'kube_endpoint_address_not_ready|kube_endpoint_address_available',
+ action: 'drop',
+ },
+ ],
tlsConfig: {
insecureSkipVerify: true,
},
diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json
index 12c2cbbd..cc4fd6d1 100644
--- a/jsonnet/kube-prometheus/versions.json
+++ b/jsonnet/kube-prometheus/versions.json
@@ -1,8 +1,8 @@
{
"alertmanager": "0.24.0",
"blackboxExporter": "0.22.0",
- "grafana": "9.1.0",
- "kubeStateMetrics": "2.5.0",
+ "grafana": "9.1.1",
+ "kubeStateMetrics": "2.6.0",
"nodeExporter": "1.3.1",
"prometheus": "2.38.0",
"prometheusAdapter": "0.9.1",
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 5d711e73..79cd1866 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
- "version": "192d635da91f0f87b7c031aedb87a75fecc01811",
+ "version": "f56e0d0e15d51a896601a9b9cebbac8c58435420",
"sum": "IkDHlaE0gvvcPjSNurFT+jQ2aCOAbqHF1WVmXbAgkds="
},
{
@@ -58,8 +58,8 @@
"subdir": "grafana-builder"
}
},
- "version": "a2ba95acc8b7653d33bd57075678d8de2a64e5b3",
- "sum": "1Ge62JmmPDq7fWyDAt3uCTobGEj4sJdbkqxRGWK22p0="
+ "version": "c132c4afcf17491718539db4c2d94c0ea4346120",
+ "sum": "tDR6yT2GVfw0wTU12iZH+m01HrbIr6g/xN+/8nzNkU0="
},
{
"source": {
@@ -68,8 +68,8 @@
"subdir": ""
}
},
- "version": "b8f44bb7be728423836bef0e904ec7166895a34b",
- "sum": "LCgSosxceeYuoau5fYSPtE5eXOFe46DxexfkrctUv7c="
+ "version": "1ddc6f6f739cc9fe4b8ac6a0fbb23cb09fe53bc3",
+ "sum": "0Goz56z5rF8rRarGQNj4f7VFvnsw7D7pSPUsYutt+J4="
},
{
"source": {
@@ -78,7 +78,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
- "version": "f1d56534651990ed434aac4e4dc86766d83004a4",
+ "version": "acca9b050edddbe2273e4c64a008487efb765859",
"sum": "evJ+PXRzuM1tezCG5WzpAn4Lk3YJfMvDFcs+45fsscU="
},
{
@@ -88,7 +88,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
- "version": "f1d56534651990ed434aac4e4dc86766d83004a4",
+ "version": "acca9b050edddbe2273e4c64a008487efb765859",
"sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
},
{
@@ -98,7 +98,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "03b531ff8024617e07c668f5fcd19fd25cfe342c",
+ "version": "01c771cefb34e79667515294c7671ff98292278d",
"sum": "GQmaVFJwKMiD/P4n3N2LrAZVcwutriWrP8joclDtBYQ=",
"name": "prometheus-operator-mixin"
},
@@ -109,7 +109,7 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "03b531ff8024617e07c668f5fcd19fd25cfe342c",
+ "version": "01c771cefb34e79667515294c7671ff98292278d",
"sum": "hV3FK2ekNFLUlKnj5chRp8WKKxZemfbwynYWK5RkY1E="
},
{
@@ -130,7 +130,7 @@
"subdir": "docs/node-mixin"
}
},
- "version": "b43db0de6e704193b952b534c98816ba836b899e",
+ "version": "46748fd229e249c0d7a9198a98e6f9450d437478",
"sum": "tappaHscNBSJCA6ypSWt7DDhohIOkxNjcLFRb3WKpu4="
},
{
@@ -140,7 +140,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "8b863c42dd956d35d18a7a0b39c89c86adf7cebf",
+ "version": "314aa45c2ced676d6a76d5ce9333a60faa331570",
"sum": "crD6rsagAMJFnVRw4pO63z3LLYfz4QFIiMR14zjjIfY=",
"name": "prometheus"
},
@@ -151,7 +151,7 @@
"subdir": "config/crd/bases"
}
},
- "version": "e9fbdfcd9213415bef43f762ff7bd2145a8ef930",
+ "version": "dd82519ae36a7d00486b1862fc23d805ba84e06b",
"sum": "d1550yhsX4VxdVN7b0gWT0cido/W90P6OGLzLqPwZcs="
},
{
@@ -161,7 +161,7 @@
"subdir": "mixin"
}
},
- "version": "6e6a48672f95e19d7c15e5f6473702516c531c0f",
+ "version": "544d67a8f3f0c8187afa974cad71972aeb10d297",
"sum": "oksO55VdKbsLAVA3vl7b1woE9TLmfvH7sz5+1A7iOBE=",
"name": "thanos-mixin"
},
diff --git a/manifests/grafana-config.yaml b/manifests/grafana-config.yaml
index f6b29509..574cf194 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: 9.1.0
+ app.kubernetes.io/version: 9.1.1
name: grafana-config
namespace: monitoring
stringData:
diff --git a/manifests/grafana-dashboardDatasources.yaml b/manifests/grafana-dashboardDatasources.yaml
index 49afea82..f024fb13 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: 9.1.0
+ app.kubernetes.io/version: 9.1.1
name: grafana-datasources
namespace: monitoring
stringData:
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index 68e19619..283d6278 100644
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
@@ -600,7 +600,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.0
+ app.kubernetes.io/version: 9.1.1
name: grafana-dashboard-alertmanager-overview
namespace: monitoring
- apiVersion: v1
@@ -2361,7 +2361,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.0
+ app.kubernetes.io/version: 9.1.1
name: grafana-dashboard-apiserver
namespace: monitoring
- apiVersion: v1
@@ -4232,7 +4232,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.0
+ app.kubernetes.io/version: 9.1.1
name: grafana-dashboard-cluster-total
namespace: monitoring
- apiVersion: v1
@@ -5411,7 +5411,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.0
+ app.kubernetes.io/version: 9.1.1
name: grafana-dashboard-controller-manager
namespace: monitoring
- apiVersion: v1
@@ -6036,7 +6036,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.0
+ app.kubernetes.io/version: 9.1.1
name: grafana-dashboard-grafana-overview
namespace: monitoring
- apiVersion: v1
@@ -9113,7 +9113,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.0
+ app.kubernetes.io/version: 9.1.1
name: grafana-dashboard-k8s-resources-cluster
namespace: monitoring
- apiVersion: v1
@@ -11899,7 +11899,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.0
+ app.kubernetes.io/version: 9.1.1
name: grafana-dashboard-k8s-resources-namespace
namespace: monitoring
- apiVersion: v1
@@ -12914,7 +12914,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.0
+ app.kubernetes.io/version: 9.1.1
name: grafana-dashboard-k8s-resources-node
namespace: monitoring
- apiVersion: v1
@@ -15372,7 +15372,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.0
+ app.kubernetes.io/version: 9.1.1
name: grafana-dashboard-k8s-resources-pod
namespace: monitoring
- apiVersion: v1
@@ -17385,7 +17385,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.0
+ app.kubernetes.io/version: 9.1.1
name: grafana-dashboard-k8s-resources-workload
namespace: monitoring
- apiVersion: v1
@@ -19563,7 +19563,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.0
+ app.kubernetes.io/version: 9.1.1
name: grafana-dashboard-k8s-resources-workloads-namespace
namespace: monitoring
- apiVersion: v1
@@ -20367,7 +20367,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "histogram_quantile(0.99, sum(rate(kubelet_pod_start_duration_seconds_count{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\",instance=~\"$instance\"}[$__rate_interval])) by (instance, le))",
+ "expr": "histogram_quantile(0.99, sum(rate(kubelet_pod_start_duration_seconds_bucket{cluster=\"$cluster\",job=\"kubelet\", metrics_path=\"/metrics\",instance=~\"$instance\"}[$__rate_interval])) by (instance, le))",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{instance}} pod",
@@ -21806,7 +21806,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.0
+ app.kubernetes.io/version: 9.1.1
name: grafana-dashboard-kubelet
namespace: monitoring
- apiVersion: v1
@@ -23259,7 +23259,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.0
+ app.kubernetes.io/version: 9.1.1
name: grafana-dashboard-namespace-by-pod
namespace: monitoring
- apiVersion: v1
@@ -24984,7 +24984,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.0
+ app.kubernetes.io/version: 9.1.1
name: grafana-dashboard-namespace-by-workload
namespace: monitoring
- apiVersion: v1
@@ -26036,7 +26036,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.0
+ app.kubernetes.io/version: 9.1.1
name: grafana-dashboard-node-cluster-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -27114,7 +27114,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.0
+ app.kubernetes.io/version: 9.1.1
name: grafana-dashboard-node-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -28176,7 +28176,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.0
+ app.kubernetes.io/version: 9.1.1
name: grafana-dashboard-nodes-darwin
namespace: monitoring
- apiVersion: v1
@@ -29231,7 +29231,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.0
+ app.kubernetes.io/version: 9.1.1
name: grafana-dashboard-nodes
namespace: monitoring
- apiVersion: v1
@@ -29807,7 +29807,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.0
+ app.kubernetes.io/version: 9.1.1
name: grafana-dashboard-persistentvolumesusage
namespace: monitoring
- apiVersion: v1
@@ -31024,7 +31024,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.0
+ app.kubernetes.io/version: 9.1.1
name: grafana-dashboard-pod-total
namespace: monitoring
- apiVersion: v1
@@ -32683,7 +32683,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.0
+ app.kubernetes.io/version: 9.1.1
name: grafana-dashboard-prometheus-remote-write
namespace: monitoring
- apiVersion: v1
@@ -33907,7 +33907,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.0
+ app.kubernetes.io/version: 9.1.1
name: grafana-dashboard-prometheus
namespace: monitoring
- apiVersion: v1
@@ -35167,7 +35167,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.0
+ app.kubernetes.io/version: 9.1.1
name: grafana-dashboard-proxy
namespace: monitoring
- apiVersion: v1
@@ -36268,7 +36268,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.0
+ app.kubernetes.io/version: 9.1.1
name: grafana-dashboard-scheduler
namespace: monitoring
- apiVersion: v1
@@ -37695,7 +37695,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.0
+ app.kubernetes.io/version: 9.1.1
name: grafana-dashboard-workload-total
namespace: monitoring
kind: ConfigMapList
diff --git a/manifests/grafana-dashboardSources.yaml b/manifests/grafana-dashboardSources.yaml
index 0cc08d98..0aa41e49 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: 9.1.0
+ app.kubernetes.io/version: 9.1.1
name: grafana-dashboards
namespace: monitoring
diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml
index 8ff0a1fb..f3ab8ca3 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: 9.1.0
+ app.kubernetes.io/version: 9.1.1
name: grafana
namespace: monitoring
spec:
@@ -18,19 +18,19 @@ spec:
template:
metadata:
annotations:
- checksum/grafana-config: 841b269e8dc8207c20c88d847b0556ee
- checksum/grafana-dashboardproviders: d72139ed637912714eb9e04fdeb504bf
- checksum/grafana-datasources: f751b8684c867ca8b520af8bd2423091
+ checksum/grafana-config: 0542ba9d9c454a4aaa1f95e2931e87ea
+ checksum/grafana-dashboardproviders: 96ab91fd3f7ddd4a9dce4ddc915cb54e
+ checksum/grafana-datasources: 05cd3c4f772ba1421a095643281548d0
labels:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.0
+ app.kubernetes.io/version: 9.1.1
spec:
automountServiceAccountToken: false
containers:
- env: []
- image: grafana/grafana:9.1.0
+ image: grafana/grafana:9.1.1
name: grafana
ports:
- containerPort: 3000
diff --git a/manifests/grafana-networkPolicy.yaml b/manifests/grafana-networkPolicy.yaml
index 0da322c3..6b488ac4 100644
--- a/manifests/grafana-networkPolicy.yaml
+++ b/manifests/grafana-networkPolicy.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: 9.1.0
+ app.kubernetes.io/version: 9.1.1
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/grafana-prometheusRule.yaml b/manifests/grafana-prometheusRule.yaml
index c152139e..205e9ebc 100644
--- a/manifests/grafana-prometheusRule.yaml
+++ b/manifests/grafana-prometheusRule.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: 9.1.0
+ app.kubernetes.io/version: 9.1.1
prometheus: k8s
role: alert-rules
name: grafana-rules
diff --git a/manifests/grafana-service.yaml b/manifests/grafana-service.yaml
index 6d508e30..7a67ad58 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: 9.1.0
+ app.kubernetes.io/version: 9.1.1
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/grafana-serviceAccount.yaml b/manifests/grafana-serviceAccount.yaml
index 8d442f33..2332ff4e 100644
--- a/manifests/grafana-serviceAccount.yaml
+++ b/manifests/grafana-serviceAccount.yaml
@@ -6,6 +6,6 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.0
+ app.kubernetes.io/version: 9.1.1
name: grafana
namespace: monitoring
diff --git a/manifests/grafana-serviceMonitor.yaml b/manifests/grafana-serviceMonitor.yaml
index c7a2839a..2d9fd776 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: 9.1.0
+ app.kubernetes.io/version: 9.1.1
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/kubeStateMetrics-clusterRole.yaml b/manifests/kubeStateMetrics-clusterRole.yaml
index cc9fc10d..6bcf0b63 100644
--- a/manifests/kubeStateMetrics-clusterRole.yaml
+++ b/manifests/kubeStateMetrics-clusterRole.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.5.0
+ app.kubernetes.io/version: 2.6.0
name: kube-state-metrics
rules:
- apiGroups:
diff --git a/manifests/kubeStateMetrics-clusterRoleBinding.yaml b/manifests/kubeStateMetrics-clusterRoleBinding.yaml
index 391161e0..4af4c746 100644
--- a/manifests/kubeStateMetrics-clusterRoleBinding.yaml
+++ b/manifests/kubeStateMetrics-clusterRoleBinding.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.5.0
+ app.kubernetes.io/version: 2.6.0
name: kube-state-metrics
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/kubeStateMetrics-deployment.yaml b/manifests/kubeStateMetrics-deployment.yaml
index 3c1996f2..4ba5ae49 100644
--- a/manifests/kubeStateMetrics-deployment.yaml
+++ b/manifests/kubeStateMetrics-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.5.0
+ app.kubernetes.io/version: 2.6.0
name: kube-state-metrics
namespace: monitoring
spec:
@@ -23,7 +23,7 @@ spec:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.5.0
+ app.kubernetes.io/version: 2.6.0
spec:
automountServiceAccountToken: true
containers:
@@ -32,7 +32,7 @@ spec:
- --port=8081
- --telemetry-host=127.0.0.1
- --telemetry-port=8082
- image: k8s.gcr.io/kube-state-metrics/kube-state-metrics:v2.5.0
+ image: k8s.gcr.io/kube-state-metrics/kube-state-metrics:v2.6.0
name: kube-state-metrics
resources:
limits:
diff --git a/manifests/kubeStateMetrics-networkPolicy.yaml b/manifests/kubeStateMetrics-networkPolicy.yaml
index 72f3599f..6ecf042a 100644
--- a/manifests/kubeStateMetrics-networkPolicy.yaml
+++ b/manifests/kubeStateMetrics-networkPolicy.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.5.0
+ app.kubernetes.io/version: 2.6.0
name: kube-state-metrics
namespace: monitoring
spec:
diff --git a/manifests/kubeStateMetrics-prometheusRule.yaml b/manifests/kubeStateMetrics-prometheusRule.yaml
index 13eb2af8..ee096257 100644
--- a/manifests/kubeStateMetrics-prometheusRule.yaml
+++ b/manifests/kubeStateMetrics-prometheusRule.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.5.0
+ app.kubernetes.io/version: 2.6.0
prometheus: k8s
role: alert-rules
name: kube-state-metrics-rules
diff --git a/manifests/kubeStateMetrics-service.yaml b/manifests/kubeStateMetrics-service.yaml
index e02c825e..351529fb 100644
--- a/manifests/kubeStateMetrics-service.yaml
+++ b/manifests/kubeStateMetrics-service.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.5.0
+ app.kubernetes.io/version: 2.6.0
name: kube-state-metrics
namespace: monitoring
spec:
diff --git a/manifests/kubeStateMetrics-serviceAccount.yaml b/manifests/kubeStateMetrics-serviceAccount.yaml
index 140ca7b9..63fd9e90 100644
--- a/manifests/kubeStateMetrics-serviceAccount.yaml
+++ b/manifests/kubeStateMetrics-serviceAccount.yaml
@@ -6,6 +6,6 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.5.0
+ app.kubernetes.io/version: 2.6.0
name: kube-state-metrics
namespace: monitoring
diff --git a/manifests/kubeStateMetrics-serviceMonitor.yaml b/manifests/kubeStateMetrics-serviceMonitor.yaml
index 635de473..6978c280 100644
--- a/manifests/kubeStateMetrics-serviceMonitor.yaml
+++ b/manifests/kubeStateMetrics-serviceMonitor.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.5.0
+ app.kubernetes.io/version: 2.6.0
name: kube-state-metrics
namespace: monitoring
spec:
@@ -13,6 +13,11 @@ spec:
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
honorLabels: true
interval: 30s
+ metricRelabelings:
+ - action: drop
+ regex: kube_endpoint_address_not_ready|kube_endpoint_address_available
+ sourceLabels:
+ - __name__
port: https-main
relabelings:
- action: labeldrop
diff --git a/manifests/kubernetesControlPlane-prometheusRule.yaml b/manifests/kubernetesControlPlane-prometheusRule.yaml
index d4baab42..2cfa9c57 100644
--- a/manifests/kubernetesControlPlane-prometheusRule.yaml
+++ b/manifests/kubernetesControlPlane-prometheusRule.yaml
@@ -230,7 +230,7 @@ spec:
description: HPA {{ $labels.namespace }}/{{ $labels.horizontalpodautoscaler }}
has not matched the desired number of replicas for longer than 15 minutes.
runbook_url: https://runbooks.prometheus-operator.dev/runbooks/kubernetes/kubehpareplicasmismatch
- summary: HPA has not matched descired number of replicas.
+ summary: HPA has not matched desired number of replicas.
expr: |
(kube_horizontalpodautoscaler_status_desired_replicas{job="kube-state-metrics"}
!=
--
GitLab