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

…update-main [bot] [main] Automated dependencies update
gitpod-io · Nov 18, 2024 · 94e8740 · 94e8740
2 parents dba57a3 + fcda9a9
commit 94e8740
Show file tree

Hide file tree

Showing 18 changed files with 225 additions and 130 deletions.
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
           "subdir": "contrib/mixin"
         }
       },
-      "version": "12b47c2b935b6040a3874c512b2dd7f89dc0b599",
+      "version": "ee789c933e5f1cac02499dbd377ef0e3960220c6",
       "sum": "IXI3LQIT9NmTPJAk8WLUJd5+qZfcGpeNCyWIK7oEpws="
     },
     {
@@ -28,7 +28,7 @@
           "subdir": "operations/observability/mixins"
         }
       },
-      "version": "8e7678a1223e1d3a517bd85ae54af53a69bf08a8",
+      "version": "21f546d4c172e62b78aa32cd9a692122610d0a85",
       "sum": "uF+K/RdAnPLuxKV/vNAKf/D34YdXCyJu2J6pk+YiTKc=",
       "name": "gitpod"
     },
@@ -99,7 +99,7 @@
           "subdir": "grafana-builder"
         }
       },
-      "version": "a8fc2139d881ae632a8c956eb9dd4b84b24f362e",
+      "version": "5a6b86b475e427b2dbd9e4af0bcafbb6da0507a5",
       "sum": "yxqWcq/N3E/a/XreeU6EuE6X7kYPnG0AspAQFKOjASo="
     },
     {
@@ -139,7 +139,7 @@
           "subdir": "jsonnet/kube-state-metrics"
         }
       },
-      "version": "17151aca659e0659259b5e1f5675acf849281ade",
+      "version": "ea5826a92cde206fc6784d2cb6b7c2548d2b2290",
       "sum": "lO7jUSzAIy8Yk9pOWJIWgPRhubkWzVh56W6wtYfbVH4="
     },
     {
@@ -149,7 +149,7 @@
           "subdir": "jsonnet/kube-state-metrics-mixin"
         }
       },
-      "version": "17151aca659e0659259b5e1f5675acf849281ade",
+      "version": "ea5826a92cde206fc6784d2cb6b7c2548d2b2290",
       "sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
     },
     {
@@ -159,8 +159,8 @@
           "subdir": "jsonnet/kube-prometheus"
         }
       },
-      "version": "69d9636b64192418d64912c032f5437361e88ea5",
-      "sum": "W4HnSyscMMutOCaDyjNZy1XXcdhRPibYuV1yVgqxXm0="
+      "version": "c503e5cc5403dd5d56b1c0c5933827baee64aeaf",
+      "sum": "fJqINQiYJPmllXFFO+Hl5HrPYANMbhHFUQ28tl0Vi00="
     },
     {
       "source": {
@@ -169,7 +169,7 @@
           "subdir": "jsonnet/mixin"
         }
       },
-      "version": "5f512d21361a300889388c3a174f4349fef3604d",
+      "version": "2d5b11ad21ac8660a4772a4671c24fae1a2a8dbb",
       "sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
       "name": "prometheus-operator-mixin"
     },
@@ -180,8 +180,8 @@
           "subdir": "jsonnet/prometheus-operator"
         }
       },
-      "version": "5f512d21361a300889388c3a174f4349fef3604d",
-      "sum": "O/QbpfCV+3sx4egAAKeD6ZjaiYsixfLwRLboky1GGNw="
+      "version": "2d5b11ad21ac8660a4772a4671c24fae1a2a8dbb",
+      "sum": "ocRDJR5Yn5bUUong2FcFydQbsAK3OFMlbl8tibUw2ZQ="
     },
     {
       "source": {
@@ -201,7 +201,7 @@
           "subdir": "docs/node-mixin"
         }
       },
-      "version": "0fddfd1ba530c954dc042c5d138de82ecd4e4ff1",
+      "version": "49d177bf95417b117ab612a376e2434d5dd61c2d",
       "sum": "cQCW+1N0Xae5yXecCWDK2oAlN0luBS/5GrwBYSlaFms="
     },
     {
@@ -211,7 +211,7 @@
           "subdir": "documentation/prometheus-mixin"
         }
       },
