[bot] [main] Automated dependencies update

gitpod-io · Jan 13, 2025 · ce25679 · ce25679
1 parent 4827a24
commit ce25679
Show file tree

Hide file tree

Showing 17 changed files with 2,282 additions and 3,136 deletions.
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
           "subdir": "contrib/mixin"
         }
       },
-      "version": "fce823ac2830033270f8fe03fa1b56e62bf882b8",
+      "version": "9db8dcb44b9ad7d0cf94438169cef7a778e2eb15",
       "sum": "IXI3LQIT9NmTPJAk8WLUJd5+qZfcGpeNCyWIK7oEpws="
     },
     {
@@ -28,7 +28,7 @@
           "subdir": "operations/observability/mixins"
         }
       },
-      "version": "4c25f426e1d1c911099e51ad3771143ca380f32c",
+      "version": "8c8685cd99ee328aeacaec14f9f3d57f719e8672",
       "sum": "hVjQ0n6vsB+8/f0UJ3PKbV+DwvxgGMy6vhrwouaHIZk=",
       "name": "gitpod"
     },
@@ -129,7 +129,7 @@
           "subdir": "jsonnet/kube-state-metrics"
         }
       },
-      "version": "d3f0c1853f11b387d7dc2c89bd5e52760f65079c",
+      "version": "c198a18d289d520f462675e622a06a85404b5a0b",
       "sum": "lO7jUSzAIy8Yk9pOWJIWgPRhubkWzVh56W6wtYfbVH4="
     },
     {
@@ -139,7 +139,7 @@
           "subdir": "jsonnet/kube-state-metrics-mixin"
         }
       },
-      "version": "d3f0c1853f11b387d7dc2c89bd5e52760f65079c",
+      "version": "c198a18d289d520f462675e622a06a85404b5a0b",
       "sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
     },
     {
@@ -149,8 +149,8 @@
           "subdir": "jsonnet/kube-prometheus"
         }
       },
-      "version": "5f0e7a6eee2fc91509a35fb2cce7989cd1bf7c9c",
-      "sum": "DieI56aZZ1iRRayvspGJPavvqvYubPEXoGNzEvVYJgY="
+      "version": "16ba4827a699f7c6f74a1bc503d518e8c89dd6a8",
+      "sum": "CLC7BSrevOd35F8c3xz1++mD8fmJxc52sNOxSIgB7Lk="
     },
     {
       "source": {
@@ -159,7 +159,7 @@
           "subdir": "jsonnet/mixin"
         }
       },
-      "version": "17cb15440c5d975b57d8a60cd22d9b5834aa542a",
+      "version": "ae04859fc90096b7bbbe297d4fdade73f0d1f1a6",
       "sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
       "name": "prometheus-operator-mixin"
     },
@@ -170,8 +170,8 @@
           "subdir": "jsonnet/prometheus-operator"
         }
       },
-      "version": "17cb15440c5d975b57d8a60cd22d9b5834aa542a",
-      "sum": "+V0hy+nn699RhjzI4XCwhNqjH4ZMxEPaks/RhyAMDlo="
+      "version": "ae04859fc90096b7bbbe297d4fdade73f0d1f1a6",
+      "sum": "hR9044bifEF7RJSZLOX9qvWHqAhuhqnqXkXgmARfneI="
     },
     {
       "source": {
@@ -180,7 +180,7 @@
           "subdir": "doc/alertmanager-mixin"
         }
       },
-      "version": "3b61ae81a7b859ae4e9ddd34c88d71b4c1691a9e",
+      "version": "6e7d4936ce16948eb1b38adb06d15515b70e4861",
       "sum": "Mf4h1BYLle2nrgjf/HXrBbl0Zk8N+xaoEM017o0BC+k=",
       "name": "alertmanager"
     },
@@ -191,7 +191,7 @@
           "subdir": "docs/node-mixin"
         }
       },
-      "version": "8f9a914bee023a614f4eea1005baf2e112bbadb0",
+      "version": "acdd9b813d71b856fe34df97caa1ed90c8587692",
       "sum": "xYj6VYFT/eafsbleNlC+Z2VfLy1CndyYrJs9BcTmnX8="
     },
     {
@@ -201,8 +201,8 @@
           "subdir": "documentation/prometheus-mixin"
         }
       },
-      "version": "a441ad771e881c0035bc90129bcae682ebf66338",
-      "sum": "OYT5u3S8DbamuJV/v3gbWSteOvFzMeNwMj+u4Apk7jM=",
+      "version": "0a19f1268e2dbb9bae9568f007a9809e8fba0402",
+      "sum": "CwaQpW66lHx+++sY2g4BgrUTEFZtlDnQzFjo0AlgfIg=",
       "name": "prometheus"
     },
     {
@@ -223,7 +223,7 @@
           "subdir": "mixin"
         }
       },
-      "version": "bed76cf4dd48928a093126d6ccfac78a71474e5a",
+      "version": "4ba0ba403896e468dfda3da07ce89aa159dfbe37",
       "sum": "ieCD4eMgGbOlrI8GmckGPHBGQDcLasE1rULYq56W/bs=",
       "name": "thanos-mixin"
     },

diff --git a/...ring-satellite/manifests/crds/prometheusOperator-0podmonitorCustomResourceDefinition.yaml b/...ring-satellite/manifests/crds/prometheusOperator-0podmonitorCustomResourceDefinition.yaml
@@ -858,6 +858,7 @@ spec:
 
                         If empty, Prometheus uses the global scrape timeout unless it is less
                         than the target's scrape interval value in which the latter is used.
+                        The value cannot be greater than the scrape interval otherwise the operator will reject the resource.
                       pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
                       type: string
                     targetPort:

diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0probeCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0probeCustomResourceDefinition.yaml
@@ -691,6 +691,7 @@ spec:
                 description: |-
                   Timeout for scraping metrics from the Prometheus exporter.
                   If not specified, the Prometheus global scrape timeout is used.
+                  The value cannot be greater than the scrape interval otherwise the operator will reject the resource.
                 pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
                 type: string
               targetLimit:

diff --git a/...ring-satellite/manifests/crds/prometheusOperator-0prometheusCustomResourceDefinition.yaml b/...ring-satellite/manifests/crds/prometheusOperator-0prometheusCustomResourceDefinition.yaml
@@ -5291,6 +5291,13 @@ spec:
                   Settings related to the OTLP receiver feature.
                   It requires Prometheus >= v2.55.0.
                 properties:
+                  keepIdentifyingResourceAttributes:
+                    description: |-
+                      Enables adding `service.name`, `service.namespace` and `service.instance.id`
+                      resource attributes to the `target_info` metric, on top of converting them into the `instance` and `job` labels.
+
+                      It requires Prometheus >= v3.1.0.
+                    type: boolean
                   promoteResourceAttributes:
                     description: List of OpenTelemetry Attributes that should be promoted to metric labels, defaults to none.
                     items:
@@ -5302,7 +5309,6 @@ spec:
                   translationStrategy:
                     description: |-
                       Configures how the OTLP receiver endpoint translates the incoming metrics.
-                      If unset, Prometheus uses its default value.
 
                       It requires Prometheus >= v3.0.0.
                     enum:
@@ -8195,7 +8201,9 @@ spec:
                 type: array
                 x-kubernetes-list-type: set
               scrapeTimeout:
-                description: Number of seconds to wait until a scrape request times out.
+                description: |-
+                  Number of seconds to wait until a scrape request times out.
+                  The value cannot be greater than the scrape interval otherwise the operator will reject the resource.
                 pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
                 type: string
               secrets:

diff --git a/...satellite/manifests/crds/prometheusOperator-0prometheusagentCustomResourceDefinition.yaml b/...satellite/manifests/crds/prometheusOperator-0prometheusagentCustomResourceDefinition.yaml
@@ -4542,7 +4542,6 @@ spec:
               mode:
                 description: |-
                   Mode defines how the Prometheus operator deploys the PrometheusAgent pod(s).
-                  For now this field has no effect.
 
                   (Alpha) Using this field requires the `PrometheusAgentDaemonSet` feature gate to be enabled.
                 enum:
@@ -4565,6 +4564,13 @@ spec:
                   Settings related to the OTLP receiver feature.
                   It requires Prometheus >= v2.55.0.
                 properties:
+                  keepIdentifyingResourceAttributes:
+                    description: |-
+                      Enables adding `service.name`, `service.namespace` and `service.instance.id`
+                      resource attributes to the `target_info` metric, on top of converting them into the `instance` and `job` labels.
+
+                      It requires Prometheus >= v3.1.0.
+                    type: boolean
                   promoteResourceAttributes:
                     description: List of OpenTelemetry Attributes that should be promoted to metric labels, defaults to none.
                     items:
@@ -4576,7 +4582,6 @@ spec:
                   translationStrategy:
                     description: |-
                       Configures how the OTLP receiver endpoint translates the incoming metrics.
-                      If unset, Prometheus uses its default value.
 
                       It requires Prometheus >= v3.0.0.
                     enum:
@@ -6588,7 +6593,9 @@ spec:
                 type: array
                 x-kubernetes-list-type: set
               scrapeTimeout:
-                description: Number of seconds to wait until a scrape request times out.
+                description: |-
+                  Number of seconds to wait until a scrape request times out.
+                  The value cannot be greater than the scrape interval otherwise the operator will reject the resource.
                 pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
                 type: string
               secrets:

diff --git a/...ng-satellite/manifests/crds/prometheusOperator-0scrapeconfigCustomResourceDefinition.yaml b/...ng-satellite/manifests/crds/prometheusOperator-0scrapeconfigCustomResourceDefinition.yaml
@@ -10510,7 +10510,9 @@ spec:
                 type: array
                 x-kubernetes-list-type: set
               scrapeTimeout:
-                description: ScrapeTimeout is the number of seconds to wait until a scrape request times out.
+                description: |-
+                  ScrapeTimeout is the number of seconds to wait until a scrape request times out.
+                  The value cannot be greater than the scrape interval otherwise the operator will reject the resource.
                 pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
                 type: string
               staticConfigs:

diff --git a/...-satellite/manifests/crds/prometheusOperator-0servicemonitorCustomResourceDefinition.yaml b/...-satellite/manifests/crds/prometheusOperator-0servicemonitorCustomResourceDefinition.yaml
@@ -776,6 +776,7 @@ spec:
 
                         If empty, Prometheus uses the global scrape timeout unless it is less
                         than the target's scrape interval value in which the latter is used.
+                        The value cannot be greater than the scrape interval otherwise the operator will reject the resource.
                       pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
                       type: string
                     targetPort: