[bot] [release-0.13] Automated version update (#2481)

Co-authored-by: Prometheus Operator Bot <prom-op-bot@users.noreply.github.com>

.github/workflows/ci.yaml

@@ -85,6 +85,7 @@ jobs:
         kind-image:
           - 'kindest/node:v1.28.0'
           - 'kindest/node:v1.27.3'
+          - 'kindest/node:v1.26.6'
     steps:
     - uses: actions/checkout@v3
       with:

.github/workflows/versions.yaml

@@ -5,17 +5,17 @@ on:
   schedule:
     - cron: '37 7 * * 1'
 env:
-  golang-version: '1.19'
+  golang-version: '1.20'
 jobs:
   versions:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         branch:
-          - 'release-0.9'
           - 'release-0.10'
           - 'release-0.11'
           - 'release-0.12'
+          - 'release-0.13'
           - 'main'
     steps:
     - uses: actions/checkout@v3

.mdox.validate.yaml

@@ -6,4 +6,8 @@ validators:
     type: "ignore"
   # Ignore release links.
   - regex: 'https:\/\/github\.com\/prometheus-operator\/kube-prometheus\/releases'
-    type: "ignore"
+    type: "ignore"
+  # the www.weave.works domain returns 404 for many pages.
+  # Ignoring for now but we need remove the related content if it persists.
+  - regex: 'https:\/\/www.weave.works.*'
+    type: "ignore"

CHANGELOG.md

@@ -1,3 +1,21 @@
+## release-0.13 / 2023-08-31
+
+* [CHANGE] Added a AKS platform to `platforms.libsonnet` [#1997](https://github.com/prometheus-operator/kube-prometheus/pull/1997)
+* [CHANGE] Disable btrfs collector by default [#2074](https://github.com/prometheus-operator/kube-prometheus/pull/2074)
+* [CHANGE] Enable Multi Cluster alerts by default [#2099](https://github.com/prometheus-operator/kube-prometheus/pull/2099)
+* [FEATURE] Create dedicated Service to expose CoreDNS metric [#2107](https://github.com/prometheus-operator/kube-prometheus/pull/2107)
+* [FEATURE] Add Windows support using Hostprocess instead of static_configs [#2048](https://github.com/prometheus-operator/kube-prometheus/pull/2048)
+* [BUGFIX] Fix a compilation error when building the custom-metrics addon [#1996](https://github.com/prometheus-operator/kube-prometheus/pull/1996)
+* [BUGFIX] Add `prometheus-adapter` in Prometheus's NetworkPolicy [#1982](https://github.com/prometheus-operator/kube-prometheus/pull/1982)
+* [BUGFIX] Fix namespace specified in manifest non-namespaced resources [#2158](https://github.com/prometheus-operator/kube-prometheus/pull/2158)
+* [BUGFIX] Override ServiceAccount, Role and ClusterRole names in RoleBinding and ClusterRoleBinding [#2135](https://github.com/prometheus-operator/kube-prometheus/pull/2135)
+* [BUGFIX] Remove deprecated `--logtostderr` argument of prometheus-adapter [#2185](https://github.com/prometheus-operator/kube-prometheus/pull/2185)
+* [BUGFIX] Fix alertmanager external config example [#1891](https://github.com/prometheus-operator/kube-prometheus/pull/1891)
+* [ENHANCEMENT] Add startupProbe to prometheus-adapter [#2029](https://github.com/prometheus-operator/kube-prometheus/pull/2029)
+* [ENHANCEMENT] Added configurable default values for kube-rbac-proxy in prometheus-operator, node-exporter and blackbox-exporter [#1987](https://github.com/prometheus-operator/kube-prometheus/pull/1987)
+* [ENHANCEMENT] Modify control plane ServiceMonitors to be compatible with Argo [#2041](https://github.com/prometheus-operator/kube-prometheus/pull/2041)
+* [ENHANCEMENT] Add md5 hash of the ConfigMap in Prometheus Adapter Deployment Annotations to force its recreation [#2195](https://github.com/prometheus-operator/kube-prometheus/pull/2195)
+
 ## release-0.12 / 2023-01-19
 
 * [CHANGE] Updates Prometheus Adapater version to 0.10.0 [#1865](https://github.com/prometheus-operator/kube-prometheus/pull/1865)

Makefile

@@ -54,13 +54,13 @@ update: $(JB_BIN)
 	$(JB_BIN) update
 
 .PHONY: validate
-validate: validate-1.23 validate-1.24
+validate: validate-1.27 validate-1.28
 
-validate-1.23:
+validate-1.27:
-	KUBE_VERSION=1.23.6 $(MAKE) kubeconform
+	KUBE_VERSION=1.27.5 $(MAKE) kubeconform
 
-validate-1.24:
+validate-1.28:
-	KUBE_VERSION=1.24.1 $(MAKE) kubeconform
+	KUBE_VERSION=1.28.1 $(MAKE) kubeconform
 
 .PHONY: kubeconform
 kubeconform: crdschemas manifests $(KUBECONFORM_BIN)

README.md

@@ -40,13 +40,13 @@ no effect, but is still deployed.
 
 The following Kubernetes versions are supported and work as we test against these versions in their respective branches. But note that other versions might work!
 
-| kube-prometheus stack                                                                      | Kubernetes 1.21 | Kubernetes 1.22 | Kubernetes 1.23 | Kubernetes 1.24 | Kubernetes 1.25 | Kubernetes 1.26 | Kubernetes 1.27 | Kubernetes 1.28 |
+| kube-prometheus stack                                                                      | Kubernetes 1.22 | Kubernetes 1.23 | Kubernetes 1.24 | Kubernetes 1.25 | Kubernetes 1.26 | Kubernetes 1.27 | Kubernetes 1.28 |
-|--------------------------------------------------------------------------------------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|
+|--------------------------------------------------------------------------------------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|
-| [`release-0.9`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.9)   | ✔               | ✔               | ✗               | ✗               | ✗               | x               | x               | x               |
+| [`release-0.10`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.10) | ✔               | ✔               | ✗               | ✗               | x               | x               | x               |
-| [`release-0.10`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.10) | ✗               | ✔               | ✔               | ✗               | ✗               | x               | x               | x               |
+| [`release-0.11`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.11) | ✗               | ✔               | ✔               | ✗               | x               | x               | x               |
-| [`release-0.11`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.11) | ✗               | ✗               | ✔               | ✔               | ✗               | x               | x               | x               |
+| [`release-0.12`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.12) | ✗               | ✗               | ✔               | ✔               | x               | x               | x               |
-| [`release-0.12`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.12) | ✗               | ✗               | ✗               | ✔               | ✔               | x               | x               | x               |
+| [`release-0.13`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.13) | ✗               | ✗               | ✗               | x               | ✔               | ✔               | ✔               |
-| [`main`](https://github.com/prometheus-operator/kube-prometheus/tree/main)                 | ✗               | ✗               | ✗               | ✗               | x               | x               | ✔               | ✔               |
+| [`main`](https://github.com/prometheus-operator/kube-prometheus/tree/main)                 | ✗               | ✗               | ✗               | x               | x               | ✔               | ✔               |
 
 ## Quickstart
 

RELEASE.md

@@ -1,10 +1,13 @@
 # Release schedule
 
 Kube-prometheus has a somehow predictable release schedule, releases were
-historically cut in sync with OpenShift releases as per downstream needs. So
+historically cut in sync with OpenShift releases as per downstream needs.
-far there hasn't been any problem with this schedule since it is also in sync
+
-with Kubernetes releases. So for every new Kubernetes release, there is a new
+This has been changed in favour of tracking upstream Kubernetes releases due
-release of kube-prometheus, although it tends to happen later.
+to changing needs and requirements in the OpenShift release process.
+
+For every new Kubernetes release, there will be a corresponding new release
+of kube-prometheus, although it tends to happen later.
 
 # How to cut a new release
 
@@ -30,12 +33,6 @@ master. Try to avoid that situation.
 Maintaining the release branches for older minor releases happens on a best
 effort basis.
 
-## Cut a release of kubernetes-mixins
-
-kube-prometheus and kubernetes-mixins releases are tied, so before cutting the
-release of kube-prometheus we should make sure that the same release of
-kubernetes-mixins exists.
-
 ## Update components version
 
 Every release of kube-prometheus should include the latest versions of each

jsonnet/kube-prometheus/jsonnetfile.json

@@ -8,7 +8,7 @@
           "subdir": "grafana"
         }
       },
-      "version": "master"
+      "version": "5698c8940b6dadca3f42107b7839557bc041761f"
     },
     {
       "source": {
@@ -17,7 +17,7 @@
           "subdir": "grafana-mixin"
         }
       },
-      "version": "main",
+      "version": "v10.1.0",
       "name": "grafana-mixin"
     },
     {
@@ -27,7 +27,7 @@
           "subdir": "contrib/mixin"
         }
       },
-      "version": "main"
+      "version": "60051be9908649b1a0f2d000dc75b3bd0822d53c"
     },
     {
       "source": {
@@ -36,7 +36,7 @@
           "subdir": "jsonnet/prometheus-operator"
         }
       },
-      "version": "main"
+      "version": "v0.67.1"
     },
     {
       "source": {
@@ -45,7 +45,7 @@
           "subdir": "jsonnet/mixin"
         }
       },
-      "version": "main",
+      "version": "v0.67.1",
       "name": "prometheus-operator-mixin"
     },
     {
@@ -55,7 +55,7 @@
           "subdir": ""
         }
       },
-      "version": "master"
+      "version": "63337d921db856bbcd2e91814a0ac90c250410d6"
     },
     {
       "source": {
@@ -64,7 +64,7 @@
           "subdir": "jsonnet/kube-state-metrics"
         }
       },
-      "version": "main"
+      "version": "v2.9.2"
     },
     {
       "source": {
@@ -73,7 +73,7 @@
           "subdir": "jsonnet/kube-state-metrics-mixin"
         }
       },
-      "version": "main"
+      "version": "v2.9.2"
     },
     {
       "source": {
@@ -91,7 +91,7 @@
           "subdir": "documentation/prometheus-mixin"
         }
       },
-      "version": "main",
+      "version": "v2.46.0",
       "name": "prometheus"
     },
     {
@@ -101,7 +101,7 @@
           "subdir": "doc/alertmanager-mixin"
         }
       },
-      "version": "main",
+      "version": "v0.26.0",
       "name": "alertmanager"
     },
     {
@@ -111,7 +111,7 @@
           "subdir": "config/crd/bases"
         }
       },
-      "version": "main"
+      "version": "v0.6.4"
     },
     {
       "source": {
@@ -120,7 +120,7 @@
           "subdir": "mixin"
         }
       },
-      "version": "main",
+      "version": "v0.32.2",
       "name": "thanos-mixin"
     }
   ],

jsonnetfile.json

@@ -1,6 +1,15 @@
 {
   "version": 1,
   "dependencies": [
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/grafana/jsonnet-libs.git",
+          "subdir": "mixin-utils"
+        }
+      },
+      "version": "master"
+    },
     {
       "source": {
         "local": {

jsonnetfile.lock.json

@@ -18,7 +18,7 @@
           "subdir": "contrib/mixin"
         }
       },
-      "version": "2888a95d5d4f20e7e852214e888d79ead642300b",
+      "version": "60051be9908649b1a0f2d000dc75b3bd0822d53c",
       "sum": "GdePvMDfLQcVhwzk/Ephi/jC27ywGObLB5t0eC0lXd4="
     },
     {
@@ -28,8 +28,8 @@
           "subdir": "grafana-mixin"
         }
       },
-      "version": "1120f9e255760a3c104b57871fcb91801e934382",
+      "version": "ff85ec33c56ffe567e6bde27473d9493eb70c743",
-      "sum": "MkjR7zCgq6MUZgjDzop574tFKoTX2OBr7DTwm1K+Ofs="
+      "sum": "XU7Xro0gZXkMga+zV69MUus8HePLzSWrYJUJCYFNELE="
     },
     {
       "source": {
@@ -58,8 +58,18 @@
           "subdir": "grafana-builder"
         }
       },
-      "version": "c0abc546c782a095a22c277d36f871bb94ffc944",
+      "version": "d9ba581fb27aa6689e911f288d4df06948eb8aad",
-      "sum": "xEFMv4+ObwP5L1Wu0XK5agWci4AJzNApys6iKAQxLlQ="
+      "sum": "yxqWcq/N3E/a/XreeU6EuE6X7kYPnG0AspAQFKOjASo="
+    },
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/grafana/jsonnet-libs.git",
+          "subdir": "mixin-utils"
+        }
+      },
+      "version": "d9ba581fb27aa6689e911f288d4df06948eb8aad",
+      "sum": "LoYq5QxJmUXEtqkEG8CFUBLBhhzDDaNANHc7Gz36ZdM="
     },
     {
       "source": {
@@ -78,7 +88,7 @@
           "subdir": "jsonnet/kube-state-metrics"
         }
       },
-      "version": "dbd456831b5adfc8642d5c7793c6cdad59c2e975",
+      "version": "93fe0be5e6af92c7a41a7dfb589494838367b6a7",
       "sum": "+dOzAK+fwsFf97uZpjcjTcEJEC1H8hh/j8f5uIQK/5g="
     },
     {
@@ -88,7 +98,7 @@
           "subdir": "jsonnet/kube-state-metrics-mixin"
         }
       },
