From 0fe6411003b3b9a969a61220fc17a94e2c0be94f Mon Sep 17 00:00:00 2001
From: PromOperatorBot <85787986+prom-op-bot@users.noreply.github.com>
Date: Mon, 20 Nov 2023 10:18:10 +0100
Subject: [PATCH] [bot] [main] Automated version update (#2280)
Co-authored-by: Prometheus Operator Bot <prom-op-bot@users.noreply.github.com>
---
jsonnet/kube-prometheus/versions.json | 4 +-
jsonnetfile.lock.json | 20 +--
manifests/grafana-config.yaml | 2 +-
manifests/grafana-dashboardDatasources.yaml | 2 +-
manifests/grafana-dashboardDefinitions.yaml | 52 +++---
manifests/grafana-dashboardSources.yaml | 2 +-
manifests/grafana-deployment.yaml | 12 +-
manifests/grafana-networkPolicy.yaml | 2 +-
manifests/grafana-prometheusRule.yaml | 2 +-
manifests/grafana-service.yaml | 2 +-
manifests/grafana-serviceAccount.yaml | 2 +-
manifests/grafana-serviceMonitor.yaml | 2 +-
manifests/prometheus-clusterRole.yaml | 2 +-
manifests/prometheus-clusterRoleBinding.yaml | 2 +-
manifests/prometheus-networkPolicy.yaml | 2 +-
manifests/prometheus-podDisruptionBudget.yaml | 2 +-
manifests/prometheus-prometheus.yaml | 8 +-
manifests/prometheus-prometheusRule.yaml | 2 +-
manifests/prometheus-roleBindingConfig.yaml | 2 +-
...metheus-roleBindingSpecificNamespaces.yaml | 6 +-
manifests/prometheus-roleConfig.yaml | 2 +-
.../prometheus-roleSpecificNamespaces.yaml | 6 +-
manifests/prometheus-service.yaml | 2 +-
manifests/prometheus-serviceAccount.yaml | 2 +-
manifests/prometheus-serviceMonitor.yaml | 2 +-
manifests/prometheusOperator-deployment.yaml | 3 +
...managerConfigCustomResourceDefinition.yaml | 168 +++++++++---------
...0alertmanagerCustomResourceDefinition.yaml | 14 +-
.../0podmonitorCustomResourceDefinition.yaml | 81 +++++----
.../setup/0probeCustomResourceDefinition.yaml | 14 +-
.../0prometheusCustomResourceDefinition.yaml | 73 +++++---
...ometheusagentCustomResourceDefinition.yaml | 55 ++++--
...0scrapeconfigCustomResourceDefinition.yaml | 149 +++++++++++++---
...ervicemonitorCustomResourceDefinition.yaml | 85 +++++----
34 files changed, 477 insertions(+), 309 deletions(-)
diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json
index 2146d578..2f8b4d7a 100644
--- a/jsonnet/kube-prometheus/versions.json
+++ b/jsonnet/kube-prometheus/versions.json
@@ -1,10 +1,10 @@
{
"alertmanager": "0.26.0",
"blackboxExporter": "0.24.0",
- "grafana": "10.2.0",
+ "grafana": "10.2.1",
"kubeStateMetrics": "2.9.2",
"nodeExporter": "1.7.0",
- "prometheus": "2.47.2",
+ "prometheus": "2.48.0",
"prometheusAdapter": "0.11.2",
"prometheusOperator": "0.69.1",
"kubeRbacProxy": "0.15.0",
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 5c725200..89a42985 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
- "version": "b343231b1294789499f2038a5e706ad9da41457c",
+ "version": "a9cf27b169b1fc89bc0189ffaea7d21c52856b24",
"sum": "xuUBd2vqF7asyVDe5CE08uPT/RxAdy8O75EjFJoMXXU="
},
{
@@ -58,7 +58,7 @@
"subdir": "gen/grafonnet-v10.0.0"
}
},
- "version": "9e217263ac4b922ca2e00bc5cc36ada2311bb5a6",
+ "version": "bb2afaffbcefeae1035cd691ab06a486e0022002",
"sum": "gj/20VIGucG2vDGjG7YdHLC4yUUfrpuaneUYaRmymOM="
},
{
@@ -68,7 +68,7 @@
"subdir": "grafana-builder"
}
},
- "version": "a7647832fd3eaae70411bc9f697fa7504b04796c",
+ "version": "f56b2115eb7789d0d0506088cd60495abfd2f656",
"sum": "aCN8uCrs2PDLR0SzRAuwZ6C5hiKt1KggCUCT7/F8yZ0="
},
{
@@ -128,7 +128,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "b836d964459d31881f4332f6ac90f8bf77e66550",
+ "version": "0a2b02340a1f165ee9b647afae34087127e2d451",
"sum": "n3flMIzlADeyygb0uipZ4KPp2uNSjdtkrwgHjTC7Ca4=",
"name": "prometheus-operator-mixin"
},
@@ -139,8 +139,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "b836d964459d31881f4332f6ac90f8bf77e66550",
- "sum": "vP6gWEmg5GLbC5IpH7ErcTx1spHgQ8Vlc2A9Zc7spP0="
+ "version": "0a2b02340a1f165ee9b647afae34087127e2d451",
+ "sum": "1A6RWEDU5rAwo5c1YHKMbKVKSu1GCNdWIP+nvaVjRKM="
},
{
"source": {
@@ -149,7 +149,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
- "version": "716830a56fe4f72b4c50d9b4918243235ea2b7f1",
+ "version": "ca5089d33eabaf03638a083d9a84f08c6de1acfb",
"sum": "IpF46ZXsm+0wJJAPtAre8+yxTNZA57mBqGpBP/r7/kw=",
"name": "alertmanager"
},
@@ -160,7 +160,7 @@
"subdir": "docs/node-mixin"
}
},
- "version": "78af952e638b5e0d00640fbdeefd096df4a51dc2",
+ "version": "97029a20a80609dd528eef4d5d39dd54e07a9ffa",
"sum": "QZwFBpulndqo799gkR5rP2/WdcQKQkNnaBwhaOI8Jeg="
},
{
@@ -170,7 +170,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "1bfb3ed062e99bd3c74e05d9ff9a7fa4e30bbe21",
+ "version": "9509ad082a0528625de6752516e58d0d381caa4e",
"sum": "rNvddVTMNfaguOGzEGoeKjUsfhlXJBUImC+SIFNNCiM=",
"name": "prometheus"
},
@@ -192,7 +192,7 @@
"subdir": "mixin"
}
},
- "version": "2320e49d8537ff748ed70269e719b0a7399bb515",
+ "version": "68bef3fce0812b01e7970fd1d90c36dbb42f562b",
"sum": "HhSSbGGCNHCMy1ee5jElYDm0yS9Vesa7QB2/SHKdjsY=",
"name": "thanos-mixin"
},
diff --git a/manifests/grafana-config.yaml b/manifests/grafana-config.yaml
index f1d59b7d..6215da57 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.0
+ app.kubernetes.io/version: 10.2.1
name: grafana-config
namespace: monitoring
stringData:
diff --git a/manifests/grafana-dashboardDatasources.yaml b/manifests/grafana-dashboardDatasources.yaml
index 4d9b7d99..690c8532 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.0
+ app.kubernetes.io/version: 10.2.1
name: grafana-datasources
namespace: monitoring
stringData:
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index 05ca7f1e..1419d7df 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.0
+ app.kubernetes.io/version: 10.2.1
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.0
+ app.kubernetes.io/version: 10.2.1
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.0
+ app.kubernetes.io/version: 10.2.1
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.0
+ app.kubernetes.io/version: 10.2.1
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.0
+ app.kubernetes.io/version: 10.2.1
name: grafana-dashboard-grafana-overview
namespace: monitoring
- apiVersion: v1
@@ -9078,7 +9078,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.0
+ app.kubernetes.io/version: 10.2.1
name: grafana-dashboard-k8s-resources-cluster
namespace: monitoring
- apiVersion: v1
@@ -10441,7 +10441,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.0
+ app.kubernetes.io/version: 10.2.1
name: grafana-dashboard-k8s-resources-multicluster
namespace: monitoring
- apiVersion: v1
@@ -13188,7 +13188,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.0
+ app.kubernetes.io/version: 10.2.1
name: grafana-dashboard-k8s-resources-namespace
namespace: monitoring
- apiVersion: v1
@@ -14186,7 +14186,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.0
+ app.kubernetes.io/version: 10.2.1
name: grafana-dashboard-k8s-resources-node
namespace: monitoring
- apiVersion: v1
@@ -16606,7 +16606,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.0
+ app.kubernetes.io/version: 10.2.1
name: grafana-dashboard-k8s-resources-pod
namespace: monitoring
- apiVersion: v1
@@ -18593,7 +18593,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.0
+ app.kubernetes.io/version: 10.2.1
name: grafana-dashboard-k8s-resources-workload
namespace: monitoring
- apiVersion: v1
@@ -20739,7 +20739,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.0
+ app.kubernetes.io/version: 10.2.1
name: grafana-dashboard-k8s-resources-workloads-namespace
namespace: monitoring
- apiVersion: v1
@@ -22983,7 +22983,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.0
+ app.kubernetes.io/version: 10.2.1
name: grafana-dashboard-kubelet
namespace: monitoring
- apiVersion: v1
@@ -24437,7 +24437,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.0
+ app.kubernetes.io/version: 10.2.1
name: grafana-dashboard-namespace-by-pod
namespace: monitoring
- apiVersion: v1
@@ -26163,7 +26163,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.0
+ app.kubernetes.io/version: 10.2.1
name: grafana-dashboard-namespace-by-workload
namespace: monitoring
- apiVersion: v1
@@ -27215,7 +27215,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.0
+ app.kubernetes.io/version: 10.2.1
name: grafana-dashboard-node-cluster-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -28293,7 +28293,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.0
+ app.kubernetes.io/version: 10.2.1
name: grafana-dashboard-node-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -29355,7 +29355,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.0
+ app.kubernetes.io/version: 10.2.1
name: grafana-dashboard-nodes-darwin
namespace: monitoring
- apiVersion: v1
@@ -30410,7 +30410,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.0
+ app.kubernetes.io/version: 10.2.1
name: grafana-dashboard-nodes
namespace: monitoring
- apiVersion: v1
@@ -30987,7 +30987,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.0
+ app.kubernetes.io/version: 10.2.1
name: grafana-dashboard-persistentvolumesusage
namespace: monitoring
- apiVersion: v1
@@ -32205,7 +32205,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.0
+ app.kubernetes.io/version: 10.2.1
name: grafana-dashboard-pod-total
namespace: monitoring
- apiVersion: v1
@@ -33864,7 +33864,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.0
+ app.kubernetes.io/version: 10.2.1
name: grafana-dashboard-prometheus-remote-write
namespace: monitoring
- apiVersion: v1
@@ -35073,7 +35073,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.0
+ app.kubernetes.io/version: 10.2.1
name: grafana-dashboard-prometheus
namespace: monitoring
- apiVersion: v1
@@ -36334,7 +36334,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.0
+ app.kubernetes.io/version: 10.2.1
name: grafana-dashboard-proxy
namespace: monitoring
- apiVersion: v1
@@ -37436,7 +37436,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.0
+ app.kubernetes.io/version: 10.2.1
name: grafana-dashboard-scheduler
namespace: monitoring
- apiVersion: v1
@@ -38864,7 +38864,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.0
+ app.kubernetes.io/version: 10.2.1
name: grafana-dashboard-workload-total
namespace: monitoring
kind: ConfigMapList
diff --git a/manifests/grafana-dashboardSources.yaml b/manifests/grafana-dashboardSources.yaml
index 3f28aad0..78dbb5b8 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.0
+ app.kubernetes.io/version: 10.2.1
name: grafana-dashboards
namespace: monitoring
diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml
index d49177c7..c55c32cc 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.0
+ app.kubernetes.io/version: 10.2.1
name: grafana
namespace: monitoring
spec:
@@ -18,19 +18,19 @@ spec:
template:
metadata:
annotations:
- checksum/grafana-config: fa44ea85feb223f835489871f51821d7
- checksum/grafana-dashboardproviders: 99dbbbc5af9bc4462192853e24ebd262
- checksum/grafana-datasources: 70205f42d36b3f2a0ec9786f8bfa06e8
+ checksum/grafana-config: ddf544dedce339c61a99b62a9818e462
+ checksum/grafana-dashboardproviders: a88fc82a2c739b6164eb3a826336ee6e
+ checksum/grafana-datasources: cf9bf39a135fe6f8fa5ca9b5b16735f1
labels:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 10.2.0
+ app.kubernetes.io/version: 10.2.1
spec:
automountServiceAccountToken: false
containers:
- env: []
- image: grafana/grafana:10.2.0
+ image: grafana/grafana:10.2.1
name: grafana
ports:
- containerPort: 3000
diff --git a/manifests/grafana-networkPolicy.yaml b/manifests/grafana-networkPolicy.yaml
index fc88ba41..210771eb 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.0
+ app.kubernetes.io/version: 10.2.1
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/grafana-prometheusRule.yaml b/manifests/grafana-prometheusRule.yaml
index 77c2d39a..4c6ec000 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.0
+ app.kubernetes.io/version: 10.2.1
prometheus: k8s
role: alert-rules
name: grafana-rules
diff --git a/manifests/grafana-service.yaml b/manifests/grafana-service.yaml
index 9c2da909..e825b6f0 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.0
+ app.kubernetes.io/version: 10.2.1
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/grafana-serviceAccount.yaml b/manifests/grafana-serviceAccount.yaml
index 4bbd5b98..9efb0e97 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.0
+ app.kubernetes.io/version: 10.2.1
name: grafana
namespace: monitoring
diff --git a/manifests/grafana-serviceMonitor.yaml b/manifests/grafana-serviceMonitor.yaml
index 2a3a5aea..9eae510e 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.0
+ app.kubernetes.io/version: 10.2.1
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/prometheus-clusterRole.yaml b/manifests/prometheus-clusterRole.yaml
index fad6b288..645a4fde 100644
--- a/manifests/prometheus-clusterRole.yaml
+++ b/manifests/prometheus-clusterRole.yaml
@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.47.2
+ app.kubernetes.io/version: 2.48.0
name: prometheus-k8s
rules:
- apiGroups:
diff --git a/manifests/prometheus-clusterRoleBinding.yaml b/manifests/prometheus-clusterRoleBinding.yaml
index f6f392df..878c9380 100644
--- a/manifests/prometheus-clusterRoleBinding.yaml
+++ b/manifests/prometheus-clusterRoleBinding.yaml
@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.47.2
+ app.kubernetes.io/version: 2.48.0
name: prometheus-k8s
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/prometheus-networkPolicy.yaml b/manifests/prometheus-networkPolicy.yaml
index 0e149445..40d9dfa3 100644
--- a/manifests/prometheus-networkPolicy.yaml
+++ b/manifests/prometheus-networkPolicy.yaml
@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.47.2
+ app.kubernetes.io/version: 2.48.0
name: prometheus-k8s
namespace: monitoring
spec:
diff --git a/manifests/prometheus-podDisruptionBudget.yaml b/manifests/prometheus-podDisruptionBudget.yaml
index f4d12f44..c63e635e 100644
--- a/manifests/prometheus-podDisruptionBudget.yaml
+++ b/manifests/prometheus-podDisruptionBudget.yaml
@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.47.2
+ app.kubernetes.io/version: 2.48.0
name: prometheus-k8s
namespace: monitoring
spec:
diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml
index e1d631d5..b43a85b7 100644
--- a/manifests/prometheus-prometheus.yaml
+++ b/manifests/prometheus-prometheus.yaml
@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.47.2
+ app.kubernetes.io/version: 2.48.0
name: k8s
namespace: monitoring
spec:
@@ -18,7 +18,7 @@ spec:
port: web
enableFeatures: []
externalLabels: {}
- image: quay.io/prometheus/prometheus:v2.47.2
+ image: quay.io/prometheus/prometheus:v2.48.0
nodeSelector:
kubernetes.io/os: linux
podMetadata:
@@ -27,7 +27,7 @@ spec:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.47.2
+ app.kubernetes.io/version: 2.48.0
podMonitorNamespaceSelector: {}
podMonitorSelector: {}
probeNamespaceSelector: {}
@@ -47,4 +47,4 @@ spec:
serviceAccountName: prometheus-k8s
serviceMonitorNamespaceSelector: {}
serviceMonitorSelector: {}
- version: 2.47.2
+ version: 2.48.0
diff --git a/manifests/prometheus-prometheusRule.yaml b/manifests/prometheus-prometheusRule.yaml
index 71540c63..59787fde 100644
--- a/manifests/prometheus-prometheusRule.yaml
+++ b/manifests/prometheus-prometheusRule.yaml
@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.47.2
+ app.kubernetes.io/version: 2.48.0
prometheus: k8s
role: alert-rules
name: prometheus-k8s-prometheus-rules
diff --git a/manifests/prometheus-roleBindingConfig.yaml b/manifests/prometheus-roleBindingConfig.yaml
index bc171ca2..baa6c11f 100644
--- a/manifests/prometheus-roleBindingConfig.yaml
+++ b/manifests/prometheus-roleBindingConfig.yaml
@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.47.2
+ app.kubernetes.io/version: 2.48.0
name: prometheus-k8s-config
namespace: monitoring
roleRef:
diff --git a/manifests/prometheus-roleBindingSpecificNamespaces.yaml b/manifests/prometheus-roleBindingSpecificNamespaces.yaml
index b9d524d6..d458b1ee 100644
--- a/manifests/prometheus-roleBindingSpecificNamespaces.yaml
+++ b/manifests/prometheus-roleBindingSpecificNamespaces.yaml
@@ -8,7 +8,7 @@ items:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.47.2
+ app.kubernetes.io/version: 2.48.0
name: prometheus-k8s
namespace: default
roleRef:
@@ -27,7 +27,7 @@ items:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.47.2
+ app.kubernetes.io/version: 2.48.0
name: prometheus-k8s
namespace: kube-system
roleRef:
@@ -46,7 +46,7 @@ items:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.47.2
+ app.kubernetes.io/version: 2.48.0
name: prometheus-k8s
namespace: monitoring
roleRef:
diff --git a/manifests/prometheus-roleConfig.yaml b/manifests/prometheus-roleConfig.yaml
index 180929af..5bd4f109 100644
--- a/manifests/prometheus-roleConfig.yaml
+++ b/manifests/prometheus-roleConfig.yaml
@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.47.2
+ app.kubernetes.io/version: 2.48.0
name: prometheus-k8s-config
namespace: monitoring
rules:
diff --git a/manifests/prometheus-roleSpecificNamespaces.yaml b/manifests/prometheus-roleSpecificNamespaces.yaml
index b0ec29ef..7eea4192 100644
--- a/manifests/prometheus-roleSpecificNamespaces.yaml
+++ b/manifests/prometheus-roleSpecificNamespaces.yaml
@@ -8,7 +8,7 @@ items:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.47.2
+ app.kubernetes.io/version: 2.48.0
name: prometheus-k8s
namespace: default
rules:
@@ -46,7 +46,7 @@ items:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.47.2
+ app.kubernetes.io/version: 2.48.0
name: prometheus-k8s
namespace: kube-system
rules:
@@ -84,7 +84,7 @@ items:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.47.2
+ app.kubernetes.io/version: 2.48.0
name: prometheus-k8s
namespace: monitoring
rules:
diff --git a/manifests/prometheus-service.yaml b/manifests/prometheus-service.yaml
index ab9f8bdc..3c9e78b9 100644
--- a/manifests/prometheus-service.yaml
+++ b/manifests/prometheus-service.yaml
@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.47.2
+ app.kubernetes.io/version: 2.48.0
name: prometheus-k8s
namespace: monitoring
spec:
diff --git a/manifests/prometheus-serviceAccount.yaml b/manifests/prometheus-serviceAccount.yaml
index 63c98426..6588cc8f 100644
--- a/manifests/prometheus-serviceAccount.yaml
+++ b/manifests/prometheus-serviceAccount.yaml
@@ -7,6 +7,6 @@ metadata:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.47.2
+ app.kubernetes.io/version: 2.48.0
name: prometheus-k8s
namespace: monitoring
diff --git a/manifests/prometheus-serviceMonitor.yaml b/manifests/prometheus-serviceMonitor.yaml
index 6800a948..2fc8d61c 100644
--- a/manifests/prometheus-serviceMonitor.yaml
+++ b/manifests/prometheus-serviceMonitor.yaml
@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: k8s
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.47.2
+ app.kubernetes.io/version: 2.48.0
name: prometheus-k8s
namespace: monitoring
spec:
diff --git a/manifests/prometheusOperator-deployment.yaml b/manifests/prometheusOperator-deployment.yaml
index 46cb5cbb..510c65a1 100644
--- a/manifests/prometheusOperator-deployment.yaml
+++ b/manifests/prometheusOperator-deployment.yaml
@@ -30,6 +30,9 @@ spec:
- args:
- --kubelet-service=kube-system/kubelet
- --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.69.1
+ env:
+ - name: GOGC
+ value: "30"
image: quay.io/prometheus-operator/prometheus-operator:v0.69.1
name: prometheus-operator
ports:
diff --git a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
index ce898762..11ac3c34 100644
--- a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
+++ b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
@@ -226,7 +226,7 @@ spec:
description: BasicAuth for the client. This is mutually exclusive with Authorization. If both are defined, BasicAuth takes precedence.
properties:
password:
- description: The secret in the service monitor namespace that contains the password for authentication.
+ description: '`password` specifies a key of a Secret containing the password for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -242,7 +242,7 @@ spec:
type: object
x-kubernetes-map-type: atomic
username:
- description: The secret in the service monitor namespace that contains the username for authentication.
+ description: '`username` specifies a key of a Secret containing the username for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -281,7 +281,7 @@ spec:
description: OAuth2 client credentials used to fetch a token for the targets.
properties:
clientId:
- description: The secret or configmap containing the OAuth2 client id
+ description: '`clientId` specifies a key of a Secret or ConfigMap containing the OAuth2 client''s ID.'
properties:
configMap:
description: ConfigMap containing data to use for the targets.
@@ -317,7 +317,7 @@ spec:
x-kubernetes-map-type: atomic
type: object
clientSecret:
- description: The secret containing the OAuth2 client secret
+ description: '`clientSecret` specifies a key of a Secret containing the OAuth2 client''s secret.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -335,15 +335,15 @@ spec:
endpointParams:
additionalProperties:
type: string
- description: Parameters to append to the token URL
+ description: '`endpointParams` configures the HTTP parameters to append to the token URL.'
type: object
scopes:
- description: OAuth2 scopes used for the token request
+ description: '`scopes` defines the OAuth2 scopes used for the token request.'
items:
type: string
type: array
tokenUrl:
- description: The URL to fetch the token from
+ description: '`tokenURL` configures the URL to fetch the token from.'
minLength: 1
type: string
required:
@@ -685,7 +685,7 @@ spec:
description: BasicAuth for the client. This is mutually exclusive with Authorization. If both are defined, BasicAuth takes precedence.
properties:
password:
- description: The secret in the service monitor namespace that contains the password for authentication.
+ description: '`password` specifies a key of a Secret containing the password for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -701,7 +701,7 @@ spec:
type: object
x-kubernetes-map-type: atomic
username:
- description: The secret in the service monitor namespace that contains the username for authentication.
+ description: '`username` specifies a key of a Secret containing the username for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -740,7 +740,7 @@ spec:
description: OAuth2 client credentials used to fetch a token for the targets.
properties:
clientId:
- description: The secret or configmap containing the OAuth2 client id
+ description: '`clientId` specifies a key of a Secret or ConfigMap containing the OAuth2 client''s ID.'
properties:
configMap:
description: ConfigMap containing data to use for the targets.
@@ -776,7 +776,7 @@ spec:
x-kubernetes-map-type: atomic
type: object
clientSecret:
- description: The secret containing the OAuth2 client secret
+ description: '`clientSecret` specifies a key of a Secret containing the OAuth2 client''s secret.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -794,15 +794,15 @@ spec:
endpointParams:
additionalProperties:
type: string
- description: Parameters to append to the token URL
+ description: '`endpointParams` configures the HTTP parameters to append to the token URL.'
type: object
scopes:
- description: OAuth2 scopes used for the token request
+ description: '`scopes` defines the OAuth2 scopes used for the token request.'
items:
type: string
type: array
tokenUrl:
- description: The URL to fetch the token from
+ description: '`tokenURL` configures the URL to fetch the token from.'
minLength: 1
type: string
required:
@@ -1025,7 +1025,7 @@ spec:
description: BasicAuth for the client. This is mutually exclusive with Authorization. If both are defined, BasicAuth takes precedence.
properties:
password:
- description: The secret in the service monitor namespace that contains the password for authentication.
+ description: '`password` specifies a key of a Secret containing the password for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -1041,7 +1041,7 @@ spec:
type: object
x-kubernetes-map-type: atomic
username:
- description: The secret in the service monitor namespace that contains the username for authentication.
+ description: '`username` specifies a key of a Secret containing the username for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -1080,7 +1080,7 @@ spec:
description: OAuth2 client credentials used to fetch a token for the targets.
properties:
clientId:
- description: The secret or configmap containing the OAuth2 client id
+ description: '`clientId` specifies a key of a Secret or ConfigMap containing the OAuth2 client''s ID.'
properties:
configMap:
description: ConfigMap containing data to use for the targets.
@@ -1116,7 +1116,7 @@ spec:
x-kubernetes-map-type: atomic
type: object
clientSecret:
- description: The secret containing the OAuth2 client secret
+ description: '`clientSecret` specifies a key of a Secret containing the OAuth2 client''s secret.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -1134,15 +1134,15 @@ spec:
endpointParams:
additionalProperties:
type: string
- description: Parameters to append to the token URL
+ description: '`endpointParams` configures the HTTP parameters to append to the token URL.'
type: object
scopes:
- description: OAuth2 scopes used for the token request
+ description: '`scopes` defines the OAuth2 scopes used for the token request.'
items:
type: string
type: array
tokenUrl:
- description: The URL to fetch the token from
+ description: '`tokenURL` configures the URL to fetch the token from.'
minLength: 1
type: string
required:
@@ -1373,7 +1373,7 @@ spec:
description: BasicAuth for the client. This is mutually exclusive with Authorization. If both are defined, BasicAuth takes precedence.
properties:
password:
- description: The secret in the service monitor namespace that contains the password for authentication.
+ description: '`password` specifies a key of a Secret containing the password for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -1389,7 +1389,7 @@ spec:
type: object
x-kubernetes-map-type: atomic
username:
- description: The secret in the service monitor namespace that contains the username for authentication.
+ description: '`username` specifies a key of a Secret containing the username for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -1428,7 +1428,7 @@ spec:
description: OAuth2 client credentials used to fetch a token for the targets.
properties:
clientId:
- description: The secret or configmap containing the OAuth2 client id
+ description: '`clientId` specifies a key of a Secret or ConfigMap containing the OAuth2 client''s ID.'
properties:
configMap:
description: ConfigMap containing data to use for the targets.
@@ -1464,7 +1464,7 @@ spec:
x-kubernetes-map-type: atomic
type: object
clientSecret:
- description: The secret containing the OAuth2 client secret
+ description: '`clientSecret` specifies a key of a Secret containing the OAuth2 client''s secret.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -1482,15 +1482,15 @@ spec:
endpointParams:
additionalProperties:
type: string
- description: Parameters to append to the token URL
+ description: '`endpointParams` configures the HTTP parameters to append to the token URL.'
type: object
scopes:
- description: OAuth2 scopes used for the token request
+ description: '`scopes` defines the OAuth2 scopes used for the token request.'
items:
type: string
type: array
tokenUrl:
- description: The URL to fetch the token from
+ description: '`tokenURL` configures the URL to fetch the token from.'
minLength: 1
type: string
required:
@@ -1714,7 +1714,7 @@ spec:
description: BasicAuth for the client. This is mutually exclusive with Authorization. If both are defined, BasicAuth takes precedence.
properties:
password:
- description: The secret in the service monitor namespace that contains the password for authentication.
+ description: '`password` specifies a key of a Secret containing the password for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -1730,7 +1730,7 @@ spec:
type: object
x-kubernetes-map-type: atomic
username:
- description: The secret in the service monitor namespace that contains the username for authentication.
+ description: '`username` specifies a key of a Secret containing the username for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -1769,7 +1769,7 @@ spec:
description: OAuth2 client credentials used to fetch a token for the targets.
properties:
clientId:
- description: The secret or configmap containing the OAuth2 client id
+ description: '`clientId` specifies a key of a Secret or ConfigMap containing the OAuth2 client''s ID.'
properties:
configMap:
description: ConfigMap containing data to use for the targets.
@@ -1805,7 +1805,7 @@ spec:
x-kubernetes-map-type: atomic
type: object
clientSecret:
- description: The secret containing the OAuth2 client secret
+ description: '`clientSecret` specifies a key of a Secret containing the OAuth2 client''s secret.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -1823,15 +1823,15 @@ spec:
endpointParams:
additionalProperties:
type: string
- description: Parameters to append to the token URL
+ description: '`endpointParams` configures the HTTP parameters to append to the token URL.'
type: object
scopes:
- description: OAuth2 scopes used for the token request
+ description: '`scopes` defines the OAuth2 scopes used for the token request.'
items:
type: string
type: array
tokenUrl:
- description: The URL to fetch the token from
+ description: '`tokenURL` configures the URL to fetch the token from.'
minLength: 1
type: string
required:
@@ -2125,7 +2125,7 @@ spec:
description: BasicAuth for the client. This is mutually exclusive with Authorization. If both are defined, BasicAuth takes precedence.
properties:
password:
- description: The secret in the service monitor namespace that contains the password for authentication.
+ description: '`password` specifies a key of a Secret containing the password for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -2141,7 +2141,7 @@ spec:
type: object
x-kubernetes-map-type: atomic
username:
- description: The secret in the service monitor namespace that contains the username for authentication.
+ description: '`username` specifies a key of a Secret containing the username for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -2180,7 +2180,7 @@ spec:
description: OAuth2 client credentials used to fetch a token for the targets.
properties:
clientId:
- description: The secret or configmap containing the OAuth2 client id
+ description: '`clientId` specifies a key of a Secret or ConfigMap containing the OAuth2 client''s ID.'
properties:
configMap:
description: ConfigMap containing data to use for the targets.
@@ -2216,7 +2216,7 @@ spec:
x-kubernetes-map-type: atomic
type: object
clientSecret:
- description: The secret containing the OAuth2 client secret
+ description: '`clientSecret` specifies a key of a Secret containing the OAuth2 client''s secret.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -2234,15 +2234,15 @@ spec:
endpointParams:
additionalProperties:
type: string
- description: Parameters to append to the token URL
+ description: '`endpointParams` configures the HTTP parameters to append to the token URL.'
type: object
scopes:
- description: OAuth2 scopes used for the token request
+ description: '`scopes` defines the OAuth2 scopes used for the token request.'
items:
type: string
type: array
tokenUrl:
- description: The URL to fetch the token from
+ description: '`tokenURL` configures the URL to fetch the token from.'
minLength: 1
type: string
required:
@@ -2426,7 +2426,7 @@ spec:
description: BasicAuth for the client. This is mutually exclusive with Authorization. If both are defined, BasicAuth takes precedence.
properties:
password:
- description: The secret in the service monitor namespace that contains the password for authentication.
+ description: '`password` specifies a key of a Secret containing the password for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -2442,7 +2442,7 @@ spec:
type: object
x-kubernetes-map-type: atomic
username:
- description: The secret in the service monitor namespace that contains the username for authentication.
+ description: '`username` specifies a key of a Secret containing the username for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -2481,7 +2481,7 @@ spec:
description: OAuth2 client credentials used to fetch a token for the targets.
properties:
clientId:
- description: The secret or configmap containing the OAuth2 client id
+ description: '`clientId` specifies a key of a Secret or ConfigMap containing the OAuth2 client''s ID.'
properties:
configMap:
description: ConfigMap containing data to use for the targets.
@@ -2517,7 +2517,7 @@ spec:
x-kubernetes-map-type: atomic
type: object
clientSecret:
- description: The secret containing the OAuth2 client secret
+ description: '`clientSecret` specifies a key of a Secret containing the OAuth2 client''s secret.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -2535,15 +2535,15 @@ spec:
endpointParams:
additionalProperties:
type: string
- description: Parameters to append to the token URL
+ description: '`endpointParams` configures the HTTP parameters to append to the token URL.'
type: object
scopes:
- description: OAuth2 scopes used for the token request
+ description: '`scopes` defines the OAuth2 scopes used for the token request.'
items:
type: string
type: array
tokenUrl:
- description: The URL to fetch the token from
+ description: '`tokenURL` configures the URL to fetch the token from.'
minLength: 1
type: string
required:
@@ -2782,7 +2782,7 @@ spec:
description: BasicAuth for the client. This is mutually exclusive with Authorization. If both are defined, BasicAuth takes precedence.
properties:
password:
- description: The secret in the service monitor namespace that contains the password for authentication.
+ description: '`password` specifies a key of a Secret containing the password for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -2798,7 +2798,7 @@ spec:
type: object
x-kubernetes-map-type: atomic
username:
- description: The secret in the service monitor namespace that contains the username for authentication.
+ description: '`username` specifies a key of a Secret containing the username for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -2837,7 +2837,7 @@ spec:
description: OAuth2 client credentials used to fetch a token for the targets.
properties:
clientId:
- description: The secret or configmap containing the OAuth2 client id
+ description: '`clientId` specifies a key of a Secret or ConfigMap containing the OAuth2 client''s ID.'
properties:
configMap:
description: ConfigMap containing data to use for the targets.
@@ -2873,7 +2873,7 @@ spec:
x-kubernetes-map-type: atomic
type: object
clientSecret:
- description: The secret containing the OAuth2 client secret
+ description: '`clientSecret` specifies a key of a Secret containing the OAuth2 client''s secret.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -2891,15 +2891,15 @@ spec:
endpointParams:
additionalProperties:
type: string
- description: Parameters to append to the token URL
+ description: '`endpointParams` configures the HTTP parameters to append to the token URL.'
type: object
scopes:
- description: OAuth2 scopes used for the token request
+ description: '`scopes` defines the OAuth2 scopes used for the token request.'
items:
type: string
type: array
tokenUrl:
- description: The URL to fetch the token from
+ description: '`tokenURL` configures the URL to fetch the token from.'
minLength: 1
type: string
required:
@@ -3098,7 +3098,7 @@ spec:
description: BasicAuth for the client. This is mutually exclusive with Authorization. If both are defined, BasicAuth takes precedence.
properties:
password:
- description: The secret in the service monitor namespace that contains the password for authentication.
+ description: '`password` specifies a key of a Secret containing the password for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -3114,7 +3114,7 @@ spec:
type: object
x-kubernetes-map-type: atomic
username:
- description: The secret in the service monitor namespace that contains the username for authentication.
+ description: '`username` specifies a key of a Secret containing the username for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -3153,7 +3153,7 @@ spec:
description: OAuth2 client credentials used to fetch a token for the targets.
properties:
clientId:
- description: The secret or configmap containing the OAuth2 client id
+ description: '`clientId` specifies a key of a Secret or ConfigMap containing the OAuth2 client''s ID.'
properties:
configMap:
description: ConfigMap containing data to use for the targets.
@@ -3189,7 +3189,7 @@ spec:
x-kubernetes-map-type: atomic
type: object
clientSecret:
- description: The secret containing the OAuth2 client secret
+ description: '`clientSecret` specifies a key of a Secret containing the OAuth2 client''s secret.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -3207,15 +3207,15 @@ spec:
endpointParams:
additionalProperties:
type: string
- description: Parameters to append to the token URL
+ description: '`endpointParams` configures the HTTP parameters to append to the token URL.'
type: object
scopes:
- description: OAuth2 scopes used for the token request
+ description: '`scopes` defines the OAuth2 scopes used for the token request.'
items:
type: string
type: array
tokenUrl:
- description: The URL to fetch the token from
+ description: '`tokenURL` configures the URL to fetch the token from.'
minLength: 1
type: string
required:
@@ -3381,7 +3381,7 @@ spec:
description: BasicAuth for the client. This is mutually exclusive with Authorization. If both are defined, BasicAuth takes precedence.
properties:
password:
- description: The secret in the service monitor namespace that contains the password for authentication.
+ description: '`password` specifies a key of a Secret containing the password for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -3397,7 +3397,7 @@ spec:
type: object
x-kubernetes-map-type: atomic
username:
- description: The secret in the service monitor namespace that contains the username for authentication.
+ description: '`username` specifies a key of a Secret containing the username for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -3436,7 +3436,7 @@ spec:
description: OAuth2 client credentials used to fetch a token for the targets.
properties:
clientId:
- description: The secret or configmap containing the OAuth2 client id
+ description: '`clientId` specifies a key of a Secret or ConfigMap containing the OAuth2 client''s ID.'
properties:
configMap:
description: ConfigMap containing data to use for the targets.
@@ -3472,7 +3472,7 @@ spec:
x-kubernetes-map-type: atomic
type: object
clientSecret:
- description: The secret containing the OAuth2 client secret
+ description: '`clientSecret` specifies a key of a Secret containing the OAuth2 client''s secret.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -3490,15 +3490,15 @@ spec:
endpointParams:
additionalProperties:
type: string
- description: Parameters to append to the token URL
+ description: '`endpointParams` configures the HTTP parameters to append to the token URL.'
type: object
scopes:
- description: OAuth2 scopes used for the token request
+ description: '`scopes` defines the OAuth2 scopes used for the token request.'
items:
type: string
type: array
tokenUrl:
- description: The URL to fetch the token from
+ description: '`tokenURL` configures the URL to fetch the token from.'
minLength: 1
type: string
required:
@@ -3657,7 +3657,7 @@ spec:
description: BasicAuth for the client. This is mutually exclusive with Authorization. If both are defined, BasicAuth takes precedence.
properties:
password:
- description: The secret in the service monitor namespace that contains the password for authentication.
+ description: '`password` specifies a key of a Secret containing the password for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -3673,7 +3673,7 @@ spec:
type: object
x-kubernetes-map-type: atomic
username:
- description: The secret in the service monitor namespace that contains the username for authentication.
+ description: '`username` specifies a key of a Secret containing the username for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -3712,7 +3712,7 @@ spec:
description: OAuth2 client credentials used to fetch a token for the targets.
properties:
clientId:
- description: The secret or configmap containing the OAuth2 client id
+ description: '`clientId` specifies a key of a Secret or ConfigMap containing the OAuth2 client''s ID.'
properties:
configMap:
description: ConfigMap containing data to use for the targets.
@@ -3748,7 +3748,7 @@ spec:
x-kubernetes-map-type: atomic
type: object
clientSecret:
- description: The secret containing the OAuth2 client secret
+ description: '`clientSecret` specifies a key of a Secret containing the OAuth2 client''s secret.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -3766,15 +3766,15 @@ spec:
endpointParams:
additionalProperties:
type: string
- description: Parameters to append to the token URL
+ description: '`endpointParams` configures the HTTP parameters to append to the token URL.'
type: object
scopes:
- description: OAuth2 scopes used for the token request
+ description: '`scopes` defines the OAuth2 scopes used for the token request.'
items:
type: string
type: array
tokenUrl:
- description: The URL to fetch the token from
+ description: '`tokenURL` configures the URL to fetch the token from.'
minLength: 1
type: string
required:
@@ -3972,7 +3972,7 @@ spec:
description: BasicAuth for the client. This is mutually exclusive with Authorization. If both are defined, BasicAuth takes precedence.
properties:
password:
- description: The secret in the service monitor namespace that contains the password for authentication.
+ description: '`password` specifies a key of a Secret containing the password for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -3988,7 +3988,7 @@ spec:
type: object
x-kubernetes-map-type: atomic
username:
- description: The secret in the service monitor namespace that contains the username for authentication.
+ description: '`username` specifies a key of a Secret containing the username for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -4027,7 +4027,7 @@ spec:
description: OAuth2 client credentials used to fetch a token for the targets.
properties:
clientId:
- description: The secret or configmap containing the OAuth2 client id
+ description: '`clientId` specifies a key of a Secret or ConfigMap containing the OAuth2 client''s ID.'
properties:
configMap:
description: ConfigMap containing data to use for the targets.
@@ -4063,7 +4063,7 @@ spec:
x-kubernetes-map-type: atomic
type: object
clientSecret:
- description: The secret containing the OAuth2 client secret
+ description: '`clientSecret` specifies a key of a Secret containing the OAuth2 client''s secret.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -4081,15 +4081,15 @@ spec:
endpointParams:
additionalProperties:
type: string
- description: Parameters to append to the token URL
+ description: '`endpointParams` configures the HTTP parameters to append to the token URL.'
type: object
scopes:
- description: OAuth2 scopes used for the token request
+ description: '`scopes` defines the OAuth2 scopes used for the token request.'
items:
type: string
type: array
tokenUrl:
- description: The URL to fetch the token from
+ description: '`tokenURL` configures the URL to fetch the token from.'
minLength: 1
type: string
required:
diff --git a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
index 2c9bd2b2..54ccc106 100644
--- a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
+++ b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
@@ -647,7 +647,7 @@ spec:
description: BasicAuth for the client. This is mutually exclusive with Authorization. If both are defined, BasicAuth takes precedence.
properties:
password:
- description: The secret in the service monitor namespace that contains the password for authentication.
+ description: '`password` specifies a key of a Secret containing the password for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -663,7 +663,7 @@ spec:
type: object
x-kubernetes-map-type: atomic
username:
- description: The secret in the service monitor namespace that contains the username for authentication.
+ description: '`username` specifies a key of a Secret containing the username for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -702,7 +702,7 @@ spec:
description: OAuth2 client credentials used to fetch a token for the targets.
properties:
clientId:
- description: The secret or configmap containing the OAuth2 client id
+ description: '`clientId` specifies a key of a Secret or ConfigMap containing the OAuth2 client''s ID.'
properties:
configMap:
description: ConfigMap containing data to use for the targets.
@@ -738,7 +738,7 @@ spec:
x-kubernetes-map-type: atomic
type: object
clientSecret:
- description: The secret containing the OAuth2 client secret
+ description: '`clientSecret` specifies a key of a Secret containing the OAuth2 client''s secret.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -756,15 +756,15 @@ spec:
endpointParams:
additionalProperties:
type: string
- description: Parameters to append to the token URL
+ description: '`endpointParams` configures the HTTP parameters to append to the token URL.'
type: object
scopes:
- description: OAuth2 scopes used for the token request
+ description: '`scopes` defines the OAuth2 scopes used for the token request.'
items:
type: string
type: array
tokenUrl:
- description: The URL to fetch the token from
+ description: '`tokenURL` configures the URL to fetch the token from.'
minLength: 1
type: string
required:
diff --git a/manifests/setup/0podmonitorCustomResourceDefinition.yaml b/manifests/setup/0podmonitorCustomResourceDefinition.yaml
index 2fb6f008..937be68d 100644
--- a/manifests/setup/0podmonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/0podmonitorCustomResourceDefinition.yaml
@@ -35,33 +35,33 @@ spec:
description: Specification of desired Pod selection for target discovery by Prometheus.
properties:
attachMetadata:
- description: Attaches node metadata to discovered targets. Requires Prometheus v2.35.0 and above.
+ description: "`attachMetadata` defines additional metadata which is added to the discovered targets. \n It requires Prometheus >= v2.37.0."
properties:
node:
- description: When set to true, Prometheus must have permissions to get Nodes.
+ description: When set to true, Prometheus must have the `get` permission on the `Nodes` objects.
type: boolean
type: object
jobLabel:
- description: The label to use to retrieve the job name from.
+ description: "The label to use to retrieve the job name from. `jobLabel` selects the label from the associated Kubernetes `Pod` object which will be used as the `job` label for all metrics. \n For example if `jobLabel` is set to `foo` and the Kubernetes `Pod` object is labeled with `foo: bar`, then Prometheus adds the `job=\"bar\"` label to all ingested metrics. \n If the value of this field is empty, the `job` label of the metrics defaults to the namespace and name of the PodMonitor object (e.g. `<namespace>/<name>`)."
type: string
keepDroppedTargets:
description: "Per-scrape limit on the number of targets dropped by relabeling that will be kept in memory. 0 means no limit. \n It requires Prometheus >= v2.47.0."
format: int64
type: integer
labelLimit:
- description: Per-scrape limit on number of labels that will be accepted for a sample. Only valid in Prometheus versions 2.27.0 and newer.
+ description: "Per-scrape limit on number of labels that will be accepted for a sample. \n It requires Prometheus >= v2.27.0."
format: int64
type: integer
labelNameLengthLimit:
- description: Per-scrape limit on length of labels name that will be accepted for a sample. Only valid in Prometheus versions 2.27.0 and newer.
+ description: "Per-scrape limit on length of labels name that will be accepted for a sample. \n It requires Prometheus >= v2.27.0."
format: int64
type: integer
labelValueLengthLimit:
- 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.
+ description: "Per-scrape limit on length of labels value that will be accepted for a sample. \n It requires Prometheus >= v2.27.0."
format: int64
type: integer
namespaceSelector:
- description: Selector to select which namespaces the Endpoints objects are discovered from.
+ description: Selector to select which namespaces the Kubernetes `Pods` objects are discovered from.
properties:
any:
description: Boolean describing whether all namespaces are selected in contrast to a list restricting them.
@@ -73,12 +73,12 @@ spec:
type: array
type: object
podMetricsEndpoints:
- description: A list of endpoints allowed as part of this PodMonitor.
+ description: List of endpoints part of this PodMonitor.
items:
- description: PodMetricsEndpoint defines a scrapeable endpoint of a Kubernetes Pod serving Prometheus metrics.
+ description: PodMetricsEndpoint defines an endpoint serving Prometheus metrics to be scraped by Prometheus.
properties:
authorization:
- description: Authorization section for this endpoint
+ description: "`authorization` configures the Authorization header credentials to use when scraping the target. \n Cannot be set at the same time as `basicAuth`, or `oauth2`."
properties:
credentials:
description: Selects a key of a Secret in the namespace that contains the credentials for authentication.
@@ -101,10 +101,10 @@ spec:
type: string
type: object
basicAuth:
- description: 'BasicAuth allow an endpoint to authenticate over basic authentication. More info: https://prometheus.io/docs/operating/configuration/#endpoint'
+ description: "`basicAuth` configures the Basic Authentication credentials to use when scraping the target. \n Cannot be set at the same time as `authorization`, or `oauth2`."
properties:
password:
- description: The secret in the service monitor namespace that contains the password for authentication.
+ description: '`password` specifies a key of a Secret containing the password for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -120,7 +120,7 @@ spec:
type: object
x-kubernetes-map-type: atomic
username:
- description: The secret in the service monitor namespace that contains the username for authentication.
+ description: '`username` specifies a key of a Secret containing the username for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -137,7 +137,7 @@ spec:
x-kubernetes-map-type: atomic
type: object
bearerTokenSecret:
- description: Secret to mount to read bearer token for scraping targets. The secret needs to be in the same namespace as the pod monitor and accessible by the Prometheus Operator.
+ description: "`bearerTokenSecret` specifies a key of a Secret containing the bearer token for scraping targets. The secret needs to be in the same namespace as the PodMonitor object and readable by the Prometheus Operator. \n Deprecated: use `authorization` instead."
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -153,26 +153,26 @@ spec:
type: object
x-kubernetes-map-type: atomic
enableHttp2:
- description: Whether to enable HTTP2.
+ description: '`enableHttp2` can be used to disable HTTP2 when scraping the target.'
type: boolean
filterRunning:
- description: 'Drop pods that are not running. (Failed, Succeeded). Enabled by default. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#pod-phase'
+ description: "When true, the pods which are not running (e.g. either in Failed or Succeeded state) are dropped during the target discovery. \n If unset, the filtering is enabled. \n More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#pod-phase"
type: boolean
followRedirects:
- description: FollowRedirects configures whether scrape requests follow HTTP 3xx redirects.
+ description: '`followRedirects` defines whether the scrape requests should follow HTTP 3xx redirects.'
type: boolean
honorLabels:
- description: HonorLabels chooses the metric's labels on collisions with target labels.
+ description: When true, `honorLabels` preserves the metric's labels when they collide with the target's labels.
type: boolean
honorTimestamps:
- description: HonorTimestamps controls whether Prometheus respects the timestamps present in scraped data.
+ description: '`honorTimestamps` controls whether Prometheus preserves the timestamps when exposed by the target.'
type: boolean
interval:
- description: Interval at which metrics should be scraped If not specified Prometheus' global scrape interval is used.
+ description: "Interval at which Prometheus scrapes the metrics from the target. \n If empty, Prometheus uses the global scrape interval."
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
metricRelabelings:
- description: MetricRelabelConfigs to apply to samples before ingestion.
+ description: '`metricRelabelings` configures the relabeling rules to apply to the samples before ingestion.'
items:
description: "RelabelConfig allows dynamic rewriting of the label set for targets, alerts, scraped samples and remote write samples. \n More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config"
properties:
@@ -229,10 +229,10 @@ spec:
type: object
type: array
oauth2:
- description: OAuth2 for the URL. Only valid in Prometheus versions 2.27.0 and newer.
+ description: "`oauth2` configures the OAuth2 settings to use when scraping the target. \n It requires Prometheus >= 2.27.0. \n Cannot be set at the same time as `authorization`, or `basicAuth`."
properties:
clientId:
- description: The secret or configmap containing the OAuth2 client id
+ description: '`clientId` specifies a key of a Secret or ConfigMap containing the OAuth2 client''s ID.'
properties:
configMap:
description: ConfigMap containing data to use for the targets.
@@ -268,7 +268,7 @@ spec:
x-kubernetes-map-type: atomic
type: object
clientSecret:
- description: The secret containing the OAuth2 client secret
+ description: '`clientSecret` specifies a key of a Secret containing the OAuth2 client''s secret.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -286,15 +286,15 @@ spec:
endpointParams:
additionalProperties:
type: string
- description: Parameters to append to the token URL
+ description: '`endpointParams` configures the HTTP parameters to append to the token URL.'
type: object
scopes:
- description: OAuth2 scopes used for the token request
+ description: '`scopes` defines the OAuth2 scopes used for the token request.'
items:
type: string
type: array
tokenUrl:
- description: The URL to fetch the token from
+ description: '`tokenURL` configures the URL to fetch the token from.'
minLength: 1
type: string
required:
@@ -307,19 +307,19 @@ spec:
items:
type: string
type: array
- description: Optional HTTP URL parameters
+ description: '`params` define optional HTTP URL parameters.'
type: object
path:
- description: HTTP path to scrape for metrics. If empty, Prometheus uses the default value (e.g. `/metrics`).
+ description: "HTTP path from which to scrape for metrics. \n If empty, Prometheus uses the default value (e.g. `/metrics`)."
type: string
port:
- description: Name of the pod port this endpoint refers to. Mutually exclusive with targetPort.
+ description: "Name of the Pod port which this endpoint refers to. \n It takes precedence over `targetPort`."
type: string
proxyUrl:
- description: ProxyURL eg http://proxyserver:2195 Directs scrapes to proxy through this endpoint.
+ description: '`proxyURL` configures the HTTP Proxy URL (e.g. "http://proxyserver:2195") to go through when scraping the target.'
type: string
relabelings:
- description: 'RelabelConfigs to apply to samples before scraping. Prometheus Operator automatically adds relabelings for a few standard Kubernetes fields. The original scrape job''s name is available via the `__tmp_prometheus_job_name` label. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config'
+ description: "`relabelings` configures the relabeling rules to apply the target's metadata labels. \n The Operator automatically adds relabelings for a few standard Kubernetes fields. \n The original scrape job's name is available via the `__tmp_prometheus_job_name` label. \n More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config"
items:
description: "RelabelConfig allows dynamic rewriting of the label set for targets, alerts, scraped samples and remote write samples. \n More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config"
properties:
@@ -376,23 +376,23 @@ spec:
type: object
type: array
scheme:
- description: HTTP scheme to use for scraping. `http` and `https` are the expected values unless you rewrite the `__scheme__` label via relabeling. If empty, Prometheus uses the default value `http`.
+ description: "HTTP scheme to use for scraping. \n `http` and `https` are the expected values unless you rewrite the `__scheme__` label via relabeling. \n If empty, Prometheus uses the default value `http`."
enum:
- http
- https
type: string
scrapeTimeout:
- description: Timeout after which the scrape is ended If not specified, the Prometheus global scrape interval is used.
+ description: "Timeout after which Prometheus considers the scrape to be failed. \n If empty, Prometheus uses the global scrape timeout unless it is less than the target's scrape interval value in which the latter is used."
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
targetPort:
anyOf:
- type: integer
- type: string
- description: 'Deprecated: Use ''port'' instead.'
+ description: "Name or number of the target port of the `Pod` object behind the Service, the port must be specified with container port property. \n Deprecated: use 'port' instead."
x-kubernetes-int-or-string: true
tlsConfig:
- description: TLS configuration to use when scraping the endpoint.
+ description: TLS configuration to use when scraping the target.
properties:
ca:
description: Certificate authority used when verifying server certificates.
@@ -492,16 +492,16 @@ spec:
type: object
type: array
podTargetLabels:
- description: PodTargetLabels transfers labels on the Kubernetes Pod onto the target.
+ description: '`podTargetLabels` defines the labels which are transferred from the associated Kubernetes `Pod` object onto the ingested metrics.'
items:
type: string
type: array
sampleLimit:
- description: SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.
+ description: '`sampleLimit` defines a per-scrape limit on the number of scraped samples that will be accepted.'
format: int64
type: integer
selector:
- description: Selector to select Pod objects.
+ description: Label selector to select the Kubernetes `Pod` objects.
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
@@ -532,11 +532,10 @@ spec:
type: object
x-kubernetes-map-type: atomic
targetLimit:
- description: TargetLimit defines a limit on the number of scraped targets that will be accepted.
+ description: '`targetLimit` defines a limit on the number of scraped targets that will be accepted.'
format: int64
type: integer
required:
- - podMetricsEndpoints
- selector
type: object
required:
diff --git a/manifests/setup/0probeCustomResourceDefinition.yaml b/manifests/setup/0probeCustomResourceDefinition.yaml
index 15babeaa..503971e9 100644
--- a/manifests/setup/0probeCustomResourceDefinition.yaml
+++ b/manifests/setup/0probeCustomResourceDefinition.yaml
@@ -61,7 +61,7 @@ spec:
description: 'BasicAuth allow an endpoint to authenticate over basic authentication. More info: https://prometheus.io/docs/operating/configuration/#endpoint'
properties:
password:
- description: The secret in the service monitor namespace that contains the password for authentication.
+ description: '`password` specifies a key of a Secret containing the password for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -77,7 +77,7 @@ spec:
type: object
x-kubernetes-map-type: atomic
username:
- description: The secret in the service monitor namespace that contains the username for authentication.
+ description: '`username` specifies a key of a Secret containing the username for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -196,7 +196,7 @@ spec:
description: OAuth2 for the URL. Only valid in Prometheus versions 2.27.0 and newer.
properties:
clientId:
- description: The secret or configmap containing the OAuth2 client id
+ description: '`clientId` specifies a key of a Secret or ConfigMap containing the OAuth2 client''s ID.'
properties:
configMap:
description: ConfigMap containing data to use for the targets.
@@ -232,7 +232,7 @@ spec:
x-kubernetes-map-type: atomic
type: object
clientSecret:
- description: The secret containing the OAuth2 client secret
+ description: '`clientSecret` specifies a key of a Secret containing the OAuth2 client''s secret.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -250,15 +250,15 @@ spec:
endpointParams:
additionalProperties:
type: string
- description: Parameters to append to the token URL
+ description: '`endpointParams` configures the HTTP parameters to append to the token URL.'
type: object
scopes:
- description: OAuth2 scopes used for the token request
+ description: '`scopes` defines the OAuth2 scopes used for the token request.'
items:
type: string
type: array
tokenUrl:
- description: The URL to fetch the token from
+ description: '`tokenURL` configures the URL to fetch the token from.'
minLength: 1
type: string
required:
diff --git a/manifests/setup/0prometheusCustomResourceDefinition.yaml b/manifests/setup/0prometheusCustomResourceDefinition.yaml
index 4d8ceac8..c3006f2d 100644
--- a/manifests/setup/0prometheusCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusCustomResourceDefinition.yaml
@@ -635,7 +635,7 @@ spec:
description: "BasicAuth configuration for Alertmanager. \n Cannot be set at the same time as `bearerTokenFile`, `authorization` or `sigv4`."
properties:
password:
- description: The secret in the service monitor namespace that contains the password for authentication.
+ description: '`password` specifies a key of a Secret containing the password for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -651,7 +651,7 @@ spec:
type: object
x-kubernetes-map-type: atomic
username:
- description: The secret in the service monitor namespace that contains the username for authentication.
+ description: '`username` specifies a key of a Secret containing the username for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -892,7 +892,7 @@ spec:
description: "BasicAuth configuration for the API server. \n Cannot be set at the same time as `authorization`, `bearerToken`, or `bearerTokenFile`."
properties:
password:
- description: The secret in the service monitor namespace that contains the password for authentication.
+ description: '`password` specifies a key of a Secret containing the password for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -908,7 +908,7 @@ spec:
type: object
x-kubernetes-map-type: atomic
username:
- description: The secret in the service monitor namespace that contains the username for authentication.
+ description: '`username` specifies a key of a Secret containing the username for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -3143,7 +3143,7 @@ spec:
description: "BasicAuth configuration for the URL. \n Cannot be set at the same time as `authorization`, or `oauth2`."
properties:
password:
- description: The secret in the service monitor namespace that contains the password for authentication.
+ description: '`password` specifies a key of a Secret containing the password for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -3159,7 +3159,7 @@ spec:
type: object
x-kubernetes-map-type: atomic
username:
- description: The secret in the service monitor namespace that contains the username for authentication.
+ description: '`username` specifies a key of a Secret containing the username for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -3199,7 +3199,7 @@ spec:
description: "OAuth2 configuration for the URL. \n It requires Prometheus >= v2.27.0. \n Cannot be set at the same time as `authorization`, or `basicAuth`."
properties:
clientId:
- description: The secret or configmap containing the OAuth2 client id
+ description: '`clientId` specifies a key of a Secret or ConfigMap containing the OAuth2 client''s ID.'
properties:
configMap:
description: ConfigMap containing data to use for the targets.
@@ -3235,7 +3235,7 @@ spec:
x-kubernetes-map-type: atomic
type: object
clientSecret:
- description: The secret containing the OAuth2 client secret
+ description: '`clientSecret` specifies a key of a Secret containing the OAuth2 client''s secret.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -3253,15 +3253,15 @@ spec:
endpointParams:
additionalProperties:
type: string
- description: Parameters to append to the token URL
+ description: '`endpointParams` configures the HTTP parameters to append to the token URL.'
type: object
scopes:
- description: OAuth2 scopes used for the token request
+ description: '`scopes` defines the OAuth2 scopes used for the token request.'
items:
type: string
type: array
tokenUrl:
- description: The URL to fetch the token from
+ description: '`tokenURL` configures the URL to fetch the token from.'
minLength: 1
type: string
required:
@@ -3440,7 +3440,7 @@ spec:
- AzurePublic
type: string
managedIdentity:
- description: ManagedIdentity defines the Azure User-assigned Managed identity.
+ description: ManagedIdentity defines the Azure User-assigned Managed identity. Cannot be set at the same time as `oauth`.
properties:
clientId:
description: The client id
@@ -3448,14 +3448,45 @@ spec:
required:
- clientId
type: object
- required:
- - managedIdentity
+ oauth:
+ description: "OAuth defines the oauth config that is being used to authenticate. Cannot be set at the same time as `managedIdentity`. \n It requires Prometheus >= v2.48.0."
+ properties:
+ clientId:
+ description: '`clientID` is the clientId of the Azure Active Directory application that is being used to authenticate.'
+ minLength: 1
+ type: string
+ clientSecret:
+ description: '`clientSecret` specifies a key of a Secret containing the client secret of the Azure Active Directory application that is being used 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
+ tenantId:
+ description: '`tenantID` is the tenant ID of the Azure Active Directory application that is being used to authenticate.'
+ minLength: 1
+ pattern: ^[0-9a-zA-Z-.]+$
+ type: string
+ required:
+ - clientId
+ - clientSecret
+ - tenantId
+ type: object
type: object
basicAuth:
description: "BasicAuth configuration for the URL. \n Cannot be set at the same time as `sigv4`, `authorization`, `oauth2`, or `azureAd`."
properties:
password:
- description: The secret in the service monitor namespace that contains the password for authentication.
+ description: '`password` specifies a key of a Secret containing the password for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -3471,7 +3502,7 @@ spec:
type: object
x-kubernetes-map-type: atomic
username:
- description: The secret in the service monitor namespace that contains the username for authentication.
+ description: '`username` specifies a key of a Secret containing the username for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -3516,7 +3547,7 @@ spec:
description: "OAuth2 configuration for the URL. \n It requires Prometheus >= v2.27.0. \n Cannot be set at the same time as `sigv4`, `authorization`, `basicAuth`, or `azureAd`."
properties:
clientId:
- description: The secret or configmap containing the OAuth2 client id
+ description: '`clientId` specifies a key of a Secret or ConfigMap containing the OAuth2 client''s ID.'
properties:
configMap:
description: ConfigMap containing data to use for the targets.
@@ -3552,7 +3583,7 @@ spec:
x-kubernetes-map-type: atomic
type: object
clientSecret:
- description: The secret containing the OAuth2 client secret
+ description: '`clientSecret` specifies a key of a Secret containing the OAuth2 client''s secret.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -3570,15 +3601,15 @@ spec:
endpointParams:
additionalProperties:
type: string
- description: Parameters to append to the token URL
+ description: '`endpointParams` configures the HTTP parameters to append to the token URL.'
type: object
scopes:
- description: OAuth2 scopes used for the token request
+ description: '`scopes` defines the OAuth2 scopes used for the token request.'
items:
type: string
type: array
tokenUrl:
- description: The URL to fetch the token from
+ description: '`tokenURL` configures the URL to fetch the token from.'
minLength: 1
type: string
required:
diff --git a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
index 8d328cbf..4602f4ba 100644
--- a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
@@ -598,7 +598,7 @@ spec:
description: "BasicAuth configuration for the API server. \n Cannot be set at the same time as `authorization`, `bearerToken`, or `bearerTokenFile`."
properties:
password:
- description: The secret in the service monitor namespace that contains the password for authentication.
+ description: '`password` specifies a key of a Secret containing the password for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -614,7 +614,7 @@ spec:
type: object
x-kubernetes-map-type: atomic
username:
- description: The secret in the service monitor namespace that contains the username for authentication.
+ description: '`username` specifies a key of a Secret containing the username for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -2795,7 +2795,7 @@ spec:
- AzurePublic
type: string
managedIdentity:
- description: ManagedIdentity defines the Azure User-assigned Managed identity.
+ description: ManagedIdentity defines the Azure User-assigned Managed identity. Cannot be set at the same time as `oauth`.
properties:
clientId:
description: The client id
@@ -2803,14 +2803,45 @@ spec:
required:
- clientId
type: object
- required:
- - managedIdentity
+ oauth:
+ description: "OAuth defines the oauth config that is being used to authenticate. Cannot be set at the same time as `managedIdentity`. \n It requires Prometheus >= v2.48.0."
+ properties:
+ clientId:
+ description: '`clientID` is the clientId of the Azure Active Directory application that is being used to authenticate.'
+ minLength: 1
+ type: string
+ clientSecret:
+ description: '`clientSecret` specifies a key of a Secret containing the client secret of the Azure Active Directory application that is being used 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
+ tenantId:
+ description: '`tenantID` is the tenant ID of the Azure Active Directory application that is being used to authenticate.'
+ minLength: 1
+ pattern: ^[0-9a-zA-Z-.]+$
+ type: string
+ required:
+ - clientId
+ - clientSecret
+ - tenantId
+ type: object
type: object
basicAuth:
description: "BasicAuth configuration for the URL. \n Cannot be set at the same time as `sigv4`, `authorization`, `oauth2`, or `azureAd`."
properties:
password:
- description: The secret in the service monitor namespace that contains the password for authentication.
+ description: '`password` specifies a key of a Secret containing the password for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -2826,7 +2857,7 @@ spec:
type: object
x-kubernetes-map-type: atomic
username:
- description: The secret in the service monitor namespace that contains the username for authentication.
+ description: '`username` specifies a key of a Secret containing the username for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -2871,7 +2902,7 @@ spec:
description: "OAuth2 configuration for the URL. \n It requires Prometheus >= v2.27.0. \n Cannot be set at the same time as `sigv4`, `authorization`, `basicAuth`, or `azureAd`."
properties:
clientId:
- description: The secret or configmap containing the OAuth2 client id
+ description: '`clientId` specifies a key of a Secret or ConfigMap containing the OAuth2 client''s ID.'
properties:
configMap:
description: ConfigMap containing data to use for the targets.
@@ -2907,7 +2938,7 @@ spec:
x-kubernetes-map-type: atomic
type: object
clientSecret:
- description: The secret containing the OAuth2 client secret
+ description: '`clientSecret` specifies a key of a Secret containing the OAuth2 client''s secret.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -2925,15 +2956,15 @@ spec:
endpointParams:
additionalProperties:
type: string
- description: Parameters to append to the token URL
+ description: '`endpointParams` configures the HTTP parameters to append to the token URL.'
type: object
scopes:
- description: OAuth2 scopes used for the token request
+ description: '`scopes` defines the OAuth2 scopes used for the token request.'
items:
type: string
type: array
tokenUrl:
- description: The URL to fetch the token from
+ description: '`tokenURL` configures the URL to fetch the token from.'
minLength: 1
type: string
required:
diff --git a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml
index 118f11e5..18c4ae98 100644
--- a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml
+++ b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml
@@ -57,11 +57,65 @@ spec:
description: "Defines the authentication type. The value is case-insensitive. \n \"Basic\" is not a supported value. \n Default: \"Bearer\""
type: string
type: object
+ azureSDConfigs:
+ description: AzureSDConfigs defines a list of Azure service discovery configurations.
+ items:
+ description: AzureSDConfig allow retrieving scrape targets from Azure VMs. See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#azure_sd_config
+ properties:
+ authenticationMethod:
+ description: '# The authentication method, either OAuth or ManagedIdentity. See https://docs.microsoft.com/en-us/azure/active-directory/managed-identities-azure-resources/overview'
+ enum:
+ - OAuth
+ - ManagedIdentity
+ type: string
+ clientID:
+ description: Optional client ID. Only required with the OAuth authentication method.
+ type: string
+ clientSecret:
+ description: Optional client secret. Only required with the OAuth authentication method.
+ 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
+ environment:
+ description: The Azure environment.
+ type: string
+ 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
+ refreshInterval:
+ description: RefreshInterval configures the refresh interval at which Prometheus will 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
+ resourceGroup:
+ description: Optional resource group name. Limits discovery to this resource group.
+ type: string
+ subscriptionID:
+ description: The subscription ID. Always required.
+ minLength: 1
+ type: string
+ tenantID:
+ description: Optional tenant ID. Only required with the OAuth authentication method.
+ type: string
+ required:
+ - subscriptionID
+ type: object
+ type: array
basicAuth:
description: BasicAuth information to use on every scrape request.
properties:
password:
- description: The secret in the service monitor namespace that contains the password for authentication.
+ description: '`password` specifies a key of a Secret containing the password for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -77,7 +131,7 @@ spec:
type: object
x-kubernetes-map-type: atomic
username:
- description: The secret in the service monitor namespace that contains the username for authentication.
+ description: '`username` specifies a key of a Secret containing the username for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -98,7 +152,7 @@ spec:
items:
description: ConsulSDConfig defines a Consul service discovery configuration See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#consul_sd_config
properties:
- allow_stale:
+ allowStale:
description: Allow stale Consul results (see https://www.consul.io/api/features/consistency.html). Will reduce load on Consul. If unset, Prometheus uses its default value.
type: boolean
authorization:
@@ -128,7 +182,7 @@ spec:
description: 'BasicAuth information to authenticate against the Consul Server. More info: https://prometheus.io/docs/operating/configuration/#endpoints'
properties:
password:
- description: The secret in the service monitor namespace that contains the password for authentication.
+ description: '`password` specifies a key of a Secret containing the password for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -144,7 +198,7 @@ spec:
type: object
x-kubernetes-map-type: atomic
username:
- description: The secret in the service monitor namespace that contains the username for authentication.
+ description: '`username` specifies a key of a Secret containing the username for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -163,19 +217,19 @@ spec:
datacenter:
description: Consul Datacenter name, if not provided it will use the local Consul Agent Datacenter.
type: string
- enable_http2:
+ enableHTTP2:
description: Whether to enable HTTP2. If unset, Prometheus uses its default value.
type: boolean
- follow_redirects:
+ followRedirects:
description: Configure whether HTTP requests follow HTTP 3xx redirects. If unset, Prometheus uses its default value.
type: boolean
namespace:
description: Namespaces are only supported in Consul Enterprise.
type: string
- no_proxy:
+ noProxy:
description: 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.
type: string
- node_meta:
+ nodeMeta:
additionalProperties:
type: string
description: Node metadata key/value pairs to filter nodes for a given service.
@@ -185,7 +239,7 @@ spec:
description: Optional OAuth 2.0 configuration.
properties:
clientId:
- description: The secret or configmap containing the OAuth2 client id
+ description: '`clientId` specifies a key of a Secret or ConfigMap containing the OAuth2 client''s ID.'
properties:
configMap:
description: ConfigMap containing data to use for the targets.
@@ -221,7 +275,7 @@ spec:
x-kubernetes-map-type: atomic
type: object
clientSecret:
- description: The secret containing the OAuth2 client secret
+ description: '`clientSecret` specifies a key of a Secret containing the OAuth2 client''s secret.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -239,15 +293,15 @@ spec:
endpointParams:
additionalProperties:
type: string
- description: Parameters to append to the token URL
+ description: '`endpointParams` configures the HTTP parameters to append to the token URL.'
type: object
scopes:
- description: OAuth2 scopes used for the token request
+ description: '`scopes` defines the OAuth2 scopes used for the token request.'
items:
type: string
type: array
tokenUrl:
- description: The URL to fetch the token from
+ description: '`tokenURL` configures the URL to fetch the token from.'
minLength: 1
type: string
required:
@@ -258,7 +312,7 @@ spec:
partition:
description: Admin Partitions are only supported in Consul Enterprise.
type: string
- proxy_connect_header:
+ proxyConnectHeader:
additionalProperties:
description: SecretKeySelector selects a key of a Secret.
properties:
@@ -278,13 +332,13 @@ spec:
description: Specifies headers to send to proxies during CONNECT requests.
type: object
x-kubernetes-map-type: atomic
- proxy_from_environment:
+ proxyFromEnvironment:
description: Use proxy URL indicated by environment variables (HTTP_PROXY, https_proxy, HTTPs_PROXY, https_proxy, and no_proxy) If unset, Prometheus uses its default value.
type: boolean
- proxy_url:
+ proxyUrl:
description: Optional proxy URL.
type: string
- refresh_interval:
+ refreshInterval:
description: The time after which the provided names are refreshed. On large setup it might be a good idea to increase this value because the catalog will change all the time. If unset, Prometheus uses its default value.
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
@@ -304,7 +358,7 @@ spec:
type: string
type: array
x-kubernetes-list-type: atomic
- tag_separator:
+ tagSeparator:
description: The string by which Consul tags are joined into the tag label. If unset, Prometheus uses its default value.
type: string
tags:
@@ -550,6 +604,37 @@ spec:
- files
type: object
type: array
+ gceSDConfigs:
+ description: GCESDConfigs defines a list of GCE service discovery configurations.
+ items:
+ description: "GCESDConfig configures scrape targets from GCP GCE instances. The private IP address is used by default, but may be changed to the public IP address with relabeling. See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#gce_sd_config \n The GCE service discovery will load the Google Cloud credentials from the file specified by the GOOGLE_APPLICATION_CREDENTIALS environment variable. See https://cloud.google.com/kubernetes-engine/docs/tutorials/authenticating-to-cloud-platform \n A pre-requisite for using GCESDConfig is that a Secret containing valid Google Cloud credentials is mounted into the Prometheus or PrometheusAgent pod via the `.spec.secrets` field and that the GOOGLE_APPLICATION_CREDENTIALS environment variable is set to /etc/prometheus/secrets/<secret-name>/<credentials-filename.json>."
+ properties:
+ filter:
+ description: 'Filter can be used optionally to filter the instance list by other criteria Syntax of this filter is described in the filter query parameter section: https://cloud.google.com/compute/docs/reference/latest/instances/list'
+ type: string
+ 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
+ project:
+ description: The Google Cloud Project ID
+ minLength: 1
+ type: string
+ refreshInterval:
+ description: RefreshInterval configures the refresh interval at which Prometheus will 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
+ tagSeparator:
+ description: The tag separator is used to separate the tags on concatenation
+ type: string
+ zone:
+ description: The zone of the scrape targets. If you need multiple zones use multiple GCESDConfigs.
+ minLength: 1
+ type: string
+ required:
+ - project
+ - zone
+ type: object
+ type: array
honorLabels:
description: HonorLabels chooses the metric's labels on collisions with target labels.
type: boolean
@@ -588,7 +673,7 @@ spec:
description: 'BasicAuth information to authenticate against the target HTTP endpoint. More info: https://prometheus.io/docs/operating/configuration/#endpoints'
properties:
password:
- description: The secret in the service monitor namespace that contains the password for authentication.
+ description: '`password` specifies a key of a Secret containing the password for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -604,7 +689,7 @@ spec:
type: object
x-kubernetes-map-type: atomic
username:
- description: The secret in the service monitor namespace that contains the username for authentication.
+ description: '`username` specifies a key of a Secret containing the username for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -745,6 +830,16 @@ spec:
enum:
- Node
- node
+ - Service
+ - service
+ - Pod
+ - pod
+ - Endpoints
+ - endpoints
+ - EndpointSlice
+ - endpointslice
+ - Ingress
+ - ingress
type: string
selectors:
description: Selector to select objects.
@@ -756,10 +851,20 @@ spec:
label:
type: string
role:
- description: K8SRole is role of the service in Kubernetes. Currently the only supported role is "Node".
+ description: Role is role of the service in Kubernetes.
enum:
- Node
- node
+ - Service
+ - service
+ - Pod
+ - pod
+ - Endpoints
+ - endpoints
+ - EndpointSlice
+ - endpointslice
+ - Ingress
+ - ingress
type: string
required:
- role
diff --git a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
index 9865220c..4749d2e9 100644
--- a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
@@ -35,19 +35,19 @@ spec:
description: Specification of desired Service selection for target discovery by Prometheus.
properties:
attachMetadata:
- description: Attaches node metadata to discovered targets. Requires Prometheus v2.37.0 and above.
+ description: "`attachMetadata` defines additional metadata which is added to the discovered targets. \n It requires Prometheus >= v2.37.0."
properties:
node:
- description: When set to true, Prometheus must have permissions to get Nodes.
+ description: When set to true, Prometheus must have the `get` permission on the `Nodes` objects.
type: boolean
type: object
endpoints:
- description: A list of endpoints allowed as part of this ServiceMonitor.
+ description: List of endpoints part of this ServiceMonitor.
items:
- description: Endpoint defines a scrapeable endpoint serving Prometheus metrics.
+ description: Endpoint defines an endpoint serving Prometheus metrics to be scraped by Prometheus.
properties:
authorization:
- description: Authorization section for this endpoint
+ description: "`authorization` configures the Authorization header credentials to use when scraping the target. \n Cannot be set at the same time as `basicAuth`, or `oauth2`."
properties:
credentials:
description: Selects a key of a Secret in the namespace that contains the credentials for authentication.
@@ -70,10 +70,10 @@ spec:
type: string
type: object
basicAuth:
- description: 'BasicAuth allow an endpoint to authenticate over basic authentication More info: https://prometheus.io/docs/operating/configuration/#endpoints'
+ description: "`basicAuth` configures the Basic Authentication credentials to use when scraping the target. \n Cannot be set at the same time as `authorization`, or `oauth2`."
properties:
password:
- description: The secret in the service monitor namespace that contains the password for authentication.
+ description: '`password` specifies a key of a Secret containing the password for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -89,7 +89,7 @@ spec:
type: object
x-kubernetes-map-type: atomic
username:
- description: The secret in the service monitor namespace that contains the username for authentication.
+ description: '`username` specifies a key of a Secret containing the username for authentication.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -106,10 +106,10 @@ spec:
x-kubernetes-map-type: atomic
type: object
bearerTokenFile:
- description: File to read bearer token for scraping targets.
+ description: "File to read bearer token for scraping the target. \n Deprecated: use `authorization` instead."
type: string
bearerTokenSecret:
- description: Secret to mount to read bearer token for scraping targets. The secret needs to be in the same namespace as the service monitor and accessible by the Prometheus Operator.
+ description: "`bearerTokenSecret` specifies a key of a Secret containing the bearer token for scraping targets. The secret needs to be in the same namespace as the ServiceMonitor object and readable by the Prometheus Operator. \n Deprecated: use `authorization` instead."
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -125,26 +125,26 @@ spec:
type: object
x-kubernetes-map-type: atomic
enableHttp2:
- description: Whether to enable HTTP2.
+ description: '`enableHttp2` can be used to disable HTTP2 when scraping the target.'
type: boolean
filterRunning:
- description: 'Drop pods that are not running. (Failed, Succeeded). Enabled by default. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#pod-phase'
+ description: "When true, the pods which are not running (e.g. either in Failed or Succeeded state) are dropped during the target discovery. \n If unset, the filtering is enabled. \n More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#pod-phase"
type: boolean
followRedirects:
- description: FollowRedirects configures whether scrape requests follow HTTP 3xx redirects.
+ description: '`followRedirects` defines whether the scrape requests should follow HTTP 3xx redirects.'
type: boolean
honorLabels:
- description: HonorLabels chooses the metric's labels on collisions with target labels.
+ description: When true, `honorLabels` preserves the metric's labels when they collide with the target's labels.
type: boolean
honorTimestamps:
- description: HonorTimestamps controls whether Prometheus respects the timestamps present in scraped data.
+ description: '`honorTimestamps` controls whether Prometheus preserves the timestamps when exposed by the target.'
type: boolean
interval:
- description: Interval at which metrics should be scraped If not specified Prometheus' global scrape interval is used.
+ description: "Interval at which Prometheus scrapes the metrics from the target. \n If empty, Prometheus uses the global scrape interval."
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
metricRelabelings:
- description: MetricRelabelConfigs to apply to samples before ingestion.
+ description: '`metricRelabelings` configures the relabeling rules to apply to the samples before ingestion.'
items:
description: "RelabelConfig allows dynamic rewriting of the label set for targets, alerts, scraped samples and remote write samples. \n More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config"
properties:
@@ -201,10 +201,10 @@ spec:
type: object
type: array
oauth2:
- description: OAuth2 for the URL. Only valid in Prometheus versions 2.27.0 and newer.
+ description: "`oauth2` configures the OAuth2 settings to use when scraping the target. \n It requires Prometheus >= 2.27.0. \n Cannot be set at the same time as `authorization`, or `basicAuth`."
properties:
clientId:
- description: The secret or configmap containing the OAuth2 client id
+ description: '`clientId` specifies a key of a Secret or ConfigMap containing the OAuth2 client''s ID.'
properties:
configMap:
description: ConfigMap containing data to use for the targets.
@@ -240,7 +240,7 @@ spec:
x-kubernetes-map-type: atomic
type: object
clientSecret:
- description: The secret containing the OAuth2 client secret
+ description: '`clientSecret` specifies a key of a Secret containing the OAuth2 client''s secret.'
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
@@ -258,15 +258,15 @@ spec:
endpointParams:
additionalProperties:
type: string
- description: Parameters to append to the token URL
+ description: '`endpointParams` configures the HTTP parameters to append to the token URL.'
type: object
scopes:
- description: OAuth2 scopes used for the token request
+ description: '`scopes` defines the OAuth2 scopes used for the token request.'
items:
type: string
type: array
tokenUrl:
- description: The URL to fetch the token from
+ description: '`tokenURL` configures the URL to fetch the token from.'
minLength: 1
type: string
required:
@@ -279,19 +279,19 @@ spec:
items:
type: string
type: array
- description: Optional HTTP URL parameters
+ description: params define optional HTTP URL parameters.
type: object
path:
- description: HTTP path to scrape for metrics. If empty, Prometheus uses the default value (e.g. `/metrics`).
+ description: "HTTP path from which to scrape for metrics. \n If empty, Prometheus uses the default value (e.g. `/metrics`)."
type: string
port:
- description: Name of the service port this endpoint refers to. Mutually exclusive with targetPort.
+ description: "Name of the Service port which this endpoint refers to. \n It takes precedence over `targetPort`."
type: string
proxyUrl:
- description: ProxyURL eg http://proxyserver:2195 Directs scrapes to proxy through this endpoint.
+ description: '`proxyURL` configures the HTTP Proxy URL (e.g. "http://proxyserver:2195") to go through when scraping the target.'
type: string
relabelings:
- description: 'RelabelConfigs to apply to samples before scraping. Prometheus Operator automatically adds relabelings for a few standard Kubernetes fields. The original scrape job''s name is available via the `__tmp_prometheus_job_name` label. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config'
+ description: "`relabelings` configures the relabeling rules to apply the target's metadata labels. \n The Operator automatically adds relabelings for a few standard Kubernetes fields. \n The original scrape job's name is available via the `__tmp_prometheus_job_name` label. \n More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config"
items:
description: "RelabelConfig allows dynamic rewriting of the label set for targets, alerts, scraped samples and remote write samples. \n More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config"
properties:
@@ -348,23 +348,23 @@ spec:
type: object
type: array
scheme:
- description: HTTP scheme to use for scraping. `http` and `https` are the expected values unless you rewrite the `__scheme__` label via relabeling. If empty, Prometheus uses the default value `http`.
+ description: "HTTP scheme to use for scraping. \n `http` and `https` are the expected values unless you rewrite the `__scheme__` label via relabeling. \n If empty, Prometheus uses the default value `http`."
enum:
- http
- https
type: string
scrapeTimeout:
- description: Timeout after which the scrape is ended If not specified, the Prometheus global scrape timeout is used unless it is less than `Interval` in which the latter is used.
+ description: "Timeout after which Prometheus considers the scrape to be failed. \n If empty, Prometheus uses the global scrape timeout unless it is less than the target's scrape interval value in which the latter is used."
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
targetPort:
anyOf:
- type: integer
- type: string
- description: Name or number of the target port of the Pod behind the Service, the port must be specified with container port property. Mutually exclusive with port.
+ description: "Name or number of the target port of the `Pod` object behind the Service, the port must be specified with container port property. \n Deprecated: use `port` instead."
x-kubernetes-int-or-string: true
tlsConfig:
- description: TLS configuration to use when scraping the endpoint
+ description: TLS configuration to use when scraping the target.
properties:
ca:
description: Certificate authority used when verifying server certificates.
@@ -473,26 +473,26 @@ spec:
type: object
type: array
jobLabel:
- description: "JobLabel selects the label from the associated Kubernetes service which will be used as the `job` label for all metrics. \n For example: If in `ServiceMonitor.spec.jobLabel: foo` and in `Service.metadata.labels.foo: bar`, then the `job=\"bar\"` label is added to all metrics. \n If the value of this field is empty or if the label doesn't exist for the given Service, the `job` label of the metrics defaults to the name of the Kubernetes Service."
+ description: "`jobLabel` selects the label from the associated Kubernetes `Service` object which will be used as the `job` label for all metrics. \n For example if `jobLabel` is set to `foo` and the Kubernetes `Service` object is labeled with `foo: bar`, then Prometheus adds the `job=\"bar\"` label to all ingested metrics. \n If the value of this field is empty or if the label doesn't exist for the given Service, the `job` label of the metrics defaults to the name of the associated Kubernetes `Service`."
type: string
keepDroppedTargets:
description: "Per-scrape limit on the number of targets dropped by relabeling that will be kept in memory. 0 means no limit. \n It requires Prometheus >= v2.47.0."
format: int64
type: integer
labelLimit:
- description: Per-scrape limit on number of labels that will be accepted for a sample. Only valid in Prometheus versions 2.27.0 and newer.
+ description: "Per-scrape limit on number of labels that will be accepted for a sample. \n It requires Prometheus >= v2.27.0."
format: int64
type: integer
labelNameLengthLimit:
- description: Per-scrape limit on length of labels name that will be accepted for a sample. Only valid in Prometheus versions 2.27.0 and newer.
+ description: "Per-scrape limit on length of labels name that will be accepted for a sample. \n It requires Prometheus >= v2.27.0."
format: int64
type: integer
labelValueLengthLimit:
- 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.
+ description: "Per-scrape limit on length of labels value that will be accepted for a sample. \n It requires Prometheus >= v2.27.0."
format: int64
type: integer
namespaceSelector:
- description: Selector to select which namespaces the Kubernetes Endpoints objects are discovered from.
+ description: Selector to select which namespaces the Kubernetes `Endpoints` objects are discovered from.
properties:
any:
description: Boolean describing whether all namespaces are selected in contrast to a list restricting them.
@@ -504,16 +504,16 @@ spec:
type: array
type: object
podTargetLabels:
- description: PodTargetLabels transfers labels on the Kubernetes `Pod` onto the created metrics.
+ description: '`podTargetLabels` defines the labels which are transferred from the associated Kubernetes `Pod` object onto the ingested metrics.'
items:
type: string
type: array
sampleLimit:
- description: SampleLimit defines per-scrape limit on number of scraped samples that will be accepted.
+ description: '`sampleLimit` defines a per-scrape limit on the number of scraped samples that will be accepted.'
format: int64
type: integer
selector:
- description: Selector to select Endpoints objects.
+ description: Label selector to select the Kubernetes `Endpoints` objects.
properties:
matchExpressions:
description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
@@ -544,16 +544,15 @@ spec:
type: object
x-kubernetes-map-type: atomic
targetLabels:
- description: TargetLabels transfers labels from the Kubernetes `Service` onto the created metrics.
+ description: '`targetLabels` defines the labels which are transferred from the associated Kubernetes `Service` object onto the ingested metrics.'
items:
type: string
type: array
targetLimit:
- description: TargetLimit defines a limit on the number of scraped targets that will be accepted.
+ description: '`targetLimit` defines a limit on the number of scraped targets that will be accepted.'
format: int64
type: integer
required:
- - endpoints
- selector
type: object
required:
--
GitLab