diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json
index ca7495ee8dad8f1a03fc58bc9772a3265112445d..bd2fa7ec922e4f601d23e9a4c67caedbe37195e9 100644
--- a/jsonnet/kube-prometheus/versions.json
+++ b/jsonnet/kube-prometheus/versions.json
@@ -4,9 +4,9 @@
"grafana": "9.5.3",
"kubeStateMetrics": "2.9.2",
"nodeExporter": "1.6.1",
- "prometheus": "2.45.0",
- "prometheusAdapter": "0.10.0",
- "prometheusOperator": "0.66.0",
+ "prometheus": "2.46.0",
+ "prometheusAdapter": "0.11.0",
+ "prometheusOperator": "0.67.1",
"kubeRbacProxy": "0.14.2",
"configmapReload": "0.5.0",
"pyrra": "0.6.4"
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 098b89bac7dbb8cc2d642fbfeb3d464af2c7e9ea..f87fcbb024cde99dd60ecf5161cc076c2e43b103 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
- "version": "26b3ecf5aa25ec085c7bd0f99a871865742c078d",
+ "version": "0d89fa73362f2dbce5ba843e3ac10b16c20d7ab9",
"sum": "GdePvMDfLQcVhwzk/Ephi/jC27ywGObLB5t0eC0lXd4="
},
{
@@ -58,7 +58,7 @@
"subdir": "grafana-builder"
}
},
- "version": "a3e4fa30494f4ee94f1cab506df85090a12545d9",
+ "version": "f3c7be86c7156678ac30369e85eb4face285b14c",
"sum": "xEFMv4+ObwP5L1Wu0XK5agWci4AJzNApys6iKAQxLlQ="
},
{
@@ -78,7 +78,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
- "version": "3fb1e86c189d40f6807508424b273b463464b372",
+ "version": "a9bdda09b92ef7508aa46069b7e2043850107ccf",
"sum": "+dOzAK+fwsFf97uZpjcjTcEJEC1H8hh/j8f5uIQK/5g="
},
{
@@ -88,7 +88,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
- "version": "3fb1e86c189d40f6807508424b273b463464b372",
+ "version": "a9bdda09b92ef7508aa46069b7e2043850107ccf",
"sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
},
{
@@ -98,7 +98,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "ec8188c48b186becae6041bcd439fa640086a1e4",
+ "version": "4488c5b02173eada870f1adb853dfa4f259cd934",
"sum": "n3flMIzlADeyygb0uipZ4KPp2uNSjdtkrwgHjTC7Ca4=",
"name": "prometheus-operator-mixin"
},
@@ -109,8 +109,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "ec8188c48b186becae6041bcd439fa640086a1e4",
- "sum": "e+BTsEsyOI6FFW464Xn8Tp1xixtArpLqGHW8qIczNjs="
+ "version": "4488c5b02173eada870f1adb853dfa4f259cd934",
+ "sum": "eiYusxOF4yc8UoQZncjPwGBtKwAbPJ4cQL7P6eO7PUo="
},
{
"source": {
@@ -119,8 +119,8 @@
"subdir": "doc/alertmanager-mixin"
}
},
- "version": "487db1383b8cc5c2867c77f110431605bb8ce247",
- "sum": "PsK+V7oETCPKu2gLoPfqY0wwPKH9TzhNj6o2xezjjXc=",
+ "version": "e1e59925cc7a4a953c7deba7fdb215224ed05fdb",
+ "sum": "1d7ZKYArJKacAWXLUz0bRC1uOkozee/PPw97/W5zGhc=",
"name": "alertmanager"
},
{
@@ -130,7 +130,7 @@
"subdir": "docs/node-mixin"
}
},
- "version": "8fb4f78ce541f404144f86b3202cc53d2a0f387c",
+ "version": "37ce0bab8c7afe5133b33bb44cff06fe965cf109",
"sum": "By6n6U10hYDogUsyhsaKZehbhzxBZZobJloiKyKadgM="
},
{
@@ -140,7 +140,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "94edd088595b3f872fd770418c8face76a853628",
+ "version": "651b5a049a3d2ca877f8cf960a8add1a366f6da0",
"sum": "8OngT76gVXOUROOOeP9yTe6E/dn+2D2J34Dn690QCG0=",
"name": "prometheus"
},
@@ -151,7 +151,7 @@
"subdir": "config/crd/bases"
}
},
- "version": "1f288e97738e6869b07d3363094f55146ce1d5eb",
+ "version": "35a7cd36d460354bce7c097d3ef1aa834f126391",
"sum": "hF23mXrMFOMwB0zGHaHdL5aw3KOx5j1lyOwWT3IaOXY="
},
{
@@ -161,7 +161,7 @@
"subdir": "mixin"
}
},
- "version": "cdba35b2c3779804adb69fca2162a528a10e682e",
+ "version": "553c061bf5da059579834727a67bc72a9233de5a",
"sum": "WhheqsiX0maUXByZFsb9xhCEsGXK2955bPmPPf1x+Cs=",
"name": "thanos-mixin"
},
diff --git a/manifests/prometheus-clusterRole.yaml b/manifests/prometheus-clusterRole.yaml
index 9c278f50fc1e2cfa50305657431ac222dced4db4..2b62fed16c5cbc46dca2d3ff1389f7f70ec14e93 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.45.0
+ app.kubernetes.io/version: 2.46.0
name: prometheus-k8s
rules:
- apiGroups:
diff --git a/manifests/prometheus-clusterRoleBinding.yaml b/manifests/prometheus-clusterRoleBinding.yaml
index ab47c90b5b5a88ac1eab86da4ea6886645b512ba..7adab3c3842769c8e24d208f5cdb85dda27b40f6 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.45.0
+ app.kubernetes.io/version: 2.46.0
name: prometheus-k8s
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/prometheus-networkPolicy.yaml b/manifests/prometheus-networkPolicy.yaml
index efc1076f228ed08a0555af0df5aaed243d4de4f4..cfa09baaf06b6f7b733e2d6995876d3c080df605 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.45.0
+ app.kubernetes.io/version: 2.46.0
name: prometheus-k8s
namespace: monitoring
spec:
diff --git a/manifests/prometheus-podDisruptionBudget.yaml b/manifests/prometheus-podDisruptionBudget.yaml
index 4a06d3c5361e18312fd7a616266c0d8bdefa1338..d7884f80360fe6fd64244387590dc0e01ea11bc2 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.45.0
+ app.kubernetes.io/version: 2.46.0
name: prometheus-k8s
namespace: monitoring
spec:
diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml
index e0082a37ef5f9b62fcbd9b39ffa883685cc454f2..cb3f5e2c47493f6fe1d2ca6d8060c3c39cfddaae 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.45.0
+ app.kubernetes.io/version: 2.46.0
name: k8s
namespace: monitoring
spec:
@@ -18,7 +18,7 @@ spec:
port: web
enableFeatures: []
externalLabels: {}
- image: quay.io/prometheus/prometheus:v2.45.0
+ image: quay.io/prometheus/prometheus:v2.46.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.45.0
+ app.kubernetes.io/version: 2.46.0
podMonitorNamespaceSelector: {}
podMonitorSelector: {}
probeNamespaceSelector: {}
@@ -45,4 +45,4 @@ spec:
serviceAccountName: prometheus-k8s
serviceMonitorNamespaceSelector: {}
serviceMonitorSelector: {}
- version: 2.45.0
+ version: 2.46.0
diff --git a/manifests/prometheus-prometheusRule.yaml b/manifests/prometheus-prometheusRule.yaml
index ec63d60716bb6809f5d845868376d959a8186e72..a86d78ac4f1e3559273f275ef665e2b7ca08efd7 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.45.0
+ app.kubernetes.io/version: 2.46.0
prometheus: k8s
role: alert-rules
name: prometheus-k8s-prometheus-rules
diff --git a/manifests/prometheus-roleBindingConfig.yaml b/manifests/prometheus-roleBindingConfig.yaml
index 05101f2c6d8132d2acdd3c75275297e7aeaed50f..ca4d062e4d12fa937c557a879ca3b6b1745accad 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.45.0
+ app.kubernetes.io/version: 2.46.0
name: prometheus-k8s-config
namespace: monitoring
roleRef:
diff --git a/manifests/prometheus-roleBindingSpecificNamespaces.yaml b/manifests/prometheus-roleBindingSpecificNamespaces.yaml
index 4d61f847c00b4ae2b3492811e98e74e301cb1bf0..8a5ce4db920f28ed48bf226af9f30165082fab0e 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.45.0
+ app.kubernetes.io/version: 2.46.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.45.0
+ app.kubernetes.io/version: 2.46.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.45.0
+ app.kubernetes.io/version: 2.46.0
name: prometheus-k8s
namespace: monitoring
roleRef:
diff --git a/manifests/prometheus-roleConfig.yaml b/manifests/prometheus-roleConfig.yaml
index 68eda57df8f7ff359b9974b0562ecb69ad7a4964..86f97418394e103f64f13f6d8e72ec30b3710630 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.45.0
+ app.kubernetes.io/version: 2.46.0
name: prometheus-k8s-config
namespace: monitoring
rules:
diff --git a/manifests/prometheus-roleSpecificNamespaces.yaml b/manifests/prometheus-roleSpecificNamespaces.yaml
index 2055c96896e46319b968787905fc447f1ac0dba0..4d59642ec63f79bd6d63bb673a457ba1c13d521c 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.45.0
+ app.kubernetes.io/version: 2.46.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.45.0
+ app.kubernetes.io/version: 2.46.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.45.0
+ app.kubernetes.io/version: 2.46.0
name: prometheus-k8s
namespace: monitoring
rules:
diff --git a/manifests/prometheus-service.yaml b/manifests/prometheus-service.yaml
index fad42dfbbd88d6d994c0a8c2195dcfa46785e682..812cd7af28a24e77cbc6c584d71025d63309b2a8 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.45.0
+ app.kubernetes.io/version: 2.46.0
name: prometheus-k8s
namespace: monitoring
spec:
diff --git a/manifests/prometheus-serviceAccount.yaml b/manifests/prometheus-serviceAccount.yaml
index dc027b2d9dffcc41e34a93018b9d5a56ec98c480..1a1bd94f9ffaa5fdb16e8bb154b966ff767ba072 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.45.0
+ app.kubernetes.io/version: 2.46.0
name: prometheus-k8s
namespace: monitoring
diff --git a/manifests/prometheus-serviceMonitor.yaml b/manifests/prometheus-serviceMonitor.yaml
index 606581acde6afa5c947cca3f456210fb5db15588..238a4e9f95a67153de57a3ab4de29d61c820231a 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.45.0
+ app.kubernetes.io/version: 2.46.0
name: prometheus-k8s
namespace: monitoring
spec:
diff --git a/manifests/prometheusAdapter-apiService.yaml b/manifests/prometheusAdapter-apiService.yaml
index bf17b251dfd2cba775f8e24bc0d7696452fa305d..50cc12b4719246da24f4165d11faee47dba77cf5 100644
--- a/manifests/prometheusAdapter-apiService.yaml
+++ b/manifests/prometheusAdapter-apiService.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.10.0
+ app.kubernetes.io/version: 0.11.0
name: v1beta1.metrics.k8s.io
spec:
group: metrics.k8s.io
diff --git a/manifests/prometheusAdapter-clusterRole.yaml b/manifests/prometheusAdapter-clusterRole.yaml
index 06ad34c8d7dc6906da3ac11f57500e9f6d40afdb..d58f7c61099da3280db2f11a58435a29de8275c5 100644
--- a/manifests/prometheusAdapter-clusterRole.yaml
+++ b/manifests/prometheusAdapter-clusterRole.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.10.0
+ app.kubernetes.io/version: 0.11.0
name: prometheus-adapter
rules:
- apiGroups:
diff --git a/manifests/prometheusAdapter-clusterRoleAggregatedMetricsReader.yaml b/manifests/prometheusAdapter-clusterRoleAggregatedMetricsReader.yaml
index ec5b4f7926802218cb19e498c1ef7d893d733da1..b280daa77d46a013821f568b87972b403bd65946 100644
--- a/manifests/prometheusAdapter-clusterRoleAggregatedMetricsReader.yaml
+++ b/manifests/prometheusAdapter-clusterRoleAggregatedMetricsReader.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.10.0
+ app.kubernetes.io/version: 0.11.0
rbac.authorization.k8s.io/aggregate-to-admin: "true"
rbac.authorization.k8s.io/aggregate-to-edit: "true"
rbac.authorization.k8s.io/aggregate-to-view: "true"
diff --git a/manifests/prometheusAdapter-clusterRoleBinding.yaml b/manifests/prometheusAdapter-clusterRoleBinding.yaml
index e7a937dad919ecd7b16d0dd5606a70ce7142ba53..9d634e90f6d3219d4df9e7c460285a7fc92a3756 100644
--- a/manifests/prometheusAdapter-clusterRoleBinding.yaml
+++ b/manifests/prometheusAdapter-clusterRoleBinding.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.10.0
+ app.kubernetes.io/version: 0.11.0
name: prometheus-adapter
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/prometheusAdapter-clusterRoleBindingDelegator.yaml b/manifests/prometheusAdapter-clusterRoleBindingDelegator.yaml
index c653e83fc187c0ab9cfe8e862168b46b9bbd8fe7..042da4f861d3450b33337c534212fd0d85ef4bf5 100644
--- a/manifests/prometheusAdapter-clusterRoleBindingDelegator.yaml
+++ b/manifests/prometheusAdapter-clusterRoleBindingDelegator.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.10.0
+ app.kubernetes.io/version: 0.11.0
name: resource-metrics:system:auth-delegator
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/prometheusAdapter-clusterRoleServerResources.yaml b/manifests/prometheusAdapter-clusterRoleServerResources.yaml
index a13d63a47b9a208d8e221f6787cfff7203d3e758..1c324ca55eb310213fa1f83fc09f4833091a4491 100644
--- a/manifests/prometheusAdapter-clusterRoleServerResources.yaml
+++ b/manifests/prometheusAdapter-clusterRoleServerResources.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.10.0
+ app.kubernetes.io/version: 0.11.0
name: resource-metrics-server-resources
rules:
- apiGroups:
diff --git a/manifests/prometheusAdapter-configMap.yaml b/manifests/prometheusAdapter-configMap.yaml
index a1690bb6ff715327200bc8e4b2901272d04979b4..4e61794941eddf0b2f1c8b16620b7bd9bde91309 100644
--- a/manifests/prometheusAdapter-configMap.yaml
+++ b/manifests/prometheusAdapter-configMap.yaml
@@ -64,6 +64,6 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.10.0
+ app.kubernetes.io/version: 0.11.0
name: adapter-config
namespace: monitoring
diff --git a/manifests/prometheusAdapter-deployment.yaml b/manifests/prometheusAdapter-deployment.yaml
index 389057e9c1654f391cc35642cf235868ae843f91..5ea3fb392c4ee73f7ae988ebaa53f8a1d0b40ea9 100644
--- a/manifests/prometheusAdapter-deployment.yaml
+++ b/manifests/prometheusAdapter-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.10.0
+ app.kubernetes.io/version: 0.11.0
name: prometheus-adapter
namespace: monitoring
spec:
@@ -25,7 +25,7 @@ spec:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.10.0
+ app.kubernetes.io/version: 0.11.0
spec:
automountServiceAccountToken: true
containers:
@@ -36,7 +36,7 @@ spec:
- --prometheus-url=http://prometheus-k8s.monitoring.svc:9090/
- --secure-port=6443
- --tls-cipher-suites=TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,TLS_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA
- image: registry.k8s.io/prometheus-adapter/prometheus-adapter:v0.10.0
+ image: registry.k8s.io/prometheus-adapter/prometheus-adapter:v0.11.0
livenessProbe:
failureThreshold: 5
httpGet:
diff --git a/manifests/prometheusAdapter-networkPolicy.yaml b/manifests/prometheusAdapter-networkPolicy.yaml
index 29a11fd536d36a850bc3c9ebce4453df567d00a8..964d1ba02136e303bc7494ccb2c039a6540e330d 100644
--- a/manifests/prometheusAdapter-networkPolicy.yaml
+++ b/manifests/prometheusAdapter-networkPolicy.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.10.0
+ app.kubernetes.io/version: 0.11.0
name: prometheus-adapter
namespace: monitoring
spec:
diff --git a/manifests/prometheusAdapter-podDisruptionBudget.yaml b/manifests/prometheusAdapter-podDisruptionBudget.yaml
index 033fcaafe60d22e4a6602c8c8bb3b0b8f5858fc8..447615b0916e3e939bb9eacc0fdb639ef36b88c2 100644
--- a/manifests/prometheusAdapter-podDisruptionBudget.yaml
+++ b/manifests/prometheusAdapter-podDisruptionBudget.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.10.0
+ app.kubernetes.io/version: 0.11.0
name: prometheus-adapter
namespace: monitoring
spec:
diff --git a/manifests/prometheusAdapter-roleBindingAuthReader.yaml b/manifests/prometheusAdapter-roleBindingAuthReader.yaml
index 5d0d9036d0c7a79241dcfe6b6a767dac0e89c4a6..8802e0cc262031b61d9308a3a849e15a4ca9c62d 100644
--- a/manifests/prometheusAdapter-roleBindingAuthReader.yaml
+++ b/manifests/prometheusAdapter-roleBindingAuthReader.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.10.0
+ app.kubernetes.io/version: 0.11.0
name: resource-metrics-auth-reader
namespace: kube-system
roleRef:
diff --git a/manifests/prometheusAdapter-service.yaml b/manifests/prometheusAdapter-service.yaml
index c9848286411f97b7fa1d67e13ddad9726c0d370c..3f92c93306e617682ff71ce5055b1ad288f532b8 100644
--- a/manifests/prometheusAdapter-service.yaml
+++ b/manifests/prometheusAdapter-service.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.10.0
+ app.kubernetes.io/version: 0.11.0
name: prometheus-adapter
namespace: monitoring
spec:
diff --git a/manifests/prometheusAdapter-serviceAccount.yaml b/manifests/prometheusAdapter-serviceAccount.yaml
index bb1058b7b0c2af970e5f284fe6357b4a67a1fe84..130b5bcfc87a3faaa90cb4c102e89c6aca671a39 100644
--- a/manifests/prometheusAdapter-serviceAccount.yaml
+++ b/manifests/prometheusAdapter-serviceAccount.yaml
@@ -6,6 +6,6 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.10.0
+ app.kubernetes.io/version: 0.11.0
name: prometheus-adapter
namespace: monitoring
diff --git a/manifests/prometheusAdapter-serviceMonitor.yaml b/manifests/prometheusAdapter-serviceMonitor.yaml
index d8941459e81bf8a07e419657c3c50ab060eeea62..bf9bbe385e7d52696188acbd7a4089b234b15dd6 100644
--- a/manifests/prometheusAdapter-serviceMonitor.yaml
+++ b/manifests/prometheusAdapter-serviceMonitor.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.10.0
+ app.kubernetes.io/version: 0.11.0
name: prometheus-adapter
namespace: monitoring
spec:
diff --git a/manifests/prometheusOperator-clusterRole.yaml b/manifests/prometheusOperator-clusterRole.yaml
index 7027045540826a61297b7498c687b40a16fae9ab..2843517330bbdd3a1cdb9c271a82be26e08683e9 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.66.0
+ app.kubernetes.io/version: 0.67.1
name: prometheus-operator
rules:
- apiGroups:
diff --git a/manifests/prometheusOperator-clusterRoleBinding.yaml b/manifests/prometheusOperator-clusterRoleBinding.yaml
index a375f5d67ccdf99e5c01ffec207866a42e774135..0ecd13a034dd5e7e1a991e32b241da137475e082 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.66.0
+ app.kubernetes.io/version: 0.67.1
name: prometheus-operator
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/prometheusOperator-deployment.yaml b/manifests/prometheusOperator-deployment.yaml
index 4cf7a6d5d5e67b87a9eb1130d309f0b40b3ee046..e98bf7e483576f26c89b04438cb76cd975cc46c5 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.66.0
+ app.kubernetes.io/version: 0.67.1
name: prometheus-operator
namespace: monitoring
spec:
@@ -23,14 +23,14 @@ spec:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.66.0
+ app.kubernetes.io/version: 0.67.1
spec:
automountServiceAccountToken: true
containers:
- args:
- --kubelet-service=kube-system/kubelet
- - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.66.0
- image: quay.io/prometheus-operator/prometheus-operator:v0.66.0
+ - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.67.1
+ image: quay.io/prometheus-operator/prometheus-operator:v0.67.1
name: prometheus-operator
ports:
- containerPort: 8080
diff --git a/manifests/prometheusOperator-networkPolicy.yaml b/manifests/prometheusOperator-networkPolicy.yaml
index 8b7c944a7ef96d80169537118f8fe43309654520..5fb067127036be1f95c301acefed01f3c67dae09 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.66.0
+ app.kubernetes.io/version: 0.67.1
name: prometheus-operator
namespace: monitoring
spec:
diff --git a/manifests/prometheusOperator-prometheusRule.yaml b/manifests/prometheusOperator-prometheusRule.yaml
index 5e1e9f3d82ecd7c4255410748b632fdb66791987..070cc25b9aba08e3ca100bdc2db347e1ebb6bf62 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.66.0
+ app.kubernetes.io/version: 0.67.1
prometheus: k8s
role: alert-rules
name: prometheus-operator-rules
diff --git a/manifests/prometheusOperator-service.yaml b/manifests/prometheusOperator-service.yaml
index 5f11f684c0c5c3c144a4de568400e1c24eb0afca..1e584931accf48f68f185405ef1857a2aa9db563 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.66.0
+ app.kubernetes.io/version: 0.67.1
name: prometheus-operator
namespace: monitoring
spec:
diff --git a/manifests/prometheusOperator-serviceAccount.yaml b/manifests/prometheusOperator-serviceAccount.yaml
index 568e30caedd66e4091d9f4652768eaca88872e1b..abcf23b62bbf694208e7cd137613f303e4c55b37 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.66.0
+ app.kubernetes.io/version: 0.67.1
name: prometheus-operator
namespace: monitoring
diff --git a/manifests/prometheusOperator-serviceMonitor.yaml b/manifests/prometheusOperator-serviceMonitor.yaml
index b8fb5cabf27cb1f17be25c47aa4c446ef40d6e5f..4b3c5c64666db08795ab8301ce641324833ff35c 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.66.0
+ app.kubernetes.io/version: 0.67.1
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.66.0
+ app.kubernetes.io/version: 0.67.1
diff --git a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
index afd9dd1b5c77139e47b8537e700719dc0ed523d7..2423b0a9f8e55b3c4825237680a3eb65c3e3b35a 100644
--- a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
+++ b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
@@ -3023,6 +3023,285 @@ spec:
type: string
type: object
type: array
+ webexConfigs:
+ description: List of Webex configurations.
+ items:
+ description: WebexConfig configures notification via Cisco Webex See https://prometheus.io/docs/alerting/latest/configuration/#webex_config
+ properties:
+ apiURL:
+ description: The Webex Teams API URL i.e. https://webexapis.com/v1/messages Provide if different from the default API URL.
+ pattern: ^https?://.+$
+ type: string
+ httpConfig:
+ description: The HTTP client's configuration. You must supply the bot token via the `httpConfig.authorization` field.
+ 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:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type:
+ description: "Defines the authentication type. The value is case-insensitive. \n \"Basic\" is not a supported value. \n 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: The secret in the service monitor namespace that contains the password for authentication.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ username:
+ description: The secret in the service monitor namespace that contains the username for authentication.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ 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:
+ 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
+ followRedirects:
+ description: FollowRedirects specifies whether the client should follow HTTP 3xx redirects.
+ type: boolean
+ oauth2:
+ description: OAuth2 client credentials used to fetch a token for the targets.
+ properties:
+ clientId:
+ description: The secret or configmap containing the OAuth2 client id
+ properties:
+ configMap:
+ description: ConfigMap containing data to use for the targets.
+ properties:
+ key:
+ description: The key to select.
+ type: string
+ name:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+ type: string
+ optional:
+ description: Specify whether the ConfigMap or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ secret:
+ description: Secret containing data to use for the targets.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: object
+ clientSecret:
+ description: The secret containing the OAuth2 client secret
+ 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
+ endpointParams:
+ additionalProperties:
+ type: string
+ description: Parameters to append to the token URL
+ type: object
+ scopes:
+ description: OAuth2 scopes used for the token request
+ items:
+ type: string
+ type: array
+ tokenUrl:
+ description: The URL to fetch the token from
+ minLength: 1
+ type: string
+ required:
+ - clientId
+ - clientSecret
+ - tokenUrl
+ type: object
+ proxyURL:
+ description: Optional proxy URL.
+ 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:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+ type: string
+ optional:
+ description: Specify whether the ConfigMap or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ secret:
+ description: Secret containing data to use for the targets.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: object
+ cert:
+ description: Client certificate to present when doing client-authentication.
+ properties:
+ configMap:
+ description: ConfigMap containing data to use for the targets.
+ properties:
+ key:
+ description: The key to select.
+ type: string
+ name:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+ type: string
+ optional:
+ description: Specify whether the ConfigMap or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ secret:
+ description: Secret containing data to use for the targets.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: object
+ insecureSkipVerify:
+ description: Disable target certificate validation.
+ type: boolean
+ keySecret:
+ description: Secret containing the client key file for the targets.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ serverName:
+ description: Used to verify the hostname for the targets.
+ type: string
+ type: object
+ type: object
+ message:
+ description: Message template
+ type: string
+ roomID:
+ description: ID of the Webex Teams room where to send the messages.
+ minLength: 1
+ type: string
+ sendResolved:
+ description: Whether to notify about resolved alerts.
+ type: boolean
+ required:
+ - roomID
+ type: object
+ type: array
webhookConfigs:
description: List of webhook configurations.
items:
diff --git a/manifests/setup/0prometheusCustomResourceDefinition.yaml b/manifests/setup/0prometheusCustomResourceDefinition.yaml
index b68bd7c788b53d7b5bb10e171c9d8a90336e5a31..177c030d22fef5f14121f3af2433909a8df68d5b 100644
--- a/manifests/setup/0prometheusCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusCustomResourceDefinition.yaml
@@ -1905,6 +1905,7 @@ spec:
- servicemonitors
- podmonitors
- probes
+ - scrapeconfigs
type: string
required:
- namespace
diff --git a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
index 1b5db057855a4a3deef3434fd866bd2e223e2375..01c0b99b167d599b2d2af2b13725dd82a8273bb4 100644
--- a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
@@ -1642,6 +1642,7 @@ spec:
- servicemonitors
- podmonitors
- probes
+ - scrapeconfigs
type: string
required:
- namespace
diff --git a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml
index e8f41fb452dbf17c10c61d8df3e2a0f6c6cd01ed..65b606d401c831a7c62c9a5234b47e7af3bc379f 100644
--- a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml
+++ b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml
@@ -660,6 +660,14 @@ spec:
metricsPath:
description: MetricsPath HTTP path to scrape for metrics. If empty, Prometheus uses the default value (e.g. /metrics).
type: string
+ params:
+ additionalProperties:
+ items:
+ type: string
+ type: array
+ description: Optional HTTP URL parameters
+ type: object
+ x-kubernetes-map-type: atomic
relabelings:
description: 'RelabelConfigs defines how to rewrite the target''s labels 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'
items:
@@ -727,6 +735,14 @@ spec:
- HTTP
- HTTPS
type: string
+ scrapeInterval:
+ description: ScrapeInterval is the interval between consecutive scrapes.
+ 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
+ scrapeTimeout:
+ description: ScrapeTimeout is the number of seconds to wait until a scrape request times out.
+ 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
staticConfigs:
description: StaticConfigs defines a list of static targets with a common label set.
items:
diff --git a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
index ea69d1de98749ede2c7fc405a0b491a133285c70..af730c7e2e366481f3b1de89691ea150152502c6 100644
--- a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
+++ b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
@@ -1448,6 +1448,7 @@ spec:
- servicemonitors
- podmonitors
- probes
+ - scrapeconfigs
type: string
required:
- namespace