diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json
index 581a565059ad28b581c88f5205765e4214f7a1f5..b7c73aed34f3c6f480c01942a22022bc49b16f3b 100644
--- a/jsonnet/kube-prometheus/versions.json
+++ b/jsonnet/kube-prometheus/versions.json
@@ -1,7 +1,7 @@
{
"alertmanager": "0.26.0",
"blackboxExporter": "0.24.0",
- "grafana": "10.2.2",
+ "grafana": "10.2.3",
"kubeStateMetrics": "2.10.1",
"nodeExporter": "1.7.0",
"prometheus": "2.48.1",
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 18c3da9f20095f974a18930a2f40290696fe803f..f3b93a41d8d022b9f0bf1ec501e3103e7c61e91f 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
- "version": "f7be2dfa17a04bd1eb2ffc02489b7518e7eb68ad",
+ "version": "f8d5ba9a3fdff4f706f06ef0f0c0a27bb033ac53",
"sum": "xuUBd2vqF7asyVDe5CE08uPT/RxAdy8O75EjFJoMXXU="
},
{
@@ -68,8 +68,8 @@
"subdir": "grafana-builder"
}
},
- "version": "713fd91d18800dd2d68670506bfc8b073d17612a",
- "sum": "VmOxvg9FuY9UYr3lN6ZJe2HhuIErJoWimPybQr3S3yQ="
+ "version": "02db06f540086fa3f67d487bd01e1b314853fb8f",
+ "sum": "B49EzIY2WZsFxNMJcgRxE/gcZ9ltnS8pkOOV6Q5qioc="
},
{
"source": {
@@ -108,8 +108,8 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
- "version": "39ffa0057673b8d0aa59dab19f9c6baf298588af",
- "sum": "+dOzAK+fwsFf97uZpjcjTcEJEC1H8hh/j8f5uIQK/5g="
+ "version": "fde27ece8aba779d23c6ae53325a0cc7af9da008",
+ "sum": "msMZyUvcebzRILLzNlTIiSOwa1XgQKtP7jbZTkiqwM0="
},
{
"source": {
@@ -118,7 +118,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
- "version": "39ffa0057673b8d0aa59dab19f9c6baf298588af",
+ "version": "fde27ece8aba779d23c6ae53325a0cc7af9da008",
"sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
},
{
@@ -128,7 +128,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "3d59308c02d5d568732fa830b1a0dafa5ccbb4ce",
+ "version": "d52d58d90dcc8df3665147941ecad3e918ca208c",
"sum": "n3flMIzlADeyygb0uipZ4KPp2uNSjdtkrwgHjTC7Ca4=",
"name": "prometheus-operator-mixin"
},
@@ -139,8 +139,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "3d59308c02d5d568732fa830b1a0dafa5ccbb4ce",
- "sum": "5i3rbAxLmSjg2yQm+sYxOYACSEqpP1Xo5oedgk6C7Fg="
+ "version": "d52d58d90dcc8df3665147941ecad3e918ca208c",
+ "sum": "x9PC68fwNnpxs305DOBcnpQ++RUVoc8cVfL+VqyeWEg="
},
{
"source": {
@@ -149,7 +149,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
- "version": "0f2b0c8286fdecb0af778d0a4f67e1ce7249fe1a",
+ "version": "c920b605b647f2548e23a3dc2fea014b9c9dbf43",
"sum": "IpF46ZXsm+0wJJAPtAre8+yxTNZA57mBqGpBP/r7/kw=",
"name": "alertmanager"
},
@@ -160,7 +160,7 @@
"subdir": "docs/node-mixin"
}
},
- "version": "16f7122d314658de889c64898f0bd0f6b467254e",
+ "version": "73d95309e9632e42ba785703f534c7938630f2ec",
"sum": "QZwFBpulndqo799gkR5rP2/WdcQKQkNnaBwhaOI8Jeg="
},
{
@@ -170,7 +170,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "69abd6d9f65a6358025461510237366f1d939c70",
+ "version": "756202aa4fc09c4fdc756a8c5b1976d709cd3939",
"sum": "rNvddVTMNfaguOGzEGoeKjUsfhlXJBUImC+SIFNNCiM=",
"name": "prometheus"
},
@@ -192,7 +192,7 @@
"subdir": "mixin"
}
},
- "version": "96b8dbaa12a8bb8a99af9bb9957695097c91f117",
+ "version": "d388b7403ddc87eda29a51ad8577a33880bc6b87",
"sum": "HhSSbGGCNHCMy1ee5jElYDm0yS9Vesa7QB2/SHKdjsY=",
"name": "thanos-mixin"
},
diff --git a/manifests/grafana-config.yaml b/manifests/grafana-config.yaml
index c59fae27800bc68d4f6d064f1d5f5b4b1cd3a1fa..aedf1afea47e5150b722387aa0b7065d8609ad31 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: 10.2.2
+ app.kubernetes.io/version: 10.2.3
name: grafana-config
namespace: monitoring
stringData:
diff --git a/manifests/grafana-dashboardDatasources.yaml b/manifests/grafana-dashboardDatasources.yaml
index 7d2fb5e96430092e53116f036720091438f92a4a..6a90578f2729d8675da561fe577503f48df01422 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: 10.2.2
+ app.kubernetes.io/version: 10.2.3
name: grafana-datasources
namespace: monitoring
stringData:
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index 2f6f740d9377902d57145c3d872aa40a1392fe08..f2596a8af38b5d3111540f42ff281d409c7ecc3c 100644
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
@@ -600,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: 10.2.2
+ app.kubernetes.io/version: 10.2.3
name: grafana-dashboard-alertmanager-overview
namespace: monitoring
- apiVersion: v1
@@ -2362,7 +2362,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.2
+ app.kubernetes.io/version: 10.2.3
name: grafana-dashboard-apiserver
namespace: monitoring
- apiVersion: v1
@@ -4234,7 +4234,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.2
+ app.kubernetes.io/version: 10.2.3
name: grafana-dashboard-cluster-total
namespace: monitoring
- apiVersion: v1
@@ -5414,7 +5414,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.2
+ app.kubernetes.io/version: 10.2.3
name: grafana-dashboard-controller-manager
namespace: monitoring
- apiVersion: v1
@@ -6039,7 +6039,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.2
+ app.kubernetes.io/version: 10.2.3
name: grafana-dashboard-grafana-overview
namespace: monitoring
- apiVersion: v1
@@ -8955,7 +8955,7 @@ items:
"value": "default"
},
"hide": 0,
- "label": "Data Source",
+ "label": "Data source",
"name": "datasource",
"options": [
@@ -9034,7 +9034,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.2
+ app.kubernetes.io/version: 10.2.3
name: grafana-dashboard-k8s-resources-cluster
namespace: monitoring
- apiVersion: v1
@@ -10327,7 +10327,7 @@ items:
"value": "default"
},
"hide": 0,
- "label": "Data Source",
+ "label": "Data source",
"name": "datasource",
"options": [
@@ -10379,7 +10379,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.2
+ app.kubernetes.io/version: 10.2.3
name: grafana-dashboard-k8s-resources-multicluster
namespace: monitoring
- apiVersion: v1
@@ -12977,7 +12977,7 @@ items:
"value": "default"
},
"hide": 0,
- "label": "Data Source",
+ "label": "Data source",
"name": "datasource",
"options": [
@@ -13083,7 +13083,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.2
+ app.kubernetes.io/version: 10.2.3
name: grafana-dashboard-k8s-resources-namespace
namespace: monitoring
- apiVersion: v1
@@ -13958,7 +13958,7 @@ items:
"value": "default"
},
"hide": 0,
- "label": "Data Source",
+ "label": "Data source",
"name": "datasource",
"options": [
@@ -14064,7 +14064,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.2
+ app.kubernetes.io/version: 10.2.3
name: grafana-dashboard-k8s-resources-node
namespace: monitoring
- apiVersion: v1
@@ -16313,7 +16313,7 @@ items:
"value": "default"
},
"hide": 0,
- "label": "Data Source",
+ "label": "Data source",
"name": "datasource",
"options": [
@@ -16446,7 +16446,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.2
+ app.kubernetes.io/version: 10.2.3
name: grafana-dashboard-k8s-resources-pod
namespace: monitoring
- apiVersion: v1
@@ -18247,7 +18247,7 @@ items:
"value": "default"
},
"hide": 0,
- "label": "Data Source",
+ "label": "Data source",
"name": "datasource",
"options": [
@@ -18407,7 +18407,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.2
+ app.kubernetes.io/version: 10.2.3
name: grafana-dashboard-k8s-resources-workload
namespace: monitoring
- apiVersion: v1
@@ -20383,7 +20383,7 @@ items:
"value": "default"
},
"hide": 0,
- "label": "Data Source",
+ "label": "Data source",
"name": "datasource",
"options": [
@@ -20521,7 +20521,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.2
+ app.kubernetes.io/version: 10.2.3
name: grafana-dashboard-k8s-resources-workloads-namespace
namespace: monitoring
- apiVersion: v1
@@ -22765,7 +22765,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.2
+ app.kubernetes.io/version: 10.2.3
name: grafana-dashboard-kubelet
namespace: monitoring
- apiVersion: v1
@@ -24219,7 +24219,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.2
+ app.kubernetes.io/version: 10.2.3
name: grafana-dashboard-namespace-by-pod
namespace: monitoring
- apiVersion: v1
@@ -25945,7 +25945,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.2
+ app.kubernetes.io/version: 10.2.3
name: grafana-dashboard-namespace-by-workload
namespace: monitoring
- apiVersion: v1
@@ -26997,7 +26997,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.2
+ app.kubernetes.io/version: 10.2.3
name: grafana-dashboard-node-cluster-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -28075,7 +28075,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.2
+ app.kubernetes.io/version: 10.2.3
name: grafana-dashboard-node-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -29137,7 +29137,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.2
+ app.kubernetes.io/version: 10.2.3
name: grafana-dashboard-nodes-darwin
namespace: monitoring
- apiVersion: v1
@@ -30192,7 +30192,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.2
+ app.kubernetes.io/version: 10.2.3
name: grafana-dashboard-nodes
namespace: monitoring
- apiVersion: v1
@@ -30769,7 +30769,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.2
+ app.kubernetes.io/version: 10.2.3
name: grafana-dashboard-persistentvolumesusage
namespace: monitoring
- apiVersion: v1
@@ -31987,7 +31987,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.2
+ app.kubernetes.io/version: 10.2.3
name: grafana-dashboard-pod-total
namespace: monitoring
- apiVersion: v1
@@ -33646,7 +33646,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.2
+ app.kubernetes.io/version: 10.2.3
name: grafana-dashboard-prometheus-remote-write
namespace: monitoring
- apiVersion: v1
@@ -34732,7 +34732,7 @@ items:
"value": "default"
},
"hide": 0,
- "label": "Data Source",
+ "label": "Data source",
"name": "datasource",
"options": [
@@ -34840,7 +34840,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.2
+ app.kubernetes.io/version: 10.2.3
name: grafana-dashboard-prometheus
namespace: monitoring
- apiVersion: v1
@@ -36101,7 +36101,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.2
+ app.kubernetes.io/version: 10.2.3
name: grafana-dashboard-proxy
namespace: monitoring
- apiVersion: v1
@@ -37203,7 +37203,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.2
+ app.kubernetes.io/version: 10.2.3
name: grafana-dashboard-scheduler
namespace: monitoring
- apiVersion: v1
@@ -38631,7 +38631,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.2
+ app.kubernetes.io/version: 10.2.3
name: grafana-dashboard-workload-total
namespace: monitoring
kind: ConfigMapList
diff --git a/manifests/grafana-dashboardSources.yaml b/manifests/grafana-dashboardSources.yaml
index b354e1276480bef76ded3da5c86fe279135b59f1..72357a00be06d67cada304951a3fb59f01da09cd 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: 10.2.2
+ app.kubernetes.io/version: 10.2.3
name: grafana-dashboards
namespace: monitoring
diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml
index 86390e5f73a8db1efc20e1b570237ccc87c11f9a..69c55be2ee2f6772ec146183ca419dd3feb7fae7 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: 10.2.2
+ app.kubernetes.io/version: 10.2.3
name: grafana
namespace: monitoring
spec:
@@ -18,19 +18,19 @@ spec:
template:
metadata:
annotations:
- checksum/grafana-config: 17c2d9e8ad6f6a331b1537b87627e2bd
- checksum/grafana-dashboardproviders: 4e8488fca475bba9cb96212e11f6d360
- checksum/grafana-datasources: abb8ce76f8d5d75af375ba9fd49d07b5
+ checksum/grafana-config: ef9ed672b6924d4f870a80fe2248c140
+ checksum/grafana-dashboardproviders: 16be5cb7f2538e273c531f895df45240
+ checksum/grafana-datasources: f25077f845af465acb8f35e4f1582565
labels:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.2
+ app.kubernetes.io/version: 10.2.3
spec:
automountServiceAccountToken: false
containers:
- env: []
- image: grafana/grafana:10.2.2
+ image: grafana/grafana:10.2.3
name: grafana
ports:
- containerPort: 3000
diff --git a/manifests/grafana-networkPolicy.yaml b/manifests/grafana-networkPolicy.yaml
index 77837336c091e150fc15ae4320c6da223c83ee63..faabffbcdaed72171984d7642f0ca08b8ce08363 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: 10.2.2
+ app.kubernetes.io/version: 10.2.3
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/grafana-prometheusRule.yaml b/manifests/grafana-prometheusRule.yaml
index 02f12852e2d25925691f960ce27bb0065c0191f6..e2dc31fe4bf55a259e72f990fba6bceccce5d3d5 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: 10.2.2
+ app.kubernetes.io/version: 10.2.3
prometheus: k8s
role: alert-rules
name: grafana-rules
diff --git a/manifests/grafana-service.yaml b/manifests/grafana-service.yaml
index 4f5e7c034a6680d89d14f5e9f0e57d33d677b139..2356cc532f9e4e5337124b6135233aa410f5f4f3 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: 10.2.2
+ app.kubernetes.io/version: 10.2.3
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/grafana-serviceAccount.yaml b/manifests/grafana-serviceAccount.yaml
index 86f9983c1bc315a9b9f79e9593bb23c2e31b75bb..e7bd8f3fb576644d79f4b49d58264d910be286a0 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: 10.2.2
+ app.kubernetes.io/version: 10.2.3
name: grafana
namespace: monitoring
diff --git a/manifests/grafana-serviceMonitor.yaml b/manifests/grafana-serviceMonitor.yaml
index 08f2fb1886b6a88c3e29b0d5f2a89028994d4ad1..a5709f026d4ac5d5ec07b39130f014492fbef449 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: 10.2.2
+ app.kubernetes.io/version: 10.2.3
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
index e4c83a21d68541102f993f062422e696ed33a9a3..481dc8932762a2ac5696ddaf15c6dc201775cbe5 100644
--- a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
+++ b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
@@ -1053,6 +1053,9 @@ spec:
description: Interval between gossip attempts.
pattern: ^(0|(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
type: string
+ clusterLabel:
+ description: Defines the identifier that uniquely identifies the Alertmanager cluster. You should only set it when the Alertmanager cluster includes Alertmanager instances which are external to this Alertmanager resource. In practice, the addresses of the external instances are provided via the `.spec.additionalPeers` field.
+ type: string
clusterPeerTimeout:
description: Timeout for cluster peering.
pattern: ^(0|(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
diff --git a/manifests/setup/0prometheusCustomResourceDefinition.yaml b/manifests/setup/0prometheusCustomResourceDefinition.yaml
index 963103235a5eddcd3fe1553d08e818b7273cf738..0bec06980b17da0112de95e78e63b8b6b9fd285a 100644
--- a/manifests/setup/0prometheusCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusCustomResourceDefinition.yaml
@@ -2885,6 +2885,11 @@ spec:
- warn
- error
type: string
+ maximumStartupDurationSeconds:
+ description: Defines the maximum time that the `prometheus` container's startup probe will wait before being considered failed. The startup probe will return success after the WAL replay is complete. If set, the value should be greater than 60 (seconds). Otherwise it will be equal to 600 seconds (15 minutes).
+ format: int32
+ minimum: 60
+ type: integer
minReadySeconds:
description: "Minimum number of seconds for which a newly created Pod should be ready without any of its container crashing for it to be considered available. Defaults to 0 (pod will be considered available as soon as it is ready) \n This is an alpha field from kubernetes 1.22 until 1.24 which requires enabling the StatefulSetMinReadySeconds feature gate."
format: int32
diff --git a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
index 5d680aeab0c743b83fbe1d770309baf57b9713e4..8ed45356de9e0026a93a175d6512c7049aa796c9 100644
--- a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
@@ -2569,6 +2569,11 @@ spec:
- warn
- error
type: string
+ maximumStartupDurationSeconds:
+ description: Defines the maximum time that the `prometheus` container's startup probe will wait before being considered failed. The startup probe will return success after the WAL replay is complete. If set, the value should be greater than 60 (seconds). Otherwise it will be equal to 600 seconds (15 minutes).
+ format: int32
+ minimum: 60
+ type: integer
minReadySeconds:
description: "Minimum number of seconds for which a newly created Pod should be ready without any of its container crashing for it to be considered available. Defaults to 0 (pod will be considered available as soon as it is ready) \n This is an alpha field from kubernetes 1.22 until 1.24 which requires enabling the StatefulSetMinReadySeconds feature gate."
format: int32
diff --git a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml
index 33bfd31ae7c7657bb694024302ebcce506245d49..f702708bf38e4456782614894eb55abaebbf760c 100644
--- a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml
+++ b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml
@@ -983,6 +983,205 @@ spec:
noProxy:
description: "`noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names that should be excluded from proxying. IP and domain names can contain port numbers. \n It requires Prometheus >= v2.43.0."
type: string
+ openstackSDConfigs:
+ description: OpenStackSDConfigs defines a list of OpenStack service discovery configurations.
+ items:
+ description: OpenStackSDConfig allow retrieving scrape targets from OpenStack Nova instances. See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#openstack_sd_config
+ properties:
+ allTenants:
+ description: Whether the service discovery should list all instances for all projects. It is only relevant for the 'instance' role and usually requires admin permissions.
+ type: boolean
+ applicationCredentialId:
+ description: ApplicationCredentialID
+ type: string
+ applicationCredentialName:
+ description: The ApplicationCredentialID or ApplicationCredentialName fields are required if using an application credential to authenticate. Some providers allow you to create an application credential to authenticate rather than a password.
+ type: string
+ applicationCredentialSecret:
+ description: The applicationCredentialSecret field is required if using an application credential to authenticate.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ availability:
+ description: Availability of the endpoint to connect to.
+ enum:
+ - Public
+ - public
+ - Admin
+ - admin
+ - Internal
+ - internal
+ type: string
+ domainID:
+ description: DomainID
+ type: string
+ domainName:
+ description: At most one of domainId and domainName must be provided if using username with Identity V3. Otherwise, either are optional.
+ type: string
+ identityEndpoint:
+ description: IdentityEndpoint specifies the HTTP endpoint that is required to work with the Identity API of the appropriate version.
+ type: string
+ password:
+ description: Password for the Identity V2 and V3 APIs. Consult with your provider's control panel to discover your account's preferred method of authentication.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ port:
+ description: The port to scrape metrics from. If using the public IP address, this must instead be specified in the relabeling rule.
+ type: integer
+ projectID:
+ description: ProjectID
+ type: string
+ projectName:
+ description: The ProjectId and ProjectName fields are optional for the Identity V2 API. Some providers allow you to specify a ProjectName instead of the ProjectId. Some require both. Your provider's authentication policies will determine how these fields influence authentication.
+ type: string
+ refreshInterval:
+ description: Refresh interval to re-read the instance list.
+ 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
+ region:
+ description: The OpenStack Region.
+ minLength: 1
+ type: string
+ role:
+ description: The OpenStack role of entities that should be discovered.
+ enum:
+ - Instance
+ - instance
+ - Hypervisor
+ - hypervisor
+ type: string
+ tlsConfig:
+ description: TLS configuration applying to the target HTTP endpoint.
+ properties:
+ ca:
+ description: Certificate authority used when verifying server certificates.
+ properties:
+ configMap:
+ description: ConfigMap containing data to use for the targets.
+ properties:
+ key:
+ description: The key to select.
+ type: string
+ name:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+ type: string
+ optional:
+ description: Specify whether the ConfigMap or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ secret:
+ description: Secret containing data to use for the targets.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: object
+ cert:
+ description: Client certificate to present when doing client-authentication.
+ properties:
+ configMap:
+ description: ConfigMap containing data to use for the targets.
+ properties:
+ key:
+ description: The key to select.
+ type: string
+ name:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+ type: string
+ optional:
+ description: Specify whether the ConfigMap or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ secret:
+ description: Secret containing data to use for the targets.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: object
+ insecureSkipVerify:
+ description: Disable target certificate validation.
+ type: boolean
+ keySecret:
+ description: Secret containing the client key file for the targets.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ serverName:
+ description: Used to verify the hostname for the targets.
+ type: string
+ type: object
+ userid:
+ description: UserID
+ type: string
+ username:
+ description: Username is required if using Identity V2 API. Consult with your provider's control panel to discover your account's username. In Identity V3, either userid or a combination of username and domainId or domainName are needed
+ type: string
+ required:
+ - region
+ - role
+ type: object
+ type: array
params:
additionalProperties:
items: