diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json
index 6c5c20b8c985e8525ba695e9f76264be7f30296e..58daa17cb09eb976ceccbbca01571bab99b21f77 100644
--- a/jsonnet/kube-prometheus/versions.json
+++ b/jsonnet/kube-prometheus/versions.json
@@ -1,7 +1,7 @@
{
"alertmanager": "0.23.0",
"blackboxExporter": "0.19.0",
- "grafana": "8.3.6",
+ "grafana": "8.4.1",
"kubeStateMetrics": "2.3.0",
"nodeExporter": "1.3.1",
"prometheus": "2.33.3",
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 1804c97ed63939c4d3131ef8520bb9bd134c249e..e1dafed6ac3e7505af84c27a29960d4e7a09e93d 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,8 +18,8 @@
"subdir": "contrib/mixin"
}
},
- "version": "bdb13e2e12d44a6eb83d35f7867e3c6b9385655b",
- "sum": "wIsqEIGSqnWwJApdQ7k8x2kd/AsffJhYcqUebDiS01w="
+ "version": "a63fa17b76bbc53e09d50fdb1cc52a2b99a0c261",
+ "sum": "zhLYhUNcXNkMRfJhMUX0UiOpi8TOuLmUqJfO9NFKFkg="
},
{
"source": {
@@ -28,7 +28,7 @@
"subdir": "grafana-mixin"
}
},
- "version": "095ea44e97457e1ae9b03780531928f20a25a1ca",
+ "version": "c6470be34ce41dade11f74317ce4dea1af78bc64",
"sum": "MkjR7zCgq6MUZgjDzop574tFKoTX2OBr7DTwm1K+Ofs="
},
{
@@ -48,7 +48,7 @@
"subdir": "grafana-builder"
}
},
- "version": "b1b20b418d180490f8226bba1ce62743b40b790c",
+ "version": "03d32a72a2a0bf0ee00ffc853be5f07ad3bafcbe",
"sum": "0KkygBQd/AFzUvVzezE4qF/uDYgrwUXVpZfINBti0oc="
},
{
@@ -58,8 +58,8 @@
"subdir": ""
}
},
- "version": "5f43b3783b3a7f505e3e4e484af0b22653802342",
- "sum": "pTtVZP1dZZH8XAQpjk1VS9gcPY/+JVzgwq76a1ClxmQ="
+ "version": "2b33b82dfe04e4b37d62008ead7a04272a0fb42d",
+ "sum": "aE4obJU9mxKR0pX/aF46JUvcvaVLkc5fra7HatmzdQg="
},
{
"source": {
@@ -68,7 +68,7 @@
"subdir": "lib/promgrafonnet"
}
},
- "version": "5f43b3783b3a7f505e3e4e484af0b22653802342",
+ "version": "2b33b82dfe04e4b37d62008ead7a04272a0fb42d",
"sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps="
},
{
@@ -78,7 +78,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
- "version": "cf19fdebd12dcf1ddc7144f385c73b19184ea5d3",
+ "version": "929f4acd01262eeb8e0395d4673cbce176322c09",
"sum": "P0dCnbzyPScQGNXwXRcwiPkMLeTq0IPNbSTysDbySnM="
},
{
@@ -88,7 +88,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
- "version": "cf19fdebd12dcf1ddc7144f385c73b19184ea5d3",
+ "version": "929f4acd01262eeb8e0395d4673cbce176322c09",
"sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
},
{
@@ -98,7 +98,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "24478fbc69fc9fe041285ef0e9c16b5c2ac5630f",
+ "version": "c0baa01acd516ffc26fe8cd5763c0eaa0cd93c88",
"sum": "qZ4WgiweaE6eeKtFK60QUjLO8sf2L9Q8fgafWvDcyfY=",
"name": "prometheus-operator-mixin"
},
@@ -109,8 +109,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "24478fbc69fc9fe041285ef0e9c16b5c2ac5630f",
- "sum": "sLz4mVNpNSijQLtLZ9jb6D785l7Q9s3ItI6dxyPbSLM="
+ "version": "c0baa01acd516ffc26fe8cd5763c0eaa0cd93c88",
+ "sum": "ATGBsVlAVmzIvrRLKh7DWkI+uwM19BTtOVKMV801axo="
},
{
"source": {
@@ -130,7 +130,7 @@
"subdir": "docs/node-mixin"
}
},
- "version": "f7086d437bc0b652ad56fe1a775b1994d7076796",
+ "version": "c2b4b2a33b91464f2e6bf1ca3fc87c851118c6d5",
"sum": "MlWDAKGZ+JArozRKdKEvewHeWn8j2DNBzesJfLVd0dk="
},
{
@@ -140,7 +140,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "9a2e93228e63a3fbac950ef0a639f754c3598c5d",
+ "version": "e239e3ee8b13b51b0f791a199813a14f74600a7e",
"sum": "ZjQoYhvgKwJNkg+h+m9lW3SYjnjv5Yx5btEipLhru88=",
"name": "prometheus"
},
@@ -151,7 +151,7 @@
"subdir": "mixin"
}
},
- "version": "2898724167224e978b514d3451dcb086263e4172",
+ "version": "b76925019deae1f902370aaa386b4e02a2e841c7",
"sum": "dBm9ML50quhu6dwTIgfNmVruMqfaUeQVCO/6EKtQLxE=",
"name": "thanos-mixin"
},
diff --git a/manifests/grafana-config.yaml b/manifests/grafana-config.yaml
index b8e00eb653d4a7e9ba54cd87e5fc85e82756900c..7c4e25ee898ec83408fc2133f81f8c7be16058b3 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: 8.3.6
+ app.kubernetes.io/version: 8.4.1
name: grafana-config
namespace: monitoring
stringData:
diff --git a/manifests/grafana-dashboardDatasources.yaml b/manifests/grafana-dashboardDatasources.yaml
index 641551afdc6f9361e14bbb311fd3a84768d52fde..b8b5862630c88df7ee29b243041fb7f3c95f7425 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: 8.3.6
+ app.kubernetes.io/version: 8.4.1
name: grafana-datasources
namespace: monitoring
stringData:
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index ad567aced69bb6e705371f99fa682c6d80db9137..c4a0dd0d03d81a9698e11182346b3b7dc008bf77 100644
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
@@ -596,7 +596,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.6
+ app.kubernetes.io/version: 8.4.1
name: grafana-dashboard-alertmanager-overview
namespace: monitoring
- apiVersion: v1
@@ -2357,7 +2357,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.6
+ app.kubernetes.io/version: 8.4.1
name: grafana-dashboard-apiserver
namespace: monitoring
- apiVersion: v1
@@ -4228,7 +4228,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.6
+ app.kubernetes.io/version: 8.4.1
name: grafana-dashboard-cluster-total
namespace: monitoring
- apiVersion: v1
@@ -5407,7 +5407,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.6
+ app.kubernetes.io/version: 8.4.1
name: grafana-dashboard-controller-manager
namespace: monitoring
- apiVersion: v1
@@ -6032,7 +6032,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.6
+ app.kubernetes.io/version: 8.4.1
name: grafana-dashboard-grafana-overview
namespace: monitoring
- apiVersion: v1
@@ -9109,7 +9109,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.6
+ app.kubernetes.io/version: 8.4.1
name: grafana-dashboard-k8s-resources-cluster
namespace: monitoring
- apiVersion: v1
@@ -11895,7 +11895,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.6
+ app.kubernetes.io/version: 8.4.1
name: grafana-dashboard-k8s-resources-namespace
namespace: monitoring
- apiVersion: v1
@@ -12910,7 +12910,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.6
+ app.kubernetes.io/version: 8.4.1
name: grafana-dashboard-k8s-resources-node
namespace: monitoring
- apiVersion: v1
@@ -15368,7 +15368,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.6
+ app.kubernetes.io/version: 8.4.1
name: grafana-dashboard-k8s-resources-pod
namespace: monitoring
- apiVersion: v1
@@ -17381,7 +17381,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.6
+ app.kubernetes.io/version: 8.4.1
name: grafana-dashboard-k8s-resources-workload
namespace: monitoring
- apiVersion: v1
@@ -19559,7 +19559,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.6
+ app.kubernetes.io/version: 8.4.1
name: grafana-dashboard-k8s-resources-workloads-namespace
namespace: monitoring
- apiVersion: v1
@@ -21742,7 +21742,7 @@ items:
"datasource": "$datasource",
"hide": 0,
"includeAll": true,
- "label": "Data Source",
+ "label": "instance",
"multi": false,
"name": "instance",
"options": [
@@ -21802,7 +21802,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.6
+ app.kubernetes.io/version: 8.4.1
name: grafana-dashboard-kubelet
namespace: monitoring
- apiVersion: v1
@@ -23255,7 +23255,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.6
+ app.kubernetes.io/version: 8.4.1
name: grafana-dashboard-namespace-by-pod
namespace: monitoring
- apiVersion: v1
@@ -24980,7 +24980,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.6
+ app.kubernetes.io/version: 8.4.1
name: grafana-dashboard-namespace-by-workload
namespace: monitoring
- apiVersion: v1
@@ -26032,7 +26032,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.6
+ app.kubernetes.io/version: 8.4.1
name: grafana-dashboard-node-cluster-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -27110,7 +27110,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.6
+ app.kubernetes.io/version: 8.4.1
name: grafana-dashboard-node-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -28090,7 +28090,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.6
+ app.kubernetes.io/version: 8.4.1
name: grafana-dashboard-nodes
namespace: monitoring
- apiVersion: v1
@@ -28666,7 +28666,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.6
+ app.kubernetes.io/version: 8.4.1
name: grafana-dashboard-persistentvolumesusage
namespace: monitoring
- apiVersion: v1
@@ -29883,7 +29883,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.6
+ app.kubernetes.io/version: 8.4.1
name: grafana-dashboard-pod-total
namespace: monitoring
- apiVersion: v1
@@ -31542,7 +31542,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.6
+ app.kubernetes.io/version: 8.4.1
name: grafana-dashboard-prometheus-remote-write
namespace: monitoring
- apiVersion: v1
@@ -32766,7 +32766,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.6
+ app.kubernetes.io/version: 8.4.1
name: grafana-dashboard-prometheus
namespace: monitoring
- apiVersion: v1
@@ -34026,7 +34026,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.6
+ app.kubernetes.io/version: 8.4.1
name: grafana-dashboard-proxy
namespace: monitoring
- apiVersion: v1
@@ -35127,7 +35127,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.6
+ app.kubernetes.io/version: 8.4.1
name: grafana-dashboard-scheduler
namespace: monitoring
- apiVersion: v1
@@ -36554,7 +36554,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.6
+ app.kubernetes.io/version: 8.4.1
name: grafana-dashboard-workload-total
namespace: monitoring
kind: ConfigMapList
diff --git a/manifests/grafana-dashboardSources.yaml b/manifests/grafana-dashboardSources.yaml
index 3644a10ecba7a528ae60a7e2d61bdae606aecfa2..8e46cd3727af04868337f4d22ec50ef0605b8022 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: 8.3.6
+ app.kubernetes.io/version: 8.4.1
name: grafana-dashboards
namespace: monitoring
diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml
index c44de98142956e5c1e5b974bc7351f9e4ada9129..90c11ed67abf0df9d103ba832bd4bd0f7049ebd2 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: 8.3.6
+ app.kubernetes.io/version: 8.4.1
name: grafana
namespace: monitoring
spec:
@@ -18,19 +18,19 @@ spec:
template:
metadata:
annotations:
- checksum/grafana-config: 10f45bde8a653540083f689579259f03
- checksum/grafana-dashboardproviders: c7291d0bfef540b2eb119cd1d0f87807
- checksum/grafana-datasources: 7a6fc0f594f9b6a37712c5dc803adc2b
+ checksum/grafana-config: 8fae34c71e5623fb5cbb6621d2f25ed5
+ checksum/grafana-dashboardproviders: 4dc71cf9c7313af2357fc284b7d642a6
+ checksum/grafana-datasources: 1f2184bad7e29410ee63a5f6b6ced56c
labels:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.6
+ app.kubernetes.io/version: 8.4.1
spec:
automountServiceAccountToken: false
containers:
- env: []
- image: grafana/grafana:8.3.6
+ image: grafana/grafana:8.4.1
name: grafana
ports:
- containerPort: 3000
diff --git a/manifests/grafana-prometheusRule.yaml b/manifests/grafana-prometheusRule.yaml
index 4622565d860c12d69b0ae920fddfe4303cf4fddc..87dc05515ab160bddc181f8dce80e3ca1dbf239b 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: 8.3.6
+ app.kubernetes.io/version: 8.4.1
prometheus: k8s
role: alert-rules
name: grafana-rules
diff --git a/manifests/grafana-service.yaml b/manifests/grafana-service.yaml
index e3fe778972d293ed0b6bdbe364425da187b5bc16..c9c2f8fa3102f8f269df7dd3bfe94b65b75d00d1 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: 8.3.6
+ app.kubernetes.io/version: 8.4.1
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/grafana-serviceAccount.yaml b/manifests/grafana-serviceAccount.yaml
index 8653ac63ab6f8cb488bc4a4b61e24462b4422f39..6073b6cf45a043a2cf905b0755d1387af2d835f6 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: 8.3.6
+ app.kubernetes.io/version: 8.4.1
name: grafana
namespace: monitoring
diff --git a/manifests/grafana-serviceMonitor.yaml b/manifests/grafana-serviceMonitor.yaml
index 8ef1f28fc412e63e2285598e328c3da0b10a1617..0f6aad976fe81dab84729c6097beaccdd01bfe7d 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: 8.3.6
+ app.kubernetes.io/version: 8.4.1
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/setup/0podmonitorCustomResourceDefinition.yaml b/manifests/setup/0podmonitorCustomResourceDefinition.yaml
index ba7bcf940698e6af997dee209c8c1283cceb1ef1..0c09236f8616fe77eb1d4007b8435397c9f7bd50 100644
--- a/manifests/setup/0podmonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/0podmonitorCustomResourceDefinition.yaml
@@ -228,6 +228,10 @@ spec:
separator and matched against the configured regular
expression for the replace, keep, and drop actions.
items:
+ description: LabelName is a valid Prometheus label name
+ which may only contain ASCII letters, numbers, as
+ well as underscores.
+ pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$
type: string
type: array
targetLabel:
@@ -387,6 +391,10 @@ spec:
separator and matched against the configured regular
expression for the replace, keep, and drop actions.
items:
+ description: LabelName is a valid Prometheus label name
+ which may only contain ASCII letters, numbers, as
+ well as underscores.
+ pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$
type: string
type: array
targetLabel:
diff --git a/manifests/setup/0probeCustomResourceDefinition.yaml b/manifests/setup/0probeCustomResourceDefinition.yaml
index c6e6d394e275b5c391ae38acd474d623d7bb94a6..502b94aa3f977d2aa5c37060a5be070c33c7dca8 100644
--- a/manifests/setup/0probeCustomResourceDefinition.yaml
+++ b/manifests/setup/0probeCustomResourceDefinition.yaml
@@ -194,6 +194,9 @@ spec:
and matched against the configured regular expression for
the replace, keep, and drop actions.
items:
+ description: LabelName is a valid Prometheus label name which
+ may only contain ASCII letters, numbers, as well as underscores.
+ pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$
type: string
type: array
targetLabel:
@@ -389,6 +392,10 @@ spec:
separator and matched against the configured regular
expression for the replace, keep, and drop actions.
items:
+ description: LabelName is a valid Prometheus label
+ name which may only contain ASCII letters, numbers,
+ as well as underscores.
+ pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$
type: string
type: array
targetLabel:
@@ -500,6 +507,10 @@ spec:
separator and matched against the configured regular
expression for the replace, keep, and drop actions.
items:
+ description: LabelName is a valid Prometheus label
+ name which may only contain ASCII letters, numbers,
+ as well as underscores.
+ pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$
type: string
type: array
targetLabel:
diff --git a/manifests/setup/0prometheusCustomResourceDefinition.yaml b/manifests/setup/0prometheusCustomResourceDefinition.yaml
index ab701b5b533d65bb9e236e3735c807daad2cdc44..affe63e1dda6626b72cbc48719e7858cdfd9fa13 100644
--- a/manifests/setup/0prometheusCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusCustomResourceDefinition.yaml
@@ -4010,13 +4010,15 @@ spec:
description: Define which Nodes the Pods are scheduled on.
type: object
overrideHonorLabels:
- description: OverrideHonorLabels if set to true overrides all user
- configured honor_labels. If HonorLabels is set in ServiceMonitor
- or PodMonitor to true, this overrides honor_labels to false.
+ description: When true, Prometheus resolves label conflicts by renaming
+ the labels in the scraped data to "exported_<label value>" for all
+ targets created from service and pod monitors. Otherwise the HonorLabels
+ field of the service or pod monitor applies.
type: boolean
overrideHonorTimestamps:
- description: OverrideHonorTimestamps allows to globally enforce honoring
- timestamps in all scrape configs.
+ description: When true, Prometheus ignores the timestamps for all
+ the targets created from service and pod monitors. Otherwise the
+ HonorTimestamps field of the service or pod monitor applies.
type: boolean
paused:
description: When a Prometheus deployment is paused, no actions except
@@ -4296,11 +4298,10 @@ spec:
docs (https://prometheus.io/docs/guides/query-log/)
type: string
remoteRead:
- description: If specified, the remote_read spec. This is an experimental
- feature, it may change in any upcoming release in a breaking way.
+ description: remoteRead is the list of remote read configurations.
items:
- description: RemoteReadSpec defines the remote_read configuration
- for prometheus.
+ description: RemoteReadSpec defines the configuration for Prometheus
+ to read back samples from a remote endpoint.
properties:
authorization:
description: Authorization section for remote read
@@ -4390,7 +4391,7 @@ spec:
versions 2.26.0 and newer.
type: object
name:
- description: The name of the remote read queue, must be unique
+ description: The name of the remote read queue, it must be unique
if specified. The name is used in metrics and logging in order
to differentiate read configurations. Only valid in Prometheus
versions 2.15.0 and newer.
@@ -4480,7 +4481,7 @@ spec:
- tokenUrl
type: object
proxyUrl:
- description: Optional ProxyURL
+ description: Optional ProxyURL.
type: string
readRecent:
description: Whether reads should be made for queries for time
@@ -4623,18 +4624,17 @@ spec:
type: string
type: object
url:
- description: The URL of the endpoint to send samples to.
+ description: The URL of the endpoint to query from.
type: string
required:
- url
type: object
type: array
remoteWrite:
- description: If specified, the remote_write spec. This is an experimental
- feature, it may change in any upcoming release in a breaking way.
+ description: remoteWrite is the list of remote write configurations.
items:
- description: RemoteWriteSpec defines the remote_write configuration
- for prometheus.
+ description: RemoteWriteSpec defines the configuration to write
+ samples from Prometheus to a remote endpoint.
properties:
authorization:
description: Authorization section for remote write
@@ -4725,22 +4725,22 @@ spec:
type: object
metadataConfig:
description: MetadataConfig configures the sending of series
- metadata to remote storage.
+ metadata to the remote storage.
properties:
send:
- description: Whether metric metadata is sent to remote storage
- or not.
+ description: Whether metric metadata is sent to the remote
+ storage or not.
type: boolean
sendInterval:
- description: How frequently metric metadata is sent to remote
- storage.
+ description: How frequently metric metadata is sent to the
+ remote storage.
type: string
type: object
name:
- description: The name of the remote write queue, must be unique
- if specified. The name is used in metrics and logging in order
- to differentiate queues. Only valid in Prometheus versions
- 2.15.0 and newer.
+ description: The name of the remote write queue, it must be
+ unique if specified. The name is used in metrics and logging
+ in order to differentiate queues. Only valid in Prometheus
+ versions 2.15.0 and newer.
type: string
oauth2:
description: OAuth2 for the URL. Only valid in Prometheus versions
@@ -4827,7 +4827,7 @@ spec:
- tokenUrl
type: object
proxyUrl:
- description: Optional ProxyURL
+ description: Optional ProxyURL.
type: string
queueConfig:
description: QueueConfig allows tuning of the remote write queue
@@ -5107,6 +5107,10 @@ spec:
separator and matched against the configured regular
expression for the replace, keep, and drop actions.
items:
+ description: LabelName is a valid Prometheus label name
+ which may only contain ASCII letters, numbers, as
+ well as underscores.
+ pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$
type: string
type: array
targetLabel:
diff --git a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
index c0917d3a2aab07c5898c52496c3b5cc667fea76d..8d5680240075bee813a7b8e2ac3685393f0967b2 100644
--- a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
@@ -197,6 +197,10 @@ spec:
separator and matched against the configured regular
expression for the replace, keep, and drop actions.
items:
+ description: LabelName is a valid Prometheus label name
+ which may only contain ASCII letters, numbers, as
+ well as underscores.
+ pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$
type: string
type: array
targetLabel:
@@ -356,6 +360,10 @@ spec:
separator and matched against the configured regular
expression for the replace, keep, and drop actions.
items:
+ description: LabelName is a valid Prometheus label name
+ which may only contain ASCII letters, numbers, as
+ well as underscores.
+ pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$
type: string
type: array
targetLabel: