chore: Unpin deps for 0.14.0 and re-generate (#2515)

prometheus-operator · Sep 12, 2024 · bc0f49d · bc0f49d
1 parent e025542
commit bc0f49d
Show file tree

Hide file tree

Showing 14 changed files with 3,550 additions and 4,609 deletions.
diff --git a/jsonnet/kube-prometheus/jsonnetfile.json b/jsonnet/kube-prometheus/jsonnetfile.json
@@ -8,7 +8,7 @@
           "subdir": "grafana"
         }
       },
-      "version": "5698c8940b6dadca3f42107b7839557bc041761f"
+      "version": "master"
     },
     {
       "source": {
@@ -17,7 +17,7 @@
           "subdir": "grafana-mixin"
         }
       },
-      "version": "release-11.2.0",
+      "version": "main",
       "name": "grafana-mixin"
     },
     {
@@ -27,7 +27,7 @@
           "subdir": "contrib/mixin"
         }
       },
-      "version": "release-3.5"
+      "version": "main"
     },
     {
       "source": {
@@ -36,7 +36,7 @@
           "subdir": "jsonnet/prometheus-operator"
         }
       },
-      "version": "release-0.76"
+      "version": "main"
     },
     {
       "source": {
@@ -45,7 +45,7 @@
           "subdir": "jsonnet/mixin"
         }
       },
-      "version": "release-0.76",
+      "version": "main",
       "name": "prometheus-operator-mixin"
     },
     {
@@ -55,7 +55,7 @@
           "subdir": ""
         }
       },
-      "version": "50150c585ebee6e4d9cb72218182da8f3c616515"
+      "version": "master"
     },
     {
       "source": {
@@ -64,7 +64,7 @@
           "subdir": "jsonnet/kube-state-metrics"
         }
       },
-      "version": "release-2.13"
+      "version": "main"
     },
     {
       "source": {
@@ -73,7 +73,7 @@
           "subdir": "jsonnet/kube-state-metrics-mixin"
         }
       },
-      "version": "release-2.13"
+      "version": "main"
     },
     {
       "source": {
@@ -82,7 +82,7 @@
           "subdir": "docs/node-mixin"
         }
       },
-      "version": "release-1.8"
+      "version": "master"
     },
     {
       "source": {
@@ -91,7 +91,7 @@
           "subdir": "documentation/prometheus-mixin"
         }
       },
-      "version": "release-2.54",
+      "version": "main",
       "name": "prometheus"
     },
     {
@@ -101,7 +101,7 @@
           "subdir": "doc/alertmanager-mixin"
         }
       },
-      "version": "release-0.27",
+      "version": "main",
       "name": "alertmanager"
     },
     {
@@ -111,7 +111,7 @@
           "subdir": "jsonnet/controller-gen"
         }
       },
-      "version": "v0.7.7",
+      "version": "release-0.7",
       "name": "pyrra"
     },
     {
@@ -121,7 +121,7 @@
           "subdir": "mixin"
         }
       },
-      "version": "release-0.36",
+      "version": "main",
       "name": "thanos-mixin"
     }
   ],

diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
@@ -18,8 +18,8 @@
           "subdir": "contrib/mixin"
         }
       },
-      "version": "f20bbadd404b57c776d1e8876cefd1ac29b03fb5",
-      "sum": "W/Azptf1PoqjyMwJON96UY69MFugDA4IAYiKURscryc="
+      "version": "981061a4958e8d386b025dbecd43af9b974709e2",
+      "sum": "IXI3LQIT9NmTPJAk8WLUJd5+qZfcGpeNCyWIK7oEpws="
     },
     {
       "source": {
@@ -28,8 +28,8 @@
           "subdir": "grafana-mixin"
         }
       },
-      "version": "c57667e4481563f5e6cf945b03bc0626caa4dbeb",
-      "sum": "S8mRTRH4w62kMCa2je3iCtvscYrwQmkyJ7Y/aM14KbE="
+      "version": "1120f9e255760a3c104b57871fcb91801e934382",
+      "sum": "MkjR7zCgq6MUZgjDzop574tFKoTX2OBr7DTwm1K+Ofs="
     },
     {
       "source": {
@@ -61,6 +61,16 @@
       "version": "733beadbc8dab55c5fe1bcdcf0d8a2d215759a55",
       "sum": "eyuJ0jOXeA4MrobbNgU4/v5a7ASDHslHZ0eS6hDdWoI="
     },
+    {
+      "source": {
+        "git": {
+          "remote": "https://github.com/grafana/grafonnet.git",
+          "subdir": "gen/grafonnet-v10.0.0"
+        }
+      },
+      "version": "733beadbc8dab55c5fe1bcdcf0d8a2d215759a55",
+      "sum": "xdcrJPJlpkq4+5LpGwN4tPAuheNNLXZjE6tDcyvFjr0="
+    },
     {
       "source": {
         "git": {
@@ -128,8 +138,8 @@
           "subdir": "jsonnet/kube-state-metrics"
         }
       },
-      "version": "76c5888e3402c946abd6f31876f3aada4c0c84fc",
-      "sum": "pvInhJNQVDOcC3NGWRMKRIP954mAvLXCQpTlafIg7fA="
+      "version": "76ef24190dbca4afb116d8f9d91fba41ae59b704",
+      "sum": "lO7jUSzAIy8Yk9pOWJIWgPRhubkWzVh56W6wtYfbVH4="
     },
     {
       "source": {
@@ -138,7 +148,7 @@
           "subdir": "jsonnet/kube-state-metrics-mixin"
         }
       },
-      "version": "76c5888e3402c946abd6f31876f3aada4c0c84fc",
+      "version": "76ef24190dbca4afb116d8f9d91fba41ae59b704",
       "sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
     },
     {
@@ -148,7 +158,7 @@
           "subdir": "jsonnet/mixin"
         }
       },
-      "version": "8ba73758bd40233fce49b68ae191692a12c6fdbf",
+      "version": "781d6df6bc8e48b010a74348f19526f66c5e2c54",
       "sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
       "name": "prometheus-operator-mixin"
     },
@@ -159,8 +169,8 @@
           "subdir": "jsonnet/prometheus-operator"
         }
       },
-      "version": "8ba73758bd40233fce49b68ae191692a12c6fdbf",
-      "sum": "Qs56OWJ2PLCEGRPlJ2Xd1LukXKj8KBzqMYncwjYTEwo="
+      "version": "781d6df6bc8e48b010a74348f19526f66c5e2c54",
+      "sum": "YhMrMNg8UEvQ6Wz0poEQ8/63zJArmGwyf0u0iSLGZS4="
     },
     {
       "source": {
@@ -169,7 +179,7 @@
           "subdir": "doc/alertmanager-mixin"
         }
       },
-      "version": "0aa3c2aad14cff039931923ab16b26b7481783b5",
+      "version": "e9904f93a7efa063bac628ed0b74184acf1c7401",
       "sum": "IpF46ZXsm+0wJJAPtAre8+yxTNZA57mBqGpBP/r7/kw=",
       "name": "alertmanager"
     },
@@ -180,8 +190,8 @@
           "subdir": "docs/node-mixin"
         }
       },
-      "version": "f1e0e8360aa60b6cb5e5cc1560bed348fc2c1895",
-      "sum": "R9ROsvpjZLgQJ78WAyD4HzrIq976Bpr4V2P2Fo2Kfns="
+      "version": "090957658ee7be8c7c71b2724979b36c49371b20",
+      "sum": "rhUvbqviGjQ2mwsRhHKMN0TiS3YvnYpUXHew3XlQ+Wg="
     },
     {
       "source": {
@@ -190,7 +200,7 @@
           "subdir": "documentation/prometheus-mixin"
         }
       },
-      "version": "c5e015d29534f06bd1d238c64a06b7ac41abdd7f",
+      "version": "5aa3d8260a7335a0da6946dea82f608cafa46c20",
       "sum": "dYLcLzGH4yF3qB7OGC/7z4nqeTNjv42L7Q3BENU8XJI=",
       "name": "prometheus"
     },
@@ -212,8 +222,8 @@
           "subdir": "mixin"
         }
       },
-      "version": "99a5742a15f107d4607d280c825eca5b7f09a253",
-      "sum": "HhSSbGGCNHCMy1ee5jElYDm0yS9Vesa7QB2/SHKdjsY=",
+      "version": "97710f41b0e4584b476ee5d59fd7b3ae5077154a",
+      "sum": "ieCD4eMgGbOlrI8GmckGPHBGQDcLasE1rULYq56W/bs=",
       "name": "thanos-mixin"
     },
     {

diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
@@ -3398,6 +3398,7 @@ items:
               }
           ],
           "schemaVersion": 30,
+          "style": "dark",
           "tags": [
 
           ],
@@ -15292,6 +15293,7 @@ items:
           },
           "timezone": "utc",
           "title": "Node Exporter / USE Method / Cluster",
+          "uid": "3e97d1d02672cdd0861f4c97c64f89b2",
           "version": 0
       }
   kind: ConfigMap
@@ -16370,6 +16372,7 @@ items:
           },
           "timezone": "utc",
           "title": "Node Exporter / USE Method / Node",
+          "uid": "fac67cfbe174d3ef53eb473d73d9212f",
           "version": 0
       }
   kind: ConfigMap
@@ -17458,6 +17461,7 @@ items:
           },
           "timezone": "utc",
           "title": "Node Exporter / MacOS",
+          "uid": "629701ea43bf69291922ea45f4a87d37",
           "version": 0
       }
   kind: ConfigMap
@@ -18539,6 +18543,7 @@ items:
           },
           "timezone": "utc",
           "title": "Node Exporter / Nodes",
+          "uid": "7d57716318ee0dddbac5a7f451fb7753",
           "version": 0
       }
   kind: ConfigMap

diff --git a/manifests/grafana-prometheusRule.yaml b/manifests/grafana-prometheusRule.yaml
@@ -19,8 +19,8 @@ spec:
         message: '{{ $labels.namespace }}/{{ $labels.job }}/{{ $labels.handler }} is experiencing {{ $value | humanize }}% errors'
         runbook_url: https://runbooks.prometheus-operator.dev/runbooks/grafana/grafanarequestsfailing
       expr: |
-        100 * sum without (status_code) (namespace_job_handler_statuscode:grafana_http_request_duration_seconds_count:rate5m{handler!~"/api/datasources/proxy/:id.*|/api/ds/query|/api/tsdb/query", status_code=~"5.."})
-        /
+        100 * namespace_job_handler_statuscode:grafana_http_request_duration_seconds_count:rate5m{handler!~"/api/datasources/proxy/:id.*|/api/ds/query|/api/tsdb/query", status_code=~"5.."}
+        / ignoring (status_code)
         sum without (status_code) (namespace_job_handler_statuscode:grafana_http_request_duration_seconds_count:rate5m{handler!~"/api/datasources/proxy/:id.*|/api/ds/query|/api/tsdb/query"})
         > 50
       for: 5m