From 3ae2bfabfa387b78f3d0141eea39cab834c0276b Mon Sep 17 00:00:00 2001
From: PromOperatorBot <85787986+prom-op-bot@users.noreply.github.com>
Date: Mon, 6 Nov 2023 10:22:05 +0100
Subject: [PATCH] [bot] [main] Automated version update (#2260)
Co-authored-by: Prometheus Operator Bot <prom-op-bot@users.noreply.github.com>
---
jsonnetfile.lock.json | 32 +++++-----
manifests/grafana-dashboardDefinitions.yaml | 62 +++++++++----------
...managerConfigCustomResourceDefinition.yaml | 1 +
...0alertmanagerCustomResourceDefinition.yaml | 3 +-
.../0podmonitorCustomResourceDefinition.yaml | 1 +
.../setup/0probeCustomResourceDefinition.yaml | 1 +
.../0prometheusCustomResourceDefinition.yaml | 54 ++++++++++++++--
...ometheusagentCustomResourceDefinition.yaml | 3 +-
...rometheusruleCustomResourceDefinition.yaml | 1 +
...0scrapeconfigCustomResourceDefinition.yaml | 26 +++++++-
...ervicemonitorCustomResourceDefinition.yaml | 1 +
.../0thanosrulerCustomResourceDefinition.yaml | 3 +-
12 files changed, 133 insertions(+), 55 deletions(-)
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 984b3a13..d011ed9a 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
- "version": "5cc9f7f7712a3de96c1afb4b9d85ed8e5b5fadd8",
+ "version": "02794b00eb0e964943c91d283106072e18fdc092",
"sum": "xuUBd2vqF7asyVDe5CE08uPT/RxAdy8O75EjFJoMXXU="
},
{
@@ -68,7 +68,7 @@
"subdir": "grafana-builder"
}
},
- "version": "f076e1630911a6a332fa6a08209450b83d11e367",
+ "version": "a8de7212fa1dc27668344bffeb67f226d4ddcb8f",
"sum": "xEFMv4+ObwP5L1Wu0XK5agWci4AJzNApys6iKAQxLlQ="
},
{
@@ -88,8 +88,8 @@
"subdir": ""
}
},
- "version": "42adb4b347a89c8e07f7ea7d459dee50fe56afe3",
- "sum": "V1fCscAmNomABItd9KJUYj1hcy/yXR4elCrGVE/JLlw="
+ "version": "c1a315a7dbead0335a5e0486acc5583395b22a24",
+ "sum": "UVdL+uuFI8BSQgLfMJEJk2WDKsQXNT3dRHcr2Ti9rLI="
},
{
"source": {
@@ -98,8 +98,8 @@
"subdir": ""
}
},
- "version": "3efc200d7e4a86c58cdfa974cf9c236d47e87b8c",
- "sum": "VUmOX5Tuk1VoShfLBnwvOjiXf9WQn/4yRBTWnKlzogo="
+ "version": "d9a7f3a21d2b83198a3519eb4c0f9960b6b0a62f",
+ "sum": "PAdS42ZaVLJD8Pe5uZxOmyJHfwGIH49z0o2ucl4NK5g="
},
{
"source": {
@@ -108,7 +108,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
- "version": "9a499d2a0531a770641ea6be745301d127536401",
+ "version": "82fd15ccc4a4c716721fcb135b1f7ef129025a3f",
"sum": "+dOzAK+fwsFf97uZpjcjTcEJEC1H8hh/j8f5uIQK/5g="
},
{
@@ -118,7 +118,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
- "version": "9a499d2a0531a770641ea6be745301d127536401",
+ "version": "82fd15ccc4a4c716721fcb135b1f7ef129025a3f",
"sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
},
{
@@ -128,7 +128,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "18a2bad4f7742ff8c97dc73322289ec1eced1d74",
+ "version": "45185c8d5c0e97027f7e99beeb9114c5642aeec3",
"sum": "n3flMIzlADeyygb0uipZ4KPp2uNSjdtkrwgHjTC7Ca4=",
"name": "prometheus-operator-mixin"
},
@@ -139,8 +139,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "18a2bad4f7742ff8c97dc73322289ec1eced1d74",
- "sum": "CvkfwykraJ/J/LdmTT6I5/cypzgKYfgX8PY5xu+zJpU="
+ "version": "45185c8d5c0e97027f7e99beeb9114c5642aeec3",
+ "sum": "bxqPs5CnlLpVZGc36H0QF/bbt4EcoEtFyASGt+9dR+E="
},
{
"source": {
@@ -149,7 +149,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
- "version": "8512285e54f33199a454f0ccfa29a096c9f0072a",
+ "version": "fdea7e731cd0b07cb2a342f182dd4d37938b69db",
"sum": "1d7ZKYArJKacAWXLUz0bRC1uOkozee/PPw97/W5zGhc=",
"name": "alertmanager"
},
@@ -160,7 +160,7 @@
"subdir": "docs/node-mixin"
}
},
- "version": "6122cee47a39ef35de5698b348fc5cf9343f28a5",
+ "version": "5ffc733af363848aa68e9d5412de2a031677eab1",
"sum": "By6n6U10hYDogUsyhsaKZehbhzxBZZobJloiKyKadgM="
},
{
@@ -170,8 +170,8 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "e9b94515caa4c0d7a0e31f722a1534948ebad838",
- "sum": "8OngT76gVXOUROOOeP9yTe6E/dn+2D2J34Dn690QCG0=",
+ "version": "69c9c29061e9be111654fd678abcb708d7a3dfd5",
+ "sum": "rNvddVTMNfaguOGzEGoeKjUsfhlXJBUImC+SIFNNCiM=",
"name": "prometheus"
},
{
@@ -192,7 +192,7 @@
"subdir": "mixin"
}
},
- "version": "326c146ddd357ca892789cbef401b3cd08f49934",
+ "version": "c74a050a190486addc1ea1ca4b522462fc7ec680",
"sum": "HhSSbGGCNHCMy1ee5jElYDm0yS9Vesa7QB2/SHKdjsY=",
"name": "thanos-mixin"
},
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index fb7cae5f..b3422a2f 100644
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
@@ -8744,7 +8744,7 @@ items:
],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
- "decimals": -1,
+ "decimals": 3,
"link": false,
"linkTargetBlank": false,
"linkTooltip": "Drill down",
@@ -8754,7 +8754,7 @@ items:
],
"type": "number",
- "unit": "short"
+ "unit": "iops"
},
{
"alias": "IOPS(Writes)",
@@ -8763,7 +8763,7 @@ items:
],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
- "decimals": -1,
+ "decimals": 3,
"link": false,
"linkTargetBlank": false,
"linkTooltip": "Drill down",
@@ -8773,7 +8773,7 @@ items:
],
"type": "number",
- "unit": "short"
+ "unit": "iops"
},
{
"alias": "IOPS(Reads + Writes)",
@@ -8782,7 +8782,7 @@ items:
],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
- "decimals": -1,
+ "decimals": 3,
"link": false,
"linkTargetBlank": false,
"linkTooltip": "Drill down",
@@ -8792,7 +8792,7 @@ items:
],
"type": "number",
- "unit": "short"
+ "unit": "iops"
},
{
"alias": "Throughput(Read)",
@@ -12827,7 +12827,7 @@ items:
],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
- "decimals": -1,
+ "decimals": 3,
"link": false,
"linkTargetBlank": false,
"linkTooltip": "Drill down",
@@ -12837,7 +12837,7 @@ items:
],
"type": "number",
- "unit": "short"
+ "unit": "iops"
},
{
"alias": "IOPS(Writes)",
@@ -12846,7 +12846,7 @@ items:
],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
- "decimals": -1,
+ "decimals": 3,
"link": false,
"linkTargetBlank": false,
"linkTooltip": "Drill down",
@@ -12856,7 +12856,7 @@ items:
],
"type": "number",
- "unit": "short"
+ "unit": "iops"
},
{
"alias": "IOPS(Reads + Writes)",
@@ -12865,7 +12865,7 @@ items:
],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
- "decimals": -1,
+ "decimals": 3,
"link": false,
"linkTargetBlank": false,
"linkTooltip": "Drill down",
@@ -12875,7 +12875,7 @@ items:
],
"type": "number",
- "unit": "short"
+ "unit": "iops"
},
{
"alias": "Throughput(Read)",
@@ -16218,7 +16218,7 @@ items:
],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
- "decimals": -1,
+ "decimals": 3,
"link": false,
"linkTargetBlank": false,
"linkTooltip": "Drill down",
@@ -16228,7 +16228,7 @@ items:
],
"type": "number",
- "unit": "short"
+ "unit": "iops"
},
{
"alias": "IOPS(Writes)",
@@ -16237,7 +16237,7 @@ items:
],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
- "decimals": -1,
+ "decimals": 3,
"link": false,
"linkTargetBlank": false,
"linkTooltip": "Drill down",
@@ -16247,7 +16247,7 @@ items:
],
"type": "number",
- "unit": "short"
+ "unit": "iops"
},
{
"alias": "IOPS(Reads + Writes)",
@@ -16256,7 +16256,7 @@ items:
],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
- "decimals": -1,
+ "decimals": 3,
"link": false,
"linkTargetBlank": false,
"linkTooltip": "Drill down",
@@ -16266,7 +16266,7 @@ items:
],
"type": "number",
- "unit": "short"
+ "unit": "iops"
},
{
"alias": "Throughput(Read)",
@@ -32283,7 +32283,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "(\n prometheus_remote_storage_highest_timestamp_in_seconds{cluster=~\"$cluster\", instance=~\"$instance\"} \n- \n ignoring(remote_name, url) group_right(instance) (prometheus_remote_storage_queue_highest_sent_timestamp_seconds{cluster=~\"$cluster\", instance=~\"$instance\"} != 0)\n)\n",
+ "expr": "(\n prometheus_remote_storage_highest_timestamp_in_seconds{cluster=~\"$cluster\", instance=~\"$instance\"} \n- \n ignoring(remote_name, url) group_right(instance) (prometheus_remote_storage_queue_highest_sent_timestamp_seconds{cluster=~\"$cluster\", instance=~\"$instance\", url=~\"$url\"} != 0)\n)\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{cluster}}:{{instance}} {{remote_name}}:{{url}}",
@@ -32376,7 +32376,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "clamp_min(\n rate(prometheus_remote_storage_highest_timestamp_in_seconds{cluster=~\"$cluster\", instance=~\"$instance\"}[5m]) \n- \n ignoring (remote_name, url) group_right(instance) rate(prometheus_remote_storage_queue_highest_sent_timestamp_seconds{cluster=~\"$cluster\", instance=~\"$instance\"}[5m])\n, 0)\n",
+ "expr": "clamp_min(\n rate(prometheus_remote_storage_highest_timestamp_in_seconds{cluster=~\"$cluster\", instance=~\"$instance\"}[5m]) \n- \n ignoring (remote_name, url) group_right(instance) rate(prometheus_remote_storage_queue_highest_sent_timestamp_seconds{cluster=~\"$cluster\", instance=~\"$instance\", url=~\"$url\"}[5m])\n, 0)\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{cluster}}:{{instance}} {{remote_name}}:{{url}}",
@@ -32482,7 +32482,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "rate(\n prometheus_remote_storage_samples_in_total{cluster=~\"$cluster\", instance=~\"$instance\"}[5m])\n- \n ignoring(remote_name, url) group_right(instance) (rate(prometheus_remote_storage_succeeded_samples_total{cluster=~\"$cluster\", instance=~\"$instance\"}[5m]) or rate(prometheus_remote_storage_samples_total{cluster=~\"$cluster\", instance=~\"$instance\"}[5m]))\n- \n (rate(prometheus_remote_storage_dropped_samples_total{cluster=~\"$cluster\", instance=~\"$instance\"}[5m]) or rate(prometheus_remote_storage_samples_dropped_total{cluster=~\"$cluster\", instance=~\"$instance\"}[5m]))\n",
+ "expr": "rate(\n prometheus_remote_storage_samples_in_total{cluster=~\"$cluster\", instance=~\"$instance\"}[5m])\n- \n ignoring(remote_name, url) group_right(instance) (rate(prometheus_remote_storage_succeeded_samples_total{cluster=~\"$cluster\", instance=~\"$instance\", url=~\"$url\"}[5m]) or rate(prometheus_remote_storage_samples_total{cluster=~\"$cluster\", instance=~\"$instance\", url=~\"$url\"}[5m]))\n- \n (rate(prometheus_remote_storage_dropped_samples_total{cluster=~\"$cluster\", instance=~\"$instance\", url=~\"$url\"}[5m]) or rate(prometheus_remote_storage_samples_dropped_total{cluster=~\"$cluster\", instance=~\"$instance\", url=~\"$url\"}[5m]))\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{cluster}}:{{instance}} {{remote_name}}:{{url}}",
@@ -32589,7 +32589,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "prometheus_remote_storage_shards{cluster=~\"$cluster\", instance=~\"$instance\"}",
+ "expr": "prometheus_remote_storage_shards{cluster=~\"$cluster\", instance=~\"$instance\", url=~\"$url\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{cluster}}:{{instance}} {{remote_name}}:{{url}}",
@@ -32682,7 +32682,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "prometheus_remote_storage_shards_max{cluster=~\"$cluster\", instance=~\"$instance\"}",
+ "expr": "prometheus_remote_storage_shards_max{cluster=~\"$cluster\", instance=~\"$instance\", url=~\"$url\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{cluster}}:{{instance}} {{remote_name}}:{{url}}",
@@ -32775,7 +32775,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "prometheus_remote_storage_shards_min{cluster=~\"$cluster\", instance=~\"$instance\"}",
+ "expr": "prometheus_remote_storage_shards_min{cluster=~\"$cluster\", instance=~\"$instance\", url=~\"$url\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{cluster}}:{{instance}} {{remote_name}}:{{url}}",
@@ -32868,7 +32868,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "prometheus_remote_storage_shards_desired{cluster=~\"$cluster\", instance=~\"$instance\"}",
+ "expr": "prometheus_remote_storage_shards_desired{cluster=~\"$cluster\", instance=~\"$instance\", url=~\"$url\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{cluster}}:{{instance}} {{remote_name}}:{{url}}",
@@ -32974,7 +32974,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "prometheus_remote_storage_shard_capacity{cluster=~\"$cluster\", instance=~\"$instance\"}",
+ "expr": "prometheus_remote_storage_shard_capacity{cluster=~\"$cluster\", instance=~\"$instance\", url=~\"$url\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{cluster}}:{{instance}} {{remote_name}}:{{url}}",
@@ -33067,7 +33067,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "prometheus_remote_storage_pending_samples{cluster=~\"$cluster\", instance=~\"$instance\"} or prometheus_remote_storage_samples_pending{cluster=~\"$cluster\", instance=~\"$instance\"}",
+ "expr": "prometheus_remote_storage_pending_samples{cluster=~\"$cluster\", instance=~\"$instance\", url=~\"$url\"} or prometheus_remote_storage_samples_pending{cluster=~\"$cluster\", instance=~\"$instance\", url=~\"$url\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{cluster}}:{{instance}} {{remote_name}}:{{url}}",
@@ -33372,7 +33372,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "rate(prometheus_remote_storage_dropped_samples_total{cluster=~\"$cluster\", instance=~\"$instance\"}[5m]) or rate(prometheus_remote_storage_samples_dropped_total{cluster=~\"$cluster\", instance=~\"$instance\"}[5m])",
+ "expr": "rate(prometheus_remote_storage_dropped_samples_total{cluster=~\"$cluster\", instance=~\"$instance\", url=~\"$url\"}[5m]) or rate(prometheus_remote_storage_samples_dropped_total{cluster=~\"$cluster\", instance=~\"$instance\", url=~\"$url\"}[5m])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{cluster}}:{{instance}} {{remote_name}}:{{url}}",
@@ -33465,7 +33465,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "rate(prometheus_remote_storage_failed_samples_total{cluster=~\"$cluster\", instance=~\"$instance\"}[5m]) or rate(prometheus_remote_storage_samples_failed_total{cluster=~\"$cluster\", instance=~\"$instance\"}[5m])",
+ "expr": "rate(prometheus_remote_storage_failed_samples_total{cluster=~\"$cluster\", instance=~\"$instance\", url=~\"$url\"}[5m]) or rate(prometheus_remote_storage_samples_failed_total{cluster=~\"$cluster\", instance=~\"$instance\", url=~\"$url\"}[5m])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{cluster}}:{{instance}} {{remote_name}}:{{url}}",
@@ -33558,7 +33558,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "rate(prometheus_remote_storage_retried_samples_total{cluster=~\"$cluster\", instance=~\"$instance\"}[5m]) or rate(prometheus_remote_storage_samples_retried_total{cluster=~\"$cluster\", instance=~\"$instance\"}[5m])",
+ "expr": "rate(prometheus_remote_storage_retried_samples_total{cluster=~\"$cluster\", instance=~\"$instance\", url=~\"$url\"}[5m]) or rate(prometheus_remote_storage_samples_retried_total{cluster=~\"$cluster\", instance=~\"$instance\", url=~\"$url\"}[5m])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{cluster}}:{{instance}} {{remote_name}}:{{url}}",
@@ -33651,7 +33651,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "rate(prometheus_remote_storage_enqueue_retries_total{cluster=~\"$cluster\", instance=~\"$instance\"}[5m])",
+ "expr": "rate(prometheus_remote_storage_enqueue_retries_total{cluster=~\"$cluster\", instance=~\"$instance\", url=~\"$url\"}[5m])",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{cluster}}:{{instance}} {{remote_name}}:{{url}}",
diff --git a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
index 447ec405..af0095ce 100644
--- a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
+++ b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
@@ -3,6 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
+ operator.prometheus.io/version: 0.68.0
creationTimestamp: null
name: alertmanagerconfigs.monitoring.coreos.com
spec:
diff --git a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
index 192aaa9c..41916e14 100644
--- a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
+++ b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
@@ -3,6 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
+ operator.prometheus.io/version: 0.68.0
creationTimestamp: null
name: alertmanagers.monitoring.coreos.com
spec:
@@ -2792,7 +2793,7 @@ spec:
description: If set to true all actions on the underlying managed objects are not goint to be performed, except for delete actions.
type: boolean
podMetadata:
- description: PodMetadata configures Labels and Annotations which are propagated to the alertmanager pods.
+ description: "PodMetadata configures labels and annotations which are propagated to the Alertmanager pods. \n The following items are reserved and cannot be overridden: * \"alertmanager\" label, set to the name of the Alertmanager instance. * \"app.kubernetes.io/instance\" label, set to the name of the Alertmanager instance. * \"app.kubernetes.io/managed-by\" label, set to \"prometheus-operator\". * \"app.kubernetes.io/name\" label, set to \"alertmanager\". * \"app.kubernetes.io/version\" label, set to the Alertmanager version. * \"kubectl.kubernetes.io/default-container\" annotation, set to \"alertmanager\"."
properties:
annotations:
additionalProperties:
diff --git a/manifests/setup/0podmonitorCustomResourceDefinition.yaml b/manifests/setup/0podmonitorCustomResourceDefinition.yaml
index bf6cd117..6f1283b1 100644
--- a/manifests/setup/0podmonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/0podmonitorCustomResourceDefinition.yaml
@@ -3,6 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
+ operator.prometheus.io/version: 0.68.0
creationTimestamp: null
name: podmonitors.monitoring.coreos.com
spec:
diff --git a/manifests/setup/0probeCustomResourceDefinition.yaml b/manifests/setup/0probeCustomResourceDefinition.yaml
index 1e8ca5d2..0a862281 100644
--- a/manifests/setup/0probeCustomResourceDefinition.yaml
+++ b/manifests/setup/0probeCustomResourceDefinition.yaml
@@ -3,6 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
+ operator.prometheus.io/version: 0.68.0
creationTimestamp: null
name: probes.monitoring.coreos.com
spec:
diff --git a/manifests/setup/0prometheusCustomResourceDefinition.yaml b/manifests/setup/0prometheusCustomResourceDefinition.yaml
index beee67c6..ea11b0d8 100644
--- a/manifests/setup/0prometheusCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusCustomResourceDefinition.yaml
@@ -3,6 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
+ operator.prometheus.io/version: 0.68.0
creationTimestamp: null
name: prometheuses.monitoring.coreos.com
spec:
@@ -609,7 +610,7 @@ spec:
description: Version of the Alertmanager API that Prometheus uses to send alerts. It can be "v1" or "v2".
type: string
authorization:
- description: "Authorization section for Alertmanager. \n Cannot be set at the same time as `basicAuth`, or `bearerTokenFile`."
+ description: "Authorization section for Alertmanager. \n Cannot be set at the same time as `basicAuth`, `bearerTokenFile` or `sigv4`."
properties:
credentials:
description: Selects a key of a Secret in the namespace that contains the credentials for authentication.
@@ -632,7 +633,7 @@ spec:
type: string
type: object
basicAuth:
- description: "BasicAuth configuration for Alertmanager. \n Cannot be set at the same time as `bearerTokenFile`, or `authorization`."
+ description: "BasicAuth configuration for Alertmanager. \n Cannot be set at the same time as `bearerTokenFile`, `authorization` or `sigv4`."
properties:
password:
description: The secret in the service monitor namespace that contains the password for authentication.
@@ -668,7 +669,7 @@ spec:
x-kubernetes-map-type: atomic
type: object
bearerTokenFile:
- description: "File to read bearer token for Alertmanager. \n Cannot be set at the same time as `basicAuth`, or `authorization`. \n *Deprecated: this will be removed in a future release. Prefer using `authorization`.*"
+ description: "File to read bearer token for Alertmanager. \n Cannot be set at the same time as `basicAuth`, `authorization`, or `sigv4`. \n *Deprecated: this will be removed in a future release. Prefer using `authorization`.*"
type: string
enableHttp2:
description: Whether to enable HTTP2.
@@ -691,6 +692,51 @@ spec:
scheme:
description: Scheme to use when firing alerts.
type: string
+ sigv4:
+ description: "Sigv4 allows to configures AWS's Signature Verification 4 for the URL. \n It requires Prometheus >= v2.48.0. \n Cannot be set at the same time as `basicAuth`, `bearerTokenFile` or `authorization`."
+ properties:
+ accessKey:
+ description: AccessKey is the AWS API key. If not specified, the environment variable `AWS_ACCESS_KEY_ID` is used.
+ 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
+ profile:
+ description: Profile is the named AWS profile used to authenticate.
+ type: string
+ region:
+ description: Region is the AWS region. If blank, the region from the default credentials chain used.
+ type: string
+ roleArn:
+ description: RoleArn is the named AWS profile used to authenticate.
+ type: string
+ secretKey:
+ description: SecretKey is the AWS API secret. If not specified, the environment variable `AWS_SECRET_ACCESS_KEY` is used.
+ 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
timeout:
description: Timeout is a per-target Alertmanager timeout when pushing alerts.
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
@@ -2859,7 +2905,7 @@ spec:
description: When a Prometheus deployment is paused, no actions except for deletion will be performed on the underlying objects.
type: boolean
podMetadata:
- description: PodMetadata configures labels and annotations which are propagated to the Prometheus pods.
+ description: "PodMetadata configures labels and annotations which are propagated to the Prometheus pods. \n The following items are reserved and cannot be overridden: * \"prometheus\" label, set to the name of the Prometheus object. * \"app.kubernetes.io/instance\" label, set to the name of the Prometheus object. * \"app.kubernetes.io/managed-by\" label, set to \"prometheus-operator\". * \"app.kubernetes.io/name\" label, set to \"prometheus\". * \"app.kubernetes.io/version\" label, set to the Prometheus version. * \"operator.prometheus.io/name\" label, set to the name of the Prometheus object. * \"operator.prometheus.io/shard\" label, set to the shard number of the Prometheus object. * \"kubectl.kubernetes.io/default-container\" annotation, set to \"prometheus\"."
properties:
annotations:
additionalProperties:
diff --git a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
index fe87a46b..bfe1d0f3 100644
--- a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
@@ -3,6 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
+ operator.prometheus.io/version: 0.68.0
creationTimestamp: null
name: prometheusagents.monitoring.coreos.com
spec:
@@ -2588,7 +2589,7 @@ spec:
description: When a Prometheus deployment is paused, no actions except for deletion will be performed on the underlying objects.
type: boolean
podMetadata:
- description: PodMetadata configures labels and annotations which are propagated to the Prometheus pods.
+ description: "PodMetadata configures labels and annotations which are propagated to the Prometheus pods. \n The following items are reserved and cannot be overridden: * \"prometheus\" label, set to the name of the Prometheus object. * \"app.kubernetes.io/instance\" label, set to the name of the Prometheus object. * \"app.kubernetes.io/managed-by\" label, set to \"prometheus-operator\". * \"app.kubernetes.io/name\" label, set to \"prometheus\". * \"app.kubernetes.io/version\" label, set to the Prometheus version. * \"operator.prometheus.io/name\" label, set to the name of the Prometheus object. * \"operator.prometheus.io/shard\" label, set to the shard number of the Prometheus object. * \"kubectl.kubernetes.io/default-container\" annotation, set to \"prometheus\"."
properties:
annotations:
additionalProperties:
diff --git a/manifests/setup/0prometheusruleCustomResourceDefinition.yaml b/manifests/setup/0prometheusruleCustomResourceDefinition.yaml
index beb3f598..9e6131fe 100644
--- a/manifests/setup/0prometheusruleCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusruleCustomResourceDefinition.yaml
@@ -3,6 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
+ operator.prometheus.io/version: 0.68.0
creationTimestamp: null
name: prometheusrules.monitoring.coreos.com
spec:
diff --git a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml
index 4f767f12..985bf2c4 100644
--- a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml
+++ b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml
@@ -3,6 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
+ operator.prometheus.io/version: 0.68.0
creationTimestamp: null
name: scrapeconfigs.monitoring.coreos.com
spec:
@@ -737,10 +738,33 @@ spec:
description: KubernetesSDConfig allows retrieving scrape targets from Kubernetes' REST API. See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#kubernetes_sd_config
properties:
role:
- description: Role of the Kubernetes entities that should be discovered. Currently the only supported role is "Node".
+ description: Role of the Kubernetes entities that should be discovered.
enum:
- Node
+ - node
type: string
+ selectors:
+ description: Selector to select objects.
+ items:
+ description: K8SSelectorConfig is Kubernetes Selector Config
+ properties:
+ field:
+ type: string
+ label:
+ type: string
+ role:
+ description: K8SRole is role of the service in Kubernetes. Currently the only supported role is "Node".
+ enum:
+ - Node
+ - node
+ type: string
+ required:
+ - role
+ type: object
+ type: array
+ x-kubernetes-list-map-keys:
+ - role
+ x-kubernetes-list-type: map
required:
- role
type: object
diff --git a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
index 5e00108a..e97f4c6a 100644
--- a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
@@ -3,6 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
+ operator.prometheus.io/version: 0.68.0
creationTimestamp: null
name: servicemonitors.monitoring.coreos.com
spec:
diff --git a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
index 1358ee7c..5a5d3e4f 100644
--- a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
+++ b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
@@ -3,6 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
+ operator.prometheus.io/version: 0.68.0
creationTimestamp: null
name: thanosrulers.monitoring.coreos.com
spec:
@@ -2488,7 +2489,7 @@ spec:
description: When a ThanosRuler deployment is paused, no actions except for deletion will be performed on the underlying objects.
type: boolean
podMetadata:
- description: PodMetadata contains Labels and Annotations gets propagated to the thanos ruler pods.
+ description: "PodMetadata configures labels and annotations which are propagated to the ThanosRuler pods. \n The following items are reserved and cannot be overridden: * \"app.kubernetes.io/name\" label, set to \"thanos-ruler\". * \"app.kubernetes.io/managed-by\" label, set to \"prometheus-operator\". * \"app.kubernetes.io/instance\" label, set to the name of the ThanosRuler instance. * \"thanos-ruler\" label, set to the name of the ThanosRuler instance. * \"kubectl.kubernetes.io/default-container\" annotation, set to \"thanos-ruler\"."
properties:
annotations:
additionalProperties:
--
GitLab