diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json
index f259b33c9fcce25c2527b450af9507e7414fa926..d00b68d3d07c8e2213e39314e9c7b088874628e2 100644
--- a/jsonnet/kube-prometheus/versions.json
+++ b/jsonnet/kube-prometheus/versions.json
@@ -1,13 +1,13 @@
{
"alertmanager": "0.24.0",
"blackboxExporter": "0.21.1",
- "grafana": "9.0.1",
+ "grafana": "9.0.2",
"kubeStateMetrics": "2.5.0",
"nodeExporter": "1.3.1",
"prometheus": "2.36.2",
"prometheusAdapter": "0.9.1",
"prometheusOperator": "0.57.0",
- "kubeRbacProxy": "0.12.0",
+ "kubeRbacProxy": "0.13.0",
"configmapReload": "0.5.0",
- "pyrra": "0.4.2"
+ "pyrra": "0.4.3"
}
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 0be12ff070edf969838eeed475896dad12cec28e..2bf96be2de1a129cc70e4a20b7db1e081c9cea20 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
- "version": "19f5ff664a35bdb77b4746c52e7deb485ebce269",
+ "version": "33347b6845fc725894c02e57b604fe2d224260e6",
"sum": "zhLYhUNcXNkMRfJhMUX0UiOpi8TOuLmUqJfO9NFKFkg="
},
{
@@ -78,8 +78,8 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
- "version": "3bc65571c4b206833320e5e18f75af6b34ab1490",
- "sum": "P0dCnbzyPScQGNXwXRcwiPkMLeTq0IPNbSTysDbySnM="
+ "version": "e4011f8f4b4f04fef2ccced18f309fe7aa0e136b",
+ "sum": "YV+ciAA4d+IRk7GVy6NatFniJWEcjxHHca4dRpZgRXg="
},
{
"source": {
@@ -88,7 +88,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
- "version": "3bc65571c4b206833320e5e18f75af6b34ab1490",
+ "version": "e4011f8f4b4f04fef2ccced18f309fe7aa0e136b",
"sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
},
{
@@ -98,7 +98,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "da50fee1fd274fb5e7b08b198eeda04d4c6e64f6",
+ "version": "3bbba976b89ca2c0b0df188aae8fb425167822f4",
"sum": "GQmaVFJwKMiD/P4n3N2LrAZVcwutriWrP8joclDtBYQ=",
"name": "prometheus-operator-mixin"
},
@@ -109,8 +109,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "da50fee1fd274fb5e7b08b198eeda04d4c6e64f6",
- "sum": "sqcNWGjnMUGikgvG9aRtjHSTqc+zplp16QFTXCvl9v0="
+ "version": "3bbba976b89ca2c0b0df188aae8fb425167822f4",
+ "sum": "wh/sdynvFt57+JsVK7AIwPxmN14K5i4WMOjaydyzQ2w="
},
{
"source": {
@@ -119,8 +119,8 @@
"subdir": "doc/alertmanager-mixin"
}
},
- "version": "805e505288ce82c3e2b625a3ca63aaf2b0aa9cea",
- "sum": "EgEdKlM78IJIjmiBL7x/cIJ+wdzGwT65YHyQVo0JCNk=",
+ "version": "528b9588bf814c394b3111a21c66aab71828131c",
+ "sum": "PsK+V7oETCPKu2gLoPfqY0wwPKH9TzhNj6o2xezjjXc=",
"name": "alertmanager"
},
{
@@ -130,8 +130,8 @@
"subdir": "docs/node-mixin"
}
},
- "version": "b99f933713a7680f6cae4fcb8cf35c2d05ac75c3",
- "sum": "/ma9CIghDhPEIBZAt41Mkutb6813lMKdIX54SmNQ79g="
+ "version": "69a3f73a9b1e1452cb3a9e62f969f21a1baaeade",
+ "sum": "f+sVYdKOuFgyX5dnR8lfqXhN2ReTrDqa5Ys7DeVoj3U="
},
{
"source": {
@@ -140,7 +140,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "87ffac3e9d2104cd368d2e8962723d9fc3ee126f",
+ "version": "d56d0a9d52c8614fdf1c5c652061929ede562f3e",
"sum": "APXOIP3B3dZ3Tyh7L2UhyWR8Vbf5+9adTLz/ya7n6uU=",
"name": "prometheus"
},
@@ -151,7 +151,7 @@
"subdir": "config/crd/bases"
}
},
- "version": "afa28f698dd24381e16eff2d281740c78d4fb488",
+ "version": "373040506502d516be297768faf80bf22302016d",
"sum": "GQ0GFKGdIWKx1b78VRs6jtC4SMqkBjT5jl65QUjPKK4="
},
{
@@ -161,7 +161,7 @@
"subdir": "mixin"
}
},
- "version": "eb65de3dc405137ba30970b45a0a5bb479798b32",
+ "version": "4de555db87d38d69b78602c1e1d0fb8ed6e0371b",
"sum": "/UJrWExMDM89fPfidt1pNLSQOLXsyBpmyp3unRbjaXw=",
"name": "thanos-mixin"
},
diff --git a/manifests/blackboxExporter-deployment.yaml b/manifests/blackboxExporter-deployment.yaml
index 8da3a82d506aab34af575d7230ad57ba06f03949..18647959c3f6b4998b6ad4550cd9c1293f2ee739 100644
--- a/manifests/blackboxExporter-deployment.yaml
+++ b/manifests/blackboxExporter-deployment.yaml
@@ -85,7 +85,7 @@ spec:
- --secure-listen-address=:9115
- --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
- --upstream=http://127.0.0.1:19115/
- image: quay.io/brancz/kube-rbac-proxy:v0.12.0
+ image: quay.io/brancz/kube-rbac-proxy:v0.13.0
name: kube-rbac-proxy
ports:
- containerPort: 9115
diff --git a/manifests/grafana-config.yaml b/manifests/grafana-config.yaml
index ba6f2f450c7f306f05602e8453f995d7de0fb312..fd71f4e2f3cbb564411ab8b56fcb4f0a79bc31cb 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.0.1
+ app.kubernetes.io/version: 9.0.2
name: grafana-config
namespace: monitoring
stringData:
diff --git a/manifests/grafana-dashboardDatasources.yaml b/manifests/grafana-dashboardDatasources.yaml
index 136f9d3c9d524334b50299a0644dbb19141cec6f..ded374161c2fd0b03d48c1b83516a4a2dd900e8e 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.0.1
+ app.kubernetes.io/version: 9.0.2
name: grafana-datasources
namespace: monitoring
stringData:
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index 0acab666c86760c3a513062f81661d6e3a76b358..2221613deb9a444bd6d5937ed5afceba3c24a5a5 100644
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
@@ -37,6 +37,7 @@ items:
"dashLength": 10,
"dashes": false,
"datasource": "$datasource",
+ "description": "current set of alerts stored in the Alertmanager",
"fill": 1,
"fillGradient": 0,
"gridPos": {
@@ -130,6 +131,7 @@ items:
"dashLength": 10,
"dashes": false,
"datasource": "$datasource",
+ "description": "rate of successful and invalid alerts received by the Alertmanager",
"fill": 1,
"fillGradient": 0,
"gridPos": {
@@ -243,6 +245,7 @@ items:
"dashLength": 10,
"dashes": false,
"datasource": "$datasource",
+ "description": "rate of successful and invalid notifications sent by the Alertmanager",
"fill": 1,
"fillGradient": 0,
"gridPos": {
@@ -342,6 +345,7 @@ items:
"dashLength": 10,
"dashes": false,
"datasource": "$datasource",
+ "description": "latency of notifications sent by the Alertmanager",
"fill": 1,
"fillGradient": 0,
"gridPos": {
@@ -596,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.0.1
+ app.kubernetes.io/version: 9.0.2
name: grafana-dashboard-alertmanager-overview
namespace: monitoring
- apiVersion: v1
@@ -2357,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.0.1
+ app.kubernetes.io/version: 9.0.2
name: grafana-dashboard-apiserver
namespace: monitoring
- apiVersion: v1
@@ -4228,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.0.1
+ app.kubernetes.io/version: 9.0.2
name: grafana-dashboard-cluster-total
namespace: monitoring
- apiVersion: v1
@@ -5407,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.0.1
+ app.kubernetes.io/version: 9.0.2
name: grafana-dashboard-controller-manager
namespace: monitoring
- apiVersion: v1
@@ -6032,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.0.1
+ app.kubernetes.io/version: 9.0.2
name: grafana-dashboard-grafana-overview
namespace: monitoring
- apiVersion: v1
@@ -9109,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.0.1
+ app.kubernetes.io/version: 9.0.2
name: grafana-dashboard-k8s-resources-cluster
namespace: monitoring
- apiVersion: v1
@@ -11895,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.0.1
+ app.kubernetes.io/version: 9.0.2
name: grafana-dashboard-k8s-resources-namespace
namespace: monitoring
- apiVersion: v1
@@ -12910,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.0.1
+ app.kubernetes.io/version: 9.0.2
name: grafana-dashboard-k8s-resources-node
namespace: monitoring
- apiVersion: v1
@@ -15368,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.0.1
+ app.kubernetes.io/version: 9.0.2
name: grafana-dashboard-k8s-resources-pod
namespace: monitoring
- apiVersion: v1
@@ -17381,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.0.1
+ app.kubernetes.io/version: 9.0.2
name: grafana-dashboard-k8s-resources-workload
namespace: monitoring
- apiVersion: v1
@@ -19559,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.0.1
+ app.kubernetes.io/version: 9.0.2
name: grafana-dashboard-k8s-resources-workloads-namespace
namespace: monitoring
- apiVersion: v1
@@ -21802,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.0.1
+ app.kubernetes.io/version: 9.0.2
name: grafana-dashboard-kubelet
namespace: monitoring
- apiVersion: v1
@@ -23255,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.0.1
+ app.kubernetes.io/version: 9.0.2
name: grafana-dashboard-namespace-by-pod
namespace: monitoring
- apiVersion: v1
@@ -24980,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.0.1
+ app.kubernetes.io/version: 9.0.2
name: grafana-dashboard-namespace-by-workload
namespace: monitoring
- apiVersion: v1
@@ -26032,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.0.1
+ app.kubernetes.io/version: 9.0.2
name: grafana-dashboard-node-cluster-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -27110,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.0.1
+ app.kubernetes.io/version: 9.0.2
name: grafana-dashboard-node-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -28170,7 +28174,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.0.1
+ app.kubernetes.io/version: 9.0.2
name: grafana-dashboard-nodes-darwin
namespace: monitoring
- apiVersion: v1
@@ -29223,7 +29227,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.0.1
+ app.kubernetes.io/version: 9.0.2
name: grafana-dashboard-nodes
namespace: monitoring
- apiVersion: v1
@@ -29799,7 +29803,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.0.1
+ app.kubernetes.io/version: 9.0.2
name: grafana-dashboard-persistentvolumesusage
namespace: monitoring
- apiVersion: v1
@@ -31016,7 +31020,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.0.1
+ app.kubernetes.io/version: 9.0.2
name: grafana-dashboard-pod-total
namespace: monitoring
- apiVersion: v1
@@ -32675,7 +32679,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.0.1
+ app.kubernetes.io/version: 9.0.2
name: grafana-dashboard-prometheus-remote-write
namespace: monitoring
- apiVersion: v1
@@ -33899,7 +33903,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.0.1
+ app.kubernetes.io/version: 9.0.2
name: grafana-dashboard-prometheus
namespace: monitoring
- apiVersion: v1
@@ -35159,7 +35163,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.0.1
+ app.kubernetes.io/version: 9.0.2
name: grafana-dashboard-proxy
namespace: monitoring
- apiVersion: v1
@@ -36260,7 +36264,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.0.1
+ app.kubernetes.io/version: 9.0.2
name: grafana-dashboard-scheduler
namespace: monitoring
- apiVersion: v1
@@ -37687,7 +37691,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.0.1
+ app.kubernetes.io/version: 9.0.2
name: grafana-dashboard-workload-total
namespace: monitoring
kind: ConfigMapList
diff --git a/manifests/grafana-dashboardSources.yaml b/manifests/grafana-dashboardSources.yaml
index 4f049d0b1037d53d200485a048f87033daf85341..b3410e76e28aecc08bd6b963c6f2e194f9d1848a 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.0.1
+ app.kubernetes.io/version: 9.0.2
name: grafana-dashboards
namespace: monitoring
diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml
index 5f4da3dcbcbc12eb61d492afcbf8bf0df2a43527..4764605b89da027fa207fb8833636c7763dbb161 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.0.1
+ app.kubernetes.io/version: 9.0.2
name: grafana
namespace: monitoring
spec:
@@ -18,19 +18,19 @@ spec:
template:
metadata:
annotations:
- checksum/grafana-config: 4f07432fb934e06bd959e5685567047d
- checksum/grafana-dashboardproviders: 2b477acf60d9e42bdee521839176786a
- checksum/grafana-datasources: 8f7ea6e09fd177aef9eee3b010258cf2
+ checksum/grafana-config: 00702bb2cd83a2e75b4d9c625e01f2a9
+ checksum/grafana-dashboardproviders: d95b76711ab872866d490baceced78fa
+ checksum/grafana-datasources: c20ade423686c4a1b00474ee14020879
labels:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.0.1
+ app.kubernetes.io/version: 9.0.2
spec:
automountServiceAccountToken: false
containers:
- env: []
- image: grafana/grafana:9.0.1
+ image: grafana/grafana:9.0.2
name: grafana
ports:
- containerPort: 3000
diff --git a/manifests/grafana-networkPolicy.yaml b/manifests/grafana-networkPolicy.yaml
index 067e85696209b4049ac10aa710a4ae806c4c39e4..882fb9c4f1af07a7753b2556700440489cd0d06f 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.0.1
+ app.kubernetes.io/version: 9.0.2
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/grafana-prometheusRule.yaml b/manifests/grafana-prometheusRule.yaml
index 4aa5aff39fbd11577adb8593202efd1a22e8fef3..d153d4f8eb842dbb489a03558497b278ea73202b 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.0.1
+ app.kubernetes.io/version: 9.0.2
prometheus: k8s
role: alert-rules
name: grafana-rules
diff --git a/manifests/grafana-service.yaml b/manifests/grafana-service.yaml
index 65135a6c07b623c7a302d05b7fc121476a2ef837..2900d9dda98284789fc3b445cb2a57602da1834c 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.0.1
+ app.kubernetes.io/version: 9.0.2
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/grafana-serviceAccount.yaml b/manifests/grafana-serviceAccount.yaml
index 0e2c0bf598c28546ee0935f032ffe1a15a524070..2c28ac704e403fa591a80cdb087c5111607930f3 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.0.1
+ app.kubernetes.io/version: 9.0.2
name: grafana
namespace: monitoring
diff --git a/manifests/grafana-serviceMonitor.yaml b/manifests/grafana-serviceMonitor.yaml
index 44a879a63ad46865ae527141ae37530f95d254ec..54efca8044da9dd25a0815dd3f3fe926d2be4666 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.0.1
+ app.kubernetes.io/version: 9.0.2
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/kubeStateMetrics-clusterRole.yaml b/manifests/kubeStateMetrics-clusterRole.yaml
index 85ee76e02acc12bbedf9ef066362f88fe1de18df..42cb46a040cf363e6b5345a9854b11582a9aaa2b 100644
--- a/manifests/kubeStateMetrics-clusterRole.yaml
+++ b/manifests/kubeStateMetrics-clusterRole.yaml
@@ -16,6 +16,7 @@ rules:
- nodes
- pods
- services
+ - serviceaccounts
- resourcequotas
- replicationcontrollers
- limitranges
diff --git a/manifests/kubeStateMetrics-deployment.yaml b/manifests/kubeStateMetrics-deployment.yaml
index 964c9350561508efba817ae5eab9783e9f94d72d..3c1996f2b474056a75ef0c7b15bf35b105961120 100644
--- a/manifests/kubeStateMetrics-deployment.yaml
+++ b/manifests/kubeStateMetrics-deployment.yaml
@@ -53,7 +53,7 @@ spec:
- --secure-listen-address=:8443
- --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
- --upstream=http://127.0.0.1:8081/
- image: quay.io/brancz/kube-rbac-proxy:v0.12.0
+ image: quay.io/brancz/kube-rbac-proxy:v0.13.0
name: kube-rbac-proxy-main
ports:
- containerPort: 8443
@@ -79,7 +79,7 @@ spec:
- --secure-listen-address=:9443
- --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
- --upstream=http://127.0.0.1:8082/
- image: quay.io/brancz/kube-rbac-proxy:v0.12.0
+ image: quay.io/brancz/kube-rbac-proxy:v0.13.0
name: kube-rbac-proxy-self
ports:
- containerPort: 9443
diff --git a/manifests/nodeExporter-daemonset.yaml b/manifests/nodeExporter-daemonset.yaml
index 05738fc1ac24239f0bbece594aaff9e7027f9631..1720502f7afb269ba645e385a348ad308dcf34d5 100644
--- a/manifests/nodeExporter-daemonset.yaml
+++ b/manifests/nodeExporter-daemonset.yaml
@@ -71,7 +71,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: status.podIP
- image: quay.io/brancz/kube-rbac-proxy:v0.12.0
+ image: quay.io/brancz/kube-rbac-proxy:v0.13.0
name: kube-rbac-proxy
ports:
- containerPort: 9100
diff --git a/manifests/prometheusOperator-deployment.yaml b/manifests/prometheusOperator-deployment.yaml
index cb2c547b94b32118bc7a6f7aef27b2e757fb451c..d41ce720c6b67dd0ec3328e8597b8b3b211052af 100644
--- a/manifests/prometheusOperator-deployment.yaml
+++ b/manifests/prometheusOperator-deployment.yaml
@@ -53,7 +53,7 @@ spec:
- --secure-listen-address=:8443
- --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
- --upstream=http://127.0.0.1:8080/
- image: quay.io/brancz/kube-rbac-proxy:v0.12.0
+ image: quay.io/brancz/kube-rbac-proxy:v0.13.0
name: kube-rbac-proxy
ports:
- containerPort: 8443
diff --git a/manifests/setup/0podmonitorCustomResourceDefinition.yaml b/manifests/setup/0podmonitorCustomResourceDefinition.yaml
index 4be81a3454e2c31cec58f76a443cea879c26ed2c..08293725ece2626d5fdc0643dbba97c8a4aa13d9 100644
--- a/manifests/setup/0podmonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/0podmonitorCustomResourceDefinition.yaml
@@ -207,15 +207,27 @@ spec:
action:
default: replace
description: Action to perform based on regex matching.
- Default is 'replace'
+ Default is 'replace'. uppercase and lowercase actions
+ require Prometheus >= 2.36.
enum:
- replace
+ - Replace
- keep
+ - Keep
- drop
+ - Drop
- hashmod
+ - HashMod
- labelmap
+ - LabelMap
- labeldrop
+ - LabelDrop
- labelkeep
+ - LabelKeep
+ - lowercase
+ - Lowercase
+ - uppercase
+ - Uppercase
type: string
modulus:
description: Modulus to take of the hash of the source
@@ -346,7 +358,8 @@ spec:
description: Optional HTTP URL parameters
type: object
path:
- description: HTTP path to scrape for metrics.
+ description: HTTP path to scrape for metrics. If empty, Prometheus
+ uses the default value (e.g. `/metrics`).
type: string
port:
description: Name of the pod port this endpoint refers to. Mutually
@@ -371,15 +384,27 @@ spec:
action:
default: replace
description: Action to perform based on regex matching.
- Default is 'replace'
+ Default is 'replace'. uppercase and lowercase actions
+ require Prometheus >= 2.36.
enum:
- replace
+ - Replace
- keep
+ - Keep
- drop
+ - Drop
- hashmod
+ - HashMod
- labelmap
+ - LabelMap
- labeldrop
+ - LabelDrop
- labelkeep
+ - LabelKeep
+ - lowercase
+ - Lowercase
+ - uppercase
+ - Uppercase
type: string
modulus:
description: Modulus to take of the hash of the source
diff --git a/manifests/setup/0probeCustomResourceDefinition.yaml b/manifests/setup/0probeCustomResourceDefinition.yaml
index 492ee8bee972193b59002253edf7be9b945ac152..25458436d82f2b67d75f0aa6f165d2dd737e51df 100644
--- a/manifests/setup/0probeCustomResourceDefinition.yaml
+++ b/manifests/setup/0probeCustomResourceDefinition.yaml
@@ -163,15 +163,27 @@ spec:
action:
default: replace
description: Action to perform based on regex matching. Default
- is 'replace'
+ is 'replace'. uppercase and lowercase actions require Prometheus
+ >= 2.36.
enum:
- replace
+ - Replace
- keep
+ - Keep
- drop
+ - Drop
- hashmod
+ - HashMod
- labelmap
+ - LabelMap
- labeldrop
+ - LabelDrop
- labelkeep
+ - LabelKeep
+ - lowercase
+ - Lowercase
+ - uppercase
+ - Uppercase
type: string
modulus:
description: Modulus to take of the hash of the source label
@@ -301,6 +313,7 @@ spec:
left empty.
properties:
path:
+ default: /probe
description: Path to collect metrics from. Defaults to `/probe`.
type: string
proxyUrl:
@@ -368,15 +381,27 @@ spec:
action:
default: replace
description: Action to perform based on regex matching.
- Default is 'replace'
+ Default is 'replace'. uppercase and lowercase actions
+ require Prometheus >= 2.36.
enum:
- replace
+ - Replace
- keep
+ - Keep
- drop
+ - Drop
- hashmod
+ - HashMod
- labelmap
+ - LabelMap
- labeldrop
+ - LabelDrop
- labelkeep
+ - LabelKeep
+ - lowercase
+ - Lowercase
+ - uppercase
+ - Uppercase
type: string
modulus:
description: Modulus to take of the hash of the source
@@ -484,15 +509,27 @@ spec:
action:
default: replace
description: Action to perform based on regex matching.
- Default is 'replace'
+ Default is 'replace'. uppercase and lowercase actions
+ require Prometheus >= 2.36.
enum:
- replace
+ - Replace
- keep
+ - Keep
- drop
+ - Drop
- hashmod
+ - HashMod
- labelmap
+ - LabelMap
- labeldrop
+ - LabelDrop
- labelkeep
+ - LabelKeep
+ - lowercase
+ - Lowercase
+ - uppercase
+ - Uppercase
type: string
modulus:
description: Modulus to take of the hash of the source
diff --git a/manifests/setup/0prometheusCustomResourceDefinition.yaml b/manifests/setup/0prometheusCustomResourceDefinition.yaml
index e07c944eaeeffb6d953f0a1a3fd443e1405a3530..2fc9efa2d7c17446c8bab4c2ade348194293d031 100644
--- a/manifests/setup/0prometheusCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusCustomResourceDefinition.yaml
@@ -1027,6 +1027,7 @@ spec:
timeout:
description: Timeout is a per-target Alertmanager timeout
when pushing alerts.
+ pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
type: string
tlsConfig:
description: TLS Config to use for alertmanager connection.
@@ -2773,6 +2774,17 @@ spec:
- resource
type: object
type: array
+ exemplars:
+ description: Exemplars related settings that are runtime reloadable.
+ It requires to enable the exemplar storage feature to be effective.
+ properties:
+ maxSize:
+ description: Maximum number of exemplars stored in memory for
+ all series. If not set, Prometheus uses its default value. A
+ value of zero or less than zero disables the storage.
+ format: int64
+ type: integer
+ type: object
externalLabels:
additionalProperties:
type: string
@@ -5165,15 +5177,27 @@ spec:
action:
default: replace
description: Action to perform based on regex matching.
- Default is 'replace'
+ Default is 'replace'. uppercase and lowercase actions
+ require Prometheus >= 2.36.
enum:
- replace
+ - Replace
- keep
+ - Keep
- drop
+ - Drop
- hashmod
+ - HashMod
- labelmap
+ - LabelMap
- labeldrop
+ - LabelDrop
- labelkeep
+ - LabelKeep
+ - lowercase
+ - Lowercase
+ - uppercase
+ - Uppercase
type: string
modulus:
description: Modulus to take of the hash of the source
diff --git a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
index f9887bca44fe632afc29cc22897a46e151421d2a..a018b1b45351051fee0e3aa29a9079d438ab31bb 100644
--- a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
@@ -167,15 +167,27 @@ spec:
action:
default: replace
description: Action to perform based on regex matching.
- Default is 'replace'
+ Default is 'replace'. uppercase and lowercase actions
+ require Prometheus >= 2.36.
enum:
- replace
+ - Replace
- keep
+ - Keep
- drop
+ - Drop
- hashmod
+ - HashMod
- labelmap
+ - LabelMap
- labeldrop
+ - LabelDrop
- labelkeep
+ - LabelKeep
+ - lowercase
+ - Lowercase
+ - uppercase
+ - Uppercase
type: string
modulus:
description: Modulus to take of the hash of the source
@@ -306,7 +318,8 @@ spec:
description: Optional HTTP URL parameters
type: object
path:
- description: HTTP path to scrape for metrics.
+ description: HTTP path to scrape for metrics. If empty, Prometheus
+ uses the default value (e.g. `/metrics`).
type: string
port:
description: Name of the service port this endpoint refers to.
@@ -331,15 +344,27 @@ spec:
action:
default: replace
description: Action to perform based on regex matching.
- Default is 'replace'
+ Default is 'replace'. uppercase and lowercase actions
+ require Prometheus >= 2.36.
enum:
- replace
+ - Replace
- keep
+ - Keep
- drop
+ - Drop
- hashmod
+ - HashMod
- labelmap
+ - LabelMap
- labeldrop
+ - LabelDrop
- labelkeep
+ - LabelKeep
+ - lowercase
+ - Lowercase
+ - uppercase
+ - Uppercase
type: string
modulus:
description: Modulus to take of the hash of the source