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

…update-main [bot] [main] Automated dependencies update
gitpod-io · Oct 21, 2024 · 80cd56b · 80cd56b
2 parents 62762c5 + 2e042a1
commit 80cd56b
Show file tree

Hide file tree

Showing 26 changed files with 60 additions and 57 deletions.
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
           "subdir": "contrib/mixin"
         }
       },
-      "version": "d6412f468e11899cbcf2162156848046c99c4328",
+      "version": "55de68d18c63fde8747f2cd9f7c2ff242346f756",
       "sum": "IXI3LQIT9NmTPJAk8WLUJd5+qZfcGpeNCyWIK7oEpws="
     },
     {
@@ -28,7 +28,7 @@
           "subdir": "operations/observability/mixins"
         }
       },
-      "version": "3e62b4e846ab55a0e025c9c05478cddfa6cd4a61",
+      "version": "00b2a7689c05aeda8c72c3c727cc1a477cb955cc",
       "sum": "znuKmqKp0SwUiYXz2sDvTJzT9f3hzP84z7uwNm9anxY=",
       "name": "gitpod"
     },
@@ -99,7 +99,7 @@
           "subdir": "grafana-builder"
         }
       },
-      "version": "7a817b8440be442cbca39d628844ef1f342143da",
+      "version": "3805ed5082bb7db66cd75badb57a673c965aa24c",
       "sum": "yxqWcq/N3E/a/XreeU6EuE6X7kYPnG0AspAQFKOjASo="
     },
     {
@@ -129,8 +129,8 @@
           "subdir": ""
         }
       },
-      "version": "6e24b642832c225d0626145f9bc0b634462c6350",
-      "sum": "CpBuO7uMrDR3PXHdwGMpRgMap0eQy/KKkUspB6QQcVE="
+      "version": "0348e09edc3961a29a55f199d1bf0060c847a608",
+      "sum": "kTZuZcE+pNw8ZVZECKxrZG4F9BS+ydWMcgACE9oUrRc="
     },
     {
       "source": {
@@ -139,7 +139,7 @@
           "subdir": "jsonnet/kube-state-metrics"
         }
       },
-      "version": "a9363414964759db050a6b9ca95fe060110dd77e",
+      "version": "e14a9d771c65c352f06cdcce0835d71daef4738e",
       "sum": "lO7jUSzAIy8Yk9pOWJIWgPRhubkWzVh56W6wtYfbVH4="
     },
     {
@@ -149,7 +149,7 @@
           "subdir": "jsonnet/kube-state-metrics-mixin"
         }
       },
-      "version": "a9363414964759db050a6b9ca95fe060110dd77e",
+      "version": "e14a9d771c65c352f06cdcce0835d71daef4738e",
       "sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
     },
     {
@@ -169,7 +169,7 @@
           "subdir": "jsonnet/mixin"
         }
       },
-      "version": "d1fb4196594218b9aea80bfb588881c293fb6e56",
+      "version": "dd2c707e7008387c6d662fefe9f474a6f874f490",
       "sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
       "name": "prometheus-operator-mixin"
     },
@@ -180,8 +180,8 @@
           "subdir": "jsonnet/prometheus-operator"
         }
       },
-      "version": "d1fb4196594218b9aea80bfb588881c293fb6e56",
-      "sum": "IR9P8k3UZdRN5gHlLOyQSloNtbcMokDOmLdHUwi7DbM="
+      "version": "dd2c707e7008387c6d662fefe9f474a6f874f490",
+      "sum": "5G3bgQK3WFueFwjZDcTaI16cyf19rqxK+H1oGsiIgx0="
     },
     {
       "source": {
@@ -190,7 +190,7 @@
           "subdir": "doc/alertmanager-mixin"
         }
       },
-      "version": "e1492602209b86e0ca6d7671c7353b62a31b897b",
+      "version": "4fcb18ee41ecaff4ee1816ad363dc63fdf3583b9",
       "sum": "IpF46ZXsm+0wJJAPtAre8+yxTNZA57mBqGpBP/r7/kw=",
       "name": "alertmanager"
     },
@@ -211,7 +211,7 @@
           "subdir": "documentation/prometheus-mixin"
         }
       },
-      "version": "16bba78f1549cfd7909b61ebd7c55c822c86630b",
+      "version": "6b36a5592a8f7e51f9801e5c8944ad9ca185e5cc",
       "sum": "dYLcLzGH4yF3qB7OGC/7z4nqeTNjv42L7Q3BENU8XJI=",
       "name": "prometheus"
     },
@@ -233,7 +233,7 @@
           "subdir": "mixin"
         }
       },
-      "version": "d215f5b349588ecfcfc1b1652f85146b0b44f198",
+      "version": "731e4607d34a5d638ebf849c53582aa21ce591dc",
       "sum": "ieCD4eMgGbOlrI8GmckGPHBGQDcLasE1rULYq56W/bs=",
       "name": "thanos-mixin"
     },

diff --git a/...ellite/manifests/crds/prometheusOperator-0alertmanagerConfigCustomResourceDefinition.yaml b/...ellite/manifests/crds/prometheusOperator-0alertmanagerConfigCustomResourceDefinition.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     argocd.argoproj.io/sync-options: Replace=true
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
     operator.prometheus.io/version: 0.77.1
   name: alertmanagerconfigs.monitoring.coreos.com
 spec:

diff --git a/...ng-satellite/manifests/crds/prometheusOperator-0alertmanagerCustomResourceDefinition.yaml b/...ng-satellite/manifests/crds/prometheusOperator-0alertmanagerCustomResourceDefinition.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     argocd.argoproj.io/sync-options: Replace=true
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
     operator.prometheus.io/version: 0.77.1
   name: alertmanagers.monitoring.coreos.com
 spec:

diff --git a/...ring-satellite/manifests/crds/prometheusOperator-0podmonitorCustomResourceDefinition.yaml b/...ring-satellite/manifests/crds/prometheusOperator-0podmonitorCustomResourceDefinition.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     argocd.argoproj.io/sync-options: Replace=true
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
     operator.prometheus.io/version: 0.77.1
   name: podmonitors.monitoring.coreos.com
 spec:

diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0probeCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0probeCustomResourceDefinition.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     argocd.argoproj.io/sync-options: Replace=true
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
     operator.prometheus.io/version: 0.77.1
   name: probes.monitoring.coreos.com
 spec:

diff --git a/...ring-satellite/manifests/crds/prometheusOperator-0prometheusCustomResourceDefinition.yaml b/...ring-satellite/manifests/crds/prometheusOperator-0prometheusCustomResourceDefinition.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     argocd.argoproj.io/sync-options: Replace=true
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
     operator.prometheus.io/version: 0.77.1
   name: prometheuses.monitoring.coreos.com
 spec:
@@ -3698,7 +3698,8 @@ spec:
                   it (https://kubernetes.io/docs/concepts/configuration/overview/).
 
                   When hostNetwork is enabled, this will set the DNS policy to
-                  `ClusterFirstWithHostNet` automatically.
+                  `ClusterFirstWithHostNet` automatically (unless `.spec.DNSPolicy` is set
+                  to a different value).
                 type: boolean
               ignoreNamespaceSelectors:
                 description: |-
@@ -5215,7 +5216,7 @@ spec:
               otlp:
                 description: |-
                   Settings related to the OTLP receiver feature.
-                  It requires Prometheus >= v2.54.0.
+                  It requires Prometheus >= v2.55.0.
                 properties:
                   promoteResourceAttributes:
                     description: List of OpenTelemetry Attributes that should be promoted to metric labels, defaults to none.

diff --git a/...satellite/manifests/crds/prometheusOperator-0prometheusagentCustomResourceDefinition.yaml b/...satellite/manifests/crds/prometheusOperator-0prometheusagentCustomResourceDefinition.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
     operator.prometheus.io/version: 0.77.1
   name: prometheusagents.monitoring.coreos.com
 spec:
@@ -3021,7 +3021,8 @@ spec:
                   it (https://kubernetes.io/docs/concepts/configuration/overview/).
 
                   When hostNetwork is enabled, this will set the DNS policy to
-                  `ClusterFirstWithHostNet` automatically.
+                  `ClusterFirstWithHostNet` automatically (unless `.spec.DNSPolicy` is set
+                  to a different value).
                 type: boolean
               ignoreNamespaceSelectors:
                 description: |-
@@ -4548,7 +4549,7 @@ spec:
               otlp:
                 description: |-
                   Settings related to the OTLP receiver feature.
-                  It requires Prometheus >= v2.54.0.
+                  It requires Prometheus >= v2.55.0.
                 properties:
                   promoteResourceAttributes:
                     description: List of OpenTelemetry Attributes that should be promoted to metric labels, defaults to none.

diff --git a/...-satellite/manifests/crds/prometheusOperator-0prometheusruleCustomResourceDefinition.yaml b/...-satellite/manifests/crds/prometheusOperator-0prometheusruleCustomResourceDefinition.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     argocd.argoproj.io/sync-options: Replace=true
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
     operator.prometheus.io/version: 0.77.1
   name: prometheusrules.monitoring.coreos.com
 spec:

diff --git a/...ng-satellite/manifests/crds/prometheusOperator-0scrapeconfigCustomResourceDefinition.yaml b/...ng-satellite/manifests/crds/prometheusOperator-0scrapeconfigCustomResourceDefinition.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
     operator.prometheus.io/version: 0.77.1
   name: scrapeconfigs.monitoring.coreos.com
 spec:

diff --git a/...-satellite/manifests/crds/prometheusOperator-0servicemonitorCustomResourceDefinition.yaml b/...-satellite/manifests/crds/prometheusOperator-0servicemonitorCustomResourceDefinition.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     argocd.argoproj.io/sync-options: Replace=true
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
     operator.prometheus.io/version: 0.77.1
   name: servicemonitors.monitoring.coreos.com
 spec:

diff --git a/...ing-satellite/manifests/crds/prometheusOperator-0thanosrulerCustomResourceDefinition.yaml b/...ing-satellite/manifests/crds/prometheusOperator-0thanosrulerCustomResourceDefinition.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     argocd.argoproj.io/sync-options: Replace=true
-    controller-gen.kubebuilder.io/version: v0.16.3
+    controller-gen.kubebuilder.io/version: v0.16.4
     operator.prometheus.io/version: 0.77.1
   name: thanosrulers.monitoring.coreos.com
 spec:

diff --git a/monitoring-satellite/manifests/grafana/dashboardDefinitions.yaml b/monitoring-satellite/manifests/grafana/dashboardDefinitions.yaml
@@ -41296,7 +41296,7 @@ items:
                               "type": "prometheus",
                               "uid": "${datasource}"
                           },
-                          "expr": "cluster:node_cpu:ratio_rate5m",
+                          "expr": "sum(cluster:node_cpu:ratio_rate5m) / count(cluster:node_cpu:ratio_rate5m)",
                           "instant": true
                       }
                   ],

diff --git a/monitoring-satellite/manifests/kube-prometheus-rules/rules.yaml b/monitoring-satellite/manifests/kube-prometheus-rules/rules.yaml
@@ -103,18 +103,18 @@ spec:
       labels:
         verb: write
       record: code:apiserver_request_total:increase30d
-    - expr: |
-        sum by (cluster, verb, scope) (increase(apiserver_request_sli_duration_seconds_count{job="apiserver"}[1h]))
-      record: cluster_verb_scope:apiserver_request_sli_duration_seconds_count:increase1h
-    - expr: |
-        sum by (cluster, verb, scope) (avg_over_time(cluster_verb_scope:apiserver_request_sli_duration_seconds_count:increase1h[30d]) * 24 * 30)
-      record: cluster_verb_scope:apiserver_request_sli_duration_seconds_count:increase30d
     - expr: |
         sum by (cluster, verb, scope, le) (increase(apiserver_request_sli_duration_seconds_bucket[1h]))
       record: cluster_verb_scope_le:apiserver_request_sli_duration_seconds_bucket:increase1h
     - expr: |
         sum by (cluster, verb, scope, le) (avg_over_time(cluster_verb_scope_le:apiserver_request_sli_duration_seconds_bucket:increase1h[30d]) * 24 * 30)
       record: cluster_verb_scope_le:apiserver_request_sli_duration_seconds_bucket:increase30d
+    - expr: |
+        sum by (cluster, verb, scope) (cluster_verb_scope_le:apiserver_request_sli_duration_seconds_bucket:increase1h{le="+Inf"})
+      record: cluster_verb_scope:apiserver_request_sli_duration_seconds_count:increase1h
+    - expr: |
+        sum by (cluster, verb, scope) (cluster_verb_scope_le:apiserver_request_sli_duration_seconds_bucket:increase30d{le="+Inf"} * 24 * 30)
+      record: cluster_verb_scope:apiserver_request_sli_duration_seconds_count:increase30d
     - expr: |
         1 - (
           (

diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/README.md b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/README.md
diff --git a/...b.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/multi-cluster.libsonnet b/...b.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/multi-cluster.libsonnet
diff --git a/...ub.com/kubernetes-monitoring/kubernetes-mixin/rules/kube_apiserver-availability.libsonnet b/...ub.com/kubernetes-monitoring/kubernetes-mixin/rules/kube_apiserver-availability.libsonnet
diff --git a/...eus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json b/...eus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json
diff --git a/...rometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagers-crd.json b/...rometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagers-crd.json
diff --git a/.../prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/podmonitors-crd.json b/.../prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/podmonitors-crd.json
diff --git a/...b.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/probes-crd.json b/...b.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/probes-crd.json
diff --git a/...etheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheusagents-crd.json b/...etheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheusagents-crd.json