Merge pull request #615 from gitpod-io/roboquat/automated-dependency-update-main

[bot] [main] Automated dependencies update

Author: roboquat

jsonnetfile.lock.json

@@ -18,7 +18,7 @@
           "subdir": "contrib/mixin"
         }
       },
-      "version": "fdf28cba6742e394019f978dfe73f1fbef8dfec7",
+      "version": "353107914b9fa18b9d2e0477bb18b7eec5e210ce",
       "sum": "XmXkOCriQIZmXwlIIFhqlJMa0e6qGWdxZD+ZDYaN0Po="
     },
     {
@@ -28,7 +28,7 @@
           "subdir": "operations/observability/mixins"
         }
       },
-      "version": "bada41fb2456de4cb5674afb3dcaaeadc9aebd5f",
+      "version": "9e34aea982f3b935dfbf172fe59fb69d0b6af213",
       "sum": "wvuIMANAM9nLAR9RmTl2J7ZkFOV/XtIQ8LwKApfydKc=",
       "name": "gitpod"
     },
@@ -89,7 +89,7 @@
           "subdir": "grafana-builder"
         }
       },
-      "version": "5d2c9c1fa845da48e6049bbbd8e98b9d6aab1805",
+      "version": "874d8f2a0b855078c8a3e0079c96c4460809cc8a",
       "sum": "G7B6E5sqWirDbMWRhifbLRfGgRFbIh9WCYa6X3kMh6g="
     },
     {
@@ -99,7 +99,7 @@
           "subdir": "mixin-utils"
         }
       },
-      "version": "5d2c9c1fa845da48e6049bbbd8e98b9d6aab1805",
+      "version": "874d8f2a0b855078c8a3e0079c96c4460809cc8a",
       "sum": "VAik6Sh5MD5H1Km1gSIXG4rwQ4m4zyw7odP5TKu3bGo="
     },
     {
@@ -159,8 +159,8 @@
           "subdir": "jsonnet/kube-prometheus"
         }
       },
-      "version": "760b786b29edb4aa917e87746cb9e2cab9cf3066",
-      "sum": "s0i5RLx1pGrmAuN4Oat5JdusWgqv1ATAqBb3rieyAMo="
+      "version": "68619d9afe02555c25b784ed2e73e907380f0876",
+      "sum": "zXJkWr2Fv+XINGqfp1KSMiaB1mbQkxWuT5P24wrW+rg="
     },
     {
       "source": {
@@ -169,7 +169,7 @@
           "subdir": "jsonnet/mixin"
         }
       },
-      "version": "b13fafecdd2876f5948561ccd97458f2280be935",
+      "version": "6954e4eefc1fe8880330436f01ddc6e36a677e27",
       "sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
       "name": "prometheus-operator-mixin"
     },
@@ -180,8 +180,8 @@
           "subdir": "jsonnet/prometheus-operator"
         }
       },
-      "version": "b13fafecdd2876f5948561ccd97458f2280be935",
-      "sum": "UqEghJURqk02Kz8faiOJQVYxGBM4g66zdawqg3qMHOA="
+      "version": "6954e4eefc1fe8880330436f01ddc6e36a677e27",
+      "sum": "6TSrvGOx2RUMfEI/0sq4tLO2kPfJPjor+gxeZYMIH2Q="
     },
     {
       "source": {
@@ -190,7 +190,7 @@
           "subdir": "doc/alertmanager-mixin"
         }
       },
-      "version": "17f42810382299639b34b56a01550243f2b2512a",
+      "version": "28d3f86811b1cd4e8a17f45cf90a1db357092589",
       "sum": "j5prvRrJdoCv7n45l5Uy2ghl1IDb9BBUqjwCDs4ZJoQ=",
       "name": "alertmanager"
     },
@@ -201,7 +201,7 @@
           "subdir": "docs/node-mixin"
         }
       },
-      "version": "b959d48df950d5c446660eca3354c26eb997ca44",
+      "version": "b6112eac8af48aceb75691416ce66a5056e7f258",
       "sum": "t5lGWjS4xUmXbOaMg8BddbJrIJeglTIi8HkT3UBWtP4="
     },
     {
@@ -211,7 +211,7 @@
           "subdir": "documentation/prometheus-mixin"
         }
       },
-      "version": "d5cc5e2738e2d0bd80c9ea31ba48fae80613917c",
+      "version": "c9e0e36701bcd1a7a6ccc372834e227fda31e616",
       "sum": "JY9uhZWjDnMd6TYjgqyzEqXqBS1zIkJrDzauiXyaJ4A=",
       "name": "prometheus"
     },
@@ -233,7 +233,7 @@
           "subdir": "mixin"
         }
       },
-      "version": "3f26e056719e4310daa7f1fbe6c7ce5033305051",
+      "version": "d997eed1749e4d91243efc0137f6a20cb659841b",
       "sum": "ieCD4eMgGbOlrI8GmckGPHBGQDcLasE1rULYq56W/bs=",
       "name": "thanos-mixin"
     },

monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerConfigCustomResourceDefinition.yaml

@@ -2572,7 +2572,7 @@ spec:
                         type: object
                       type: array
                     name:
-                      description: name defiens the name of the receiver. Must be unique across all items from the list.
+                      description: name defines the name of the receiver. Must be unique across all items from the list.
                       minLength: 1
                       type: string
                     opsgenieConfigs:

monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerCustomResourceDefinition.yaml

@@ -6213,7 +6213,7 @@ spec:
                 description: |-
                   serviceName defines the service name used by the underlying StatefulSet(s) as the governing service.
                   If defined, the Service  must be created before the Alertmanager resource in the same namespace and it must define a selector that matches the pod labels.
-                  If empty, the operator will create and manage a headless service named `alertmanager-operated` for Alermanager resources.
+                  If empty, the operator will create and manage a headless service named `alertmanager-operated` for Alertmanager resources.
                   When deploying multiple Alertmanager resources in the same namespace, it is recommended to specify a different value for each.
                   See https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#stable-network-id for more details.
                 minLength: 1

monitoring-satellite/manifests/crds/prometheusOperator-0podmonitorCustomResourceDefinition.yaml

@@ -1206,7 +1206,7 @@ spec:
               https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
             properties:
               bindings:
-                description: bindings defines the list of workload resources (Prometheus or PrometheusAgent) which select the configuration resource.
+                description: bindings defines the list of workload resources (Prometheus, PrometheusAgent, or ThanosRuler) which select the configuration resource.
                 items:
                   description: WorkloadBinding is a link between a configuration resource and a workload resource.
                   properties:
@@ -1268,10 +1268,11 @@ spec:
                       minLength: 1
                       type: string
                     resource:
-                      description: resource defines the type of resource being referenced (e.g. Prometheus or PrometheusAgent).
+                      description: resource defines the type of resource being referenced (e.g. Prometheus, PrometheusAgent, or ThanosRuler).
                       enum:
                       - prometheuses
                       - prometheusagents
+                      - thanosrulers
                       type: string
                   required:
                   - group

monitoring-satellite/manifests/crds/prometheusOperator-0probeCustomResourceDefinition.yaml

@@ -653,7 +653,7 @@ spec:
                 x-kubernetes-list-type: map
               prober:
                 description: |-
-                  prober defines the pecification for the prober to use for probing targets.
+                  prober defines the specification for the prober to use for probing targets.
                   The prober.URL parameter is required. Targets cannot be probed if left empty.
                 properties:
                   noProxy:
@@ -1207,7 +1207,7 @@ spec:
               https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
             properties:
               bindings:
-                description: bindings defines the list of workload resources (Prometheus or PrometheusAgent) which select the configuration resource.
+                description: bindings defines the list of workload resources (Prometheus, PrometheusAgent, or ThanosRuler) which select the configuration resource.
                 items:
                   description: WorkloadBinding is a link between a configuration resource and a workload resource.
                   properties:
@@ -1269,10 +1269,11 @@ spec:
                       minLength: 1
                       type: string
                     resource:
-                      description: resource defines the type of resource being referenced (e.g. Prometheus or PrometheusAgent).
+                      description: resource defines the type of resource being referenced (e.g. Prometheus, PrometheusAgent, or ThanosRuler).
                       enum:
                       - prometheuses
                       - prometheusagents
+                      - thanosrulers
                       type: string
                   required:
                   - group

monitoring-satellite/manifests/crds/prometheusOperator-0prometheusCustomResourceDefinition.yaml

@@ -5606,6 +5606,12 @@ spec:
                     minItems: 1
                     type: array
                     x-kubernetes-list-type: set
+                  promoteScopeMetadata:
+                    description: |-
+                      promoteScopeMetadata controls whether to promote OpenTelemetry scope metadata (i.e. name, version, schema URL, and attributes) to metric labels.
+                      As per the OpenTelemetry specification, the aforementioned scope metadata should be identifying, i.e. made into metric labels.
+                      It requires Prometheus >= v3.6.0.
+                    type: boolean
                   translationStrategy:
                     description: |-
                       translationStrategy defines how the OTLP receiver endpoint translates the incoming metrics.
@@ -5615,14 +5621,15 @@ spec:
                     - NoUTF8EscapingWithSuffixes
                     - UnderscoreEscapingWithSuffixes
                     - NoTranslation
+                    - UnderscoreEscapingWithoutSuffixes
                     type: string
                 type: object
               overrideHonorLabels:
                 description: |-
                   overrideHonorLabels when true, Prometheus resolves label conflicts by renaming the labels in the scraped data
                    to “exported_” for all targets created from ServiceMonitor, PodMonitor and
                   ScrapeConfig objects. Otherwise the HonorLabels field of the service or pod monitor applies.
-                  In practice,`overrideHonorLaels:true` enforces `honorLabels:false`
+                  In practice,`OverrideHonorLabels:true` enforces `honorLabels:false`
                   for all ServiceMonitor, PodMonitor and ScrapeConfig objects.
                 type: boolean
               overrideHonorTimestamps:
@@ -5953,7 +5960,7 @@ spec:
                   type: object
                 type: array
               query:
-                description: query defines the configuration of the Promethus query service.
+                description: query defines the configuration of the Prometheus query service.
                 properties:
                   lookbackDelta:
                     description: lookbackDelta defines the delta difference allowed for retrieving metrics during expression evaluations.

monitoring-satellite/manifests/crds/prometheusOperator-0prometheusagentCustomResourceDefinition.yaml

@@ -4879,6 +4879,12 @@ spec:
                     minItems: 1
                     type: array
                     x-kubernetes-list-type: set
+                  promoteScopeMetadata:
+                    description: |-
+                      promoteScopeMetadata controls whether to promote OpenTelemetry scope metadata (i.e. name, version, schema URL, and attributes) to metric labels.
+                      As per the OpenTelemetry specification, the aforementioned scope metadata should be identifying, i.e. made into metric labels.
+                      It requires Prometheus >= v3.6.0.
+                    type: boolean
                   translationStrategy:
                     description: |-
                       translationStrategy defines how the OTLP receiver endpoint translates the incoming metrics.
@@ -4888,14 +4894,15 @@ spec:
                     - NoUTF8EscapingWithSuffixes
                     - UnderscoreEscapingWithSuffixes
                     - NoTranslation
+                    - UnderscoreEscapingWithoutSuffixes
                     type: string
                 type: object
               overrideHonorLabels:
                 description: |-
                   overrideHonorLabels when true, Prometheus resolves label conflicts by renaming the labels in the scraped data
                    to “exported_” for all targets created from ServiceMonitor, PodMonitor and
                   ScrapeConfig objects. Otherwise the HonorLabels field of the service or pod monitor applies.
-                  In practice,`overrideHonorLaels:true` enforces `honorLabels:false`
+                  In practice,`OverrideHonorLabels:true` enforces `honorLabels:false`
                   for all ServiceMonitor, PodMonitor and ScrapeConfig objects.
                 type: boolean
               overrideHonorTimestamps:

monitoring-satellite/manifests/crds/prometheusOperator-0prometheusruleCustomResourceDefinition.yaml

@@ -147,8 +147,102 @@ spec:
                 - name
                 x-kubernetes-list-type: map
             type: object
+          status:
+            description: |-
+              status defines the status subresource. It is under active development and is updated only when the
+              "StatusForConfigurationResources" feature gate is enabled.
+
+              Most recent observed status of the PrometheusRule. Read-only.
+              More info:
+              https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
+            properties:
+              bindings:
+                description: bindings defines the list of workload resources (Prometheus, PrometheusAgent, or ThanosRuler) which select the configuration resource.
+                items:
+                  description: WorkloadBinding is a link between a configuration resource and a workload resource.
+                  properties:
+                    conditions:
+                      description: conditions defines the current state of the configuration resource when bound to the referenced Prometheus object.
+                      items:
+                        description: ConfigResourceCondition describes the status of configuration resources linked to Prometheus, PrometheusAgent, Alertmanager, or ThanosRuler.
+                        properties:
+                          lastTransitionTime:
+                            description: lastTransitionTime defines the time of the last update to the current status property.
+                            format: date-time
+                            type: string
+                          message:
+                            description: message defines the human-readable message indicating details for the condition's last transition.
+                            type: string
+                          observedGeneration:
+                            description: |-
+                              observedGeneration defines the .metadata.generation that the
+                              condition was set based upon. For instance, if `.metadata.generation` is
+                              currently 12, but the `.status.conditions[].observedGeneration` is 9, the
+                              condition is out of date with respect to the current state of the object.
+                            format: int64
+                            type: integer
+                          reason:
+                            description: reason for the condition's last transition.
+                            type: string
+                          status:
+                            description: status of the condition.
+                            minLength: 1
+                            type: string
+                          type:
+                            description: |-
+                              type of the condition being reported.
+                              Currently, only "Accepted" is supported.
+                            enum:
+                            - Accepted
+                            minLength: 1
+                            type: string
+                        required:
+                        - lastTransitionTime
+                        - status
+                        - type
+                        type: object
+                      type: array
+                      x-kubernetes-list-map-keys:
+                      - type
+                      x-kubernetes-list-type: map
+                    group:
+                      description: group defines the group of the referenced resource.
+                      enum:
+                      - monitoring.coreos.com
+                      type: string
+                    name:
+                      description: name defines the name of the referenced object.
+                      minLength: 1
+                      type: string
+                    namespace:
+                      description: namespace defines the namespace of the referenced object.
+                      minLength: 1
+                      type: string
+                    resource:
+                      description: resource defines the type of resource being referenced (e.g. Prometheus, PrometheusAgent, or ThanosRuler).
+                      enum:
+                      - prometheuses
+                      - prometheusagents
+                      - thanosrulers
+                      type: string
+                  required:
+                  - group
+                  - name
+                  - namespace
+                  - resource
+                  type: object
+                type: array
+                x-kubernetes-list-map-keys:
+                - group
+                - resource
+                - name
+                - namespace
+                x-kubernetes-list-type: map
+            type: object
         required:
         - spec
         type: object
     served: true
     storage: true
+    subresources:
+      status: {}

monitoring-satellite/manifests/crds/prometheusOperator-0scrapeconfigCustomResourceDefinition.yaml

@@ -10032,7 +10032,7 @@ spec:
                       type: string
                     applicationCredentialSecret:
                       description: |-
-                        applicationCredentialSecret defines the requiered field if using an application
+                        applicationCredentialSecret defines the required field if using an application
                         credential to authenticate.
                       properties:
                         key:
@@ -10118,7 +10118,7 @@ spec:
                       type: string
                     projectName:
                       description: |-
-                        projectName defines an ptional field for the Identity V2 API.
+                        projectName defines an optional field for the Identity V2 API.
                         Some providers allow you to specify a ProjectName instead of the ProjectId.
                         Some require both. Your provider's authentication policies will determine
                         how these fields influence authentication.

monitoring-satellite/manifests/crds/prometheusOperator-0servicemonitorCustomResourceDefinition.yaml

@@ -1226,7 +1226,7 @@ spec:
               https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
             properties:
               bindings:
-                description: bindings defines the list of workload resources (Prometheus or PrometheusAgent) which select the configuration resource.
+                description: bindings defines the list of workload resources (Prometheus, PrometheusAgent, or ThanosRuler) which select the configuration resource.
                 items:
                   description: WorkloadBinding is a link between a configuration resource and a workload resource.
                   properties:
@@ -1288,10 +1288,11 @@ spec:
                       minLength: 1
                       type: string
                     resource:
-                      description: resource defines the type of resource being referenced (e.g. Prometheus or PrometheusAgent).
+                      description: resource defines the type of resource being referenced (e.g. Prometheus, PrometheusAgent, or ThanosRuler).
                       enum:
                       - prometheuses
                       - prometheusagents
+                      - thanosrulers
                       type: string
                   required:
                   - group