diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 1aa450e513f7f68a1b7667649f17586b779b21ef..49003b27042f960473933d949ef937e39bc923e8 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 bd7ff13809ce8dafe87cfb70157bdd1797449f97..df2e697ecc00d790b8681c4845f9dc616fa5f2da 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 54d405f0753b37d1ca197d81e2c6f2a65587ae1d..bda8b63b5197203fb55deca6f52c4827928ce410 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: