[bot] Update jsonnet dependencies

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
openshift · May 10, 2022 · 1db07cb · 1db07cb
1 parent bc45b87
commit 1db07cb
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 34 deletions.
diff --git a/assets/node-exporter/prometheus-rule.yaml b/assets/node-exporter/prometheus-rule.yaml
@@ -55,10 +55,10 @@ spec:
         description: Filesystem on {{ $labels.device }} at {{ $labels.instance }}
           has only {{ printf "%.2f" $value }}% available space left.
         runbook_url: https://github.com/openshift/runbooks/blob/master/alerts/cluster-monitoring-operator/NodeFilesystemAlmostOutOfSpace.md
-        summary: Filesystem has less than 5% space left.
+        summary: Filesystem has less than 3% space left.
       expr: |
         (
-          node_filesystem_avail_bytes{job="node-exporter",fstype!=""} / node_filesystem_size_bytes{job="node-exporter",fstype!=""} * 100 < 5
+          node_filesystem_avail_bytes{job="node-exporter",fstype!=""} / node_filesystem_size_bytes{job="node-exporter",fstype!=""} * 100 < 3
         and
           node_filesystem_readonly{job="node-exporter",fstype!=""} == 0
         )
@@ -70,10 +70,10 @@ spec:
         description: Filesystem on {{ $labels.device }} at {{ $labels.instance }}
           has only {{ printf "%.2f" $value }}% available space left.
         runbook_url: https://github.com/openshift/runbooks/blob/master/alerts/cluster-monitoring-operator/NodeFilesystemAlmostOutOfSpace.md
-        summary: Filesystem has less than 3% space left.
+        summary: Filesystem has less than 5% space left.
       expr: |
         (
-          node_filesystem_avail_bytes{job="node-exporter",fstype!=""} / node_filesystem_size_bytes{job="node-exporter",fstype!=""} * 100 < 3
+          node_filesystem_avail_bytes{job="node-exporter",fstype!=""} / node_filesystem_size_bytes{job="node-exporter",fstype!=""} * 100 < 5
         and
           node_filesystem_readonly{job="node-exporter",fstype!=""} == 0
         )

diff --git a/jsonnet/jsonnetfile.lock.json b/jsonnet/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
           "subdir": "contrib/mixin"
         }
       },
-      "version": "81491914fbfbfcc041e175beb20f2cf3f575557e",
+      "version": "b7be91f98b7a7a6202ed9e9bc37b692d484585a8",
       "sum": "zhLYhUNcXNkMRfJhMUX0UiOpi8TOuLmUqJfO9NFKFkg="
     },
     {
@@ -41,15 +41,25 @@
       "version": "6db00c292d3a1c71661fc875f90e0ec7caa538c2",
       "sum": "gF8foHByYcB25jcUOBqP6jxk0OPifQMjPvKY0HaCk6w="
     },
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/grafana/grafonnet-lib.git",
+          "subdir": "grafonnet-7.0"
+        }
+      },
+      "version": "6db00c292d3a1c71661fc875f90e0ec7caa538c2",
+      "sum": "gCtR9s/4D5fxU9aKXg0Bru+/njZhA0YjLjPiASc61FM="
+    },
     {
       "source": {
         "git": {
           "remote": "https://github.com/grafana/jsonnet-libs.git",
           "subdir": "grafana-builder"
         }
       },
-      "version": "28e90490f768aaf14d5bcb15ed2f6ab4e3efe725",
-      "sum": "0KkygBQd/AFzUvVzezE4qF/uDYgrwUXVpZfINBti0oc="
+      "version": "2e980525502eda008cfb88a5672bd70d7d411fda",
+      "sum": "TieGrr7GyKjURk1+wXHFpdoCiwNaIVfZvyc5mbI9OM0="
     },
     {
       "source": {
@@ -72,24 +82,14 @@
       "version": "62ad10fe9ceb53c6b846871997abbfe8e0bd7cf5",
       "sum": "6gD9F29f8T2a71n35Y61P7TBiF5NQuhk4JUwEafsA1E="
     },
-    {
-      "source": {
-        "git": {
-          "remote": "https://github.com/kubernetes-monitoring/kubernetes-mixin.git",
-          "subdir": "lib/promgrafonnet"
-        }
-      },
-      "version": "62ad10fe9ceb53c6b846871997abbfe8e0bd7cf5",
-      "sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps="
-    },
     {
       "source": {
         "git": {
           "remote": "https://github.com/kubernetes/kube-state-metrics.git",
           "subdir": "jsonnet/kube-state-metrics"
         }
       },
-      "version": "b43b8cd57b7e71e7e5c151f6b7753ce5fdd04905",
+      "version": "9e97bb1413fea53002c5489f2e1b002784b67b61",
       "sum": "P0dCnbzyPScQGNXwXRcwiPkMLeTq0IPNbSTysDbySnM="
     },
     {
@@ -99,7 +99,7 @@
           "subdir": "jsonnet/kube-state-metrics-mixin"
         }
       },
-      "version": "b43b8cd57b7e71e7e5c151f6b7753ce5fdd04905",
+      "version": "9e97bb1413fea53002c5489f2e1b002784b67b61",
       "sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
     },
     {
@@ -120,8 +120,8 @@
           "subdir": "jsonnet/telemeter"
         }
       },
-      "version": "987128a17c198270ff22cf36ff7b7df396f51826",
-      "sum": "vsJuJBdzAERSX8hvz0NRP6Lj13kGRztw/Wm8jFpwHAQ=",
+      "version": "76493ca3d439dc9d1ab5476a25d36c83d1947289",
+      "sum": "qaSPKpik0WiU5BMtW0Q51+NvEcWhdVE2XLqwZDyvJ+c=",
       "name": "telemeter-client"
     },
     {
@@ -131,8 +131,8 @@
           "subdir": "jsonnet/kube-prometheus"
         }
       },
-      "version": "bbdb94a23e97edbab113f8cb788071cf6a541e6d",
-      "sum": "350sbhl/YOwB1oQYF3KLHapsqsVN93iIb8TnOn3wzsI="
+      "version": "805f875f8c716c49650bf899399a1c590a2a29ab",
+      "sum": "0mlBsCZk5gOXV2kwzQfYzRvqENSAhGoke2yqCo6kwZ8="
     },
     {
       "source": {
@@ -141,7 +141,7 @@
           "subdir": "jsonnet/mixin"
         }
       },
-      "version": "b0628d00ee84230c24560736060e1ca45e7fc429",
+      "version": "8e6de29b4c1be9cc2f322528c0d1f1b2492c4a32",
       "sum": "joc3gM74r0q658bmpfTbeAr0Nce4gTBv0rf3I+2J0rQ=",
       "name": "prometheus-operator-mixin"
     },
@@ -152,8 +152,8 @@
           "subdir": "jsonnet/prometheus-operator"
         }
       },
-      "version": "b0628d00ee84230c24560736060e1ca45e7fc429",
-      "sum": "mYU7yZz9AkpjVw+YrqebZOx+WON1jJZewVtVoUTXsx0="
+      "version": "8e6de29b4c1be9cc2f322528c0d1f1b2492c4a32",
+      "sum": "Qjbmmxbpdwwx1qqVNXPWSqCPHHR3GQKqxxKGi87MnFw="
     },
     {
       "source": {
@@ -162,8 +162,8 @@
           "subdir": "doc/alertmanager-mixin"
         }
       },
-      "version": "71d61c9c9149420209c973014e0d6c981b183611",
-      "sum": "iqF63VWQovIGBb7JI5oVVgMShz0dKptSzEVQQjsy+Jo=",
+      "version": "23f961ec6a9c8a15bf99c83815d35e13d66a4d5d",
+      "sum": "f3iZDUXQ/YWB5yDCY7VLD5bs442+3CdJgXJhJyWhNf8=",
       "name": "alertmanager"
     },
     {
@@ -173,8 +173,8 @@
           "subdir": "docs/node-mixin"
         }
       },
-      "version": "3d9ee5d9cc4545c7aaccc0f282f59478fe128ed1",
-      "sum": "fNanwWpnovE/ok6i7zlwd1mwOPbglp19edJdOLgTDnU="
+      "version": "da8b0f694ceadd3013096f6e8671cdd70a98da24",
+      "sum": "+ZeoFzdjV7GKrrs0Bf6a+M+QDikd5QhcxTnFRObA0/w="
     },
     {
       "source": {
@@ -183,7 +183,7 @@
           "subdir": "documentation/prometheus-mixin"
         }
       },
-      "version": "4deb1a90d2f1300bb92938aa3c5949fffc7b7ce4",
+      "version": "78f264578722493dcd8bf25c43bde7865a18792f",
       "sum": "APXOIP3B3dZ3Tyh7L2UhyWR8Vbf5+9adTLz/ya7n6uU=",
       "name": "prometheus"
     },
@@ -194,7 +194,7 @@
           "subdir": "config/crd/bases"
         }
       },
-      "version": "ac027a4a3dd7526a3afe80fc7e48cfec62436d81",
+      "version": "7a2345a647740894d9abcf0c68ee862833caef34",
       "sum": "GQ0GFKGdIWKx1b78VRs6jtC4SMqkBjT5jl65QUjPKK4="
     },
     {
@@ -214,8 +214,8 @@
           "subdir": "mixin"
         }
       },
-      "version": "81218afa5b01d44d20db8be599c88127e2cdf646",
-      "sum": "dBm9ML50quhu6dwTIgfNmVruMqfaUeQVCO/6EKtQLxE="
+      "version": "8d1179e2cc76b6eb0d04acb4d02e4ae546ae38a7",
+      "sum": "/UJrWExMDM89fPfidt1pNLSQOLXsyBpmyp3unRbjaXw="
     }
   ],
   "legacyImports": false

diff --git a/...00_50_cluster-monitoring-operator_00_0alertmanager-config-custom-resource-definition.yaml b/...00_50_cluster-monitoring-operator_00_0alertmanager-config-custom-resource-definition.yaml
@@ -881,6 +881,12 @@ spec:
                             description: Comma separated list of tags attached to
                               the notifications.
                             type: string
+                          updateAlerts:
+                            description: Whether to update message and description
+                              of the alert in OpsGenie if it already exists By default,
+                              the alert is never updated in OpsGenie, the new message
+                              only appears in activity log.
+                            type: boolean
                         type: object
                       type: array
                     pagerdutyConfigs: