diff --git a/jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet b/jsonnet/kube-prometheus/components/kube-state-metrics.libsonnet index 5893588fd646092cba1e5ac0074cf0e597900ad4..a58c738f3f30d474e221b8e8468eb75cd5266580 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 12c2cbbd2ecc461dd3605d0499e5fec33ac8a4c2..cc4fd6d118a419ac6814b242ad0d0df21d075732 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 5d711e739e3c2f7c01ff6ac37e342a79b3ebcb03..79cd1866518ef40372ed09e5da098cc5d55ea0f0 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 f6b295093f74d2b35dfd12141f5ff5352ead4c4c..574cf19497c4a1da794f1f6f6a11a57814a70842 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 49afea82d3de845aef6c0b197da5c129ee9f9d76..f024fb138063bfae7651e36a4185341423d2f1e8 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 68e196191eca8bd08c684abd995d0b915c904c34..283d6278d491de44a3e8d58370a1198d9f00cafb 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 0cc08d981ed7d73a76dbe94deb7d8a61bdeafb9e..0aa41e49c8c7f606dd8b0a045b6203e114c124a1 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 8ff0a1fbf4122ca4fb7549f6cb12ced982283580..f3ab8ca3e4ad59ce89533cdfa65461a64d6f88c9 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 0da322c3994d057627fa27dadf869cd7e5e46438..6b488ac417d820cc45ed7717d7526fc96043cc01 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 c152139e821442c1aca8f16c7fd14614d74a517f..205e9ebce752d1c20addbc0d27117e3ef5cb839d 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 6d508e30a32c9cef7cdc958747a9cf0f2660ae8e..7a67ad58b0e52f5e73a993cd93662620e0e4bc86 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 8d442f331af38f99ae0a03063a901d1692241891..2332ff4e06f9b08ce4d7a3adb44b3485db4a7df1 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 c7a2839a3e23e06aa09358ce6df2b32908754acf..2d9fd776679d9c1eee2e733dceaa5a0d8195a519 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 cc9fc10de1fff90aeaf9fe80b94ad1efa815d9f1..6bcf0b63ba515be82e15d333a792f1c12d69d0e0 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 391161e0a19286e6e57ab369bb32a9fbcbc86569..4af4c7469404f23b221b1ffa1bbcaadc6f90b390 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 3c1996f2b474056a75ef0c7b15bf35b105961120..4ba5ae4978179c3b51ee86992757e6f536bddea3 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 72f3599f6c0f960807cc63a6e85eb23e3547bef4..6ecf042a99cb28a4a05489bb410341f13adc040d 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 13eb2af85729dea6bc41460d8c2bdd7e5d569044..ee096257505cdb3c1b61d984add1f027c48dbb6c 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 e02c825e9333cac95b436254b560040968ade3a6..351529fb4f1584e83147c6cabf702a1214f44563 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 140ca7b98882145487d179b3f73616b9b9aa53db..63fd9e90440daebd0350a247654a55752c0fb119 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 635de4733e0845a3d6a95bc08f6a83fd454d7380..6978c280354ad7e3800a4aa8a4c680a06ccdf04f 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 d4baab42c8f3e90aff17f7ea0ed513716d7995a3..2cfa9c575e0d5377f7917b4f8f3996528a5036d3 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"} !=