diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json
index b6f359cd15b18f22eb757a799584fda0ebc82cf3..bbf26aeca530f0fe32f17f7522a012a64f3f8e68 100644
--- a/jsonnet/kube-prometheus/versions.json
+++ b/jsonnet/kube-prometheus/versions.json
@@ -1,5 +1,5 @@
{
- "alertmanager": "0.27.0",
+ "alertmanager": "0.28.0",
"blackboxExporter": "0.25.0",
"grafana": "11.4.0",
"kubeStateMetrics": "2.14.0",
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 088fd07f2cd403205c8b6b32f31c5ece9eafa8b7..5b781c623033564c9faef6623a39c5b1c06ef600 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
- "version": "5813dce9ad1a9e31d9b51d199d374e68d233e439",
+ "version": "83cf7bb4fc621f017fcaa9a735194fcec23420b8",
"sum": "IXI3LQIT9NmTPJAk8WLUJd5+qZfcGpeNCyWIK7oEpws="
},
{
@@ -78,7 +78,7 @@
"subdir": "grafana-builder"
}
},
- "version": "748f8a97f55b2575692d1990138da84c270704fa",
+ "version": "81276dc16831be896821b44b03a6405b4af8a8b4",
"sum": "yxqWcq/N3E/a/XreeU6EuE6X7kYPnG0AspAQFKOjASo="
},
{
@@ -88,7 +88,7 @@
"subdir": "mixin-utils"
}
},
- "version": "748f8a97f55b2575692d1990138da84c270704fa",
+ "version": "81276dc16831be896821b44b03a6405b4af8a8b4",
"sum": "SRElwa/XrKAN8aZA9zvdRUx8iebl2It7KNQ7VFvMcBA="
},
{
@@ -128,7 +128,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
- "version": "c198a18d289d520f462675e622a06a85404b5a0b",
+ "version": "288b3cf855c33e6e222dcd16a4c44d3490c757ef",
"sum": "lO7jUSzAIy8Yk9pOWJIWgPRhubkWzVh56W6wtYfbVH4="
},
{
@@ -138,7 +138,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
- "version": "c198a18d289d520f462675e622a06a85404b5a0b",
+ "version": "288b3cf855c33e6e222dcd16a4c44d3490c757ef",
"sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
},
{
@@ -148,7 +148,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "ae04859fc90096b7bbbe297d4fdade73f0d1f1a6",
+ "version": "6e3ecb473accda9c5947f78d60e84e20adfc7829",
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
"name": "prometheus-operator-mixin"
},
@@ -159,8 +159,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "ae04859fc90096b7bbbe297d4fdade73f0d1f1a6",
- "sum": "hR9044bifEF7RJSZLOX9qvWHqAhuhqnqXkXgmARfneI="
+ "version": "6e3ecb473accda9c5947f78d60e84e20adfc7829",
+ "sum": "ZZVen2GGS9xNZLODTtZSEJmgSmhfXeoU00M1ZqITN9o="
},
{
"source": {
@@ -169,7 +169,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
- "version": "486a463e1076bcf610b62542f53d2604a8a6788a",
+ "version": "3b06b97af4d146e141af92885a185891eb79a5b0",
"sum": "Mf4h1BYLle2nrgjf/HXrBbl0Zk8N+xaoEM017o0BC+k=",
"name": "alertmanager"
},
@@ -180,7 +180,7 @@
"subdir": "docs/node-mixin"
}
},
- "version": "acdd9b813d71b856fe34df97caa1ed90c8587692",
+ "version": "c46d1f23d06491408f51845862dfbbc73b51bd6e",
"sum": "xYj6VYFT/eafsbleNlC+Z2VfLy1CndyYrJs9BcTmnX8="
},
{
@@ -190,7 +190,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "1e81fd216631913104b37fc6a43312cb3af0eec4",
+ "version": "9258e40589d971c0a009dccaa13462b87fb9454a",
"sum": "CwaQpW66lHx+++sY2g4BgrUTEFZtlDnQzFjo0AlgfIg=",
"name": "prometheus"
},
@@ -212,7 +212,7 @@
"subdir": "mixin"
}
},
- "version": "4ba0ba403896e468dfda3da07ce89aa159dfbe37",
+ "version": "236777732278c64ca01c1c09d726f0f712c87164",
"sum": "ieCD4eMgGbOlrI8GmckGPHBGQDcLasE1rULYq56W/bs=",
"name": "thanos-mixin"
},
diff --git a/manifests/alertmanager-alertmanager.yaml b/manifests/alertmanager-alertmanager.yaml
index 7bed18395aa7929af37cf68e6558028f5100ca5c..5871f2621223bc3df3ac802a884fb409f5a4c770 100644
--- a/manifests/alertmanager-alertmanager.yaml
+++ b/manifests/alertmanager-alertmanager.yaml
@@ -6,11 +6,11 @@ metadata:
app.kubernetes.io/instance: main
app.kubernetes.io/name: alertmanager
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.27.0
+ app.kubernetes.io/version: 0.28.0
name: main
namespace: monitoring
spec:
- image: quay.io/prometheus/alertmanager:v0.27.0
+ image: quay.io/prometheus/alertmanager:v0.28.0
nodeSelector:
kubernetes.io/os: linux
podMetadata:
@@ -19,7 +19,7 @@ spec:
app.kubernetes.io/instance: main
app.kubernetes.io/name: alertmanager
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.27.0
+ app.kubernetes.io/version: 0.28.0
replicas: 3
resources:
limits:
@@ -34,4 +34,4 @@ spec:
runAsNonRoot: true
runAsUser: 1000
serviceAccountName: alertmanager-main
- version: 0.27.0
+ version: 0.28.0
diff --git a/manifests/alertmanager-networkPolicy.yaml b/manifests/alertmanager-networkPolicy.yaml
index ffc844eab55cf8eae0baab6d9d5dad9767498560..01ddb6bcdb9b11558e4f51fdcc7aa58869ba72b0 100644
--- a/manifests/alertmanager-networkPolicy.yaml
+++ b/manifests/alertmanager-networkPolicy.yaml
@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: main
app.kubernetes.io/name: alertmanager
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.27.0
+ app.kubernetes.io/version: 0.28.0
name: alertmanager-main
namespace: monitoring
spec:
diff --git a/manifests/alertmanager-podDisruptionBudget.yaml b/manifests/alertmanager-podDisruptionBudget.yaml
index 6dd87b3a4e3b5c1d6d8e108e15ca1651a379cfca..3644e4a1abf3e3aa3eebd8e6f26cd4cb21c63890 100644
--- a/manifests/alertmanager-podDisruptionBudget.yaml
+++ b/manifests/alertmanager-podDisruptionBudget.yaml
@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: main
app.kubernetes.io/name: alertmanager
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.27.0
+ app.kubernetes.io/version: 0.28.0
name: alertmanager-main
namespace: monitoring
spec:
diff --git a/manifests/alertmanager-prometheusRule.yaml b/manifests/alertmanager-prometheusRule.yaml
index 520e358525df4d3780812af879d6dc560bdc760e..8897c6182de1510c38b886b163bfcda571d29d5e 100644
--- a/manifests/alertmanager-prometheusRule.yaml
+++ b/manifests/alertmanager-prometheusRule.yaml
@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: main
app.kubernetes.io/name: alertmanager
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.27.0
+ app.kubernetes.io/version: 0.28.0
prometheus: k8s
role: alert-rules
name: alertmanager-main-rules
diff --git a/manifests/alertmanager-secret.yaml b/manifests/alertmanager-secret.yaml
index 00b0c680cf318619cb782a973eb4b0cc08cb81a5..58f492940f3a968b5575b4307b0231eeb2de92bc 100644
--- a/manifests/alertmanager-secret.yaml
+++ b/manifests/alertmanager-secret.yaml
@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: main
app.kubernetes.io/name: alertmanager
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.27.0
+ app.kubernetes.io/version: 0.28.0
name: alertmanager-main
namespace: monitoring
stringData:
diff --git a/manifests/alertmanager-service.yaml b/manifests/alertmanager-service.yaml
index 623b027660a602d34f81dc7347f320bc9e22209c..7ec88ee24dc769e6943678d10d3186f0f0d18331 100644
--- a/manifests/alertmanager-service.yaml
+++ b/manifests/alertmanager-service.yaml
@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: main
app.kubernetes.io/name: alertmanager
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.27.0
+ app.kubernetes.io/version: 0.28.0
name: alertmanager-main
namespace: monitoring
spec:
diff --git a/manifests/alertmanager-serviceAccount.yaml b/manifests/alertmanager-serviceAccount.yaml
index 2c2583c62258c8728eafcdafcc6b8acef4eac9e0..93661bfb14f4618e1893ca6f5620c34e8ab58f99 100644
--- a/manifests/alertmanager-serviceAccount.yaml
+++ b/manifests/alertmanager-serviceAccount.yaml
@@ -7,6 +7,6 @@ metadata:
app.kubernetes.io/instance: main
app.kubernetes.io/name: alertmanager
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.27.0
+ app.kubernetes.io/version: 0.28.0
name: alertmanager-main
namespace: monitoring
diff --git a/manifests/alertmanager-serviceMonitor.yaml b/manifests/alertmanager-serviceMonitor.yaml
index 9bbbd07827031bed014638a705c921a5e65f050d..09a4db2087281893869dfee6e20a233ebca5895a 100644
--- a/manifests/alertmanager-serviceMonitor.yaml
+++ b/manifests/alertmanager-serviceMonitor.yaml
@@ -6,7 +6,7 @@ metadata:
app.kubernetes.io/instance: main
app.kubernetes.io/name: alertmanager
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.27.0
+ app.kubernetes.io/version: 0.28.0
name: alertmanager-main
namespace: monitoring
spec:
diff --git a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
index e5c87611b6c53f06f5c0870c52a29b279f6e0542..77094631a5878d2bf84335be2f4aa250e5772dbe 100644
--- a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
+++ b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.5
+ controller-gen.kubebuilder.io/version: v0.17.1
operator.prometheus.io/version: 0.79.2
name: alertmanagerconfigs.monitoring.coreos.com
spec:
diff --git a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
index ae1eefa2409e5f2259990c03619953a4d31462ee..aee0f6381f55dfc81622401f6121d3b5b2f2681a 100644
--- a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
+++ b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.5
+ controller-gen.kubebuilder.io/version: v0.17.1
operator.prometheus.io/version: 0.79.2
name: alertmanagers.monitoring.coreos.com
spec:
diff --git a/manifests/setup/0podmonitorCustomResourceDefinition.yaml b/manifests/setup/0podmonitorCustomResourceDefinition.yaml
index c646ec4f186a4b92097fb93216ddb4c6434c7b62..6bfa596189f11e909139a3ce3417c10c0bc19844 100644
--- a/manifests/setup/0podmonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/0podmonitorCustomResourceDefinition.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.5
+ controller-gen.kubebuilder.io/version: v0.17.1
operator.prometheus.io/version: 0.79.2
name: podmonitors.monitoring.coreos.com
spec:
diff --git a/manifests/setup/0probeCustomResourceDefinition.yaml b/manifests/setup/0probeCustomResourceDefinition.yaml
index 04512f95ffdc848256a9c532ac066c4cfe83dba8..12517173f97c855eb732043427bfc02cf5d4da32 100644
--- a/manifests/setup/0probeCustomResourceDefinition.yaml
+++ b/manifests/setup/0probeCustomResourceDefinition.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.5
+ controller-gen.kubebuilder.io/version: v0.17.1
operator.prometheus.io/version: 0.79.2
name: probes.monitoring.coreos.com
spec:
diff --git a/manifests/setup/0prometheusCustomResourceDefinition.yaml b/manifests/setup/0prometheusCustomResourceDefinition.yaml
index 484c08a9454a54959ff266cb04a98e6fbc8653ac..bbb6b5d0791850a6707febd656beb94a731c696f 100644
--- a/manifests/setup/0prometheusCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusCustomResourceDefinition.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.5
+ controller-gen.kubebuilder.io/version: v0.17.1
operator.prometheus.io/version: 0.79.2
name: prometheuses.monitoring.coreos.com
spec:
@@ -8562,6 +8562,16 @@ spec:
type: object
type: object
x-kubernetes-map-type: atomic
+ serviceName:
+ description: |-
+ The name of the service name used by the underlying StatefulSet(s) as the governing service.
+ If defined, the Service must be created before the Prometheus/PrometheusAgent resource in the same namespace and it must define a selector that matches the pod labels.
+ If empty, the operator will create and manage a headless service named `prometheus-operated` for Prometheus resources,
+ or `prometheus-agent-operated` for PrometheusAgent resources.
+ When deploying multiple Prometheus/PrometheusAgent resources in the same namespace, it is recommended to specify a different value for each.
+ See https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#stable-network-id for more details.
+ minLength: 1
+ type: string
sha:
description: 'Deprecated: use ''spec.image'' instead. The image''s digest can be specified as part of the image name.'
type: string
diff --git a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
index 93a0f47d0eb48bc9b90fd130e035b1463a54f667..acee16c945bca8e5bfc8a684970efe3bb3cb300b 100644
--- a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.5
+ controller-gen.kubebuilder.io/version: v0.17.1
operator.prometheus.io/version: 0.79.2
name: prometheusagents.monitoring.coreos.com
spec:
@@ -6955,6 +6955,16 @@ spec:
type: object
type: object
x-kubernetes-map-type: atomic
+ serviceName:
+ description: |-
+ The name of the service name used by the underlying StatefulSet(s) as the governing service.
+ If defined, the Service must be created before the Prometheus/PrometheusAgent resource in the same namespace and it must define a selector that matches the pod labels.
+ If empty, the operator will create and manage a headless service named `prometheus-operated` for Prometheus resources,
+ or `prometheus-agent-operated` for PrometheusAgent resources.
+ When deploying multiple Prometheus/PrometheusAgent resources in the same namespace, it is recommended to specify a different value for each.
+ See https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#stable-network-id for more details.
+ minLength: 1
+ type: string
shards:
description: |-
Number of shards to distribute scraped targets onto.
diff --git a/manifests/setup/0prometheusruleCustomResourceDefinition.yaml b/manifests/setup/0prometheusruleCustomResourceDefinition.yaml
index ccac3029b57cb913e5a63a3eb4292711b536d6c0..00c084d46741aad54366e1ffdaa08b316bf3f1a4 100644
--- a/manifests/setup/0prometheusruleCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusruleCustomResourceDefinition.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.5
+ controller-gen.kubebuilder.io/version: v0.17.1
operator.prometheus.io/version: 0.79.2
name: prometheusrules.monitoring.coreos.com
spec:
diff --git a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml
index 62d6e32cbe1fd2000148d045ff433f62dd7afe1b..5d4884a2a239c4735ebb1849f0e53284a1293699 100644
--- a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml
+++ b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.5
+ controller-gen.kubebuilder.io/version: v0.17.1
operator.prometheus.io/version: 0.79.2
name: scrapeconfigs.monitoring.coreos.com
spec:
diff --git a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
index 34cf94ba460725ee6013bfad6e1bbbd517b18713..452ad147c82ac4778445b7798aa6e32182d6e980 100644
--- a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.5
+ controller-gen.kubebuilder.io/version: v0.17.1
operator.prometheus.io/version: 0.79.2
name: servicemonitors.monitoring.coreos.com
spec:
diff --git a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
index 50bd6b3dc696d32f36b564a010e6305cf15c03f5..d118dfbd677038e3a9507d11e11234f3011ce7cf 100644
--- a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
+++ b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.16.5
+ controller-gen.kubebuilder.io/version: v0.17.1
operator.prometheus.io/version: 0.79.2
name: thanosrulers.monitoring.coreos.com
spec: