diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json
index 9aca2d33742d3fad7913a5a3472725de7cfea10d..c92094992c14027b1d2de9b75b5f079c9bcfa3e8 100644
--- a/jsonnet/kube-prometheus/versions.json
+++ b/jsonnet/kube-prometheus/versions.json
@@ -1,10 +1,10 @@
{
- "alertmanager": "0.22.2",
+ "alertmanager": "0.23.0",
"blackboxExporter": "0.19.0",
"grafana": "8.1.2",
"kubeStateMetrics": "2.2.0",
"nodeExporter": "1.2.2",
- "prometheus": "2.29.1",
+ "prometheus": "2.29.2",
"prometheusAdapter": "0.9.0",
"prometheusOperator": "0.50.0",
"kubeRbacProxy": "0.11.0",
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index bc50873f54cfca1700fb3b560a95dcab1d72703a..2d3bc413d397212f6dfd55a31d5e5b0d7b097952 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
- "version": "6a32bbad756b656da23af007ac4a0256b3dab7b5",
+ "version": "ef81030105b5519b49de6d13218c32532d932db6",
"sum": "5XhYOigrKipOWDbIn9hlrz7JcbelzvJnormxSaup9JI="
},
{
@@ -38,7 +38,7 @@
"subdir": "grafana-builder"
}
},
- "version": "ac31371db5008f92b054751dfc4f7ece6526250f",
+ "version": "ff22d1d6698573e7cb76228198edfa2b2f632dcc",
"sum": "GRf2GvwEU4jhXV+JOonXSZ4wdDv8mnHBPCQ6TUVd+g8="
},
{
@@ -88,7 +88,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "83fe36566f4e0894eb5ffcd2638a0f039a17bdeb",
+ "version": "07fcff9170ceffe82fd1336e518a51710d2994c4",
"sum": "6reUygVmQrLEWQzTKcH8ceDbvM+2ztK3z2VBR2K2l+U=",
"name": "prometheus-operator-mixin"
},
@@ -99,8 +99,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "83fe36566f4e0894eb5ffcd2638a0f039a17bdeb",
- "sum": "J1G++A8hrtr3+OZQMmcNeb1w/C30bXqqwpwHL/Xhsd4="
+ "version": "07fcff9170ceffe82fd1336e518a51710d2994c4",
+ "sum": "8sW09DSYBOS3RCvnBtC850sujaFNwoJoclW4AQxUw9Q="
},
{
"source": {
@@ -130,8 +130,8 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "4323aa00a7019c356491c76ed00264c18b721456",
- "sum": "AS8WYFi/z10BZSF6DFkKBscjB32XDMM7iIso7CO/FyI=",
+ "version": "a2665a9f7384cd34052ede077c036c27fa9a8ce5",
+ "sum": "m4VHwft4fUcxzL4+52lLZG/V5aH5ZEdjaweb88vISL0=",
"name": "prometheus"
},
{
@@ -141,8 +141,8 @@
"subdir": "mixin"
}
},
- "version": "8b4c3c90343541b28a6ab6686c6239f0e72ea783",
- "sum": "4yPiwx8421KpQO0XsssDCsPx2JjlQLHkchJjXt5Ci9c=",
+ "version": "fdfc0776d0c3544a29e1bad5cc49ef971c5b73ef",
+ "sum": "X+060DnePPeN/87fgj0SrfxVitywTk8hZA9V4nHxl1g=",
"name": "thanos-mixin"
},
{
diff --git a/manifests/alertmanager-alertmanager.yaml b/manifests/alertmanager-alertmanager.yaml
index b7f660c94bcd5f8d30518aa56bd146e2b2bb7e55..42bed1e15154c071d092a01f0caff1b853629e2d 100644
--- a/manifests/alertmanager-alertmanager.yaml
+++ b/manifests/alertmanager-alertmanager.yaml
@@ -6,11 +6,11 @@ metadata:
app.kubernetes.io/component: alert-router
app.kubernetes.io/name: alertmanager
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.22.2
+ app.kubernetes.io/version: 0.23.0
name: main
namespace: monitoring
spec:
- image: quay.io/prometheus/alertmanager:v0.22.2
+ image: quay.io/prometheus/alertmanager:v0.23.0
nodeSelector:
kubernetes.io/os: linux
podMetadata:
@@ -18,7 +18,7 @@ spec:
app.kubernetes.io/component: alert-router
app.kubernetes.io/name: alertmanager
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.22.2
+ app.kubernetes.io/version: 0.23.0
replicas: 3
resources:
limits:
@@ -32,4 +32,4 @@ spec:
runAsNonRoot: true
runAsUser: 1000
serviceAccountName: alertmanager-main
- version: 0.22.2
+ version: 0.23.0
diff --git a/manifests/alertmanager-podDisruptionBudget.yaml b/manifests/alertmanager-podDisruptionBudget.yaml
index 4454aba3dd6ad735a4db88275839dfc1e60ab7a9..b55b7cdb9c097c93bea53e4bfc27117d6c4c9aaa 100644
--- a/manifests/alertmanager-podDisruptionBudget.yaml
+++ b/manifests/alertmanager-podDisruptionBudget.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: alert-router
app.kubernetes.io/name: alertmanager
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.22.2
+ app.kubernetes.io/version: 0.23.0
name: alertmanager-main
namespace: monitoring
spec:
diff --git a/manifests/alertmanager-prometheusRule.yaml b/manifests/alertmanager-prometheusRule.yaml
index a7fd4cc3788489673800bb9e3f32a86509d5e673..9f749c998d08b639d89bf2ca25d6107e3d581cb3 100644
--- a/manifests/alertmanager-prometheusRule.yaml
+++ b/manifests/alertmanager-prometheusRule.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: alert-router
app.kubernetes.io/name: alertmanager
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.22.2
+ app.kubernetes.io/version: 0.23.0
prometheus: k8s
role: alert-rules
name: alertmanager-main-rules
diff --git a/manifests/alertmanager-secret.yaml b/manifests/alertmanager-secret.yaml
index 0248756a2f6646d48113ec18271a69b9453dff86..f265e096cb4caa90dfd9a3e13762e529e5625bf9 100644
--- a/manifests/alertmanager-secret.yaml
+++ b/manifests/alertmanager-secret.yaml
@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/component: alert-router
app.kubernetes.io/name: alertmanager
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.22.2
+ app.kubernetes.io/version: 0.23.0
name: alertmanager-main
namespace: monitoring
stringData:
diff --git a/manifests/alertmanager-service.yaml b/manifests/alertmanager-service.yaml
index 733ab5e0e272d641c468c3cc0236588a52716555..f3f6cf719cf900dbbc2affd1a4db6ea6b7c6654d 100644
--- a/manifests/alertmanager-service.yaml
+++ b/manifests/alertmanager-service.yaml
@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/component: alert-router
app.kubernetes.io/name: alertmanager
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.22.2
+ app.kubernetes.io/version: 0.23.0
name: alertmanager-main
namespace: monitoring
spec:
diff --git a/manifests/alertmanager-serviceAccount.yaml b/manifests/alertmanager-serviceAccount.yaml
index 07cccc9f49f5e5872c3c763c2d0643c2ff9994b9..ba806b5042a6c97786047c49475864847e39cfe3 100644
--- a/manifests/alertmanager-serviceAccount.yaml
+++ b/manifests/alertmanager-serviceAccount.yaml
@@ -6,6 +6,6 @@ metadata:
app.kubernetes.io/component: alert-router
app.kubernetes.io/name: alertmanager
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.22.2
+ app.kubernetes.io/version: 0.23.0
name: alertmanager-main
namespace: monitoring
diff --git a/manifests/alertmanager-serviceMonitor.yaml b/manifests/alertmanager-serviceMonitor.yaml
index c889ae86b86a1523a71ef76d265fc28d6ed14241..070ef530252d52daf58a62eda46bb1a8116363a8 100644
--- a/manifests/alertmanager-serviceMonitor.yaml
+++ b/manifests/alertmanager-serviceMonitor.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: alert-router
app.kubernetes.io/name: alertmanager
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.22.2
+ app.kubernetes.io/version: 0.23.0
name: alertmanager
namespace: monitoring
spec:
diff --git a/manifests/prometheus-clusterRole.yaml b/manifests/prometheus-clusterRole.yaml
index b878982a8ae17984e4c7f7ba0715f8ab595100b3..8fac941b811b7be5c60e82b5e15cb3f414c26b1a 100644
--- a/manifests/prometheus-clusterRole.yaml
+++ b/manifests/prometheus-clusterRole.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.29.1
+ app.kubernetes.io/version: 2.29.2
name: prometheus-k8s
rules:
- apiGroups:
diff --git a/manifests/prometheus-clusterRoleBinding.yaml b/manifests/prometheus-clusterRoleBinding.yaml
index a1096b6120b5d84b70760d86bcc5ef67284db836..cafde39036266841e50c226e63a62fa63f615760 100644
--- a/manifests/prometheus-clusterRoleBinding.yaml
+++ b/manifests/prometheus-clusterRoleBinding.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.29.1
+ app.kubernetes.io/version: 2.29.2
name: prometheus-k8s
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/prometheus-podDisruptionBudget.yaml b/manifests/prometheus-podDisruptionBudget.yaml
index 65303f8843cbcf077606845b30b37991c931e044..f7adef54bae3dd920770067b7bc7626a2f5961a0 100644
--- a/manifests/prometheus-podDisruptionBudget.yaml
+++ b/manifests/prometheus-podDisruptionBudget.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.29.1
+ app.kubernetes.io/version: 2.29.2
name: prometheus-k8s
namespace: monitoring
spec:
diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml
index cc9b674b4fbc897e73eb75fa43a5a1bba27accc1..8731891f39877e6baaf056ab99c8f1425da6acd2 100644
--- a/manifests/prometheus-prometheus.yaml
+++ b/manifests/prometheus-prometheus.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.29.1
+ app.kubernetes.io/version: 2.29.2
prometheus: k8s
name: k8s
namespace: monitoring
@@ -18,7 +18,7 @@ spec:
port: web
enableFeatures: []
externalLabels: {}
- image: quay.io/prometheus/prometheus:v2.29.1
+ image: quay.io/prometheus/prometheus:v2.29.2
nodeSelector:
kubernetes.io/os: linux
podMetadata:
@@ -26,7 +26,7 @@ spec:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.29.1
+ app.kubernetes.io/version: 2.29.2
podMonitorNamespaceSelector: {}
podMonitorSelector: {}
probeNamespaceSelector: {}
@@ -44,4 +44,4 @@ spec:
serviceAccountName: prometheus-k8s
serviceMonitorNamespaceSelector: {}
serviceMonitorSelector: {}
- version: 2.29.1
+ version: 2.29.2
diff --git a/manifests/prometheus-prometheusRule.yaml b/manifests/prometheus-prometheusRule.yaml
index ae5078b8e4ac13e21a6b151d0dad5e341f3b14d5..c15e8c139ad3bdb8ed8054f0acde5270236181d0 100644
--- a/manifests/prometheus-prometheusRule.yaml
+++ b/manifests/prometheus-prometheusRule.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.29.1
+ app.kubernetes.io/version: 2.29.2
prometheus: k8s
role: alert-rules
name: prometheus-k8s-prometheus-rules
diff --git a/manifests/prometheus-roleBindingConfig.yaml b/manifests/prometheus-roleBindingConfig.yaml
index a0340332adb56f801d0bc297d81ce83e36899f22..ca17d7eb791f99100e91c4946aa1d9c743933c85 100644
--- a/manifests/prometheus-roleBindingConfig.yaml
+++ b/manifests/prometheus-roleBindingConfig.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.29.1
+ app.kubernetes.io/version: 2.29.2
name: prometheus-k8s-config
namespace: monitoring
roleRef:
diff --git a/manifests/prometheus-roleBindingSpecificNamespaces.yaml b/manifests/prometheus-roleBindingSpecificNamespaces.yaml
index 78e3ebe2360ad07774f9a4288f7e07b30324b725..33309a20210c7ac06b1a1ff1316c090ec09cc621 100644
--- a/manifests/prometheus-roleBindingSpecificNamespaces.yaml
+++ b/manifests/prometheus-roleBindingSpecificNamespaces.yaml
@@ -7,7 +7,7 @@ items:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.29.1
+ app.kubernetes.io/version: 2.29.2
name: prometheus-k8s
namespace: default
roleRef:
@@ -25,7 +25,7 @@ items:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.29.1
+ app.kubernetes.io/version: 2.29.2
name: prometheus-k8s
namespace: kube-system
roleRef:
@@ -43,7 +43,7 @@ items:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.29.1
+ app.kubernetes.io/version: 2.29.2
name: prometheus-k8s
namespace: monitoring
roleRef:
diff --git a/manifests/prometheus-roleConfig.yaml b/manifests/prometheus-roleConfig.yaml
index c2f1870dc93e9c30b06dbeb3fa105f0851616963..0f7129cb4540e80128ad830bcbd1395279f2a6de 100644
--- a/manifests/prometheus-roleConfig.yaml
+++ b/manifests/prometheus-roleConfig.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.29.1
+ app.kubernetes.io/version: 2.29.2
name: prometheus-k8s-config
namespace: monitoring
rules:
diff --git a/manifests/prometheus-roleSpecificNamespaces.yaml b/manifests/prometheus-roleSpecificNamespaces.yaml
index 53f6e44e138cde6dd6053498cc22cbc7695696b9..ffe15628b8cb42f2d5065ee5d728fe02689a0349 100644
--- a/manifests/prometheus-roleSpecificNamespaces.yaml
+++ b/manifests/prometheus-roleSpecificNamespaces.yaml
@@ -7,7 +7,7 @@ items:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.29.1
+ app.kubernetes.io/version: 2.29.2
name: prometheus-k8s
namespace: default
rules:
@@ -44,7 +44,7 @@ items:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.29.1
+ app.kubernetes.io/version: 2.29.2
name: prometheus-k8s
namespace: kube-system
rules:
@@ -81,7 +81,7 @@ items:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.29.1
+ app.kubernetes.io/version: 2.29.2
name: prometheus-k8s
namespace: monitoring
rules:
diff --git a/manifests/prometheus-service.yaml b/manifests/prometheus-service.yaml
index 611a0f05a0d3f0b2cd14969bba736258bd42cfb4..0b14d9bb514e2edf2a49887bae68afca6f087508 100644
--- a/manifests/prometheus-service.yaml
+++ b/manifests/prometheus-service.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.29.1
+ app.kubernetes.io/version: 2.29.2
prometheus: k8s
name: prometheus-k8s
namespace: monitoring
diff --git a/manifests/prometheus-serviceAccount.yaml b/manifests/prometheus-serviceAccount.yaml
index b8c486ba95f244f346458083b3ae38b6354e9508..371b8ec9fb81f3016a0dd40e89568e53afb3b3a7 100644
--- a/manifests/prometheus-serviceAccount.yaml
+++ b/manifests/prometheus-serviceAccount.yaml
@@ -5,6 +5,6 @@ metadata:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.29.1
+ app.kubernetes.io/version: 2.29.2
name: prometheus-k8s
namespace: monitoring
diff --git a/manifests/prometheus-serviceMonitor.yaml b/manifests/prometheus-serviceMonitor.yaml
index b9907a17d547110d6a6f2276dad337706e72464c..b5282ebf17cf1742dc800e47dc99c5dedaf649f1 100644
--- a/manifests/prometheus-serviceMonitor.yaml
+++ b/manifests/prometheus-serviceMonitor.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.29.1
+ app.kubernetes.io/version: 2.29.2
name: prometheus-k8s
namespace: monitoring
spec:
diff --git a/manifests/setup/prometheus-operator-0probeCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0probeCustomResourceDefinition.yaml
index 6b69feac2867b2b335b5944b852235b53d0983a3..aa511ffb65b6727fd29cc0cc5ecb915a2fb9b144 100644
--- a/manifests/setup/prometheus-operator-0probeCustomResourceDefinition.yaml
+++ b/manifests/setup/prometheus-operator-0probeCustomResourceDefinition.yaml
@@ -121,6 +121,37 @@ spec:
description: Per-scrape limit on length of labels value that will be accepted for a sample. Only valid in Prometheus versions 2.27.0 and newer.
format: int64
type: integer
+ metricRelabelings:
+ description: MetricRelabelConfigs to apply to samples before ingestion.
+ items:
+ description: 'RelabelConfig allows dynamic rewriting of the label set, being applied to samples before ingestion. It defines `<metric_relabel_configs>`-section of Prometheus configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs'
+ properties:
+ action:
+ description: Action to perform based on regex matching. Default is 'replace'
+ type: string
+ modulus:
+ description: Modulus to take of the hash of the source label values.
+ format: int64
+ type: integer
+ regex:
+ description: Regular expression against which the extracted value is matched. Default is '(.*)'
+ type: string
+ replacement:
+ description: Replacement value against which a regex replace is performed if the regular expression matches. Regex capture groups are available. Default is '$1'
+ type: string
+ separator:
+ description: Separator placed between concatenated source label values. default is ';'.
+ type: string
+ sourceLabels:
+ description: The source labels select values from existing labels. Their content is concatenated using the configured separator and matched against the configured regular expression for the replace, keep, and drop actions.
+ items:
+ type: string
+ type: array
+ targetLabel:
+ description: Label to which the resulting value is written in a replace action. It is mandatory for replace actions. Regex capture groups are available.
+ type: string
+ type: object
+ type: array
module:
description: 'The module to use for probing specifying how to probe the target. Example module configuring in the blackbox exporter: https://github.com/prometheus/blackbox_exporter/blob/master/example.yml'
type: string