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

…update-main [bot] [main] Automated dependencies update
gitpod-io · May 20, 2024 · b32a819 · b32a819
2 parents 0a8f928 + 52928fd
commit b32a819
Show file tree

Hide file tree

Showing 24 changed files with 338 additions and 306 deletions.
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
           "subdir": "contrib/mixin"
         }
       },
-      "version": "a2ce03538f2dc6a900aefdda606a431374ccd14b",
+      "version": "52fb28c1a8db4e66c547b7975bf6dc1e0b17f8bf",
       "sum": "IXI3LQIT9NmTPJAk8WLUJd5+qZfcGpeNCyWIK7oEpws="
     },
     {
@@ -28,8 +28,8 @@
           "subdir": "operations/observability/mixins"
         }
       },
-      "version": "bcf779794174550cbe345b6a7493363771976489",
-      "sum": "ib+j6kKrmwubgOtDuKIwCD6CZxl0qK8O2ipn/HnXkv8=",
+      "version": "5fdedd96443f204b301e5e975a93e031fc478ef6",
+      "sum": "W/EJz6gxBgggO8qFOpHCjZ4oO754p3OwORr2Rx1LTUQ=",
       "name": "gitpod"
     },
     {
@@ -99,8 +99,8 @@
           "subdir": "grafana-builder"
         }
       },
-      "version": "60f98f603ffb2f88b360d9e31dafa5b0422914a7",
-      "sum": "5ku1Hd8UPnjmn8nWyaTFzMpT3Pa+VylBnmposMSVEuU="
+      "version": "02db06f540086fa3f67d487bd01e1b314853fb8f",
+      "sum": "B49EzIY2WZsFxNMJcgRxE/gcZ9ltnS8pkOOV6Q5qioc="
     },
     {
       "source": {
@@ -169,7 +169,7 @@
           "subdir": "jsonnet/mixin"
         }
       },
-      "version": "f4b82d7235daee34f41ceb3e60210759c4733525",
+      "version": "cd506c4fb584f40b46163926f01ba24a91f5baf5",
       "sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
       "name": "prometheus-operator-mixin"
     },
@@ -180,8 +180,8 @@
           "subdir": "jsonnet/prometheus-operator"
         }
       },
-      "version": "f4b82d7235daee34f41ceb3e60210759c4733525",
-      "sum": "2oKH6voUO/qmkU8oz0lFmM4IgICfJF4R4jSRxRMkPwk="
+      "version": "cd506c4fb584f40b46163926f01ba24a91f5baf5",
+      "sum": "XahuGOJRU3s3I+V9/IT4zo43rlA35XiAN7mdfUF/BoA="
     },
     {
       "source": {
@@ -211,7 +211,7 @@
           "subdir": "documentation/prometheus-mixin"
         }
       },
-      "version": "edf5ebd84422d1f894e7d56451cdf06fd16a83dc",
+      "version": "114dc5c393ce54ac663a2466a82571e1e0e0d03d",
       "sum": "vGD+MxGadIBvvDC+/71BRKWEA8vHgcuBP5PcuCKZGEs=",
       "name": "prometheus"
     },
@@ -233,7 +233,7 @@
           "subdir": "mixin"
         }
       },
-      "version": "9707a4f7da53efe0ca674c9e867c3936ead9ba2c",
+      "version": "9e6cbd9fdd9df17125e20ecf7a084198e4355b9a",
       "sum": "HhSSbGGCNHCMy1ee5jElYDm0yS9Vesa7QB2/SHKdjsY=",
       "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.14.0
-    operator.prometheus.io/version: 0.73.2
+    operator.prometheus.io/version: 0.74.0
   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.14.0
-    operator.prometheus.io/version: 0.73.2
+    operator.prometheus.io/version: 0.74.0
   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.14.0
-    operator.prometheus.io/version: 0.73.2
+    operator.prometheus.io/version: 0.74.0
   name: podmonitors.monitoring.coreos.com
 spec:
   group: monitoring.coreos.com

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.14.0
-    operator.prometheus.io/version: 0.73.2
+    operator.prometheus.io/version: 0.74.0
   name: probes.monitoring.coreos.com
 spec:
   group: monitoring.coreos.com

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.14.0
-    operator.prometheus.io/version: 0.73.2
+    operator.prometheus.io/version: 0.74.0
   name: prometheuses.monitoring.coreos.com
 spec:
   group: monitoring.coreos.com
@@ -1060,6 +1060,100 @@ spec:
                         AlertmanagerEndpoints defines a selection of a single Endpoints object
                         containing Alertmanager IPs to fire alerts against.
                       properties:
+                        alertRelabelings:
+                          description: |-
+                            Relabeling configs applied before sending alerts to a specific Alertmanager.
+                            It requires Prometheus >= v2.51.0.
+                          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
                         apiVersion:
                           description: |-
                             Version of the Alertmanager API that Prometheus uses to send alerts.
@@ -5588,7 +5682,7 @@ spec:
                         managedIdentity:
                           description: |-
                             ManagedIdentity defines the Azure User-assigned Managed identity.
-                            Cannot be set at the same time as `oauth`.
+                            Cannot be set at the same time as `oauth` or `sdk`.
                           properties:
                             clientId:
                               description: The client id
@@ -5599,7 +5693,7 @@ spec:
                         oauth:
                           description: |-
                             OAuth defines the oauth config that is being used to authenticate.
-                            Cannot be set at the same time as `managedIdentity`.
+                            Cannot be set at the same time as `managedIdentity` or `sdk`.
 
 
                             It requires Prometheus >= v2.48.0.
@@ -5628,7 +5722,7 @@ spec:
                               type: object
                               x-kubernetes-map-type: atomic
                             tenantId:
-                              description: '`tenantID` is the tenant ID of the Azure Active Directory application that is being used to authenticate.'
+                              description: '`tenantId` is the tenant ID of the Azure Active Directory application that is being used to authenticate.'
                               minLength: 1
                               pattern: ^[0-9a-zA-Z-.]+$
                               type: string
@@ -5637,6 +5731,20 @@ spec:
                           - clientSecret
                           - tenantId
                           type: object
+                        sdk:
+                          description: |-
+                            SDK defines the Azure SDK config that is being used to authenticate.
+                            See https://learn.microsoft.com/en-us/azure/developer/go/azure-sdk-authentication
+                            Cannot be set at the same time as `oauth` or `managedIdentity`.
+
+
+                            It requires Prometheus >= 2.52.0.
+                          properties:
+                            tenantId:
+                              description: '`tenantId` is the tenant ID of the azure active directory application that is being used to authenticate.'
+                              pattern: ^[0-9a-zA-Z-.]+$
+                              type: string
+                          type: object
                       type: object
                     basicAuth:
                       description: |-

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.14.0
-    operator.prometheus.io/version: 0.73.2
+    operator.prometheus.io/version: 0.74.0
   name: prometheusagents.monitoring.coreos.com
 spec:
   group: monitoring.coreos.com
@@ -4588,7 +4588,7 @@ spec:
                         managedIdentity:
                           description: |-
                             ManagedIdentity defines the Azure User-assigned Managed identity.
-                            Cannot be set at the same time as `oauth`.
+                            Cannot be set at the same time as `oauth` or `sdk`.
                           properties:
                             clientId:
                               description: The client id
@@ -4599,7 +4599,7 @@ spec:
                         oauth:
                           description: |-
                             OAuth defines the oauth config that is being used to authenticate.
-                            Cannot be set at the same time as `managedIdentity`.
+                            Cannot be set at the same time as `managedIdentity` or `sdk`.
 
 
                             It requires Prometheus >= v2.48.0.
@@ -4628,7 +4628,7 @@ spec:
                               type: object
                               x-kubernetes-map-type: atomic
                             tenantId:
-                              description: '`tenantID` is the tenant ID of the Azure Active Directory application that is being used to authenticate.'
+                              description: '`tenantId` is the tenant ID of the Azure Active Directory application that is being used to authenticate.'
                               minLength: 1
                               pattern: ^[0-9a-zA-Z-.]+$
                               type: string
@@ -4637,6 +4637,20 @@ spec:
                           - clientSecret
                           - tenantId
                           type: object
+                        sdk:
+                          description: |-
+                            SDK defines the Azure SDK config that is being used to authenticate.
+                            See https://learn.microsoft.com/en-us/azure/developer/go/azure-sdk-authentication
+                            Cannot be set at the same time as `oauth` or `managedIdentity`.
+
+
+                            It requires Prometheus >= 2.52.0.
+                          properties:
+                            tenantId:
+                              description: '`tenantId` is the tenant ID of the azure active directory application that is being used to authenticate.'
+                              pattern: ^[0-9a-zA-Z-.]+$
+                              type: string
+                          type: object
                       type: object
                     basicAuth:
                       description: |-

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.14.0
-    operator.prometheus.io/version: 0.73.2
+    operator.prometheus.io/version: 0.74.0
   name: prometheusrules.monitoring.coreos.com
 spec:
   group: monitoring.coreos.com

diff --git a/...ng-satellite/manifests/crds/prometheusOperator-0scrapeconfigCustomResourceDefinition.yaml b/...ng-satellite/manifests/crds/prometheusOperator-0scrapeconfigCustomResourceDefinition.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.14.0
-    operator.prometheus.io/version: 0.73.2
+    operator.prometheus.io/version: 0.74.0
   name: scrapeconfigs.monitoring.coreos.com
 spec:
   group: monitoring.coreos.com

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

diff --git a/...ing-satellite/manifests/crds/prometheusOperator-0thanosrulerCustomResourceDefinition.yaml b/...ing-satellite/manifests/crds/prometheusOperator-0thanosrulerCustomResourceDefinition.yaml
@@ -4,7 +4,7 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-options: Replace=true
     controller-gen.kubebuilder.io/version: v0.14.0
-    operator.prometheus.io/version: 0.73.2
+    operator.prometheus.io/version: 0.74.0
   name: thanosrulers.monitoring.coreos.com
 spec:
   group: monitoring.coreos.com