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

…update-main

[bot] [main] Automated dependencies update

jsonnetfile.lock.json

@@ -18,8 +18,8 @@
           "subdir": "contrib/mixin"
         }
       },
-      "version": "0c0128aad45db095340011bda80baa59cae91741",
-      "sum": "GdePvMDfLQcVhwzk/Ephi/jC27ywGObLB5t0eC0lXd4="
+      "version": "01a0d8ba839120fab607fdc258cb8b0437565507",
+      "sum": "LTbR+JGJ0gW3AdJQRl24VIKyKnPlPFaB+d+iysj4IU0="
     },
     {
       "source": {
@@ -28,7 +28,7 @@
           "subdir": "operations/observability/mixins"
         }
       },
-      "version": "89af3c0871e9339b0fa604cd3ec954c455df42e9",
+      "version": "6dcf2d859cce5382afc65ad0edfa24f631a2ce64",
       "sum": "xHYVFqG3CZ4NPebl8/ciW1Uj7wmPVZATr0gP6cVedOM=",
       "name": "gitpod"
     },
@@ -62,16 +62,46 @@
       "version": "a1d61cce1da59c71409b99b5c7568511fec661ea",
       "sum": "gCtR9s/4D5fxU9aKXg0Bru+/njZhA0YjLjPiASc61FM="
     },
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/grafana/grafonnet.git",
+          "subdir": "gen/grafonnet-v10.0.0"
+        }
+      },
+      "version": "e85299323fd8808187d30865cc5c7a38a347399a",
+      "sum": "uJCTMGtY/7c5HSLQ7UQD38TOPmuSYrIKLIKmdSF/Htk="
+    },
     {
       "source": {
         "git": {
           "remote": "https://github.com/grafana/jsonnet-libs.git",
           "subdir": "grafana-builder"
         }
       },
-      "version": "14ecb5b5cecc02afe3855b67c3a93fe44f75b5ce",
+      "version": "4ef571d6a729989dec2f7dd3ba63b664988d0a3f",
       "sum": "xEFMv4+ObwP5L1Wu0XK5agWci4AJzNApys6iKAQxLlQ="
     },
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/jsonnet-libs/docsonnet.git",
+          "subdir": "doc-util"
+        }
+      },
+      "version": "fd8de9039b3c06da77d635a3a8289809a5bfb542",
+      "sum": "mFebrE9fhyAKW4zbnidcjVFupziN5LPA/Z7ii94uCzs="
+    },
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/jsonnet-libs/xtd.git",
+          "subdir": ""
+        }
+      },
+      "version": "0256a910ac71f0f842696d7bca0bf01ea77eb654",
+      "sum": "zBOpb1oTNvXdq9RF6yzTHill5r1YTJLBBoqyx4JYtAg="
+    },
     {
       "source": {
         "git": {
@@ -119,7 +149,7 @@
           "subdir": "jsonnet/mixin"
         }
       },
-      "version": "0e3614cf613d2f652e72066cbfde66f0e77b7842",
+      "version": "dec6461ac4af1d712e75c756d44a7ec5a4085beb",
       "sum": "n3flMIzlADeyygb0uipZ4KPp2uNSjdtkrwgHjTC7Ca4=",
       "name": "prometheus-operator-mixin"
     },
@@ -130,8 +160,8 @@
           "subdir": "jsonnet/prometheus-operator"
         }
       },
-      "version": "0e3614cf613d2f652e72066cbfde66f0e77b7842",
-      "sum": "LqEGtR9CVOdIqWsLqIpU7fCLYWCxr+vrB75wcC1zYXo="
+      "version": "dec6461ac4af1d712e75c756d44a7ec5a4085beb",
+      "sum": "gl4yvv+WLjt+CaTW4/urKAMx8fs9I4K8PgZ4PyOMD58="
     },
     {
       "source": {
@@ -140,7 +170,7 @@
           "subdir": "doc/alertmanager-mixin"
         }
       },
-      "version": "57fdd136ab39ee8037a4d9fab5f32c83d6910522",
+      "version": "e92d29d8618b2c7c291a86d79ed46a42c0035e8a",
       "sum": "1d7ZKYArJKacAWXLUz0bRC1uOkozee/PPw97/W5zGhc=",
       "name": "alertmanager"
     },
@@ -151,7 +181,7 @@
           "subdir": "docs/node-mixin"
         }
       },
-      "version": "e8c5110ada6152ec0efb8b2dc8be7e493624d232",
+      "version": "7dd2f0dc4f632f7778be134ace0e7c8ecdfe279a",
       "sum": "By6n6U10hYDogUsyhsaKZehbhzxBZZobJloiKyKadgM="
     },
     {
@@ -161,7 +191,7 @@
           "subdir": "documentation/prometheus-mixin"
         }
       },
-      "version": "2fe9e7bfd7d9e3b2895d7411ecdaab9857f85bf1",
+      "version": "b787e5f190428ba23de9b6dcaa18eb963f239a76",
       "sum": "8OngT76gVXOUROOOeP9yTe6E/dn+2D2J34Dn690QCG0=",
       "name": "prometheus"
     },
@@ -183,7 +213,7 @@
           "subdir": "mixin"
         }
       },
-      "version": "531cdb1e8ec3dd9f25b910c0f840fce7c104a109",
+      "version": "ef2d5d63b184a513af1e188b7a625ad8ef3bce5d",
       "sum": "HhSSbGGCNHCMy1ee5jElYDm0yS9Vesa7QB2/SHKdjsY=",
       "name": "thanos-mixin"
     },

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

@@ -22,7 +22,7 @@ spec:
   - name: v1alpha1
     schema:
       openAPIV3Schema:
-        description: AlertmanagerConfig defines a namespaced AlertmanagerConfig to be aggregated across multiple namespaces configuring one Alertmanager cluster.
+        description: AlertmanagerConfig configures the Prometheus Alertmanager, specifying how alerts should be grouped, inhibited and notified to external systems.
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
@@ -1661,7 +1661,7 @@ spec:
                             description: Notification title.
                             type: string
                           token:
-                            description: The secret's key that contains the registered application's API token, see https://pushover.net/apps. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator.
+                            description: The secret's key that contains the registered application's API token, see https://pushover.net/apps. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator. Either `token` or `tokenFile` is required.
                             properties:
                               key:
                                 description: The key of the secret to select from.  Must be a valid secret key.
@@ -1675,14 +1675,17 @@ spec:
                             required:
                             - key
                             type: object
+                          tokenFile:
+                            description: The token file that contains the registered application's API token, see https://pushover.net/apps. Either `token` or `tokenFile` is required. It requires Alertmanager >= v0.26.0.
+                            type: string
                           url:
                             description: A supplementary URL shown alongside the message.
                             type: string
                           urlTitle:
                             description: A title for supplementary URL, otherwise just the URL is shown
                             type: string
                           userKey:
-                            description: The secret's key that contains the recipient user's user key. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator.
+                            description: The secret's key that contains the recipient user's user key. The secret needs to be in the same namespace as the AlertmanagerConfig object and accessible by the Prometheus Operator. Either `userKey` or `userKeyFile` is required.
                             properties:
                               key:
                                 description: The key of the secret to select from.  Must be a valid secret key.
@@ -1696,6 +1699,9 @@ spec:
                             required:
                             - key
                             type: object
+                          userKeyFile:
+                            description: The user key file that contains the recipient user's user key. Either `userKey` or `userKeyFile` is required. It requires Alertmanager >= v0.26.0.
+                            type: string
                         type: object
                       type: array
                     slackConfigs:

vendor/doc-util

@@ -0,0 +1 @@
+github.com/jsonnet-libs/docsonnet/doc-util