diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 59181d962ce4e9daa14c37786b225bf1b9e25c1c..657c1091c85d7c5ef88928c2700f30a25604dfc0 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -18,7 +18,7 @@ "subdir": "contrib/mixin" } }, - "version": "96a9fd0a1e2a2887ebcf3b8eba90d8f0a881e77b", + "version": "28b9089de970c2759c9f3439a0493bd170dbbfe9", "sum": "cdKL5kPYfpWSpTCu4qctmh+gWQqL+4YWom6rw9qLYJU=" }, { @@ -28,7 +28,7 @@ "subdir": "grafana-mixin" } }, - "version": "9d11c9153fe6ce8251c7ed1be9d36b6722a36e6d", + "version": "7422789ec7ab665fd5d01e3b891f44ac427061c5", "sum": "MkjR7zCgq6MUZgjDzop574tFKoTX2OBr7DTwm1K+Ofs=" }, { @@ -48,7 +48,7 @@ "subdir": "grafana-builder" } }, - "version": "b46355107c024e0aa4932adadd939294c3b8260d", + "version": "38443f6f8d8ee1e44d2753f5c92dcfe418e08225", "sum": "0KkygBQd/AFzUvVzezE4qF/uDYgrwUXVpZfINBti0oc=" }, { @@ -58,8 +58,8 @@ "subdir": "" } }, - "version": "3346c8cbcc1660caeddf2ffc9443dabe583e1a35", - "sum": "3d7EmbTZ5Vyd93nWG7Hayfzz9Z6aXwo+wxRqvKuuPH8=" + "version": "c76b9378b86d28bd617d94a57c72b4770efed510", + "sum": "czyBANhl44ENj9wpv7ma4jiI01F+66g8WkgJ/LmPGF8=" }, { "source": { @@ -68,7 +68,7 @@ "subdir": "lib/promgrafonnet" } }, - "version": "3346c8cbcc1660caeddf2ffc9443dabe583e1a35", + "version": "c76b9378b86d28bd617d94a57c72b4770efed510", "sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps=" }, { @@ -98,7 +98,7 @@ "subdir": "jsonnet/mixin" } }, - "version": "56e89dfa0bac7a6b38a962059127992e64f69301", + "version": "80cb3c8c76c644e342fe1684ee8732027d8530f7", "sum": "qZ4WgiweaE6eeKtFK60QUjLO8sf2L9Q8fgafWvDcyfY=", "name": "prometheus-operator-mixin" }, @@ -109,8 +109,8 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "56e89dfa0bac7a6b38a962059127992e64f69301", - "sum": "9tMXOZtJJa+LebG6uR9ItdwWh5XrgSzNt9NhXyC8uyQ=" + "version": "80cb3c8c76c644e342fe1684ee8732027d8530f7", + "sum": "YwsTuahU2pWuYMLTQksQ3n4188UTiyW+I5aNR/H4GuI=" }, { "source": { @@ -119,7 +119,7 @@ "subdir": "doc/alertmanager-mixin" } }, - "version": "c0a7b75c9cfb0772bdf5ec7362775f5f7798a3a0", + "version": "c91717bc89aadd3253063ddca9f56a7c4a4c2736", "sum": "iqF63VWQovIGBb7JI5oVVgMShz0dKptSzEVQQjsy+Jo=", "name": "alertmanager" }, @@ -140,7 +140,7 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "2ce94ac19673a3f7faf164e9e078a79d4d52b767", + "version": "30e2c81c97ce052a9dcfc51ef78885846a6c9745", "sum": "ZjQoYhvgKwJNkg+h+m9lW3SYjnjv5Yx5btEipLhru88=", "name": "prometheus" }, @@ -151,7 +151,7 @@ "subdir": "mixin" } }, - "version": "cc178554365234a39d001dd2d22d5f7ebdb85f2b", + "version": "4d5f4d9ac2ad33451eae76852ae262a53c959225", "sum": "RbqWknYtfJHwMBlM+gAjqfmvV5wqn5AFV/IGcHGadM0=", "name": "thanos-mixin" }, diff --git a/manifests/kubernetesControlPlane-prometheusRule.yaml b/manifests/kubernetesControlPlane-prometheusRule.yaml index 8cff151c0f025516bf70612d026fba0ea8132c8c..742662288cf695ff79ab99d33ccdbee52c1236f4 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 ) diff --git a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml index d514f1484ce96e9168139cb0c5d5f31b6d00c75f..79df29ce03e92319a9be0f636fe4e83ceac93590 100644 --- a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml +++ b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml @@ -16,7 +16,15 @@ spec: singular: thanosruler scope: Namespaced versions: - - name: v1 + - additionalPrinterColumns: + - description: The desired replicas number of Thanos Rulers + jsonPath: .spec.replicas + name: Replicas + type: integer + - jsonPath: .metadata.creationTimestamp + name: Age + type: date + name: v1 schema: openAPIV3Schema: description: ThanosRuler defines a ThanosRuler deployment. @@ -6196,6 +6204,7 @@ spec: type: object served: true storage: true + subresources: {} status: acceptedNames: kind: ""