diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json
index caec6ab9458b722b25bd12dad09cd4f73ea7d036..2ac628e660e9b55ed529c7152d80ff76800c5675 100644
--- a/jsonnet/kube-prometheus/versions.json
+++ b/jsonnet/kube-prometheus/versions.json
@@ -1,13 +1,13 @@
{
"alertmanager": "0.28.1",
"blackboxExporter": "0.26.0",
- "grafana": "11.6.0",
+ "grafana": "11.6.1",
"kubeStateMetrics": "2.15.0",
"nodeExporter": "1.9.1",
- "prometheus": "3.2.1",
+ "prometheus": "3.3.0",
"prometheusAdapter": "0.12.0",
- "prometheusOperator": "0.81.0",
- "kubeRbacProxy": "0.19.0",
+ "prometheusOperator": "0.82.0",
+ "kubeRbacProxy": "0.19.1",
"configmapReload": "0.15.0",
"pyrra": "0.6.4"
}
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 9516b1acccc497b9117f4e8b031c2f1ccc0215b3..41e423f393318e9c306d608d169bf50e1db73316 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
- "version": "d3cebaec933fe681fafeeb97ffc751340aea4d50",
+ "version": "21a976e9e254f3938f2ced3eb96310449ccf8bef",
"sum": "XmXkOCriQIZmXwlIIFhqlJMa0e6qGWdxZD+ZDYaN0Po="
},
{
@@ -78,7 +78,7 @@
"subdir": "grafana-builder"
}
},
- "version": "e08354040a18d3299f3c76b335d75b0a62a8d870",
+ "version": "42da78cf7f2735c0cf57dee8f80cc52e9e7e57d8",
"sum": "G7B6E5sqWirDbMWRhifbLRfGgRFbIh9WCYa6X3kMh6g="
},
{
@@ -88,7 +88,7 @@
"subdir": "mixin-utils"
}
},
- "version": "e08354040a18d3299f3c76b335d75b0a62a8d870",
+ "version": "42da78cf7f2735c0cf57dee8f80cc52e9e7e57d8",
"sum": "SRElwa/XrKAN8aZA9zvdRUx8iebl2It7KNQ7VFvMcBA="
},
{
@@ -118,8 +118,8 @@
"subdir": ""
}
},
- "version": "01058fafd8701fc04a7960800252f5f2dd1a399a",
- "sum": "DrDTMU5jWvydD46DKZ7gqFsL+mGHUsmpBZS/J6qJLC8="
+ "version": "aad557d746a4e05d028a2ce542f61dde3b13c621",
+ "sum": "H+gpR450rmG2/USp9Y4vMfiz9FCUhKiG7xgqPNB1FJk="
},
{
"source": {
@@ -128,7 +128,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
- "version": "209f3ab5fa5ad33ef5835856cb824e4875ff390a",
+ "version": "0b01e3abce1da521b5e620b8aaa76774bb0fda87",
"sum": "3bioG7CfTfY9zeu5xU4yon6Zt3kYvNkyl492nOhQxnM="
},
{
@@ -138,7 +138,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
- "version": "209f3ab5fa5ad33ef5835856cb824e4875ff390a",
+ "version": "0b01e3abce1da521b5e620b8aaa76774bb0fda87",
"sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
},
{
@@ -148,7 +148,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "4396b185f3423510daa9ad5e6c4d163a76c019a0",
+ "version": "b8e2df1c092b464deee69b178451a7f068a9ffdb",
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
"name": "prometheus-operator-mixin"
},
@@ -159,8 +159,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "4396b185f3423510daa9ad5e6c4d163a76c019a0",
- "sum": "BJcO0Xz++8ohLMZxzrhYtD895ELdZIzMARYnszygaNI="
+ "version": "b8e2df1c092b464deee69b178451a7f068a9ffdb",
+ "sum": "p12q3AVid+40sY+D7uGYWG3gay03I3I4QkEVZH5jCXI="
},
{
"source": {
@@ -169,7 +169,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
- "version": "c88eb78142c80a8046204650d02ffc7a71cdceda",
+ "version": "e060127980825a83511f651d1eb48660fc74efd6",
"sum": "j5prvRrJdoCv7n45l5Uy2ghl1IDb9BBUqjwCDs4ZJoQ=",
"name": "alertmanager"
},
@@ -190,7 +190,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "bce72b93d91186785a675fcd45b5bca2669d30de",
+ "version": "5f9f01de1451561a4f63a9a6171d3f591e4f9e61",
"sum": "2c+wttfee9TwuQJZIkNV7Tekem74Qgc7iZ842P28rNw=",
"name": "prometheus"
},
@@ -212,7 +212,7 @@
"subdir": "mixin"
}
},
- "version": "c0b5500cb5ef8842fd3dccaa66fcc5ff57c7a789",
+ "version": "2a5a856e34adb2653dda700c4d87637236afb2dd",
"sum": "ieCD4eMgGbOlrI8GmckGPHBGQDcLasE1rULYq56W/bs=",
"name": "thanos-mixin"
},
diff --git a/manifests/blackboxExporter-deployment.yaml b/manifests/blackboxExporter-deployment.yaml
index 34c33626c9e1f624bb1b9b8ae3b50964715fb5ee..ab8df3d3171df471d3d02dca27e8c6db8920983b 100644
--- a/manifests/blackboxExporter-deployment.yaml
+++ b/manifests/blackboxExporter-deployment.yaml
@@ -86,7 +86,7 @@ spec:
- --secure-listen-address=:9115
- --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
- --upstream=http://127.0.0.1:19115/
- image: quay.io/brancz/kube-rbac-proxy:v0.19.0
+ image: quay.io/brancz/kube-rbac-proxy:v0.19.1
name: kube-rbac-proxy
ports:
- containerPort: 9115
diff --git a/manifests/grafana-config.yaml b/manifests/grafana-config.yaml
index 4899dc3d398c7b1dc40e81aab74d53301177bc71..b6d8f2a31067657b5cdbb710efffce3cce1244b3 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: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana-config
namespace: monitoring
stringData:
diff --git a/manifests/grafana-dashboardDatasources.yaml b/manifests/grafana-dashboardDatasources.yaml
index 901d337dffeee1d07771e1d209ee3684b15b9618..8196fa8cc238b33fd7b7eb38df5de3593f7d015a 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: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana-datasources
namespace: monitoring
stringData:
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index e474b230013a567e58d87fb90d49ee10f3f91bd9..3ebc1dcbea4e98d3b73fdda75ef8204a63cf8eef 100644
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
@@ -360,7 +360,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana-dashboard-alertmanager-overview
namespace: monitoring
- apiVersion: v1
@@ -1242,7 +1242,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana-dashboard-apiserver
namespace: monitoring
- apiVersion: v1
@@ -2056,7 +2056,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana-dashboard-cluster-total
namespace: monitoring
- apiVersion: v1
@@ -2660,7 +2660,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana-dashboard-controller-manager
namespace: monitoring
- apiVersion: v1
@@ -3285,7 +3285,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana-dashboard-grafana-overview
namespace: monitoring
- apiVersion: v1
@@ -4872,7 +4872,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana-dashboard-k8s-resources-cluster
namespace: monitoring
- apiVersion: v1
@@ -5513,7 +5513,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana-dashboard-k8s-resources-multicluster
namespace: monitoring
- apiVersion: v1
@@ -7031,7 +7031,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana-dashboard-k8s-resources-namespace
namespace: monitoring
- apiVersion: v1
@@ -7712,7 +7712,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana-dashboard-k8s-resources-node
namespace: monitoring
- apiVersion: v1
@@ -9096,7 +9096,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana-dashboard-k8s-resources-pod
namespace: monitoring
- apiVersion: v1
@@ -9783,7 +9783,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana-dashboard-k8s-resources-windows-cluster
namespace: monitoring
- apiVersion: v1
@@ -10237,7 +10237,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana-dashboard-k8s-resources-windows-namespace
namespace: monitoring
- apiVersion: v1
@@ -10746,7 +10746,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana-dashboard-k8s-resources-windows-pod
namespace: monitoring
- apiVersion: v1
@@ -11812,7 +11812,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana-dashboard-k8s-resources-workload
namespace: monitoring
- apiVersion: v1
@@ -13075,7 +13075,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana-dashboard-k8s-resources-workloads-namespace
namespace: monitoring
- apiVersion: v1
@@ -13491,7 +13491,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana-dashboard-k8s-windows-cluster-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -14118,7 +14118,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana-dashboard-k8s-windows-node-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -15371,7 +15371,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana-dashboard-kubelet
namespace: monitoring
- apiVersion: v1
@@ -16011,7 +16011,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana-dashboard-namespace-by-pod
namespace: monitoring
- apiVersion: v1
@@ -16809,7 +16809,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana-dashboard-namespace-by-workload
namespace: monitoring
- apiVersion: v1
@@ -17402,7 +17402,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana-dashboard-node-cluster-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -18006,7 +18006,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana-dashboard-node-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -18729,7 +18729,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana-dashboard-nodes-aix
namespace: monitoring
- apiVersion: v1
@@ -19476,7 +19476,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana-dashboard-nodes-darwin
namespace: monitoring
- apiVersion: v1
@@ -20215,7 +20215,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana-dashboard-nodes
namespace: monitoring
- apiVersion: v1
@@ -20537,7 +20537,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana-dashboard-persistentvolumesusage
namespace: monitoring
- apiVersion: v1
@@ -21031,7 +21031,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana-dashboard-pod-total
namespace: monitoring
- apiVersion: v1
@@ -21832,7 +21832,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana-dashboard-prometheus-remote-write
namespace: monitoring
- apiVersion: v1
@@ -22671,7 +22671,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana-dashboard-prometheus
namespace: monitoring
- apiVersion: v1
@@ -23326,7 +23326,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana-dashboard-proxy
namespace: monitoring
- apiVersion: v1
@@ -23927,7 +23927,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana-dashboard-scheduler
namespace: monitoring
- apiVersion: v1
@@ -24513,7 +24513,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana-dashboard-workload-total
namespace: monitoring
kind: ConfigMapList
diff --git a/manifests/grafana-dashboardSources.yaml b/manifests/grafana-dashboardSources.yaml
index 8f30b32ed2b3b3071a55bad5bf8c72e250ca71a4..66327d43cd7fcab54c20d206ce4b14343c167629 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: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana-dashboards
namespace: monitoring
diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml
index 22a4ca7b76d26bdd0676433efb8c94f7e1d52675..b2a94028a47741687edf1d811ec804cb109d4fc6 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: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana
namespace: monitoring
spec:
@@ -18,19 +18,19 @@ spec:
template:
metadata:
annotations:
- checksum/grafana-config: db816b862a58387300e069a497a0f830
- checksum/grafana-dashboardproviders: d680b506539bac023577c0cdc347d05b
- checksum/grafana-datasources: 6d66b9ce1e9ce4b8c29a314bc63f0ca8
+ checksum/grafana-config: 71d581b5d5c371857df6dc1be90746a5
+ checksum/grafana-dashboardproviders: a6490465201224639c99622044148a79
+ checksum/grafana-datasources: 17cf986b1f34dd2e4ca98774e1a2d4e0
labels:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.6.0
+ app.kubernetes.io/version: 11.6.1
spec:
automountServiceAccountToken: false
containers:
- env: []
- image: grafana/grafana:11.6.0
+ image: grafana/grafana:11.6.1
name: grafana
ports:
- containerPort: 3000
diff --git a/manifests/grafana-networkPolicy.yaml b/manifests/grafana-networkPolicy.yaml
index 52add4b2ae6bff1b1076ff6cf04a9e356bc4ca03..38fc533b38ce3b79535de623c7c793ba3b1c8dd5 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: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/grafana-prometheusRule.yaml b/manifests/grafana-prometheusRule.yaml
index 652b640e163ec59b44cda27035edb80d3b8ec193..7319df3394fefe83ae21c2136cb1f4a21b48f0e7 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: 11.6.0
+ app.kubernetes.io/version: 11.6.1
prometheus: k8s
role: alert-rules
name: grafana-rules
diff --git a/manifests/grafana-service.yaml b/manifests/grafana-service.yaml
index e7f95ba487fdb3ea17668da941a3d79780d438e1..f357f3da9f51608768c19998ed3d9e265f6f8c51 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: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/grafana-serviceAccount.yaml b/manifests/grafana-serviceAccount.yaml
index 2fc5b989273528795d803d7a0f9642f4006f3dfd..a617325421e60df73647c6f485661ffb969fff88 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: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana
namespace: monitoring
diff --git a/manifests/grafana-serviceMonitor.yaml b/manifests/grafana-serviceMonitor.yaml
index b5af568a145cbe08b7d0d9661c4085fa43e60fe9..813d43a3c23667b935a344f0e937035e3d56e2c5 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: 11.6.0
+ app.kubernetes.io/version: 11.6.1
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/kubeStateMetrics-deployment.yaml b/manifests/kubeStateMetrics-deployment.yaml
index 641fa6efd90ea36186fd366962e5dc93e63efa77..6ebabe6df56d487600251b8eb032e97144330b63 100644
--- a/manifests/kubeStateMetrics-deployment.yaml
+++ b/manifests/kubeStateMetrics-deployment.yaml
@@ -56,7 +56,7 @@ spec:
- --secure-listen-address=:8443
- --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
- --upstream=http://127.0.0.1:8081/
- image: quay.io/brancz/kube-rbac-proxy:v0.19.0
+ image: quay.io/brancz/kube-rbac-proxy:v0.19.1
name: kube-rbac-proxy-main
ports:
- containerPort: 8443
@@ -83,7 +83,7 @@ spec:
- --secure-listen-address=:9443
- --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
- --upstream=http://127.0.0.1:8082/
- image: quay.io/brancz/kube-rbac-proxy:v0.19.0
+ image: quay.io/brancz/kube-rbac-proxy:v0.19.1
name: kube-rbac-proxy-self
ports:
- containerPort: 9443
diff --git a/manifests/nodeExporter-daemonset.yaml b/manifests/nodeExporter-daemonset.yaml
index 392a1d744b38f75d90c1d49e5c5d5f9305fe9b42..e4be35b12b5d1527e3530bb4bbc0a75a279c970a 100644
--- a/manifests/nodeExporter-daemonset.yaml
+++ b/manifests/nodeExporter-daemonset.yaml
@@ -72,7 +72,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: status.podIP
- image: quay.io/brancz/kube-rbac-proxy:v0.19.0
+ image: quay.io/brancz/kube-rbac-proxy:v0.19.1
name: kube-rbac-proxy
ports:
- containerPort: 9100
diff --git a/manifests/prometheus-clusterRole.yaml b/manifests/prometheus-clusterRole.yaml
index 15f4f897e112a0bf7c71a98900a17844392bfa1c..c36fef1f3c8336458b11c7df03325efb5c25f803 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: 3.2.1
+ app.kubernetes.io/version: 3.3.0
name: prometheus-k8s
rules:
- apiGroups:
diff --git a/manifests/prometheus-clusterRoleBinding.yaml b/manifests/prometheus-clusterRoleBinding.yaml
index ba61cbcd3280f35a9cb040831950fa2651f4c04c..0ce0c598e969f9cfcb6a3be4341b8f5e01b3a6c6 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: 3.2.1
+ app.kubernetes.io/version: 3.3.0
name: prometheus-k8s
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/prometheus-networkPolicy.yaml b/manifests/prometheus-networkPolicy.yaml
index fa5d86c7a89c867f57cceeed687c75937e86c309..33d36341bdb14cbbf16728bb1bcc6e436c98f0f9 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: 3.2.1
+ app.kubernetes.io/version: 3.3.0
name: prometheus-k8s
namespace: monitoring
spec:
diff --git a/manifests/prometheus-podDisruptionBudget.yaml b/manifests/prometheus-podDisruptionBudget.yaml
index 720797a0b1fd0113eaab046551fb536fa5325f9c..229791ca06122f0120a08811bfd6aabe259833f0 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: 3.2.1
+ app.kubernetes.io/version: 3.3.0
name: prometheus-k8s
namespace: monitoring
spec:
diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml
index 98111710e87a59a7982616cd4f0b9c947f2cbcd5..d4a2d30f20f587785f33f0e64cf2241acceb17a8 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: 3.2.1
+ app.kubernetes.io/version: 3.3.0
name: k8s
namespace: monitoring
spec:
@@ -18,7 +18,7 @@ spec:
port: web
enableFeatures: []
externalLabels: {}
- image: quay.io/prometheus/prometheus:v3.2.1
+ image: quay.io/prometheus/prometheus:v3.3.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: 3.2.1
+ app.kubernetes.io/version: 3.3.0
podMonitorNamespaceSelector: {}
podMonitorSelector: {}
probeNamespaceSelector: {}
@@ -47,4 +47,4 @@ spec:
serviceAccountName: prometheus-k8s
serviceMonitorNamespaceSelector: {}
serviceMonitorSelector: {}
- version: 3.2.1
+ version: 3.3.0
diff --git a/manifests/prometheus-prometheusRule.yaml b/manifests/prometheus-prometheusRule.yaml
index 02f92e316f7f8315996aa9a5a5c1ca1c1cea6575..a0931c5c1a43f4289dc316499ba922c97457f007 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: 3.2.1
+ app.kubernetes.io/version: 3.3.0
prometheus: k8s
role: alert-rules
name: prometheus-k8s-prometheus-rules
diff --git a/manifests/prometheus-roleBindingConfig.yaml b/manifests/prometheus-roleBindingConfig.yaml
index a5ab7afafafd74469afebb8ce2043f85e6893f7b..eb2564c1021b150c0f741a6f3f4e731df9e308f9 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: 3.2.1
+ app.kubernetes.io/version: 3.3.0
name: prometheus-k8s-config
namespace: monitoring
roleRef:
diff --git a/manifests/prometheus-roleBindingSpecificNamespaces.yaml b/manifests/prometheus-roleBindingSpecificNamespaces.yaml
index fc92b9fc9e4fa6e1154165a0bcce54dfdc382f67..3633f3f9336901547e2fc9b2c3a6c02413cc15e5 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: 3.2.1
+ app.kubernetes.io/version: 3.3.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: 3.2.1
+ app.kubernetes.io/version: 3.3.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: 3.2.1
+ app.kubernetes.io/version: 3.3.0
name: prometheus-k8s
namespace: monitoring
roleRef:
diff --git a/manifests/prometheus-roleConfig.yaml b/manifests/prometheus-roleConfig.yaml
index 61f25b30bb5593ecdaf18eb6669fa4a453e8c782..14804ea27f2d0ed5b77fbb07fe7aacff0aef0f41 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: 3.2.1
+ app.kubernetes.io/version: 3.3.0
name: prometheus-k8s-config
namespace: monitoring
rules:
diff --git a/manifests/prometheus-roleSpecificNamespaces.yaml b/manifests/prometheus-roleSpecificNamespaces.yaml
index b940b28944b77219c8fe5b99ab5a4115b55bc05e..48717925649ed92b09443990b4592daed4d28952 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: 3.2.1
+ app.kubernetes.io/version: 3.3.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: 3.2.1
+ app.kubernetes.io/version: 3.3.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: 3.2.1
+ app.kubernetes.io/version: 3.3.0
name: prometheus-k8s
namespace: monitoring
rules:
diff --git a/manifests/prometheus-service.yaml b/manifests/prometheus-service.yaml
index 3efceb4fa7e5cce8153ba74240e58e2fc3e43c65..4782dfc0f6838a81fcc55a6f3d0ce0b19c3097df 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: 3.2.1
+ app.kubernetes.io/version: 3.3.0
name: prometheus-k8s
namespace: monitoring
spec:
diff --git a/manifests/prometheus-serviceAccount.yaml b/manifests/prometheus-serviceAccount.yaml
index 1f68d8201d807d10f4b4846d403c1df5f4b9fe38..8ac546d3c7d15c317d5e433abd18994ee8ec0830 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: 3.2.1
+ app.kubernetes.io/version: 3.3.0
name: prometheus-k8s
namespace: monitoring
diff --git a/manifests/prometheus-serviceMonitor.yaml b/manifests/prometheus-serviceMonitor.yaml
index 3b11f2e717e4928388d8243b7bd8416d4c7eadf8..6dd19e5540c0153f1397b8c07db4071b3362422f 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: 3.2.1
+ app.kubernetes.io/version: 3.3.0
name: prometheus-k8s
namespace: monitoring
spec:
diff --git a/manifests/prometheusOperator-clusterRole.yaml b/manifests/prometheusOperator-clusterRole.yaml
index 9aa9a8ada849c084ac01379455bca65da0bbef0d..5708baccab6fb094b7260ffcdab657d64087b9fd 100644
--- a/manifests/prometheusOperator-clusterRole.yaml
+++ b/manifests/prometheusOperator-clusterRole.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.81.0
+ app.kubernetes.io/version: 0.82.0
name: prometheus-operator
rules:
- apiGroups:
diff --git a/manifests/prometheusOperator-clusterRoleBinding.yaml b/manifests/prometheusOperator-clusterRoleBinding.yaml
index e5fdde17c309de3898faad22003db72b5e009353..5f66c060bd29a37bdd0333701e8d371b5c40d74f 100644
--- a/manifests/prometheusOperator-clusterRoleBinding.yaml
+++ b/manifests/prometheusOperator-clusterRoleBinding.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.81.0
+ app.kubernetes.io/version: 0.82.0
name: prometheus-operator
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/prometheusOperator-deployment.yaml b/manifests/prometheusOperator-deployment.yaml
index 3adae943ccab07cfd03b02811f20de5b036c1c14..880b8d630d291a09a8b3cdbfa6bfbcedfc4dea55 100644
--- a/manifests/prometheusOperator-deployment.yaml
+++ b/manifests/prometheusOperator-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.81.0
+ app.kubernetes.io/version: 0.82.0
name: prometheus-operator
namespace: monitoring
spec:
@@ -23,19 +23,19 @@ spec:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.81.0
+ app.kubernetes.io/version: 0.82.0
spec:
automountServiceAccountToken: true
containers:
- args:
- --kubelet-service=kube-system/kubelet
- - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.81.0
+ - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.82.0
- --kubelet-endpoints=true
- --kubelet-endpointslice=false
env:
- name: GOGC
value: "30"
- image: quay.io/prometheus-operator/prometheus-operator:v0.81.0
+ image: quay.io/prometheus-operator/prometheus-operator:v0.82.0
name: prometheus-operator
ports:
- containerPort: 8080
@@ -57,7 +57,7 @@ spec:
- --secure-listen-address=:8443
- --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
- --upstream=http://127.0.0.1:8080/
- image: quay.io/brancz/kube-rbac-proxy:v0.19.0
+ image: quay.io/brancz/kube-rbac-proxy:v0.19.1
name: kube-rbac-proxy
ports:
- containerPort: 8443
diff --git a/manifests/prometheusOperator-networkPolicy.yaml b/manifests/prometheusOperator-networkPolicy.yaml
index ef4122543a147c97677e6c90c53e36d44d88747f..2285e4d6b4834d91a8cbb55e34fdb44dbae325cb 100644
--- a/manifests/prometheusOperator-networkPolicy.yaml
+++ b/manifests/prometheusOperator-networkPolicy.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.81.0
+ app.kubernetes.io/version: 0.82.0
name: prometheus-operator
namespace: monitoring
spec:
diff --git a/manifests/prometheusOperator-prometheusRule.yaml b/manifests/prometheusOperator-prometheusRule.yaml
index 78dca8666ce16235c00f0a4f8db8b9920dae1d8d..45ffb0e74ffc672ab71987805b36031e0aa90c8c 100644
--- a/manifests/prometheusOperator-prometheusRule.yaml
+++ b/manifests/prometheusOperator-prometheusRule.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.81.0
+ app.kubernetes.io/version: 0.82.0
prometheus: k8s
role: alert-rules
name: prometheus-operator-rules
diff --git a/manifests/prometheusOperator-service.yaml b/manifests/prometheusOperator-service.yaml
index c3f675fc5c0358f29150e896163c7ce3774d7209..259be554a6e69623c1404de7e7a2ff0bd84607f7 100644
--- a/manifests/prometheusOperator-service.yaml
+++ b/manifests/prometheusOperator-service.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.81.0
+ app.kubernetes.io/version: 0.82.0
name: prometheus-operator
namespace: monitoring
spec:
diff --git a/manifests/prometheusOperator-serviceAccount.yaml b/manifests/prometheusOperator-serviceAccount.yaml
index 427dedab65f56f3fc25ec482f03c7a393356b08e..39eb007eec6b9c35d0c95002678f521bade3e1cc 100644
--- a/manifests/prometheusOperator-serviceAccount.yaml
+++ b/manifests/prometheusOperator-serviceAccount.yaml
@@ -6,6 +6,6 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.81.0
+ app.kubernetes.io/version: 0.82.0
name: prometheus-operator
namespace: monitoring
diff --git a/manifests/prometheusOperator-serviceMonitor.yaml b/manifests/prometheusOperator-serviceMonitor.yaml
index 17eb270ff532787174a18c0a09246fbcf155c949..69cfe774ac53727b875861f9052a522381cd0e45 100644
--- a/manifests/prometheusOperator-serviceMonitor.yaml
+++ b/manifests/prometheusOperator-serviceMonitor.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.81.0
+ app.kubernetes.io/version: 0.82.0
name: prometheus-operator
namespace: monitoring
spec:
@@ -21,4 +21,4 @@ spec:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.81.0
+ app.kubernetes.io/version: 0.82.0
diff --git a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
index 84e582056bc59277619dafce7d58134d34599d6a..612730538751c530da02a641bacf7c84a40834f1 100644
--- a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
+++ b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
@@ -2,8 +2,8 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.17.2
- operator.prometheus.io/version: 0.81.0
+ controller-gen.kubebuilder.io/version: v0.17.3
+ operator.prometheus.io/version: 0.82.0
name: alertmanagerconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -250,6 +250,14 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ avatarURL:
+ description: The avatar url of the message sender.
+ pattern: ^https?://.+$
+ type: string
+ content:
+ description: The template of the content's body.
+ minLength: 1
+ type: string
httpConfig:
description: HTTP client configuration.
properties:
@@ -512,7 +520,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -726,7 +734,7 @@ spec:
type: string
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
tlsConfig:
description: TLS configuration for the client.
@@ -888,6 +896,10 @@ spec:
title:
description: The template of the message's title.
type: string
+ username:
+ description: The username of the message sender.
+ minLength: 1
+ type: string
required:
- apiURL
type: object
@@ -1421,7 +1433,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -1635,7 +1647,7 @@ spec:
type: string
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
tlsConfig:
description: TLS configuration for the client.
@@ -1828,6 +1840,680 @@ spec:
- webhookUrl
type: object
type: array
+ msteamsv2Configs:
+ description: |-
+ List of MSTeamsV2 configurations.
+ It requires Alertmanager >= 0.28.0.
+ items:
+ description: |-
+ MSTeamsV2Config configures notifications via Microsoft Teams using the new message format with adaptive cards as required by flows
+ See https://prometheus.io/docs/alerting/latest/configuration/#msteamsv2_config
+ It requires Alertmanager >= 0.28.0.
+ properties:
+ httpConfig:
+ description: HTTP client configuration.
+ properties:
+ authorization:
+ description: |-
+ Authorization header configuration for the client.
+ This is mutually exclusive with BasicAuth and is only available starting from Alertmanager v0.22+.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace that contains the credentials for authentication.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
+ basicAuth:
+ description: |-
+ BasicAuth for the client.
+ This is mutually exclusive with Authorization. If both are defined, BasicAuth takes precedence.
+ properties:
+ password:
+ 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.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ 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
+ username:
+ 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.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: object
+ bearerTokenSecret:
+ description: |-
+ The secret's key that contains the bearer token to be used by the client
+ for authentication.
+ The secret needs to be in the same namespace as the AlertmanagerConfig
+ object and accessible by the Prometheus Operator.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ 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
+ followRedirects:
+ description: FollowRedirects specifies whether the client should follow HTTP 3xx redirects.
+ type: boolean
+ noProxy:
+ description: |-
+ `noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
+ that should be excluded from proxying. IP and domain names can
+ contain port numbers.
+
+ It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+ type: string
+ oauth2:
+ description: OAuth2 client credentials used to fetch a token for the targets.
+ properties:
+ clientId:
+ 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.
+ properties:
+ key:
+ description: The key to select.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ type: string
+ optional:
+ description: Specify whether the ConfigMap or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ secret:
+ description: Secret containing data to use for the targets.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: object
+ clientSecret:
+ 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.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ 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
+ endpointParams:
+ additionalProperties:
+ type: string
+ description: |-
+ `endpointParams` configures the HTTP parameters to append to the token
+ URL.
+ type: object
+ noProxy:
+ description: |-
+ `noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
+ that should be excluded from proxying. IP and domain names can
+ contain port numbers.
+
+ It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+ type: string
+ proxyConnectHeader:
+ additionalProperties:
+ items:
+ description: SecretKeySelector selects a key of a Secret.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: array
+ description: |-
+ ProxyConnectHeader optionally specifies headers to send to
+ proxies during CONNECT requests.
+
+ It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+ type: object
+ x-kubernetes-map-type: atomic
+ proxyFromEnvironment:
+ description: |-
+ Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+ It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+ type: boolean
+ proxyUrl:
+ description: '`proxyURL` defines the HTTP proxy server to use.'
+ pattern: ^(http|https|socks5)://.+$
+ type: string
+ scopes:
+ description: '`scopes` defines the OAuth2 scopes used for the token request.'
+ items:
+ type: string
+ type: array
+ tlsConfig:
+ description: |-
+ TLS configuration to use when connecting to the OAuth2 server.
+ It requires Prometheus >= v2.43.0.
+ properties:
+ ca:
+ description: Certificate authority used when verifying server certificates.
+ properties:
+ configMap:
+ description: ConfigMap containing data to use for the targets.
+ properties:
+ key:
+ description: The key to select.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ type: string
+ optional:
+ description: Specify whether the ConfigMap or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ secret:
+ description: Secret containing data to use for the targets.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: object
+ cert:
+ description: Client certificate to present when doing client-authentication.
+ properties:
+ configMap:
+ description: ConfigMap containing data to use for the targets.
+ properties:
+ key:
+ description: The key to select.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ type: string
+ optional:
+ description: Specify whether the ConfigMap or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ secret:
+ description: Secret containing data to use for the targets.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: object
+ insecureSkipVerify:
+ description: Disable target certificate validation.
+ type: boolean
+ keySecret:
+ description: Secret containing the client key file for the targets.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ 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
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+ It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+ It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ serverName:
+ description: Used to verify the hostname for the targets.
+ type: string
+ type: object
+ tokenUrl:
+ description: '`tokenURL` configures the URL to fetch the token from.'
+ minLength: 1
+ type: string
+ required:
+ - clientId
+ - clientSecret
+ - tokenUrl
+ type: object
+ proxyConnectHeader:
+ additionalProperties:
+ items:
+ description: SecretKeySelector selects a key of a Secret.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: array
+ description: |-
+ ProxyConnectHeader optionally specifies headers to send to
+ proxies during CONNECT requests.
+
+ It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+ type: object
+ x-kubernetes-map-type: atomic
+ proxyFromEnvironment:
+ description: |-
+ Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+ It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
+ type: boolean
+ proxyURL:
+ description: |-
+ Optional proxy URL.
+
+ If defined, this field takes precedence over `proxyUrl`.
+ type: string
+ proxyUrl:
+ description: '`proxyURL` defines the HTTP proxy server to use.'
+ pattern: ^(http|https|socks5)://.+$
+ type: string
+ tlsConfig:
+ description: TLS configuration for the client.
+ properties:
+ ca:
+ description: Certificate authority used when verifying server certificates.
+ properties:
+ configMap:
+ description: ConfigMap containing data to use for the targets.
+ properties:
+ key:
+ description: The key to select.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ type: string
+ optional:
+ description: Specify whether the ConfigMap or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ secret:
+ description: Secret containing data to use for the targets.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: object
+ cert:
+ description: Client certificate to present when doing client-authentication.
+ properties:
+ configMap:
+ description: ConfigMap containing data to use for the targets.
+ properties:
+ key:
+ description: The key to select.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ type: string
+ optional:
+ description: Specify whether the ConfigMap or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ secret:
+ description: Secret containing data to use for the targets.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: object
+ insecureSkipVerify:
+ description: Disable target certificate validation.
+ type: boolean
+ keySecret:
+ description: Secret containing the client key file for the targets.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ 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
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+ It requires Prometheus >= v2.41.0 or Thanos >= v0.31.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+ It requires Prometheus >= v2.35.0 or Thanos >= v0.28.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ serverName:
+ description: Used to verify the hostname for the targets.
+ type: string
+ type: object
+ type: object
+ sendResolved:
+ description: Whether to notify about resolved alerts.
+ type: boolean
+ text:
+ description: Message body template.
+ minLength: 1
+ type: string
+ title:
+ description: Message title template.
+ minLength: 1
+ type: string
+ webhookURL:
+ description: MSTeams incoming webhook URL.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: object
+ type: array
name:
description: Name of the receiver. Must be unique across all items from the list.
minLength: 1
@@ -2155,7 +2841,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -2369,7 +3055,7 @@ spec:
type: string
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
tlsConfig:
description: TLS configuration for the client.
@@ -2875,7 +3561,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -3089,7 +3775,7 @@ spec:
type: string
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
tlsConfig:
description: TLS configuration for the client.
@@ -3619,7 +4305,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -3833,7 +4519,7 @@ spec:
type: string
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
tlsConfig:
description: TLS configuration for the client.
@@ -4458,7 +5144,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -4672,7 +5358,7 @@ spec:
type: string
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
tlsConfig:
description: TLS configuration for the client.
@@ -5135,7 +5821,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -5349,7 +6035,7 @@ spec:
type: string
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
tlsConfig:
description: TLS configuration for the client.
@@ -5904,7 +6590,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -6118,7 +6804,7 @@ spec:
type: string
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
tlsConfig:
description: TLS configuration for the client.
@@ -6611,7 +7297,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -6825,7 +7511,7 @@ spec:
type: string
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
tlsConfig:
description: TLS configuration for the client.
@@ -7272,7 +7958,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -7486,7 +8172,7 @@ spec:
type: string
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
tlsConfig:
description: TLS configuration for the client.
@@ -7922,7 +8608,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -8136,7 +8822,7 @@ spec:
type: string
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
tlsConfig:
description: TLS configuration for the client.
@@ -8640,7 +9326,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -8854,7 +9540,7 @@ spec:
type: string
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
tlsConfig:
description: TLS configuration for the client.
diff --git a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
index 763bdfe7738f3270775894c7ec77fffe180500f4..1c89c6f4621ff96915ab38aa7a220a327c725713 100644
--- a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
+++ b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
@@ -2,8 +2,8 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.17.2
- operator.prometheus.io/version: 0.81.0
+ controller-gen.kubebuilder.io/version: v0.17.3
+ operator.prometheus.io/version: 0.82.0
name: alertmanagers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -1366,7 +1366,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -1574,7 +1574,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
tlsConfig:
description: TLS configuration for the client.
@@ -5247,6 +5247,25 @@ spec:
- name
type: object
type: array
+ limits:
+ description: Defines the limits command line flags when starting Alertmanager.
+ properties:
+ maxPerSilenceBytes:
+ description: |-
+ The maximum size of an individual silence as stored on disk. This corresponds to the Alertmanager's
+ `--silences.max-per-silence-bytes` flag.
+ It requires Alertmanager >= v0.28.0.
+ pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$
+ type: string
+ maxSilences:
+ description: |-
+ The maximum number active and pending silences. This corresponds to the
+ Alertmanager's `--silences.max-silences` flag.
+ It requires Alertmanager >= v0.28.0.
+ format: int32
+ minimum: 0
+ type: integer
+ type: object
listenLocal:
description: |-
ListenLocal makes the Alertmanager server listen on loopback, so that it
@@ -6333,6 +6352,16 @@ spec:
Version is ignored if Tag is set.
Deprecated: use 'image' instead. The image tag can be specified as part of the image URL.
type: string
+ terminationGracePeriodSeconds:
+ description: |-
+ Optional duration in seconds the pod needs to terminate gracefully.
+ Value must be non-negative integer. The value zero indicates stop immediately via
+ the kill signal (no opportunity to shut down) which may lead to data corruption.
+
+ Defaults to 120 seconds.
+ format: int64
+ minimum: 0
+ type: integer
tolerations:
description: If specified, the pod's tolerations.
items:
diff --git a/manifests/setup/0podmonitorCustomResourceDefinition.yaml b/manifests/setup/0podmonitorCustomResourceDefinition.yaml
index ed8653dc413b026a7b7d4124cb593af9d16d6b5b..a8b1e13dee9b6d6e5269050c4bdd4df3128161c0 100644
--- a/manifests/setup/0podmonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/0podmonitorCustomResourceDefinition.yaml
@@ -2,8 +2,8 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.17.2
- operator.prometheus.io/version: 0.81.0
+ controller-gen.kubebuilder.io/version: v0.17.3
+ operator.prometheus.io/version: 0.82.0
name: podmonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -553,7 +553,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
diff --git a/manifests/setup/0probeCustomResourceDefinition.yaml b/manifests/setup/0probeCustomResourceDefinition.yaml
index af912d0c12f901822a174824a6205296dc340722..f9ed9d59dbec63169b5648ce405254694ae3af7c 100644
--- a/manifests/setup/0probeCustomResourceDefinition.yaml
+++ b/manifests/setup/0probeCustomResourceDefinition.yaml
@@ -2,8 +2,8 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.17.2
- operator.prometheus.io/version: 0.81.0
+ controller-gen.kubebuilder.io/version: v0.17.3
+ operator.prometheus.io/version: 0.82.0
name: probes.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -455,7 +455,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
diff --git a/manifests/setup/0prometheusCustomResourceDefinition.yaml b/manifests/setup/0prometheusCustomResourceDefinition.yaml
index eda1a192a9fd7feb2cef5a0afe40642d53e95c72..0cef939ff329641b6502a221056268ff75360057 100644
--- a/manifests/setup/0prometheusCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusCustomResourceDefinition.yaml
@@ -2,8 +2,8 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.17.2
- operator.prometheus.io/version: 0.81.0
+ controller-gen.kubebuilder.io/version: v0.17.3
+ operator.prometheus.io/version: 0.82.0
name: prometheuses.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -1371,7 +1371,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
relabelings:
description: Relabel configuration applied to the discovered Alertmanagers.
@@ -5988,7 +5988,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -6196,7 +6196,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
readRecent:
description: |-
@@ -6787,7 +6787,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -6995,7 +6995,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
queueConfig:
description: QueueConfig allows tuning of the remote write queue parameters.
@@ -9327,6 +9327,16 @@ spec:
If you want to enforce a maximum limit for all scrape objects, refer to enforcedTargetLimit.
format: int64
type: integer
+ terminationGracePeriodSeconds:
+ description: |-
+ Optional duration in seconds the pod needs to terminate gracefully.
+ Value must be non-negative integer. The value zero indicates stop immediately via
+ the kill signal (no opportunity to shut down) which may lead to data corruption.
+
+ Defaults to 600 seconds.
+ format: int64
+ minimum: 0
+ type: integer
thanos:
description: Defines the configuration of the optional Thanos sidecar.
properties:
diff --git a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
index 1478d7069346b3bed07eafa74e76e3e4d1b797bd..92f721b18d801ce1ad8e0f08754f1c61110e3042 100644
--- a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
@@ -2,8 +2,8 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.17.2
- operator.prometheus.io/version: 0.81.0
+ controller-gen.kubebuilder.io/version: v0.17.3
+ operator.prometheus.io/version: 0.82.0
name: prometheusagents.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -5319,7 +5319,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -5527,7 +5527,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
queueConfig:
description: QueueConfig allows tuning of the remote write queue parameters.
@@ -7678,6 +7678,16 @@ spec:
If you want to enforce a maximum limit for all scrape objects, refer to enforcedTargetLimit.
format: int64
type: integer
+ terminationGracePeriodSeconds:
+ description: |-
+ Optional duration in seconds the pod needs to terminate gracefully.
+ Value must be non-negative integer. The value zero indicates stop immediately via
+ the kill signal (no opportunity to shut down) which may lead to data corruption.
+
+ Defaults to 600 seconds.
+ format: int64
+ minimum: 0
+ type: integer
tolerations:
description: Defines the Pods' tolerations if specified.
items:
diff --git a/manifests/setup/0prometheusruleCustomResourceDefinition.yaml b/manifests/setup/0prometheusruleCustomResourceDefinition.yaml
index 37b9ae6cafed699f9ee7230c5941caeecee9ed83..138f067bb860c598e49ce37d35afb3f707bc763a 100644
--- a/manifests/setup/0prometheusruleCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusruleCustomResourceDefinition.yaml
@@ -2,8 +2,8 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.17.2
- operator.prometheus.io/version: 0.81.0
+ controller-gen.kubebuilder.io/version: v0.17.3
+ operator.prometheus.io/version: 0.82.0
name: prometheusrules.monitoring.coreos.com
spec:
group: monitoring.coreos.com
diff --git a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml
index 7077c4bac09e4c4d2377a76a6e6433333408f09d..470c0ec8ab7570f169739fda7c986829f8232e3f 100644
--- a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml
+++ b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml
@@ -2,8 +2,8 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.17.2
- operator.prometheus.io/version: 0.81.0
+ controller-gen.kubebuilder.io/version: v0.17.3
+ operator.prometheus.io/version: 0.82.0
name: scrapeconfigs.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -366,7 +366,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -582,7 +582,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
refreshInterval:
description: RefreshInterval configures the refresh interval at which Prometheus will re-read the instance list.
@@ -1089,7 +1089,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -1308,7 +1308,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
refreshInterval:
description: |-
@@ -1720,7 +1720,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -1934,7 +1934,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
refreshInterval:
description: Refresh interval to re-read the instance list.
@@ -2421,7 +2421,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -2632,7 +2632,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
refreshInterval:
description: Time after which the container is refreshed.
@@ -3067,7 +3067,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -3283,7 +3283,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
refreshInterval:
description: The time after which the service discovery data is refreshed.
@@ -3580,7 +3580,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
refreshInterval:
description: RefreshInterval configures the refresh interval at which Prometheus will re-read the instance list.
@@ -4023,7 +4023,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -4231,7 +4231,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
refreshInterval:
description: Refresh interval to re-read the instance list.
@@ -4735,7 +4735,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -4946,7 +4946,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
refreshInterval:
description: The time after which the servers are refreshed.
@@ -5366,7 +5366,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -5574,7 +5574,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
refreshInterval:
description: |-
@@ -5932,7 +5932,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -6146,7 +6146,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
refreshInterval:
description: Refresh interval to re-read the list of resources.
@@ -6607,7 +6607,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -6815,7 +6815,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
role:
description: |-
@@ -7269,7 +7269,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -7477,7 +7477,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
refreshInterval:
description: The time to wait between polling update requests.
@@ -7930,7 +7930,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -8146,7 +8146,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
refreshInterval:
description: Refresh interval to re-read the list of instances.
@@ -8522,7 +8522,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -8736,7 +8736,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
refreshInterval:
description: Time after which the linode instances are refreshed.
@@ -9265,7 +9265,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -9473,7 +9473,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
refreshInterval:
description: |-
@@ -9775,7 +9775,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -10373,7 +10373,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
puppetDBSDConfigs:
description: PuppetDBSDConfigs defines a list of PuppetDB service discovery configurations.
@@ -10626,7 +10626,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -10840,7 +10840,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
query:
description: |-
@@ -11189,7 +11189,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
refreshInterval:
description: Refresh interval to re-read the list of instances.
diff --git a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
index 959208363a409f5abf57b50a0d72b34ef1e94ec4..f4e2bab5f120e1813baa666394a1c1201799c8d5 100644
--- a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
@@ -2,8 +2,8 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.17.2
- operator.prometheus.io/version: 0.81.0
+ controller-gen.kubebuilder.io/version: v0.17.3
+ operator.prometheus.io/version: 0.82.0
name: servicemonitors.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -477,7 +477,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
diff --git a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
index 1d076e15cf8b90456b0ed03d2ebcb73f0a95ce97..a304520ee462cafc092190362eaa45889d0f2306 100644
--- a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
+++ b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
@@ -2,8 +2,8 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.17.2
- operator.prometheus.io/version: 0.81.0
+ controller-gen.kubebuilder.io/version: v0.17.3
+ operator.prometheus.io/version: 0.82.0
name: thanosrulers.monitoring.coreos.com
spec:
group: monitoring.coreos.com
@@ -4767,7 +4767,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
scopes:
description: '`scopes` defines the OAuth2 scopes used for the token request.'
@@ -4975,7 +4975,7 @@ spec:
type: boolean
proxyUrl:
description: '`proxyURL` defines the HTTP proxy server to use.'
- pattern: ^http(s)?://.+$
+ pattern: ^(http|https|socks5)://.+$
type: string
queueConfig:
description: QueueConfig allows tuning of the remote write queue parameters.
@@ -6417,6 +6417,16 @@ spec:
type: object
type: object
type: object
+ terminationGracePeriodSeconds:
+ description: |-
+ Optional duration in seconds the pod needs to terminate gracefully.
+ Value must be non-negative integer. The value zero indicates stop immediately via
+ the kill signal (no opportunity to shut down) which may lead to data corruption.
+
+ Defaults to 120 seconds.
+ format: int64
+ minimum: 0
+ type: integer
tolerations:
description: If specified, the pod's tolerations.
items: