Merge pull request #560 from gitpod-io/roboquat/automated-dependency-…

…update-main [bot] [main] Automated dependencies update
gitpod-io · Oct 28, 2024 · ec6a01b · ec6a01b
2 parents 80cd56b + 0eaede5
commit ec6a01b
Show file tree

Hide file tree

Showing 22 changed files with 330 additions and 39 deletions.
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
           "subdir": "contrib/mixin"
         }
       },
-      "version": "55de68d18c63fde8747f2cd9f7c2ff242346f756",
+      "version": "7cded36ba87fa2308d76e8f3eb0aeb06b21c0fb6",
       "sum": "IXI3LQIT9NmTPJAk8WLUJd5+qZfcGpeNCyWIK7oEpws="
     },
     {
@@ -28,7 +28,7 @@
           "subdir": "operations/observability/mixins"
         }
       },
-      "version": "00b2a7689c05aeda8c72c3c727cc1a477cb955cc",
+      "version": "9e8da3bdd041b1a42fd8d2ef1d732907bb0630c7",
       "sum": "znuKmqKp0SwUiYXz2sDvTJzT9f3hzP84z7uwNm9anxY=",
       "name": "gitpod"
     },
@@ -99,7 +99,7 @@
           "subdir": "grafana-builder"
         }
       },
-      "version": "3805ed5082bb7db66cd75badb57a673c965aa24c",
+      "version": "b9761545ddeac33ffe25bd87121076eab258c6f1",
       "sum": "yxqWcq/N3E/a/XreeU6EuE6X7kYPnG0AspAQFKOjASo="
     },
     {
@@ -139,7 +139,7 @@
           "subdir": "jsonnet/kube-state-metrics"
         }
       },
-      "version": "e14a9d771c65c352f06cdcce0835d71daef4738e",
+      "version": "eb5e34701d4f486e51036f45880af7b0a63e43ca",
       "sum": "lO7jUSzAIy8Yk9pOWJIWgPRhubkWzVh56W6wtYfbVH4="
     },
     {
@@ -149,7 +149,7 @@
           "subdir": "jsonnet/kube-state-metrics-mixin"
         }
       },
-      "version": "e14a9d771c65c352f06cdcce0835d71daef4738e",
+      "version": "eb5e34701d4f486e51036f45880af7b0a63e43ca",
       "sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
     },
     {
@@ -159,8 +159,8 @@
           "subdir": "jsonnet/kube-prometheus"
         }
       },
-      "version": "f3c2f84ccea1e9dfaaeccbd6b02ddbc3b6ae2754",
-      "sum": "NKlS33HxtOMyC2GWUlb9W2F4WBLMqBJMWNFRxVIMA/Y="
+      "version": "69d9636b64192418d64912c032f5437361e88ea5",
+      "sum": "W4HnSyscMMutOCaDyjNZy1XXcdhRPibYuV1yVgqxXm0="
     },
     {
       "source": {
@@ -169,7 +169,7 @@
           "subdir": "jsonnet/mixin"
         }
       },
-      "version": "dd2c707e7008387c6d662fefe9f474a6f874f490",
+      "version": "d2599cfe67beb97b9208e79422457b0f7cde3c4a",
       "sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
       "name": "prometheus-operator-mixin"
     },
@@ -180,8 +180,8 @@
           "subdir": "jsonnet/prometheus-operator"
         }
       },
-      "version": "dd2c707e7008387c6d662fefe9f474a6f874f490",
-      "sum": "5G3bgQK3WFueFwjZDcTaI16cyf19rqxK+H1oGsiIgx0="
+      "version": "d2599cfe67beb97b9208e79422457b0f7cde3c4a",
+      "sum": "qZwYjsYpalWEkkS0cytnksmRz8/NkMlmytI3G29s5kA="
     },
     {
       "source": {
@@ -190,7 +190,7 @@
           "subdir": "doc/alertmanager-mixin"
         }
       },
-      "version": "4fcb18ee41ecaff4ee1816ad363dc63fdf3583b9",
+      "version": "d04ef60a1675db13ffd42613bc74aec298cbe67a",
       "sum": "IpF46ZXsm+0wJJAPtAre8+yxTNZA57mBqGpBP/r7/kw=",
       "name": "alertmanager"
     },
@@ -201,7 +201,7 @@
           "subdir": "docs/node-mixin"
         }
       },
-      "version": "e6a9cfbdcdaa21bf9676c6cd37bef8160227f423",
+      "version": "f35a592dd65d6b3488426a789b328c8ca5b2bc22",
       "sum": "cQCW+1N0Xae5yXecCWDK2oAlN0luBS/5GrwBYSlaFms="
     },
     {
@@ -211,7 +211,7 @@
           "subdir": "documentation/prometheus-mixin"
         }
       },
-      "version": "6b36a5592a8f7e51f9801e5c8944ad9ca185e5cc",
+      "version": "bab587b9dca16274e38babbbf56efba50956dbd2",
       "sum": "dYLcLzGH4yF3qB7OGC/7z4nqeTNjv42L7Q3BENU8XJI=",
       "name": "prometheus"
     },
@@ -233,7 +233,7 @@
           "subdir": "mixin"
         }
       },
-      "version": "731e4607d34a5d638ebf849c53582aa21ce591dc",
+      "version": "a31af1da03a9fb7586794ce1a94671050617cced",
       "sum": "ieCD4eMgGbOlrI8GmckGPHBGQDcLasE1rULYq56W/bs=",
       "name": "thanos-mixin"
     },

diff --git a/...ellite/manifests/crds/prometheusOperator-0alertmanagerConfigCustomResourceDefinition.yaml b/...ellite/manifests/crds/prometheusOperator-0alertmanagerConfigCustomResourceDefinition.yaml
@@ -4,7 +4,7 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: Replace=true
     controller-gen.kubebuilder.io/version: v0.16.4
-    operator.prometheus.io/version: 0.77.1
+    operator.prometheus.io/version: 0.77.2
   name: alertmanagerconfigs.monitoring.coreos.com
 spec:
   group: monitoring.coreos.com

diff --git a/...ng-satellite/manifests/crds/prometheusOperator-0alertmanagerCustomResourceDefinition.yaml b/...ng-satellite/manifests/crds/prometheusOperator-0alertmanagerCustomResourceDefinition.yaml
@@ -4,7 +4,7 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: Replace=true
     controller-gen.kubebuilder.io/version: v0.16.4
-    operator.prometheus.io/version: 0.77.1
+    operator.prometheus.io/version: 0.77.2
   name: alertmanagers.monitoring.coreos.com
 spec:
   group: monitoring.coreos.com

diff --git a/...ring-satellite/manifests/crds/prometheusOperator-0podmonitorCustomResourceDefinition.yaml b/...ring-satellite/manifests/crds/prometheusOperator-0podmonitorCustomResourceDefinition.yaml
@@ -4,7 +4,7 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: Replace=true
     controller-gen.kubebuilder.io/version: v0.16.4
-    operator.prometheus.io/version: 0.77.1
+    operator.prometheus.io/version: 0.77.2
   name: podmonitors.monitoring.coreos.com
 spec:
   group: monitoring.coreos.com
@@ -134,6 +134,23 @@ spec:
                       type: string
                     type: array
                 type: object
+              nativeHistogramBucketLimit:
+                description: |-
+                  If there are more than this many buckets in a native histogram,
+                  buckets will be merged to stay within the limit.
+                  It requires Prometheus >= v2.45.0.
+                format: int64
+                type: integer
+              nativeHistogramMinBucketFactor:
+                anyOf:
+                - type: integer
+                - type: string
+                description: |-
+                  If the growth factor of one bucket to the next is smaller than this,
+                  buckets will be merged to increase the factor sufficiently.
+                  It requires Prometheus >= v2.50.0.
+                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                x-kubernetes-int-or-string: true
               podMetricsEndpoints:
                 description: Defines how to scrape metrics from the selected pods.
                 items:
@@ -1012,6 +1029,11 @@ spec:
                 description: The scrape class to apply.
                 minLength: 1
                 type: string
+              scrapeClassicHistograms:
+                description: |-
+                  Whether to scrape a classic histogram that is also exposed as a native histogram.
+                  It requires Prometheus >= v2.45.0.
+                type: boolean
               scrapeProtocols:
                 description: |-
                   `scrapeProtocols` defines the protocols to negotiate during a scrape. It tells clients the

diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0probeCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0probeCustomResourceDefinition.yaml
@@ -4,7 +4,7 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: Replace=true
     controller-gen.kubebuilder.io/version: v0.16.4
-    operator.prometheus.io/version: 0.77.1
+    operator.prometheus.io/version: 0.77.2
   name: probes.monitoring.coreos.com
 spec:
   group: monitoring.coreos.com
@@ -290,6 +290,23 @@ spec:
                   Example module configuring in the blackbox exporter:
                   https://github.com/prometheus/blackbox_exporter/blob/master/example.yml
                 type: string
+              nativeHistogramBucketLimit:
+                description: |-
+                  If there are more than this many buckets in a native histogram,
+                  buckets will be merged to stay within the limit.
+                  It requires Prometheus >= v2.45.0.
+                format: int64
+                type: integer
+              nativeHistogramMinBucketFactor:
+                anyOf:
+                - type: integer
+                - type: string
+                description: |-
+                  If the growth factor of one bucket to the next is smaller than this,
+                  buckets will be merged to increase the factor sufficiently.
+                  It requires Prometheus >= v2.50.0.
+                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                x-kubernetes-int-or-string: true
               oauth2:
                 description: OAuth2 for the URL. Only valid in Prometheus versions 2.27.0 and newer.
                 properties:
@@ -627,6 +644,11 @@ spec:
                 description: The scrape class to apply.
                 minLength: 1
                 type: string
+              scrapeClassicHistograms:
+                description: |-
+                  Whether to scrape a classic histogram that is also exposed as a native histogram.
+                  It requires Prometheus >= v2.45.0.
+                type: boolean
               scrapeProtocols:
                 description: |-
                   `scrapeProtocols` defines the protocols to negotiate during a scrape. It tells clients the

diff --git a/...ring-satellite/manifests/crds/prometheusOperator-0prometheusCustomResourceDefinition.yaml b/...ring-satellite/manifests/crds/prometheusOperator-0prometheusCustomResourceDefinition.yaml
@@ -4,7 +4,7 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: Replace=true
     controller-gen.kubebuilder.io/version: v0.16.4
-    operator.prometheus.io/version: 0.77.1
+    operator.prometheus.io/version: 0.77.2
   name: prometheuses.monitoring.coreos.com
 spec:
   group: monitoring.coreos.com
@@ -6507,6 +6507,24 @@ spec:
 
                         It requires Prometheus >= v2.25.0.
                       type: object
+                    messageVersion:
+                      description: |-
+                        The Remote Write message's version to use when writing to the endpoint.
+
+                        `Version1.0` corresponds to the `prometheus.WriteRequest` protobuf message introduced in Remote Write 1.0.
+                        `Version2.0` corresponds to the `io.prometheus.write.v2.Request` protobuf message introduced in Remote Write 2.0.
+
+                        When `Version2.0` is selected, Prometheus will automatically be
+                        configured to append the metadata of scraped metrics to the WAL.
+
+                        Before setting this field, consult with your remote storage provider
+                        what message version it supports.
+
+                        It requires Prometheus >= v2.54.0.
+                      enum:
+                      - V1.0
+                      - V2.0
+                      type: string
                     metadataConfig:
                       description: MetadataConfig configures the sending of series metadata to the remote storage.
                       properties:
@@ -6933,7 +6951,7 @@ spec:
                     sendExemplars:
                       description: |-
                         Enables sending of exemplars over remote write. Note that
-                        exemplar-storage itself must be enabled using the `spec.enableFeature`
+                        exemplar-storage itself must be enabled using the `spec.enableFeatures`
                         option for exemplars to be scraped in the first place.
 
                         It requires Prometheus >= v2.27.0.
@@ -7172,6 +7190,7 @@ spec:
                       type: object
                     url:
                       description: The URL of the endpoint to send samples to.
+                      minLength: 1
                       type: string
                     writeRelabelConfigs:
                       description: The list of remote write relabel configurations.
@@ -7262,6 +7281,20 @@ spec:
                   - url
                   type: object
                 type: array
+              remoteWriteReceiverMessageVersions:
+                description: |-
+                  List of the protobuf message versions to accept when receiving the
+                  remote writes.
+
+                  It requires Prometheus >= v2.54.0.
+                items:
+                  enum:
+                  - V1.0
+                  - V2.0
+                  type: string
+                minItems: 1
+                type: array
+                x-kubernetes-list-type: set
               replicaExternalLabelName:
                 description: |-
                   Name of Prometheus external label used to denote the replica name.

diff --git a/...satellite/manifests/crds/prometheusOperator-0prometheusagentCustomResourceDefinition.yaml b/...satellite/manifests/crds/prometheusOperator-0prometheusagentCustomResourceDefinition.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.16.4
-    operator.prometheus.io/version: 0.77.1
+    operator.prometheus.io/version: 0.77.2
   name: prometheusagents.monitoring.coreos.com
 spec:
   group: monitoring.coreos.com
@@ -5098,6 +5098,24 @@ spec:
 
                         It requires Prometheus >= v2.25.0.
                       type: object
+                    messageVersion:
+                      description: |-
+                        The Remote Write message's version to use when writing to the endpoint.
+
+                        `Version1.0` corresponds to the `prometheus.WriteRequest` protobuf message introduced in Remote Write 1.0.
+                        `Version2.0` corresponds to the `io.prometheus.write.v2.Request` protobuf message introduced in Remote Write 2.0.
+
+                        When `Version2.0` is selected, Prometheus will automatically be
+                        configured to append the metadata of scraped metrics to the WAL.
+
+                        Before setting this field, consult with your remote storage provider
+                        what message version it supports.
+
+                        It requires Prometheus >= v2.54.0.
+                      enum:
+                      - V1.0
+                      - V2.0
+                      type: string
                     metadataConfig:
                       description: MetadataConfig configures the sending of series metadata to the remote storage.
                       properties:
@@ -5524,7 +5542,7 @@ spec:
                     sendExemplars:
                       description: |-
                         Enables sending of exemplars over remote write. Note that
-                        exemplar-storage itself must be enabled using the `spec.enableFeature`
+                        exemplar-storage itself must be enabled using the `spec.enableFeatures`
                         option for exemplars to be scraped in the first place.
 
                         It requires Prometheus >= v2.27.0.
@@ -5763,6 +5781,7 @@ spec:
                       type: object
                     url:
                       description: The URL of the endpoint to send samples to.
+                      minLength: 1
                       type: string
                     writeRelabelConfigs:
                       description: The list of remote write relabel configurations.
@@ -5853,6 +5872,20 @@ spec:
                   - url
                   type: object
                 type: array
+              remoteWriteReceiverMessageVersions:
+                description: |-
+                  List of the protobuf message versions to accept when receiving the
+                  remote writes.
+
+                  It requires Prometheus >= v2.54.0.
+                items:
+                  enum:
+                  - V1.0
+                  - V2.0
+                  type: string
+                minItems: 1
+                type: array
+                x-kubernetes-list-type: set
               replicaExternalLabelName:
                 description: |-
                   Name of Prometheus external label used to denote the replica name.

diff --git a/...-satellite/manifests/crds/prometheusOperator-0prometheusruleCustomResourceDefinition.yaml b/...-satellite/manifests/crds/prometheusOperator-0prometheusruleCustomResourceDefinition.yaml
@@ -4,7 +4,7 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: Replace=true
     controller-gen.kubebuilder.io/version: v0.16.4
-    operator.prometheus.io/version: 0.77.1
+    operator.prometheus.io/version: 0.77.2
   name: prometheusrules.monitoring.coreos.com
 spec:
   group: monitoring.coreos.com