From 8026584896d37f756ac96feebbd2edbe6c6389b5 Mon Sep 17 00:00:00 2001
From: Prometheus Operator Bot <prom-op-bot@users.noreply.github.com>
Date: Mon, 16 Oct 2023 14:04:39 +0000
Subject: [PATCH] [bot] [main] Automated version update
---
jsonnet/kube-prometheus/versions.json | 2 +-
jsonnetfile.lock.json | 60 ++++++++++++++-----
manifests/grafana-dashboardDefinitions.yaml | 11 ++++
manifests/prometheus-clusterRole.yaml | 2 +-
manifests/prometheus-clusterRoleBinding.yaml | 2 +-
manifests/prometheus-networkPolicy.yaml | 2 +-
manifests/prometheus-podDisruptionBudget.yaml | 2 +-
manifests/prometheus-prometheus.yaml | 8 +--
manifests/prometheus-prometheusRule.yaml | 2 +-
manifests/prometheus-roleBindingConfig.yaml | 2 +-
...metheus-roleBindingSpecificNamespaces.yaml | 6 +-
manifests/prometheus-roleConfig.yaml | 2 +-
.../prometheus-roleSpecificNamespaces.yaml | 6 +-
manifests/prometheus-service.yaml | 2 +-
manifests/prometheus-serviceAccount.yaml | 2 +-
manifests/prometheus-serviceMonitor.yaml | 2 +-
manifests/prometheusOperator-clusterRole.yaml | 6 ++
...managerConfigCustomResourceDefinition.yaml | 12 +++-
18 files changed, 92 insertions(+), 39 deletions(-)
diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json
index f4caafa2..7b9078a8 100644
--- a/jsonnet/kube-prometheus/versions.json
+++ b/jsonnet/kube-prometheus/versions.json
@@ -4,7 +4,7 @@
"grafana": "9.5.3",
"kubeStateMetrics": "2.9.2",
"nodeExporter": "1.6.1",
- "prometheus": "2.47.0",
+ "prometheus": "2.47.2",
"prometheusAdapter": "0.11.1",
"prometheusOperator": "0.68.0",
"kubeRbacProxy": "0.14.3",
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 7cb3fbe7..32b06336 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,8 +18,8 @@
"subdir": "contrib/mixin"
}
},
- "version": "e1ebc260a9bb609ad4c07f7691d8517d1a6c3ad1",
- "sum": "GdePvMDfLQcVhwzk/Ephi/jC27ywGObLB5t0eC0lXd4="
+ "version": "569640f278e5ee731e80448a395b3398851199b7",
+ "sum": "LTbR+JGJ0gW3AdJQRl24VIKyKnPlPFaB+d+iysj4IU0="
},
{
"source": {
@@ -51,6 +51,16 @@
"version": "a1d61cce1da59c71409b99b5c7568511fec661ea",
"sum": "gCtR9s/4D5fxU9aKXg0Bru+/njZhA0YjLjPiASc61FM="
},
+ {
+ "source": {
+ "git": {
+ "remote": "https://github.com/grafana/grafonnet.git",
+ "subdir": "gen/grafonnet-v10.0.0"
+ }
+ },
+ "version": "16f374fcebd987bc1d8bc526f433a75e2e5dcb28",
+ "sum": "oteDmtf/QpAaG1F+lDtEhf0AYWKa+6cGVv41ncaSdh4="
+ },
{
"source": {
"git": {
@@ -58,9 +68,29 @@
"subdir": "grafana-builder"
}
},
- "version": "6b312900746a7f379d67afd46f263745e2ab5d01",
+ "version": "981fe02c0ac0421b74db444de6b9f9b012b3f67c",
"sum": "xEFMv4+ObwP5L1Wu0XK5agWci4AJzNApys6iKAQxLlQ="
},
+ {
+ "source": {
+ "git": {
+ "remote": "https://github.com/jsonnet-libs/docsonnet.git",
+ "subdir": "doc-util"
+ }
+ },
+ "version": "fd8de9039b3c06da77d635a3a8289809a5bfb542",
+ "sum": "mFebrE9fhyAKW4zbnidcjVFupziN5LPA/Z7ii94uCzs="
+ },
+ {
+ "source": {
+ "git": {
+ "remote": "https://github.com/jsonnet-libs/xtd.git",
+ "subdir": ""
+ }
+ },
+ "version": "0256a910ac71f0f842696d7bca0bf01ea77eb654",
+ "sum": "zBOpb1oTNvXdq9RF6yzTHill5r1YTJLBBoqyx4JYtAg="
+ },
{
"source": {
"git": {
@@ -68,8 +98,8 @@
"subdir": ""
}
},
- "version": "baffdc10fb6336c43b549cff3cc52b09d4df3c03",
- "sum": "eyfIL6KkkWEql9AdFEXA4oNelWbkvzlGuPmHFjFlV+g="
+ "version": "31169fd115654ca023c03cd7b45b9c96704a87e2",
+ "sum": "KJZ5QCtsPm3NofFURHO315rd4pnKc5+trU6ihuE64P8="
},
{
"source": {
@@ -78,7 +108,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
- "version": "b91dd311397047f15aae4f6dacba0708f24cf446",
+ "version": "5c71459a614eaf8370bed2f406899f2269edff66",
"sum": "+dOzAK+fwsFf97uZpjcjTcEJEC1H8hh/j8f5uIQK/5g="
},
{
@@ -88,7 +118,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
- "version": "b91dd311397047f15aae4f6dacba0708f24cf446",
+ "version": "5c71459a614eaf8370bed2f406899f2269edff66",
"sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
},
{
@@ -98,7 +128,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "aeceb0b4fadc8307a44dc55afdceca0bea50bbb0",
+ "version": "75f05e1988716d8610e4aa513437e271443964e9",
"sum": "n3flMIzlADeyygb0uipZ4KPp2uNSjdtkrwgHjTC7Ca4=",
"name": "prometheus-operator-mixin"
},
@@ -109,8 +139,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "aeceb0b4fadc8307a44dc55afdceca0bea50bbb0",
- "sum": "0jtf0dxDTlCZNgw+l4rgHQR0CkrKmSvrHEtSpjJg3vI="
+ "version": "75f05e1988716d8610e4aa513437e271443964e9",
+ "sum": "gl4yvv+WLjt+CaTW4/urKAMx8fs9I4K8PgZ4PyOMD58="
},
{
"source": {
@@ -119,7 +149,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
- "version": "b517645d951da230fbb078da417c5ac46928dbd6",
+ "version": "acb58400fd2b324dd4cc56110c8e891e8b1c0420",
"sum": "1d7ZKYArJKacAWXLUz0bRC1uOkozee/PPw97/W5zGhc=",
"name": "alertmanager"
},
@@ -130,7 +160,7 @@
"subdir": "docs/node-mixin"
}
},
- "version": "e8c5110ada6152ec0efb8b2dc8be7e493624d232",
+ "version": "0f6a4d8c3970f452131a97f14ca200660f46fc2b",
"sum": "By6n6U10hYDogUsyhsaKZehbhzxBZZobJloiKyKadgM="
},
{
@@ -140,7 +170,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "86729d4d7b8659e2b90fa65ae2d42ecddc3657bc",
+ "version": "dcaca86958531929752d9cb5f52eb03d390a3b8f",
"sum": "8OngT76gVXOUROOOeP9yTe6E/dn+2D2J34Dn690QCG0=",
"name": "prometheus"
},
@@ -162,8 +192,8 @@
"subdir": "mixin"
}
},
- "version": "6257767ec9d08a0f41014d4ac6f21aeb6a886773",
- "sum": "WhheqsiX0maUXByZFsb9xhCEsGXK2955bPmPPf1x+Cs=",
+ "version": "77fac932094be5cac69c9ea0c5c85c3f4ac0e5be",
+ "sum": "HhSSbGGCNHCMy1ee5jElYDm0yS9Vesa7QB2/SHKdjsY=",
"name": "thanos-mixin"
},
{
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index 475c72b0..c48167f3 100644
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
@@ -2253,6 +2253,7 @@ items:
"list": [
{
"current": {
+ "selected": true,
"text": "default",
"value": "default"
},
@@ -4150,6 +4151,7 @@ items:
},
{
"current": {
+ "selected": true,
"text": "default",
"value": "default"
},
@@ -5303,6 +5305,7 @@ items:
"list": [
{
"current": {
+ "selected": true,
"text": "default",
"value": "default"
},
@@ -22871,6 +22874,7 @@ items:
"list": [
{
"current": {
+ "selected": true,
"text": "default",
"value": "default"
},
@@ -24238,6 +24242,7 @@ items:
"list": [
{
"current": {
+ "selected": true,
"text": "default",
"value": "default"
},
@@ -25931,6 +25936,7 @@ items:
"list": [
{
"current": {
+ "selected": true,
"text": "default",
"value": "default"
},
@@ -30846,6 +30852,7 @@ items:
"list": [
{
"current": {
+ "selected": true,
"text": "default",
"value": "default"
},
@@ -31971,6 +31978,7 @@ items:
"list": [
{
"current": {
+ "selected": true,
"text": "default",
"value": "default"
},
@@ -36217,6 +36225,7 @@ items:
"list": [
{
"current": {
+ "selected": true,
"text": "default",
"value": "default"
},
@@ -37318,6 +37327,7 @@ items:
"list": [
{
"current": {
+ "selected": true,
"text": "default",
"value": "default"
},
@@ -38595,6 +38605,7 @@ items:
"list": [
{
"current": {
+ "selected": true,
"text": "default",
"value": "default"
},
diff --git a/manifests/prometheus-clusterRole.yaml b/manifests/prometheus-clusterRole.yaml
index 499a151d..fad6b288 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.47.0
+ app.kubernetes.io/version: 2.47.2
name: prometheus-k8s
rules:
- apiGroups:
diff --git a/manifests/prometheus-clusterRoleBinding.yaml b/manifests/prometheus-clusterRoleBinding.yaml
index 31a3845d..f6f392df 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.47.0
+ app.kubernetes.io/version: 2.47.2
name: prometheus-k8s
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/prometheus-networkPolicy.yaml b/manifests/prometheus-networkPolicy.yaml
index 8cefcb48..0e149445 100644
--- a/manifests/prometheus-networkPolicy.yaml
+++ b/manifests/prometheus-networkPolicy.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.47.0
+ app.kubernetes.io/version: 2.47.2
name: prometheus-k8s
namespace: monitoring
spec:
diff --git a/manifests/prometheus-podDisruptionBudget.yaml b/manifests/prometheus-podDisruptionBudget.yaml
index 3d61c8e8..f4d12f44 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.47.0
+ app.kubernetes.io/version: 2.47.2
name: prometheus-k8s
namespace: monitoring
spec:
diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml
index b3741365..19aa3cae 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.47.0
+ app.kubernetes.io/version: 2.47.2
name: k8s
namespace: monitoring
spec:
@@ -18,7 +18,7 @@ spec:
port: web
enableFeatures: []
externalLabels: {}
- image: quay.io/prometheus/prometheus:v2.47.0
+ image: quay.io/prometheus/prometheus:v2.47.2
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.47.0
+ app.kubernetes.io/version: 2.47.2
podMonitorNamespaceSelector: {}
podMonitorSelector: {}
probeNamespaceSelector: {}
@@ -45,4 +45,4 @@ spec:
serviceAccountName: prometheus-k8s
serviceMonitorNamespaceSelector: {}
serviceMonitorSelector: {}
- version: 2.47.0
+ version: 2.47.2
diff --git a/manifests/prometheus-prometheusRule.yaml b/manifests/prometheus-prometheusRule.yaml
index 3b7ff044..71540c63 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.47.0
+ app.kubernetes.io/version: 2.47.2
prometheus: k8s
role: alert-rules
name: prometheus-k8s-prometheus-rules
diff --git a/manifests/prometheus-roleBindingConfig.yaml b/manifests/prometheus-roleBindingConfig.yaml
index c2ecfa67..bc171ca2 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.47.0
+ app.kubernetes.io/version: 2.47.2
name: prometheus-k8s-config
namespace: monitoring
roleRef:
diff --git a/manifests/prometheus-roleBindingSpecificNamespaces.yaml b/manifests/prometheus-roleBindingSpecificNamespaces.yaml
index 8e6d4fa0..b9d524d6 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.47.0
+ app.kubernetes.io/version: 2.47.2
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.47.0
+ app.kubernetes.io/version: 2.47.2
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.47.0
+ app.kubernetes.io/version: 2.47.2
name: prometheus-k8s
namespace: monitoring
roleRef:
diff --git a/manifests/prometheus-roleConfig.yaml b/manifests/prometheus-roleConfig.yaml
index 22b3c97b..180929af 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.47.0
+ app.kubernetes.io/version: 2.47.2
name: prometheus-k8s-config
namespace: monitoring
rules:
diff --git a/manifests/prometheus-roleSpecificNamespaces.yaml b/manifests/prometheus-roleSpecificNamespaces.yaml
index f6ce749e..b0ec29ef 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.47.0
+ app.kubernetes.io/version: 2.47.2
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.47.0
+ app.kubernetes.io/version: 2.47.2
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.47.0
+ app.kubernetes.io/version: 2.47.2
name: prometheus-k8s
namespace: monitoring
rules:
diff --git a/manifests/prometheus-service.yaml b/manifests/prometheus-service.yaml
index fca2f5fe..ab9f8bdc 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.47.0
+ app.kubernetes.io/version: 2.47.2
name: prometheus-k8s
namespace: monitoring
spec:
diff --git a/manifests/prometheus-serviceAccount.yaml b/manifests/prometheus-serviceAccount.yaml
index 26045562..63c98426 100644
--- a/manifests/prometheus-serviceAccount.yaml
+++ b/manifests/prometheus-serviceAccount.yaml
@@ -7,6 +7,6 @@ metadata:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.47.0
+ app.kubernetes.io/version: 2.47.2
name: prometheus-k8s
namespace: monitoring
diff --git a/manifests/prometheus-serviceMonitor.yaml b/manifests/prometheus-serviceMonitor.yaml
index 4a300592..6800a948 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.47.0
+ app.kubernetes.io/version: 2.47.2
name: prometheus-k8s
namespace: monitoring
spec:
diff --git a/manifests/prometheusOperator-clusterRole.yaml b/manifests/prometheusOperator-clusterRole.yaml
index e72b3134..4efd4372 100644
--- a/manifests/prometheusOperator-clusterRole.yaml
+++ b/manifests/prometheusOperator-clusterRole.yaml
@@ -85,6 +85,12 @@ rules:
- get
- list
- watch
+- apiGroups:
+ - storage.k8s.io
+ resources:
+ - storageclasses
+ verbs:
+ - get
- apiGroups:
- authentication.k8s.io
resources:
diff --git a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
index 1d59733c..6a56599e 100644
--- a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
+++ b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
@@ -21,7 +21,7 @@ spec:
- name: v1alpha1
schema:
openAPIV3Schema:
- description: AlertmanagerConfig defines a namespaced AlertmanagerConfig to be aggregated across multiple namespaces configuring one Alertmanager cluster.
+ description: AlertmanagerConfig configures the Prometheus Alertmanager, specifying how alerts should be grouped, inhibited and notified to external systems.
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
@@ -1660,7 +1660,7 @@ spec:
description: Notification title.
type: string
token:
- description: The secret's key that contains the registered application's API token, see https://pushover.net/apps. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator.
+ description: The secret's key that contains the registered application's API token, see https://pushover.net/apps. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator. Either `token` or `tokenFile` is required.
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -1674,6 +1674,9 @@ spec:
required:
- key
type: object
+ tokenFile:
+ description: The token file that contains the registered application's API token, see https://pushover.net/apps. Either `token` or `tokenFile` is required. It requires Alertmanager >= v0.26.0.
+ type: string
url:
description: A supplementary URL shown alongside the message.
type: string
@@ -1681,7 +1684,7 @@ spec:
description: A title for supplementary URL, otherwise just the URL is shown
type: string
userKey:
- description: The secret's key that contains the recipient user's user key. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator.
+ description: The secret's key that contains the recipient user's user key. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator. Either `userKey` or `userKeyFile` is required.
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -1695,6 +1698,9 @@ spec:
required:
- key
type: object
+ userKeyFile:
+ description: The user key file that contains the recipient user's user key. Either `userKey` or `userKeyFile` is required. It requires Alertmanager >= v0.26.0.
+ type: string
type: object
type: array
slackConfigs:
--
GitLab