From d20a4b2926f474a71b2a91d221fc4cb8284dde10 Mon Sep 17 00:00:00 2001
From: PromOperatorBot <85787986+prom-op-bot@users.noreply.github.com>
Date: Wed, 7 Aug 2024 18:29:59 +0200
Subject: [PATCH] [bot] [main] Automated version update (#2482)
Co-authored-by: Prometheus Operator Bot <prom-op-bot@users.noreply.github.com>
---
jsonnetfile.lock.json | 14 +++++++-------
.../setup/0prometheusCustomResourceDefinition.yaml | 7 +++++--
.../0prometheusagentCustomResourceDefinition.yaml | 5 ++++-
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 1aa450e5..49003b27 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
- "version": "8b1b69b1e26621e1038f78a3fe84e0919b00034d",
+ "version": "e34a10191473e5be14ca3b6f972327f28e9b20db",
"sum": "IXI3LQIT9NmTPJAk8WLUJd5+qZfcGpeNCyWIK7oEpws="
},
{
@@ -88,8 +88,8 @@
"subdir": "grafana-builder"
}
},
- "version": "02db06f540086fa3f67d487bd01e1b314853fb8f",
- "sum": "B49EzIY2WZsFxNMJcgRxE/gcZ9ltnS8pkOOV6Q5qioc="
+ "version": "d9ba581fb27aa6689e911f288d4df06948eb8aad",
+ "sum": "yxqWcq/N3E/a/XreeU6EuE6X7kYPnG0AspAQFKOjASo="
},
{
"source": {
@@ -158,7 +158,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "0a3712ac74a8b9eaff80409018654faab978b06c",
+ "version": "e84c86213c45858f401482eb38c880922a97a288",
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
"name": "prometheus-operator-mixin"
},
@@ -169,8 +169,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "0a3712ac74a8b9eaff80409018654faab978b06c",
- "sum": "IIi/otkMN2nirQUjZy2GVknbDzTQexpCsAPx0roksEE="
+ "version": "e84c86213c45858f401482eb38c880922a97a288",
+ "sum": "u/JKJOcXudLvK1TQSDA/b+fRJqGUs1aeNenhyYWDLAU="
},
{
"source": {
@@ -200,7 +200,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "ee5bba07c003af88d233083cdd65ac6d064b5b82",
+ "version": "3a673cd0bced1ba5223a6d4350d587d7631ce994",
"sum": "dYLcLzGH4yF3qB7OGC/7z4nqeTNjv42L7Q3BENU8XJI=",
"name": "prometheus"
},
diff --git a/manifests/setup/0prometheusCustomResourceDefinition.yaml b/manifests/setup/0prometheusCustomResourceDefinition.yaml
index bd7ff138..df2e697e 100644
--- a/manifests/setup/0prometheusCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusCustomResourceDefinition.yaml
@@ -1112,7 +1112,7 @@ spec:
description: Defines the settings related to Alertmanager.
properties:
alertmanagers:
- description: AlertmanagerEndpoints Prometheus should fire alerts against.
+ description: Alertmanager endpoints where Prometheus should send alerts to.
items:
description: |-
AlertmanagerEndpoints defines a selection of a single Endpoints object
@@ -8074,7 +8074,10 @@ spec:
type: string
serviceDiscoveryRole:
description: |-
- Defines the service discovery role used to discover targets from `ServiceMonitor` objects.
+ Defines the service discovery role used to discover targets from
+ `ServiceMonitor` objects and Alertmanager endpoints.
+
+
If set, the value should be either "Endpoints" or "EndpointSlice".
If unset, the operator assumes the "Endpoints" role.
enum:
diff --git a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
index 54d405f0..bda8b63b 100644
--- a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
@@ -6624,7 +6624,10 @@ spec:
type: string
serviceDiscoveryRole:
description: |-
- Defines the service discovery role used to discover targets from `ServiceMonitor` objects.
+ Defines the service discovery role used to discover targets from
+ `ServiceMonitor` objects and Alertmanager endpoints.
+
+
If set, the value should be either "Endpoints" or "EndpointSlice".
If unset, the operator assumes the "Endpoints" role.
enum:
--
GitLab