-      "version": "dbd456831b5adfc8642d5c7793c6cdad59c2e975",
+      "version": "93fe0be5e6af92c7a41a7dfb589494838367b6a7",
       "sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
     },
     {
@@ -98,7 +108,7 @@
           "subdir": "jsonnet/mixin"
         }
       },
-      "version": "0209080d37fc4293cfa6be252dcfec926fdfc39a",
+      "version": "89858173a30ae83b34f4019610d817eb6712d40b",
       "sum": "n3flMIzlADeyygb0uipZ4KPp2uNSjdtkrwgHjTC7Ca4=",
       "name": "prometheus-operator-mixin"
     },
@@ -109,8 +119,8 @@
           "subdir": "jsonnet/prometheus-operator"
         }
       },
-      "version": "0209080d37fc4293cfa6be252dcfec926fdfc39a",
+      "version": "89858173a30ae83b34f4019610d817eb6712d40b",
-      "sum": "Gr+fwRoLDcx3fVegJJRQzFCWUugbFQXO/l1Pz2TNYzI="
+      "sum": "c2r/2d05k/SGfaOG3zKEfggclrPHd60E3y55xj2kHOo="
     },
     {
       "source": {
@@ -119,7 +129,7 @@
           "subdir": "doc/alertmanager-mixin"
         }
       },
-      "version": "6cbe2eb21f7cd770d8f247c545941f3a8c97f6a0",
+      "version": "41db3af00d94b190fde5343e1c7d277d6dd03aa9",
       "sum": "1d7ZKYArJKacAWXLUz0bRC1uOkozee/PPw97/W5zGhc=",
       "name": "alertmanager"
     },
@@ -130,8 +140,8 @@
           "subdir": "docs/node-mixin"
         }
       },
-      "version": "381f32b1c5943afb35940b88c45c3fa4bf5fc1de",
+      "version": "b9d0932179a0c5b3a8863f3d6cdafe8584cedc8e",
-      "sum": "By6n6U10hYDogUsyhsaKZehbhzxBZZobJloiKyKadgM="
+      "sum": "rhUvbqviGjQ2mwsRhHKMN0TiS3YvnYpUXHew3XlQ+Wg="
     },
     {
       "source": {
@@ -140,7 +150,7 @@
           "subdir": "documentation/prometheus-mixin"
         }
       },
-      "version": "c5e1498ae243bbf0b8363786de065bf98acd1edb",
+      "version": "e6d3a9b65012ec28f00976a6e08830a4c5553845",
       "sum": "8OngT76gVXOUROOOeP9yTe6E/dn+2D2J34Dn690QCG0=",
       "name": "prometheus"
     },
@@ -151,8 +161,8 @@
           "subdir": "config/crd/bases"
         }
       },
-      "version": "b81fbf22bec162581c78b449f9a95f63d9d4d527",
+      "version": "551856d42dff02ec38c5b0ea6a2d99c4cb127e82",
-      "sum": "v0uv2DLx8qjW+OviUfzTFOzZ+0IizXqBhuglGHIhGmo="
+      "sum": "bY/Pcrrbynguq8/HaI88cQ3B2hLv/xc+76QILY7IL+g="
     },
     {
       "source": {
@@ -161,7 +171,7 @@
           "subdir": "mixin"
         }
       },
-      "version": "7b20b1db38857ee69abe6cb1e7e3c67ef4b96fe8",
+      "version": "edd33797cb386c112951a0557bac1b3735f8ded4",
       "sum": "WhheqsiX0maUXByZFsb9xhCEsGXK2955bPmPPf1x+Cs=",
       "name": "thanos-mixin"
     },

manifests/grafana-prometheusRule.yaml

@@ -19,8 +19,8 @@ spec:
         message: '{{ $labels.namespace }}/{{ $labels.job }}/{{ $labels.handler }} is experiencing {{ $value | humanize }}% errors'
         runbook_url: https://runbooks.prometheus-operator.dev/runbooks/grafana/grafanarequestsfailing
       expr: |
-        100 * namespace_job_handler_statuscode:grafana_http_request_duration_seconds_count:rate5m{handler!~"/api/datasources/proxy/:id.*|/api/ds/query|/api/tsdb/query", status_code=~"5.."}
+        100 * sum without (status_code) (namespace_job_handler_statuscode:grafana_http_request_duration_seconds_count:rate5m{handler!~"/api/datasources/proxy/:id.*|/api/ds/query|/api/tsdb/query", status_code=~"5.."})
-        / ignoring (status_code)
+        /
         sum without (status_code) (namespace_job_handler_statuscode:grafana_http_request_duration_seconds_count:rate5m{handler!~"/api/datasources/proxy/:id.*|/api/ds/query|/api/tsdb/query"})
         > 50
       for: 5m

manifests/nodeExporter-prometheusRule.yaml

@@ -297,7 +297,7 @@ spec:
     - alert: NodeDiskIOSaturation
       annotations:
         description: |
-          Disk IO queue (aqu-sq) is high on {{ $labels.device }} at {{ $labels.instance }}, has been above 10 for the last 15 minutes, is currently at {{ printf "%.2f" $value }}.
+          Disk IO queue (aqu-sq) is high on {{ $labels.device }} at {{ $labels.instance }}, has been above 10 for the last 30 minutes, is currently at {{ printf "%.2f" $value }}.
           This symptom might indicate disk saturation.
         runbook_url: https://runbooks.prometheus-operator.dev/runbooks/node/nodediskiosaturation
         summary: Disk IO queue is high.
@@ -316,6 +316,16 @@ spec:
       for: 5m
       labels:
         severity: warning
+    - alert: NodeBondingDegraded
+      annotations:
+        description: Bonding interface {{ $labels.master }} on {{ $labels.instance }} is in degraded state due to one or more slave failures.
+        runbook_url: https://runbooks.prometheus-operator.dev/runbooks/node/nodebondingdegraded
+        summary: Bonding interface is degraded
+      expr: |
+        (node_bonding_slaves - node_bonding_active) != 0
+      for: 5m
+      labels:
+        severity: warning
   - name: node-exporter.rules
     rules:
     - expr: |

manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml

@@ -3023,285 +3023,6 @@ 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:

manifests/setup/0scrapeconfigCustomResourceDefinition.yaml

@@ -657,63 +657,6 @@ spec:
                 description: Per-scrape limit on length of labels value that will be accepted for a sample. Only valid in Prometheus versions 2.27.0 and newer.
                 format: int64
                 type: integer
-              metricRelabelings:
-                description: MetricRelabelConfigs to apply to samples before ingestion.
-                items:
-                  description: "RelabelConfig allows dynamic rewriting of the label set for targets, alerts, scraped samples and remote write samples. \n More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config"
-                  properties:
-                    action:
-                      default: replace
-                      description: "Action to perform based on the regex matching. \n `Uppercase` and `Lowercase` actions require Prometheus >= v2.36.0. `DropEqual` and `KeepEqual` actions require Prometheus >= v2.41.0. \n Default: \"Replace\""
-                      enum:
-                      - replace
-                      - Replace
-                      - keep
-                      - Keep
-                      - drop
-                      - Drop
-                      - hashmod
-                      - HashMod
-                      - labelmap
-                      - LabelMap
-                      - labeldrop
-                      - LabelDrop
-                      - labelkeep
-                      - LabelKeep
-                      - lowercase
-                      - Lowercase
-                      - uppercase
-                      - Uppercase
-                      - keepequal
-                      - KeepEqual
-                      - dropequal
-                      - DropEqual
-                      type: string
-                    modulus:
-                      description: "Modulus to take of the hash of the source label values. \n Only applicable when the action is `HashMod`."
-                      format: int64
-                      type: integer
-                    regex:
-                      description: Regular expression against which the extracted value is matched.
-                      type: string
-                    replacement:
-                      description: "Replacement value against which a Replace action is performed if the regular expression matches. \n Regex capture groups are available."
-                      type: string
-                    separator:
-                      description: Separator is the string between concatenated SourceLabels.
-                      type: string
-                    sourceLabels:
-                      description: The source labels select values from existing labels. Their content is concatenated using the configured Separator and matched against the configured regular expression.
-                      items:
-                        description: LabelName is a valid Prometheus label name which may only contain ASCII letters, numbers, as well as underscores.
-                        pattern: ^[a-zA-Z_][a-zA-Z0-9_]*$
-                        type: string
-                      type: array
-                    targetLabel:
-                      description: "Label to which the resulting string is written in a replacement. \n It is mandatory for `Replace`, `HashMod`, `Lowercase`, `Uppercase`, `KeepEqual` and `DropEqual` actions. \n Regex capture groups are available."
-                      type: string
-                  type: object
-                type: array
               metricsPath:
                 description: MetricsPath HTTP path to scrape for metrics. If empty, Prometheus uses the default value (e.g. /metrics).
                 type: string