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

…update-main [bot] [main] Automated dependencies update
gitpod-io · May 27, 2024 · d24b069 · d24b069
2 parents b32a819 + 145ea68
commit d24b069
Show file tree

Hide file tree

Showing 448 changed files with 25,200 additions and 33,359 deletions.
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
           "subdir": "contrib/mixin"
         }
       },
-      "version": "52fb28c1a8db4e66c547b7975bf6dc1e0b17f8bf",
+      "version": "bb701b9265f31d61db5906325e0a7e2abf7d3627",
       "sum": "IXI3LQIT9NmTPJAk8WLUJd5+qZfcGpeNCyWIK7oEpws="
     },
     {
@@ -28,8 +28,8 @@
           "subdir": "operations/observability/mixins"
         }
       },
-      "version": "5fdedd96443f204b301e5e975a93e031fc478ef6",
-      "sum": "W/EJz6gxBgggO8qFOpHCjZ4oO754p3OwORr2Rx1LTUQ=",
+      "version": "504189b123f6d7024a9d5db0607972a2cef1b5fd",
+      "sum": "99I5DKpjdO4d978XycsznmK41XIjzTHKL2wdx2bXPSU=",
       "name": "gitpod"
     },
     {
@@ -69,8 +69,8 @@
           "subdir": "gen/grafonnet-latest"
         }
       },
-      "version": "1c56af39815c4903e47c27194444456f005f65df",
-      "sum": "GxEO83uxgsDclLp/fmlUJZDbSGpeUZY6Ap3G2cgdL1g="
+      "version": "18eb4e529c60ec20ab243e2da3bcb52b2fd0d223",
+      "sum": "eyuJ0jOXeA4MrobbNgU4/v5a7ASDHslHZ0eS6hDdWoI="
     },
     {
       "source": {
@@ -79,18 +79,18 @@
           "subdir": "gen/grafonnet-v10.0.0"
         }
       },
-      "version": "1c56af39815c4903e47c27194444456f005f65df",
+      "version": "18eb4e529c60ec20ab243e2da3bcb52b2fd0d223",
       "sum": "xdcrJPJlpkq4+5LpGwN4tPAuheNNLXZjE6tDcyvFjr0="
     },
     {
       "source": {
         "git": {
           "remote": "https://github.com/grafana/grafonnet.git",
-          "subdir": "gen/grafonnet-v10.4.0"
+          "subdir": "gen/grafonnet-v11.0.0"
         }
       },
-      "version": "1c56af39815c4903e47c27194444456f005f65df",
-      "sum": "DKj+Sn+rlI48g/aoJpzkfPge46ya0jLk5kcZoiZ2X/I="
+      "version": "18eb4e529c60ec20ab243e2da3bcb52b2fd0d223",
+      "sum": "6ycXhBvq/k7j01vaNiDSZcVsKikh01pfNH+2oauHgJg="
     },
     {
       "source": {
@@ -129,8 +129,8 @@
           "subdir": ""
         }
       },
-      "version": "033a6fb33be80d381045dc570fc53f0b7750e8b6",
-      "sum": "mrmfolXgp1MNMX5Svdbro8/L5v6VDh8UIpsQ9KwU39M="
+      "version": "de834e9a291b49396125768f041e2078763f48b5",
+      "sum": "E6z1j4MS6/NnIVZkUuk+gb0m9FvRmZ77H6SSopIZEa8="
     },
     {
       "source": {
@@ -139,7 +139,7 @@
           "subdir": "jsonnet/kube-state-metrics"
         }
       },
-      "version": "fa083b53d0dbe8ae2f0a93870689ad0f490428ff",
+      "version": "d8dd6e0704c6008bc40b112bb10cbd3f8be9dd43",
       "sum": "msMZyUvcebzRILLzNlTIiSOwa1XgQKtP7jbZTkiqwM0="
     },
     {
@@ -149,7 +149,7 @@
           "subdir": "jsonnet/kube-state-metrics-mixin"
         }
       },
-      "version": "fa083b53d0dbe8ae2f0a93870689ad0f490428ff",
+      "version": "d8dd6e0704c6008bc40b112bb10cbd3f8be9dd43",
       "sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
     },
     {
@@ -159,8 +159,8 @@
           "subdir": "jsonnet/kube-prometheus"
         }
       },
-      "version": "cb55161e24eee55d67f3bb7e7f1719feab66da52",
-      "sum": "9zbJ1/VBNBXA+mU0L59i7ZBXOVF8/v054l7rsStiiag="
+      "version": "65922b9fd8c3869c06686b44f5f3aa9f96560666",
+      "sum": "DtatPRLo28DgT9wMG5PKZWodiMLxx7saV6aKuqXd9gM="
     },
     {
       "source": {
@@ -169,7 +169,7 @@
           "subdir": "jsonnet/mixin"
         }
       },
-      "version": "cd506c4fb584f40b46163926f01ba24a91f5baf5",
+      "version": "4c1706c4cf97c9e2db07635b3e517c1e0a949ec7",
       "sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
       "name": "prometheus-operator-mixin"
     },
@@ -180,8 +180,8 @@
           "subdir": "jsonnet/prometheus-operator"
         }
       },
-      "version": "cd506c4fb584f40b46163926f01ba24a91f5baf5",
-      "sum": "XahuGOJRU3s3I+V9/IT4zo43rlA35XiAN7mdfUF/BoA="
+      "version": "4c1706c4cf97c9e2db07635b3e517c1e0a949ec7",
+      "sum": "53aMSZkXBOvXsbF3nuxrUjmvx5B69lOjkDtM428VsBk="
     },
     {
       "source": {
@@ -190,7 +190,7 @@
           "subdir": "doc/alertmanager-mixin"
         }
       },
-      "version": "91a94f00f987048fa4f42856165d49370a3af568",
+      "version": "fd37ce9c95898ca68be1ab4d4529517174b73c33",
       "sum": "IpF46ZXsm+0wJJAPtAre8+yxTNZA57mBqGpBP/r7/kw=",
       "name": "alertmanager"
     },
@@ -201,7 +201,7 @@
           "subdir": "docs/node-mixin"
         }
       },
-      "version": "3afc0a341e3c2c6605b18a882fb045318c18c444",
+      "version": "0d3400ebc976e14d5b87db276bb2ec32f55b4052",
       "sum": "R9ROsvpjZLgQJ78WAyD4HzrIq976Bpr4V2P2Fo2Kfns="
     },
     {
@@ -211,7 +211,7 @@
           "subdir": "documentation/prometheus-mixin"
         }
       },
-      "version": "114dc5c393ce54ac663a2466a82571e1e0e0d03d",
+      "version": "8894d65cd6135635c4ac9cf100464e6aacd29593",
       "sum": "vGD+MxGadIBvvDC+/71BRKWEA8vHgcuBP5PcuCKZGEs=",
       "name": "prometheus"
     },
@@ -233,7 +233,7 @@
           "subdir": "mixin"
         }
       },
-      "version": "9e6cbd9fdd9df17125e20ecf7a084198e4355b9a",
+      "version": "447cb96ad27378c0470d84f55f363e7fae71d05a",
       "sum": "HhSSbGGCNHCMy1ee5jElYDm0yS9Vesa7QB2/SHKdjsY=",
       "name": "thanos-mixin"
     },

diff --git a/...ellite/manifests/crds/prometheusOperator-0alertmanagerConfigCustomResourceDefinition.yaml b/...ellite/manifests/crds/prometheusOperator-0alertmanagerConfigCustomResourceDefinition.yaml
@@ -2024,6 +2024,9 @@ spec:
                           severity:
                             description: Severity of the incident.
                             type: string
+                          source:
+                            description: Unique location of the affected system.
+                            type: string
                           url:
                             description: The URL to send requests to.
                             type: string

diff --git a/...ring-satellite/manifests/crds/prometheusOperator-0prometheusCustomResourceDefinition.yaml b/...ring-satellite/manifests/crds/prometheusOperator-0prometheusCustomResourceDefinition.yaml
@@ -4933,7 +4933,7 @@ spec:
               podMonitorNamespaceSelector:
                 description: |-
                   Namespaces to match for PodMonitors discovery. An empty label selector
-                  matches all namespaces. A null label selector matches the current
+                  matches all namespaces. A null label selector (default value) matches the current
                   namespace only.
                 properties:
                   matchExpressions:
@@ -6533,6 +6533,107 @@ spec:
 
                         Only one scrape class can be set as the default.
                       type: boolean
+                    metricRelabelings:
+                      description: |-
+                        MetricRelabelings configures the relabeling rules to apply to all samples before ingestion.
+
+
+                        The Operator adds the scrape class metric relabelings defined here.
+                        Then the Operator adds the target-specific metric relabelings defined in ServiceMonitors, PodMonitors, Probes and ScrapeConfigs.
+                        Then the Operator adds namespace enforcement relabeling rule, specified in '.spec.enforcedNamespaceLabel'.
+
+
+                        More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs
+                      items:
+                        description: |-
+                          RelabelConfig allows dynamic rewriting of the label set for targets, alerts,
+                          scraped samples and remote write samples.
+
+
+                          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.
+
+
+                              `Uppercase` and `Lowercase` actions require Prometheus >= v2.36.0.
+                              `DropEqual` and `KeepEqual` actions require Prometheus >= v2.41.0.
+
+
+                              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.
+
+
+                              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.
+
+
+                              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.
+
+
+                              It is mandatory for `Replace`, `HashMod`, `Lowercase`, `Uppercase`,
+                              `KeepEqual` and `DropEqual` actions.
+
+
+                              Regex capture groups are available.
+                            type: string
+                        type: object
+                      type: array
                     name:
                       description: Name of the scrape class.
                       minLength: 1
@@ -7106,7 +7207,7 @@ spec:
               serviceMonitorNamespaceSelector:
                 description: |-
                   Namespaces to match for ServicedMonitors discovery. An empty label selector
-                  matches all namespaces. A null label selector matches the current
+                  matches all namespaces. A null label selector (default value) matches the current
                   namespace only.
                 properties:
                   matchExpressions: