From ad6e0c2770aa885fa913b919654a88af42c98ef2 Mon Sep 17 00:00:00 2001 From: Jan Fajerski Date: Thu, 6 Oct 2022 21:57:26 +0200 Subject: [PATCH] release-0.10: update jsonnet depndencies (#1894) This pulls in a bug fix for kubernetes-mixins https://github.com/kubernetes-monitoring/kubernetes-mixin/issues/786. Signed-off-by: Jan Fajerski Signed-off-by: Jan Fajerski --- jsonnetfile.lock.json | 18 +++++++++--------- .../kubernetesControlPlane-prometheusRule.yaml | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index d9772be0..2a7a7f53 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -18,7 +18,7 @@ "subdir": "contrib/mixin" } }, - "version": "73080a716634f45d50d0593e0454ed3206a52f5b", + "version": "5daf35bb4a8b2c6b1d6d612624f6edecf5d7bf16", "sum": "W/Azptf1PoqjyMwJON96UY69MFugDA4IAYiKURscryc=" }, { @@ -28,8 +28,8 @@ "subdir": "grafonnet" } }, - "version": "3626fc4dc2326931c530861ac5bebe39444f6cbf", - "sum": "gF8foHByYcB25jcUOBqP6jxk0OPifQMjPvKY0HaCk6w=" + "version": "30280196507e0fe6fa978a3e0eaca3a62844f817", + "sum": "342u++/7rViR/zj2jeJOjshzglkZ1SY+hFNuyCBFMdc=" }, { "source": { @@ -38,8 +38,8 @@ "subdir": "grafana-builder" } }, - "version": "264a5c2078c5930af57fe2d107eff83ab63553af", - "sum": "0KkygBQd/AFzUvVzezE4qF/uDYgrwUXVpZfINBti0oc=" + "version": "044d4f24b634a2736f0933593e9668dab7a60531", + "sum": "tDR6yT2GVfw0wTU12iZH+m01HrbIr6g/xN+/8nzNkU0=" }, { "source": { @@ -48,8 +48,8 @@ "subdir": "" } }, - "version": "b538a10c89508f8d12885680cca72a134d3127f5", - "sum": "GLt5T2k4RKg36Gfcaf9qlTfVumDitqotVD0ipz/bPJ4=" + "version": "c2519b7b90fe2f5c5ba4f55fb7cc71dbc2d431b0", + "sum": "6MgmuZEtctydDzTrT04SyArEtFbSN5dO/m6EWM3Eolw=" }, { "source": { @@ -58,7 +58,7 @@ "subdir": "lib/promgrafonnet" } }, - "version": "fd913499e956da06f520c3784c59573ee552b152", + "version": "5e44626d70c2bf2d35c37f3fee5a6261a5335cc6", "sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps=" }, { @@ -141,7 +141,7 @@ "subdir": "mixin" } }, - "version": "632032712f12eea0015aaef24ee1e14f38ef3e55", + "version": "fb97c9a5ef51849ccb7960abbeb9581ad7f511b9", "sum": "X+060DnePPeN/87fgj0SrfxVitywTk8hZA9V4nHxl1g=", "name": "thanos-mixin" }, diff --git a/manifests/kubernetesControlPlane-prometheusRule.yaml b/manifests/kubernetesControlPlane-prometheusRule.yaml index 4ce1a2df..6c7b8cbb 100644 --- a/manifests/kubernetesControlPlane-prometheusRule.yaml +++ b/manifests/kubernetesControlPlane-prometheusRule.yaml @@ -150,7 +150,7 @@ spec: != 0 ) or ( - kube_daemonset_updated_number_scheduled{job="kube-state-metrics"} + kube_daemonset_status_updated_number_scheduled{job="kube-state-metrics"} != kube_daemonset_status_desired_number_scheduled{job="kube-state-metrics"} ) or ( @@ -159,7 +159,7 @@ spec: kube_daemonset_status_desired_number_scheduled{job="kube-state-metrics"} ) ) and ( - changes(kube_daemonset_updated_number_scheduled{job="kube-state-metrics"}[5m]) + changes(kube_daemonset_status_updated_number_scheduled{job="kube-state-metrics"}[5m]) == 0 )