diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json index 15891b72192543cd546187fd7b4f76a7460918f9..fd4705b9122ea827f44a81b376fc40c8e068e441 100644 --- a/jsonnet/kube-prometheus/versions.json +++ b/jsonnet/kube-prometheus/versions.json @@ -4,9 +4,9 @@ "grafana": "8.3.4", "kubeStateMetrics": "2.3.0", "nodeExporter": "1.3.1", - "prometheus": "2.32.1", + "prometheus": "2.33.0", "prometheusAdapter": "0.9.1", - "prometheusOperator": "0.53.1", + "prometheusOperator": "0.54.0", "kubeRbacProxy": "0.11.0", "configmapReload": "0.5.0" } diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 4565ef95c40944b613a39d54ee022291872b07ff..a75e88cc23649fde21d77a31451713b2a77ed0f7 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -18,7 +18,7 @@ "subdir": "contrib/mixin" } }, - "version": "f9a8c49c695b098d66a07948666664ea10d01a82", + "version": "95ae9c19f0bc1f2c0567e3eda6570d7b766b9e1e", "sum": "wIsqEIGSqnWwJApdQ7k8x2kd/AsffJhYcqUebDiS01w=" }, { @@ -28,7 +28,7 @@ "subdir": "grafana-mixin" } }, - "version": "641e34e341c2a5c8481a8bad2317ed4e75e1c846", + "version": "5e2280ceee506245db1149e45a62ae3e7facb6e9", "sum": "MkjR7zCgq6MUZgjDzop574tFKoTX2OBr7DTwm1K+Ofs=" }, { @@ -48,7 +48,7 @@ "subdir": "grafana-builder" } }, - "version": "d3d43dd85811b89949650f570e77455f4cec1136", + "version": "5a128df878434da37969b811e99bb9cd0a3779e3", "sum": "0KkygBQd/AFzUvVzezE4qF/uDYgrwUXVpZfINBti0oc=" }, { @@ -78,8 +78,8 @@ "subdir": "jsonnet/kube-state-metrics" } }, - "version": "486b95fcc1ad522d51179b76f0c60f3104ba7c9b", - "sum": "7EENy1etunEj7RzhxbRdmqpfM9qpojxu0UBOrA0iV/U=" + "version": "9ea05e42fb90c1d422eef7ba713eaa4ea77e26e8", + "sum": "Aoy8T2dBCSNOBDZ7vE5UK/+vRiFGfP71s37aZoCtqr0=" }, { "source": { @@ -88,7 +88,7 @@ "subdir": "jsonnet/kube-state-metrics-mixin" } }, - "version": "486b95fcc1ad522d51179b76f0c60f3104ba7c9b", + "version": "9ea05e42fb90c1d422eef7ba713eaa4ea77e26e8", "sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk=" }, { @@ -98,7 +98,7 @@ "subdir": "jsonnet/mixin" } }, - "version": "881663b9229405e44504168938af76762c85e7e3", + "version": "dcdbff3affd0b7e451194fc6f834431e7c8aad70", "sum": "qZ4WgiweaE6eeKtFK60QUjLO8sf2L9Q8fgafWvDcyfY=", "name": "prometheus-operator-mixin" }, @@ -109,8 +109,8 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "881663b9229405e44504168938af76762c85e7e3", - "sum": "hPpoqkhs2Fc5wf7aGi3n49OOKXjpEJeRnFenjHO9Ito=" + "version": "dcdbff3affd0b7e451194fc6f834431e7c8aad70", + "sum": "d/Plm5fiKe4cg4noh0USHvZAuaxxjiCtWjFKq32t1IQ=" }, { "source": { @@ -119,7 +119,7 @@ "subdir": "doc/alertmanager-mixin" } }, - "version": "ef25f81f1bc7b74381469b5bb0c264d59a64c8f2", + "version": "4dcc0d9563c2e0e8675790f8515cb6515797d501", "sum": "iqF63VWQovIGBb7JI5oVVgMShz0dKptSzEVQQjsy+Jo=", "name": "alertmanager" }, @@ -130,7 +130,7 @@ "subdir": "docs/node-mixin" } }, - "version": "996563f9729588660d5d32826c46b0d7169b1334", + "version": "bf320eb05f1074da874977cf5c8e41d3d3be3ab2", "sum": "MlWDAKGZ+JArozRKdKEvewHeWn8j2DNBzesJfLVd0dk=" }, { @@ -140,7 +140,7 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "027b082793bc557f9f7dcf8fe4f149ea1cc856eb", + "version": "3c9faa25bfc7148b8d195a9148c534c936f166f5", "sum": "ZjQoYhvgKwJNkg+h+m9lW3SYjnjv5Yx5btEipLhru88=", "name": "prometheus" }, @@ -151,8 +151,8 @@ "subdir": "mixin" } }, - "version": "73f4cf4226a0c6eac73919cc1b37c0c88b701ca3", - "sum": "RbqWknYtfJHwMBlM+gAjqfmvV5wqn5AFV/IGcHGadM0=", + "version": "480d2e44ebb4216a09caffc944451fbff9527033", + "sum": "c3c2Z6Ejf6rDDJQ7ajDq0Sd+MOwYXcpDqFyOoPmIWfE=", "name": "thanos-mixin" }, { diff --git a/manifests/prometheus-clusterRole.yaml b/manifests/prometheus-clusterRole.yaml index 7bf33192c54f1c7512c0bef38accf3d5e2f6e37d..556dd967431c9b059bc26dfd5149c121eb0e3eb5 100644 --- a/manifests/prometheus-clusterRole.yaml +++ b/manifests/prometheus-clusterRole.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.32.1 + app.kubernetes.io/version: 2.33.0 name: prometheus-k8s rules: - apiGroups: diff --git a/manifests/prometheus-clusterRoleBinding.yaml b/manifests/prometheus-clusterRoleBinding.yaml index 4dabee82a6319d5df5b51f151356b39434ac0528..ad717c3998a41e7a9a6262896d0d3bfcc4b0fb6b 100644 --- a/manifests/prometheus-clusterRoleBinding.yaml +++ b/manifests/prometheus-clusterRoleBinding.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.32.1 + app.kubernetes.io/version: 2.33.0 name: prometheus-k8s roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/manifests/prometheus-podDisruptionBudget.yaml b/manifests/prometheus-podDisruptionBudget.yaml index fb50ac564bd53d1d5ac312aa764dda5d4f398bd6..c800f648da63c0794dbed6705ed437538403fb45 100644 --- a/manifests/prometheus-podDisruptionBudget.yaml +++ b/manifests/prometheus-podDisruptionBudget.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.32.1 + app.kubernetes.io/version: 2.33.0 name: prometheus-k8s namespace: monitoring spec: diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml index 12c587dd3f6fc6e8ba27ea4f7dcbd161f6f231c1..79c92493cb41c17ad44102bf9441bbe02dd966bd 100644 --- a/manifests/prometheus-prometheus.yaml +++ b/manifests/prometheus-prometheus.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.32.1 + app.kubernetes.io/version: 2.33.0 name: k8s namespace: monitoring spec: @@ -18,7 +18,7 @@ spec: port: web enableFeatures: [] externalLabels: {} - image: quay.io/prometheus/prometheus:v2.32.1 + image: quay.io/prometheus/prometheus:v2.33.0 nodeSelector: kubernetes.io/os: linux podMetadata: @@ -27,7 +27,7 @@ spec: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.32.1 + app.kubernetes.io/version: 2.33.0 podMonitorNamespaceSelector: {} podMonitorSelector: {} probeNamespaceSelector: {} @@ -45,4 +45,4 @@ spec: serviceAccountName: prometheus-k8s serviceMonitorNamespaceSelector: {} serviceMonitorSelector: {} - version: 2.32.1 + version: 2.33.0 diff --git a/manifests/prometheus-prometheusRule.yaml b/manifests/prometheus-prometheusRule.yaml index 8530ba79f645ae1437f6f0ac322f7eaa79a1e99e..4168cb93428ec45244349ff3039bbe0815f687f6 100644 --- a/manifests/prometheus-prometheusRule.yaml +++ b/manifests/prometheus-prometheusRule.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.32.1 + app.kubernetes.io/version: 2.33.0 prometheus: k8s role: alert-rules name: prometheus-k8s-prometheus-rules diff --git a/manifests/prometheus-roleBindingConfig.yaml b/manifests/prometheus-roleBindingConfig.yaml index 51af82da0f4ecf33f66e3a9c17af582a2d569580..6240f1b31343b46f4064e96d706abe27ac9946d5 100644 --- a/manifests/prometheus-roleBindingConfig.yaml +++ b/manifests/prometheus-roleBindingConfig.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.32.1 + app.kubernetes.io/version: 2.33.0 name: prometheus-k8s-config namespace: monitoring roleRef: diff --git a/manifests/prometheus-roleBindingSpecificNamespaces.yaml b/manifests/prometheus-roleBindingSpecificNamespaces.yaml index 6e216cb88f2f19350d61fa5dfae2a5aa0c780605..b5a07a19f69cdd958ef72a09335bbaed657c0df6 100644 --- a/manifests/prometheus-roleBindingSpecificNamespaces.yaml +++ b/manifests/prometheus-roleBindingSpecificNamespaces.yaml @@ -8,7 +8,7 @@ items: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.32.1 + app.kubernetes.io/version: 2.33.0 name: prometheus-k8s namespace: default roleRef: @@ -27,7 +27,7 @@ items: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.32.1 + app.kubernetes.io/version: 2.33.0 name: prometheus-k8s namespace: kube-system roleRef: @@ -46,7 +46,7 @@ items: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.32.1 + app.kubernetes.io/version: 2.33.0 name: prometheus-k8s namespace: monitoring roleRef: diff --git a/manifests/prometheus-roleConfig.yaml b/manifests/prometheus-roleConfig.yaml index 3e8cde7812e80c839ea41c991ed7857e8454f6b2..94351e97a5151116766859530ffd8f352cdc334a 100644 --- a/manifests/prometheus-roleConfig.yaml +++ b/manifests/prometheus-roleConfig.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.32.1 + app.kubernetes.io/version: 2.33.0 name: prometheus-k8s-config namespace: monitoring rules: diff --git a/manifests/prometheus-roleSpecificNamespaces.yaml b/manifests/prometheus-roleSpecificNamespaces.yaml index ecc9a3e7093a7a44d68b2c79f0a57ae49f022892..7930bc0b360b3ae87ca5b45c82eee23e96477070 100644 --- a/manifests/prometheus-roleSpecificNamespaces.yaml +++ b/manifests/prometheus-roleSpecificNamespaces.yaml @@ -8,7 +8,7 @@ items: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.32.1 + app.kubernetes.io/version: 2.33.0 name: prometheus-k8s namespace: default rules: @@ -46,7 +46,7 @@ items: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.32.1 + app.kubernetes.io/version: 2.33.0 name: prometheus-k8s namespace: kube-system rules: @@ -84,7 +84,7 @@ items: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.32.1 + app.kubernetes.io/version: 2.33.0 name: prometheus-k8s namespace: monitoring rules: diff --git a/manifests/prometheus-service.yaml b/manifests/prometheus-service.yaml index 2a238de39352bf6e35d7dc87313abe6caff19dbd..def2faadacc6ce8096c0cc985d3f32088e89b94c 100644 --- a/manifests/prometheus-service.yaml +++ b/manifests/prometheus-service.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.32.1 + app.kubernetes.io/version: 2.33.0 name: prometheus-k8s namespace: monitoring spec: diff --git a/manifests/prometheus-serviceAccount.yaml b/manifests/prometheus-serviceAccount.yaml index 6e332759d7b5b2975d1d713b4091afd78acc621a..954222c56867aa45ff0d5d4cf3b64b15da26d009 100644 --- a/manifests/prometheus-serviceAccount.yaml +++ b/manifests/prometheus-serviceAccount.yaml @@ -6,6 +6,6 @@ metadata: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.32.1 + app.kubernetes.io/version: 2.33.0 name: prometheus-k8s namespace: monitoring diff --git a/manifests/prometheus-serviceMonitor.yaml b/manifests/prometheus-serviceMonitor.yaml index 54bbc2c3829ee971926a45fb3787fa87b7a84c26..37ec1f7476fd07ae5472a9265a70817b43377df4 100644 --- a/manifests/prometheus-serviceMonitor.yaml +++ b/manifests/prometheus-serviceMonitor.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/instance: k8s app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 2.32.1 + app.kubernetes.io/version: 2.33.0 name: prometheus-k8s namespace: monitoring spec: diff --git a/manifests/prometheusOperator-clusterRole.yaml b/manifests/prometheusOperator-clusterRole.yaml index 77ec7243770d7a814a06c6e10f190ee2d9c99513..b53b995d4922856a4c22e9eb69085af67401d2f8 100644 --- a/manifests/prometheusOperator-clusterRole.yaml +++ b/manifests/prometheusOperator-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.53.1 + app.kubernetes.io/version: 0.54.0 name: prometheus-operator rules: - apiGroups: diff --git a/manifests/prometheusOperator-clusterRoleBinding.yaml b/manifests/prometheusOperator-clusterRoleBinding.yaml index 948c258ffd15f66f9146395bd3f5fee2f3280b8b..a0f24ecd8230394402c95fe0ec7426aa3b890535 100644 --- a/manifests/prometheusOperator-clusterRoleBinding.yaml +++ b/manifests/prometheusOperator-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.53.1 + app.kubernetes.io/version: 0.54.0 name: prometheus-operator roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/manifests/prometheusOperator-deployment.yaml b/manifests/prometheusOperator-deployment.yaml index 915170fc7f980efe5ed854c4a52e039bad6caec7..aa9ac1aba51cd682d47b0cd9781bb414f738f0d9 100644 --- a/manifests/prometheusOperator-deployment.yaml +++ b/manifests/prometheusOperator-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.53.1 + app.kubernetes.io/version: 0.54.0 name: prometheus-operator namespace: monitoring spec: @@ -23,14 +23,14 @@ spec: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 0.53.1 + app.kubernetes.io/version: 0.54.0 spec: automountServiceAccountToken: true containers: - args: - --kubelet-service=kube-system/kubelet - - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.53.1 - image: quay.io/prometheus-operator/prometheus-operator:v0.53.1 + - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.54.0 + image: quay.io/prometheus-operator/prometheus-operator:v0.54.0 name: prometheus-operator ports: - containerPort: 8080 diff --git a/manifests/prometheusOperator-prometheusRule.yaml b/manifests/prometheusOperator-prometheusRule.yaml index 2f7b2a2cfb53798a2c6c57f30209847df8ce676b..bbab50b4fcfdb008ebc09290f00383a5bce714dd 100644 --- a/manifests/prometheusOperator-prometheusRule.yaml +++ b/manifests/prometheusOperator-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.53.1 + app.kubernetes.io/version: 0.54.0 prometheus: k8s role: alert-rules name: prometheus-operator-rules diff --git a/manifests/prometheusOperator-service.yaml b/manifests/prometheusOperator-service.yaml index 795f76ab2170d9d33d6ecf807f80d0be087b493f..c4c78cdfc3b3af1d4c89c3bc2d70534e6ad1bbde 100644 --- a/manifests/prometheusOperator-service.yaml +++ b/manifests/prometheusOperator-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.53.1 + app.kubernetes.io/version: 0.54.0 name: prometheus-operator namespace: monitoring spec: diff --git a/manifests/prometheusOperator-serviceAccount.yaml b/manifests/prometheusOperator-serviceAccount.yaml index cb764d98dab8b0d394975fc21d0f93f8c0df8246..9d6153bc8eaa6f690ef94ff9adab7c4738f8591b 100644 --- a/manifests/prometheusOperator-serviceAccount.yaml +++ b/manifests/prometheusOperator-serviceAccount.yaml @@ -6,6 +6,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.53.1 + app.kubernetes.io/version: 0.54.0 name: prometheus-operator namespace: monitoring diff --git a/manifests/prometheusOperator-serviceMonitor.yaml b/manifests/prometheusOperator-serviceMonitor.yaml index d6c927c4bb6b46fded37d1d7dd0f8229432950c5..9f680fc8ae6943511dc5c4f83075724433a61eb2 100644 --- a/manifests/prometheusOperator-serviceMonitor.yaml +++ b/manifests/prometheusOperator-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.53.1 + app.kubernetes.io/version: 0.54.0 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.53.1 + app.kubernetes.io/version: 0.54.0 diff --git a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml index f61454c098028a74a2f7b16719734d5bf621b152..a3f84c228784eb17d4632049e0ea5b04e8090776 100644 --- a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml +++ b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml @@ -598,8 +598,7 @@ spec: type: object targetLabels: description: TargetLabels transfers labels from the Kubernetes `Service` - onto the created metrics. All labels set in `selector.matchLabels` - are automatically transferred. + onto the created metrics. items: type: string type: array