-      "version": "f9057544cb69261acd59628c2e81369adeb584c9",
+      "version": "101b1c307f2b80b142c38f7cebcc3db50084ed8f",
       "sum": "dYLcLzGH4yF3qB7OGC/7z4nqeTNjv42L7Q3BENU8XJI=",
       "name": "prometheus"
     },
@@ -233,7 +233,7 @@
           "subdir": "mixin"
         }
       },
-      "version": "bfbabbb89a3119e904d48028fb2534446e31a642",
+      "version": "2a975d33662bf16b47e82680c9ac085909214353",
       "sum": "ieCD4eMgGbOlrI8GmckGPHBGQDcLasE1rULYq56W/bs=",
       "name": "thanos-mixin"
     },

diff --git a/...ring-satellite/manifests/crds/prometheusOperator-0prometheusCustomResourceDefinition.yaml b/...ring-satellite/manifests/crds/prometheusOperator-0prometheusCustomResourceDefinition.yaml
@@ -1193,6 +1193,7 @@ spec:
                           description: |-
                             Version of the Alertmanager API that Prometheus uses to send alerts.
                             It can be "v1" or "v2".
+                            The field has no effect for Prometheus >= v3.0.0 because only the v2 API is supported.
                           type: string
                         authorization:
                           description: |-
@@ -3444,6 +3445,14 @@ spec:
                   type: string
                 type: array
                 x-kubernetes-list-type: set
+              enableOTLPReceiver:
+                description: |-
+                  Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+                  Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+                  It requires Prometheus >= v2.47.0.
+                type: boolean
               enableRemoteWriteReceiver:
                 description: |-
                   Enable Prometheus to be used as a receiver for the Prometheus remote
@@ -5226,6 +5235,16 @@ spec:
                     minItems: 1
                     type: array
                     x-kubernetes-list-type: set
+                  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:
+                    - NoUTF8EscapingWithSuffixes
+                    - UnderscoreEscapingWithSuffixes
+                    type: string
                 type: object
               overrideHonorLabels:
                 description: |-

diff --git a/...satellite/manifests/crds/prometheusOperator-0prometheusagentCustomResourceDefinition.yaml b/...satellite/manifests/crds/prometheusOperator-0prometheusagentCustomResourceDefinition.yaml
@@ -2791,6 +2791,14 @@ spec:
                   type: string
                 type: array
                 x-kubernetes-list-type: set
+              enableOTLPReceiver:
+                description: |-
+                  Enable Prometheus to be used as a receiver for the OTLP Metrics protocol.
+
+                  Note that the OTLP receiver endpoint is automatically enabled if `.spec.otlpConfig` is defined.
+
+                  It requires Prometheus >= v2.47.0.
+                type: boolean
               enableRemoteWriteReceiver:
                 description: |-
                   Enable Prometheus to be used as a receiver for the Prometheus remote
@@ -4559,6 +4567,16 @@ spec:
                     minItems: 1
                     type: array
                     x-kubernetes-list-type: set
+                  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:
+                    - NoUTF8EscapingWithSuffixes
+                    - UnderscoreEscapingWithSuffixes
+                    type: string
                 type: object
               overrideHonorLabels:
                 description: |-

diff --git a/...ng-satellite/manifests/crds/prometheusOperator-0scrapeconfigCustomResourceDefinition.yaml b/...ng-satellite/manifests/crds/prometheusOperator-0scrapeconfigCustomResourceDefinition.yaml
@@ -213,7 +213,9 @@ spec:
                         If unset, Prometheus uses its default value.
                       type: boolean
                     authorization:
-                      description: Authorization header configuration to authenticate against the Consul Server.
+                      description: |-
+                        Optional Authorization header configuration to authenticate against the Consul Server.
+                        Cannot be set at the same time as `basicAuth`, or `oauth2`.
                       properties:
                         credentials:
                           description: Selects a key of a Secret in the namespace that contains the credentials for authentication.
@@ -248,8 +250,9 @@ spec:
                       type: object
                     basicAuth:
                       description: |-
-                        BasicAuth information to authenticate against the Consul Server.
+                        Optional BasicAuth information to authenticate against the Consul Server.
                         More info: https://prometheus.io/docs/operating/configuration/#endpoints
+                        Cannot be set at the same time as `authorization`, or `oauth2`.
                       properties:
                         password:
                           description: |-
@@ -302,6 +305,7 @@ spec:
                       type: object
                     datacenter:
                       description: Consul Datacenter name, if not provided it will use the local Consul Agent Datacenter.
+                      minLength: 1
                       type: string
                     enableHTTP2:
                       description: |-
@@ -314,7 +318,11 @@ spec:
                         If unset, Prometheus uses its default value.
                       type: boolean
                     namespace:
-                      description: Namespaces are only supported in Consul Enterprise.
+                      description: |-
+                        Namespaces are only supported in Consul Enterprise.
+
+                        It requires Prometheus >= 2.28.0.
+                      minLength: 1
                       type: string
                     noProxy:
                       description: |-
@@ -331,7 +339,9 @@ spec:
                       type: object
                       x-kubernetes-map-type: atomic
                     oauth2:
-                      description: Optional OAuth 2.0 configuration.
+                      description: |-
+                        Optional OAuth2.0 configuration.
+                        Cannot be set at the same time as `basicAuth`, or `authorization`.
                       properties:
                         clientId:
                           description: |-
@@ -632,6 +642,14 @@ spec:
                       type: object
                     partition:
                       description: Admin Partitions are only supported in Consul Enterprise.
+                      minLength: 1
+                      type: string
+                    pathPrefix:
+                      description: |-
+                        Prefix for URIs for when consul is behind an API gateway (reverse proxy).
+
+                        It requires Prometheus >= 2.45.0.
+                      minLength: 1
                       type: string
                     proxyConnectHeader:
                       additionalProperties:
@@ -689,28 +707,29 @@ spec:
                       - HTTPS
                       type: string
                     server:
-                      description: A valid string consisting of a hostname or IP followed by an optional port number.
+                      description: Consul server address. A valid string consisting of a hostname or IP followed by an optional port number.
                       minLength: 1
                       type: string
                     services:
                       description: A list of services for which targets are retrieved. If omitted, all services are scraped.
                       items:
                         type: string
                       type: array
-                      x-kubernetes-list-type: atomic
+                      x-kubernetes-list-type: set
                     tagSeparator:
                       description: |-
                         The string by which Consul tags are joined into the tag label.
                         If unset, Prometheus uses its default value.
+                      minLength: 1
                       type: string
                     tags:
                       description: An optional list of tags used to filter nodes for a given service. Services must contain all tags in the list.
                       items:
                         type: string
                       type: array
-                      x-kubernetes-list-type: atomic
+                      x-kubernetes-list-type: set
                     tlsConfig:
-                      description: TLS Config
+                      description: TLS configuration to connect to the Consul API.
                       properties:
                         ca:
                           description: Certificate authority used when verifying server certificates.
@@ -1247,6 +1266,9 @@ spec:
                       type: object
                     port:
                       description: The port to scrape metrics from.
+                      format: int32
+                      maximum: 65535
+                      minimum: 0
                       type: integer
                     proxyConnectHeader:
                       additionalProperties:

diff --git a/monitoring-satellite/manifests/grafana/config.yaml b/monitoring-satellite/manifests/grafana/config.yaml
@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/component: grafana
     app.kubernetes.io/name: grafana
     app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 11.2.1
+    app.kubernetes.io/version: 11.3.0
   name: grafana-config
   namespace: monitoring-satellite
 stringData:

diff --git a/monitoring-satellite/manifests/grafana/dashboardDatasources.yaml b/monitoring-satellite/manifests/grafana/dashboardDatasources.yaml
@@ -5,7 +5,7 @@ metadata:
     app.kubernetes.io/component: grafana
     app.kubernetes.io/name: grafana
     app.kubernetes.io/part-of: kube-prometheus
-    app.kubernetes.io/version: 11.2.1
+    app.kubernetes.io/version: 11.3.0
   name: grafana-datasources
   namespace: monitoring-satellite
 stringData: