diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 6f5d21a3..fc9f07ab 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -18,7 +18,7 @@ "subdir": "contrib/mixin" } }, - "version": "0e1d3ca558dd3efa989adbb595331f210aeb932f", + "version": "91201b1a0236a7e9af8c9216db14d609240617ff", "sum": "XmXkOCriQIZmXwlIIFhqlJMa0e6qGWdxZD+ZDYaN0Po=" }, { @@ -28,7 +28,7 @@ "subdir": "operations/observability/mixins" } }, - "version": "8e02e09f71084f827583a1701d3777b0381b7e42", + "version": "f650690d13b3d133d4d1d17775081c43ca795227", "sum": "wvuIMANAM9nLAR9RmTl2J7ZkFOV/XtIQ8LwKApfydKc=", "name": "gitpod" }, @@ -89,7 +89,7 @@ "subdir": "grafana-builder" } }, - "version": "38e888ec993543791c4c565cd700c9d47c0d84dd", + "version": "d9709a268f70932be2ba0a5728f01e7f833930e5", "sum": "dr3ok/KQ0aNc/U+CxO5hlHFuP66z1IlsnthKeE+m/ss=" }, { @@ -99,7 +99,7 @@ "subdir": "mixin-utils" } }, - "version": "38e888ec993543791c4c565cd700c9d47c0d84dd", + "version": "d9709a268f70932be2ba0a5728f01e7f833930e5", "sum": "VAik6Sh5MD5H1Km1gSIXG4rwQ4m4zyw7odP5TKu3bGo=" }, { @@ -119,8 +119,8 @@ "subdir": "" } }, - "version": "4eee017d21cb63a303925d1dcd9fc5c496809b46", - "sum": "Kh0GbIycNmJPzk6IOMXn1BbtLNyaiiimclYk7+mvsns=" + "version": "4d7f8cb24d613430799f9d56809cc6964f35cea9", + "sum": "hOrwkOx34tOXqoDVnwuI/Uf/dr9HFFSPWpDPOvnEGrk=" }, { "source": { @@ -139,7 +139,7 @@ "subdir": "jsonnet/kube-state-metrics" } }, - "version": "fe54b88a452a90bcc990138913dd1ed23867ab46", + "version": "807f8bd184ed4325c1a04214039bb0bd51e1878e", "sum": "3bioG7CfTfY9zeu5xU4yon6Zt3kYvNkyl492nOhQxnM=" }, { @@ -149,7 +149,7 @@ "subdir": "jsonnet/kube-state-metrics-mixin" } }, - "version": "fe54b88a452a90bcc990138913dd1ed23867ab46", + "version": "807f8bd184ed4325c1a04214039bb0bd51e1878e", "sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c=" }, { @@ -159,8 +159,8 @@ "subdir": "jsonnet/kube-prometheus" } }, - "version": "614e6268bdc15737250299ac9c3454ff4be7f5fb", - "sum": "AgWlMKoyyX4Ae3wamnlduFfXLJlCTxSscsVZbCCV0PM=" + "version": "5a769e33bf43c38d948c6bea8aca45599445be0a", + "sum": "omXCBuv4xqc5feTGkX7ElQmQ3fjhyteHrLKXP/51trE=" }, { "source": { @@ -169,7 +169,7 @@ "subdir": "jsonnet/mixin" } }, - "version": "38601823f19c1cb0f3ffd312fc0a095ad37dbc5a", + "version": "b128cbb2b962cc92870af7a094579bf9a0f50a76", "sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=", "name": "prometheus-operator-mixin" }, @@ -180,8 +180,8 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "38601823f19c1cb0f3ffd312fc0a095ad37dbc5a", - "sum": "r/y+jvqIgQW46DuAG6XQuEF40ey5X/WFfRDiFMe5Xro=" + "version": "b128cbb2b962cc92870af7a094579bf9a0f50a76", + "sum": "igLre3CTwKz4/zEMHlZxL7NkcQXE8AKkVfr9QqIvJPw=" }, { "source": { @@ -190,7 +190,7 @@ "subdir": "doc/alertmanager-mixin" } }, - "version": "64a7edfb4e18ce7245717786eb24738507414622", + "version": "2e0970e8d8191f6fb7df6fb625f236bad5aa759a", "sum": "j5prvRrJdoCv7n45l5Uy2ghl1IDb9BBUqjwCDs4ZJoQ=", "name": "alertmanager" }, @@ -201,7 +201,7 @@ "subdir": "docs/node-mixin" } }, - "version": "e62d5975cb13d21f7b6ce982323c0e47316f22b8", + "version": "819c3705973b179c03896c2ab4d9af0bd7c35575", "sum": "t5lGWjS4xUmXbOaMg8BddbJrIJeglTIi8HkT3UBWtP4=" }, { @@ -211,7 +211,7 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "49254f45e9ecf61cd0836270e67fe94983ce1077", + "version": "4aa8941eb186264e570ee76eda8b23ff8989abc5", "sum": "UuADJwhNploRwfJYGb0sr2mi+MvswKpumoOMXnGs0Dc=", "name": "prometheus" }, @@ -222,7 +222,7 @@ "subdir": "jsonnet/controller-gen" } }, - "version": "7fb18e0681757879a24c3ebf85b09423eeab5cdc", + "version": "fc08b8858998a8488a8ac2cd23810b4da7223d53", "sum": "xUGxDjMr7V/SpY21Xsr0X3ve/a04du3pRlbrA3I/Uk8=", "name": "pyrra" }, @@ -233,7 +233,7 @@ "subdir": "mixin" } }, - "version": "ac856f19e87861558ebb86f2353e654644af0627", + "version": "1473450480ec2fd9485336dd7a460a7c86b87ff4", "sum": "ieCD4eMgGbOlrI8GmckGPHBGQDcLasE1rULYq56W/bs=", "name": "thanos-mixin" }, diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerConfigCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerConfigCustomResourceDefinition.yaml index 17666778..afccb031 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerConfigCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerConfigCustomResourceDefinition.yaml @@ -4,7 +4,7 @@ metadata: annotations: argocd.argoproj.io/sync-options: Replace=true controller-gen.kubebuilder.io/version: v0.19.0 - operator.prometheus.io/version: 0.86.1 + operator.prometheus.io/version: 0.86.2 name: alertmanagerconfigs.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerCustomResourceDefinition.yaml index d51071e1..0b2d1dd2 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0alertmanagerCustomResourceDefinition.yaml +++ b/monitoring-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.19.0 - operator.prometheus.io/version: 0.86.1 + operator.prometheus.io/version: 0.86.2 name: alertmanagers.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0podmonitorCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0podmonitorCustomResourceDefinition.yaml index 831c10f6..0e3650c7 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0podmonitorCustomResourceDefinition.yaml +++ b/monitoring-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.19.0 - operator.prometheus.io/version: 0.86.1 + operator.prometheus.io/version: 0.86.2 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 index ddadb432..eb828a18 100644 --- 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.19.0 - operator.prometheus.io/version: 0.86.1 + operator.prometheus.io/version: 0.86.2 name: probes.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusCustomResourceDefinition.yaml index e45bdce2..ade0b2c4 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusCustomResourceDefinition.yaml +++ b/monitoring-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.19.0 - operator.prometheus.io/version: 0.86.1 + operator.prometheus.io/version: 0.86.2 name: prometheuses.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusagentCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusagentCustomResourceDefinition.yaml index 114336b6..99a3ea23 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusagentCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusagentCustomResourceDefinition.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.19.0 - operator.prometheus.io/version: 0.86.1 + operator.prometheus.io/version: 0.86.2 name: prometheusagents.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusruleCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusruleCustomResourceDefinition.yaml index a56c6cb0..1b1c17c9 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusruleCustomResourceDefinition.yaml +++ b/monitoring-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.19.0 - operator.prometheus.io/version: 0.86.1 + operator.prometheus.io/version: 0.86.2 name: prometheusrules.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0scrapeconfigCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0scrapeconfigCustomResourceDefinition.yaml index 2ba8ca3b..29306c94 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0scrapeconfigCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0scrapeconfigCustomResourceDefinition.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.19.0 - operator.prometheus.io/version: 0.86.1 + operator.prometheus.io/version: 0.86.2 name: scrapeconfigs.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0servicemonitorCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0servicemonitorCustomResourceDefinition.yaml index ef2ebcf5..2bd13eb8 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0servicemonitorCustomResourceDefinition.yaml +++ b/monitoring-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.19.0 - operator.prometheus.io/version: 0.86.1 + operator.prometheus.io/version: 0.86.2 name: servicemonitors.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0thanosrulerCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0thanosrulerCustomResourceDefinition.yaml index 289ccf38..47457821 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0thanosrulerCustomResourceDefinition.yaml +++ b/monitoring-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.19.0 - operator.prometheus.io/version: 0.86.1 + operator.prometheus.io/version: 0.86.2 name: thanosrulers.monitoring.coreos.com spec: group: monitoring.coreos.com diff --git a/monitoring-satellite/manifests/grafana/config.yaml b/monitoring-satellite/manifests/grafana/config.yaml index 2d30a89c..5fd286be 100644 --- a/monitoring-satellite/manifests/grafana/config.yaml +++ b/monitoring-satellite/manifests/grafana/config.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-config namespace: monitoring-satellite stringData: diff --git a/monitoring-satellite/manifests/grafana/dashboardDatasources.yaml b/monitoring-satellite/manifests/grafana/dashboardDatasources.yaml index 8949741b..634602b1 100644 --- a/monitoring-satellite/manifests/grafana/dashboardDatasources.yaml +++ b/monitoring-satellite/manifests/grafana/dashboardDatasources.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-datasources namespace: monitoring-satellite stringData: diff --git a/monitoring-satellite/manifests/grafana/dashboardDefinitions.yaml b/monitoring-satellite/manifests/grafana/dashboardDefinitions.yaml index 401eb696..76bf558a 100644 --- a/monitoring-satellite/manifests/grafana/dashboardDefinitions.yaml +++ b/monitoring-satellite/manifests/grafana/dashboardDefinitions.yaml @@ -1915,7 +1915,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-admin-node namespace: monitoring-satellite - apiVersion: v1 @@ -3159,7 +3159,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-admin-workspace namespace: monitoring-satellite - apiVersion: v1 @@ -3667,7 +3667,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-applications namespace: monitoring-satellite - apiVersion: v1 @@ -4761,7 +4761,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-cluster-autoscaler-k3s namespace: monitoring-satellite - apiVersion: v1 @@ -5410,7 +5410,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-connect-server namespace: monitoring-satellite - apiVersion: v1 @@ -6307,7 +6307,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-grpc-client namespace: monitoring-satellite - apiVersion: v1 @@ -7187,7 +7187,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-grpc-server namespace: monitoring-satellite - apiVersion: v1 @@ -11325,7 +11325,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-node-resource-metrics namespace: monitoring-satellite - apiVersion: v1 @@ -12400,7 +12400,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-nodes-overview namespace: monitoring-satellite - apiVersion: v1 @@ -14288,7 +14288,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-overview namespace: monitoring-satellite - apiVersion: v1 @@ -14741,7 +14741,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-slo-workspace-startuptime namespace: monitoring-satellite - apiVersion: v1 @@ -16356,7 +16356,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-redis namespace: monitoring-satellite - apiVersion: v1 @@ -21369,7 +21369,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-argocd namespace: monitoring-satellite - apiVersion: v1 @@ -21381,7 +21381,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-cardinality-management-overview namespace: monitoring-satellite - apiVersion: v1 @@ -21845,7 +21845,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-sh-example-overview namespace: monitoring-satellite - apiVersion: v1 @@ -23297,7 +23297,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-observability namespace: monitoring-satellite - apiVersion: v1 @@ -25421,7 +25421,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-component-blobserve namespace: monitoring-satellite - apiVersion: v1 @@ -25647,7 +25647,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-component-browser-overview namespace: monitoring-satellite - apiVersion: v1 @@ -27057,7 +27057,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-component-code-browser namespace: monitoring-satellite - apiVersion: v1 @@ -28298,7 +28298,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-component-ide-service namespace: monitoring-satellite - apiVersion: v1 @@ -28988,7 +28988,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-component-ide-startup-time namespace: monitoring-satellite - apiVersion: v1 @@ -29267,7 +29267,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-component-jb namespace: monitoring-satellite - apiVersion: v1 @@ -29870,7 +29870,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-component-local-ssh namespace: monitoring-satellite - apiVersion: v1 @@ -32221,7 +32221,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-component-openvsx-mirror namespace: monitoring-satellite - apiVersion: v1 @@ -34337,7 +34337,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-component-openvsx-proxy namespace: monitoring-satellite - apiVersion: v1 @@ -34815,7 +34815,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-component-ssh-gateway namespace: monitoring-satellite - apiVersion: v1 @@ -35446,7 +35446,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-component-supervisor namespace: monitoring-satellite - apiVersion: v1 @@ -35791,7 +35791,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-alertmanager-overview namespace: monitoring-satellite - apiVersion: v1 @@ -36673,7 +36673,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-apiserver namespace: monitoring-satellite - apiVersion: v1 @@ -38010,7 +38010,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-cert-manager namespace: monitoring-satellite - apiVersion: v1 @@ -38824,7 +38824,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-cluster-total namespace: monitoring-satellite - apiVersion: v1 @@ -39428,7 +39428,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-controller-manager namespace: monitoring-satellite - apiVersion: v1 @@ -41015,7 +41015,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-k8s-resources-cluster namespace: monitoring-satellite - apiVersion: v1 @@ -41656,7 +41656,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-k8s-resources-multicluster namespace: monitoring-satellite - apiVersion: v1 @@ -43174,7 +43174,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-k8s-resources-namespace namespace: monitoring-satellite - apiVersion: v1 @@ -43855,7 +43855,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-k8s-resources-node namespace: monitoring-satellite - apiVersion: v1 @@ -45239,7 +45239,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-k8s-resources-pod namespace: monitoring-satellite - apiVersion: v1 @@ -45926,7 +45926,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-k8s-resources-windows-cluster namespace: monitoring-satellite - apiVersion: v1 @@ -46380,7 +46380,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-k8s-resources-windows-namespace namespace: monitoring-satellite - apiVersion: v1 @@ -46889,7 +46889,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-k8s-resources-windows-pod namespace: monitoring-satellite - apiVersion: v1 @@ -47955,7 +47955,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-k8s-resources-workload namespace: monitoring-satellite - apiVersion: v1 @@ -49218,7 +49218,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-k8s-resources-workloads-namespace namespace: monitoring-satellite - apiVersion: v1 @@ -49634,7 +49634,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-k8s-windows-cluster-rsrc-use namespace: monitoring-satellite - apiVersion: v1 @@ -50261,7 +50261,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-k8s-windows-node-rsrc-use namespace: monitoring-satellite - apiVersion: v1 @@ -51514,7 +51514,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-kubelet namespace: monitoring-satellite - apiVersion: v1 @@ -52154,7 +52154,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-namespace-by-pod namespace: monitoring-satellite - apiVersion: v1 @@ -52952,7 +52952,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-namespace-by-workload namespace: monitoring-satellite - apiVersion: v1 @@ -53545,7 +53545,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-node-cluster-rsrc-use namespace: monitoring-satellite - apiVersion: v1 @@ -54149,7 +54149,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-node-rsrc-use namespace: monitoring-satellite - apiVersion: v1 @@ -54872,7 +54872,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-nodes-aix namespace: monitoring-satellite - apiVersion: v1 @@ -55619,7 +55619,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-nodes-darwin namespace: monitoring-satellite - apiVersion: v1 @@ -56358,7 +56358,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-nodes namespace: monitoring-satellite - apiVersion: v1 @@ -56680,7 +56680,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-persistentvolumesusage namespace: monitoring-satellite - apiVersion: v1 @@ -57174,7 +57174,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-pod-total namespace: monitoring-satellite - apiVersion: v1 @@ -57976,7 +57976,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-prometheus-remote-write namespace: monitoring-satellite - apiVersion: v1 @@ -58816,7 +58816,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-prometheus namespace: monitoring-satellite - apiVersion: v1 @@ -59471,7 +59471,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-proxy namespace: monitoring-satellite - apiVersion: v1 @@ -60072,7 +60072,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-scheduler namespace: monitoring-satellite - apiVersion: v1 @@ -60658,7 +60658,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-workload-total namespace: monitoring-satellite - apiVersion: v1 @@ -62065,7 +62065,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-component-dashboard namespace: monitoring-satellite - apiVersion: v1 @@ -63470,7 +63470,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-component-db namespace: monitoring-satellite - apiVersion: v1 @@ -65332,7 +65332,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-component-proxy namespace: monitoring-satellite - apiVersion: v1 @@ -65939,7 +65939,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-component-server-garbage-collector namespace: monitoring-satellite - apiVersion: v1 @@ -68462,7 +68462,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-component-server namespace: monitoring-satellite - apiVersion: v1 @@ -69330,7 +69330,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-component-usage namespace: monitoring-satellite - apiVersion: v1 @@ -71839,7 +71839,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-component-ws-manager-bridge namespace: monitoring-satellite - apiVersion: v1 @@ -72834,7 +72834,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-components-spicedb namespace: monitoring-satellite - apiVersion: v1 @@ -73757,7 +73757,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-meta-overview namespace: monitoring-satellite - apiVersion: v1 @@ -74302,7 +74302,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-meta-services namespace: monitoring-satellite - apiVersion: v1 @@ -75863,7 +75863,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-slo-login namespace: monitoring-satellite - apiVersion: v1 @@ -78733,7 +78733,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-component-agent-smith namespace: monitoring-satellite - apiVersion: v1 @@ -81301,7 +81301,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-component-content-service namespace: monitoring-satellite - apiVersion: v1 @@ -83926,7 +83926,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-component-image-builder namespace: monitoring-satellite - apiVersion: v1 @@ -86947,7 +86947,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-component-registry-facade namespace: monitoring-satellite - apiVersion: v1 @@ -90386,7 +90386,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-component-ws-daemon namespace: monitoring-satellite - apiVersion: v1 @@ -94741,7 +94741,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-component-ws-manager-mk2 namespace: monitoring-satellite - apiVersion: v1 @@ -96149,7 +96149,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-component-ws-proxy namespace: monitoring-satellite - apiVersion: v1 @@ -96586,7 +96586,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-network-limiting namespace: monitoring-satellite - apiVersion: v1 @@ -96889,7 +96889,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-node-ephemeral-storage namespace: monitoring-satellite - apiVersion: v1 @@ -97651,7 +97651,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-node-problem-detector namespace: monitoring-satellite - apiVersion: v1 @@ -97914,7 +97914,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-node-swap namespace: monitoring-satellite - apiVersion: v1 @@ -98590,7 +98590,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-psi namespace: monitoring-satellite - apiVersion: v1 @@ -100705,7 +100705,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-workspace-coredns namespace: monitoring-satellite - apiVersion: v1 @@ -101179,7 +101179,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-workspace-psi namespace: monitoring-satellite - apiVersion: v1 @@ -101788,7 +101788,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-workspace-registry-facade-blobsource namespace: monitoring-satellite - apiVersion: v1 @@ -102590,7 +102590,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboard-gitpod-workspace-success-criteria namespace: monitoring-satellite kind: ConfigMapList diff --git a/monitoring-satellite/manifests/grafana/dashboardSources.yaml b/monitoring-satellite/manifests/grafana/dashboardSources.yaml index 6f0946c4..d4bd60a9 100644 --- a/monitoring-satellite/manifests/grafana/dashboardSources.yaml +++ b/monitoring-satellite/manifests/grafana/dashboardSources.yaml @@ -72,6 +72,6 @@ metadata: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana-dashboards namespace: monitoring-satellite diff --git a/monitoring-satellite/manifests/grafana/deployment.yaml b/monitoring-satellite/manifests/grafana/deployment.yaml index 90056235..5c0993d8 100644 --- a/monitoring-satellite/manifests/grafana/deployment.yaml +++ b/monitoring-satellite/manifests/grafana/deployment.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana namespace: monitoring-satellite spec: @@ -18,14 +18,14 @@ spec: template: metadata: annotations: - checksum/grafana-config: cb78ac562d89a0b7871640267f9f885a - checksum/grafana-dashboardproviders: 9f9430e6ef73d9f028dabb78e97b33a0 - checksum/grafana-datasources: 04d02a50b2637d152ebbddcbcb041054 + checksum/grafana-config: 75fabca29910d90d48732e49b1326abc + checksum/grafana-dashboardproviders: 1973f80cd4fc0f33488bb45397801c6a + checksum/grafana-datasources: 3f5015219c0ecce4331fb37879aafb0e labels: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 spec: automountServiceAccountToken: false containers: @@ -36,7 +36,7 @@ spec: value: Admin - name: GF_AUTH_DISABLE_LOGIN_FORM value: "true" - image: grafana/grafana:12.2.0 + image: grafana/grafana:12.2.1 name: grafana ports: - containerPort: 3000 diff --git a/monitoring-satellite/manifests/grafana/prometheusRule.yaml b/monitoring-satellite/manifests/grafana/prometheusRule.yaml index 34b589e0..9271c71f 100644 --- a/monitoring-satellite/manifests/grafana/prometheusRule.yaml +++ b/monitoring-satellite/manifests/grafana/prometheusRule.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 prometheus: k8s role: alert-rules name: grafana-rules diff --git a/monitoring-satellite/manifests/grafana/service.yaml b/monitoring-satellite/manifests/grafana/service.yaml index 79db9d38..996cbc18 100644 --- a/monitoring-satellite/manifests/grafana/service.yaml +++ b/monitoring-satellite/manifests/grafana/service.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana namespace: monitoring-satellite spec: diff --git a/monitoring-satellite/manifests/grafana/serviceAccount.yaml b/monitoring-satellite/manifests/grafana/serviceAccount.yaml index a615336c..2ac9bb5f 100644 --- a/monitoring-satellite/manifests/grafana/serviceAccount.yaml +++ b/monitoring-satellite/manifests/grafana/serviceAccount.yaml @@ -6,6 +6,6 @@ metadata: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana namespace: monitoring-satellite diff --git a/monitoring-satellite/manifests/grafana/serviceMonitor.yaml b/monitoring-satellite/manifests/grafana/serviceMonitor.yaml index d7d932bc..17100b6b 100644 --- a/monitoring-satellite/manifests/grafana/serviceMonitor.yaml +++ b/monitoring-satellite/manifests/grafana/serviceMonitor.yaml @@ -5,7 +5,7 @@ metadata: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.2.0 + app.kubernetes.io/version: 12.2.1 name: grafana namespace: monitoring-satellite spec: diff --git a/vendor/github.com/jsonnet-libs/xtd/array.libsonnet b/vendor/github.com/jsonnet-libs/xtd/array.libsonnet index b43c0f0e..22a50590 100644 --- a/vendor/github.com/jsonnet-libs/xtd/array.libsonnet +++ b/vendor/github.com/jsonnet-libs/xtd/array.libsonnet @@ -52,4 +52,18 @@ local d = import 'github.com/jsonnet-libs/docsonnet/doc-util/main.libsonnet'; for i in std.range(0, std.length(arr) - 1) if filter_func(i, arr[i]) ], + + '#chunkArray':: d.fn( + ||| + `chunkArray` chunks an array into smaller arrays of the given max size. + |||, + [ + d.arg('arr', d.T.array), + d.arg('maxSize', d.T.number), + ] + ), + chunkArray(arr, maxSize): [ + arr[i * maxSize:std.min((i + 1) * maxSize, std.length(arr))] + for i in std.range(0, std.ceil(std.length(arr) / maxSize) - 1) + ], } diff --git a/vendor/github.com/jsonnet-libs/xtd/docs/README.md b/vendor/github.com/jsonnet-libs/xtd/docs/README.md index 61d9c39e..b5c05d35 100644 --- a/vendor/github.com/jsonnet-libs/xtd/docs/README.md +++ b/vendor/github.com/jsonnet-libs/xtd/docs/README.md @@ -23,4 +23,5 @@ in the future, but also provides a place for less general, yet useful utilities. * [jsonpath](jsonpath.md) * [number](number.md) * [string](string.md) +* [units](units.md) * [url](url.md) \ No newline at end of file diff --git a/vendor/github.com/jsonnet-libs/xtd/docs/array.md b/vendor/github.com/jsonnet-libs/xtd/docs/array.md index cc538d86..93642d8e 100644 --- a/vendor/github.com/jsonnet-libs/xtd/docs/array.md +++ b/vendor/github.com/jsonnet-libs/xtd/docs/array.md @@ -12,11 +12,21 @@ local array = import "github.com/jsonnet-libs/xtd/array.libsonnet" ## Index +* [`fn chunkArray(arr, maxSize)`](#fn-chunkarray) * [`fn filterMapWithIndex(filter_func, map_func, arr)`](#fn-filtermapwithindex) * [`fn slice(indexable, index, end='null', step=1)`](#fn-slice) ## Fields +### fn chunkArray + +```ts +chunkArray(arr, maxSize) +``` + +`chunkArray` chunks an array into smaller arrays of the given max size. + + ### fn filterMapWithIndex ```ts diff --git a/vendor/github.com/jsonnet-libs/xtd/docs/string.md b/vendor/github.com/jsonnet-libs/xtd/docs/string.md index 62873e57..2642e1b7 100644 --- a/vendor/github.com/jsonnet-libs/xtd/docs/string.md +++ b/vendor/github.com/jsonnet-libs/xtd/docs/string.md @@ -13,6 +13,7 @@ local string = import "github.com/jsonnet-libs/xtd/string.libsonnet" ## Index * [`fn splitEscape(str, c, escape='\\')`](#fn-splitescape) +* [`fn strReplaceMulti(str, replacements)`](#fn-strreplacemulti) ## Fields @@ -24,3 +25,18 @@ splitEscape(str, c, escape='\\') `split` works the same as `std.split` but with support for escaping the dividing string `c`. + + +### fn strReplaceMulti + +```ts +strReplaceMulti(str, replacements) +``` + +`strReplaceMulti` replaces multiple substrings in a string. + +Example: +```jsonnet +strReplaceMulti('hello world', [['hello', 'goodbye'], ['world', 'universe']]) +// 'goodbye universe' +``` diff --git a/vendor/github.com/jsonnet-libs/xtd/docs/units.md b/vendor/github.com/jsonnet-libs/xtd/docs/units.md new file mode 100644 index 00000000..a3ae7627 --- /dev/null +++ b/vendor/github.com/jsonnet-libs/xtd/docs/units.md @@ -0,0 +1,61 @@ +--- +permalink: /units/ +--- + +# units + +```jsonnet +local units = import "github.com/jsonnet-libs/xtd/units.libsonnet" +``` + +`units` implements helper functions for converting units. + +## Index + +* [`fn formatDuration(seconds)`](#fn-formatduration) +* [`fn parseDuration(duration)`](#fn-parseduration) +* [`fn parseKubernetesCPU(input)`](#fn-parsekubernetescpu) +* [`fn siToBytes(str)`](#fn-sitobytes) + +## Fields + +### fn formatDuration + +```ts +formatDuration(seconds) +``` + +`formatDuration` formats a number of seconds into a human-readable duration string. +Returns the duration in the smallest appropriate unit (s, m, h, or combined formats like "4m30s"). + + +### fn parseDuration + +```ts +parseDuration(duration) +``` + +`parseDuration` parses a duration string and returns the number of seconds. +Handles milliseconds (ms), seconds (s), minutes (m), hours (h), and combined formats like "4m30s" or "1h30m". + + +### fn parseKubernetesCPU + +```ts +parseKubernetesCPU(input) +``` + +`parseKubernetesCPU` parses a Kubernetes CPU string/number into a number of cores. + The function assumes the input is in a correct Kubernetes format, i.e., an integer, a float, + a string representation of an integer or a float, or a string containing a number ending with 'm' + representing a number of millicores. + + +### fn siToBytes + +```ts +siToBytes(str) +``` + +`siToBytes` converts Kubernetes byte units to bytes. +Only works for limited set of SI prefixes: Ki, Mi, Gi, Ti. diff --git a/vendor/github.com/jsonnet-libs/xtd/main.libsonnet b/vendor/github.com/jsonnet-libs/xtd/main.libsonnet index 5bda2977..3edfdc38 100644 --- a/vendor/github.com/jsonnet-libs/xtd/main.libsonnet +++ b/vendor/github.com/jsonnet-libs/xtd/main.libsonnet @@ -21,5 +21,6 @@ local d = import 'github.com/jsonnet-libs/docsonnet/doc-util/main.libsonnet'; jsonpath: (import './jsonpath.libsonnet'), number: (import './number.libsonnet'), string: (import './string.libsonnet'), + units: (import './units.libsonnet'), url: (import './url.libsonnet'), } diff --git a/vendor/github.com/jsonnet-libs/xtd/string.libsonnet b/vendor/github.com/jsonnet-libs/xtd/string.libsonnet index 66559818..5dccf131 100644 --- a/vendor/github.com/jsonnet-libs/xtd/string.libsonnet +++ b/vendor/github.com/jsonnet-libs/xtd/string.libsonnet @@ -32,4 +32,30 @@ local d = import 'github.com/jsonnet-libs/docsonnet/doc-util/main.libsonnet'; c, ) ), + + '#strReplaceMulti':: d.fn( + ||| + `strReplaceMulti` replaces multiple substrings in a string. + + Example: + ```jsonnet + strReplaceMulti('hello world', [['hello', 'goodbye'], ['world', 'universe']]) + // 'goodbye universe' + ``` + |||, + [ + d.arg('str', d.T.string), + d.arg('replacements', d.T.array), + ] + ), + strReplaceMulti(str, replacements): + assert std.isString(str) : 'str must be a string'; + assert std.isArray(replacements) : 'replacements must be an array'; + assert std.all([std.isArray(r) && std.length(r) == 2 && std.isString(r[0]) && std.isString(r[1]) for r in replacements]) : 'replacements must be an array of arrays of strings'; + std.foldl( + function(acc, replacement) + std.strReplace(acc, replacement[0], replacement[1]), + replacements, + str, + ), } diff --git a/vendor/github.com/jsonnet-libs/xtd/test/array_test.jsonnet b/vendor/github.com/jsonnet-libs/xtd/test/array_test.jsonnet index 65aef8a2..4c9a36e0 100644 --- a/vendor/github.com/jsonnet-libs/xtd/test/array_test.jsonnet +++ b/vendor/github.com/jsonnet-libs/xtd/test/array_test.jsonnet @@ -2,6 +2,7 @@ local array = import '../array.libsonnet'; local test = import 'github.com/jsonnet-libs/testonnet/main.libsonnet'; local arr = std.range(0, 10); +local mixedArr = ['a', 1, 'b', 2, 'c', 3, 4, 5, 6, 7, 8, 9, 'd', 'e', 'f', 'g', 'h', 'i', 'j']; test.new(std.thisFile) @@ -81,3 +82,32 @@ test.new(std.thisFile) expected=[0, 2, 4], ) ) + ++ test.case.new( + name='chunkArray', + test=test.expect.eq( + actual=array.chunkArray(mixedArr, maxSize=3), + expected=[['a', 1, 'b'], [2, 'c', 3], [4, 5, 6], [7, 8, 9], ['d', 'e', 'f'], ['g', 'h', 'i'], ['j']], + ) +) ++ test.case.new( + name='chunkArray - maxSize is 2', + test=test.expect.eq( + actual=array.chunkArray(mixedArr, maxSize=2), + expected=[['a', 1], ['b', 2], ['c', 3], [4, 5], [6, 7], [8, 9], ['d', 'e'], ['f', 'g'], ['h', 'i'], ['j']], + ) +) ++ test.case.new( + name='chunkArray - maxSize is larger than array length', + test=test.expect.eq( + actual=array.chunkArray(mixedArr, maxSize=100), + expected=[mixedArr], + ) +) ++ test.case.new( + name='chunkArray - maxSize is 1', + test=test.expect.eq( + actual=array.chunkArray(mixedArr, maxSize=1), + expected=[['a'], [1], ['b'], [2], ['c'], [3], [4], [5], [6], [7], [8], [9], ['d'], ['e'], ['f'], ['g'], ['h'], ['i'], ['j']], + ) +) diff --git a/vendor/github.com/jsonnet-libs/xtd/test/string_test.jsonnet b/vendor/github.com/jsonnet-libs/xtd/test/string_test.jsonnet new file mode 100644 index 00000000..4f375eb1 --- /dev/null +++ b/vendor/github.com/jsonnet-libs/xtd/test/string_test.jsonnet @@ -0,0 +1,33 @@ +local string = import '../string.libsonnet'; +local test = import 'github.com/jsonnet-libs/testonnet/main.libsonnet'; + +test.new(std.thisFile) + ++ test.case.new( + name='strReplaceMulti', + test=test.expect.eq( + actual=string.strReplaceMulti('hello world', [['hello', 'goodbye'], ['world', 'universe']]), + expected='goodbye universe', + ) +) ++ test.case.new( + name='strReplaceMulti - chained', + test=test.expect.eq( + actual=string.strReplaceMulti('hello world', [['hello', 'goodbye'], ['goodbye', 'hi again']]), + expected='hi again world', + ) +) ++ test.case.new( + name='strReplaceMulti - not found', + test=test.expect.eq( + actual=string.strReplaceMulti('hello world', [['first', 'second'], ['third', 'fourth']]), + expected='hello world', + ) +) ++ test.case.new( + name='strReplaceMulti - empty replacements', + test=test.expect.eq( + actual=string.strReplaceMulti('hello world', []), + expected='hello world', + ) +) diff --git a/vendor/github.com/jsonnet-libs/xtd/test/units_test.jsonnet b/vendor/github.com/jsonnet-libs/xtd/test/units_test.jsonnet new file mode 100644 index 00000000..d2f4459d --- /dev/null +++ b/vendor/github.com/jsonnet-libs/xtd/test/units_test.jsonnet @@ -0,0 +1,248 @@ +local units = import '../units.libsonnet'; +local test = import 'github.com/jsonnet-libs/testonnet/main.libsonnet'; + +test.new(std.thisFile) +// parseCPU(10) = parseCPU("10") = 10 +// parseCPU(4.5) = parse("4.5") = 4.5 +// parseCPU("3000m") = 3000 / 1000 +// parseCPU("3580m") = 3580 / 1000 +// parseCPU("3980.7m") = 3980.7 / 1000 +// parseCPU(0.5) = parse("0.5") = parse("500m") = 0.5 ++ test.case.new( + name='parseCPU - integer', + test=test.expect.eq( + actual=units.parseKubernetesCPU(10), + expected=10, + ) +) ++ test.case.new( + name='parseCPU - string integer', + test=test.expect.eq( + actual=units.parseKubernetesCPU('10'), + expected=10, + ) +) ++ test.case.new( + name='parseCPU - float', + test=test.expect.eq( + actual=units.parseKubernetesCPU(4.5), + expected=4.5, + ) +) ++ test.case.new( + name='parseCPU - string float', + test=test.expect.eq( + actual=units.parseKubernetesCPU('4.5'), + expected=4.5, + ) +) ++ test.case.new( + name='parseCPU - string millicores', + test=test.expect.eq( + actual=units.parseKubernetesCPU('3000m'), + expected=3, + ) +) ++ test.case.new( + name='parseCPU - string millicores', + test=test.expect.eq( + actual=units.parseKubernetesCPU('3580m'), + expected=3.58, + ) +) ++ test.case.new( + name='parseCPU - string millicores', + test=test.expect.eq( + actual=units.parseKubernetesCPU('3980.7m'), + expected=3980.7 / 1000, // Use a division to avoid floating point precision issues + ) +) ++ test.case.new( + name='parseCPU - fraction', + test=test.expect.eq( + actual=units.parseKubernetesCPU(0.5), + expected=0.5, + ) +) ++ test.case.new( + name='parseCPU - string fraction', + test=test.expect.eq( + actual=units.parseKubernetesCPU('0.5'), + expected=0.5, + ) +) ++ test.case.new( + name='parseCPU - fraction millicores', + test=test.expect.eq( + actual=units.parseKubernetesCPU('500m'), + expected=0.5, + ) +) + +// siToBytes tests ++ test.case.new( + name='siToBytes - plain number', + test=test.expect.eq( + actual=units.siToBytes('1024'), + expected=1024, + ) +) ++ test.case.new( + name='siToBytes - Ki', + test=test.expect.eq( + actual=units.siToBytes('1Ki'), + expected=1024, + ) +) ++ test.case.new( + name='siToBytes - Mi', + test=test.expect.eq( + actual=units.siToBytes('1Mi'), + expected=1048576, + ) +) ++ test.case.new( + name='siToBytes - Gi', + test=test.expect.eq( + actual=units.siToBytes('2Gi'), + expected=2147483648, + ) +) ++ test.case.new( + name='siToBytes - Ti', + test=test.expect.eq( + actual=units.siToBytes('1Ti'), + expected=1099511627776, + ) +) ++ test.case.new( + name='siToBytes - fractional Ki', + test=test.expect.eq( + actual=units.siToBytes('1.5Ki'), + expected=1536, + ) +) + +// parseDuration tests ++ test.case.new( + name='parseDuration - milliseconds', + test=test.expect.eq( + actual=units.parseDuration('500ms'), + expected=0.5, + ) +) ++ test.case.new( + name='parseDuration - seconds', + test=test.expect.eq( + actual=units.parseDuration('30s'), + expected=30, + ) +) ++ test.case.new( + name='parseDuration - minutes', + test=test.expect.eq( + actual=units.parseDuration('5m'), + expected=300, + ) +) ++ test.case.new( + name='parseDuration - hours', + test=test.expect.eq( + actual=units.parseDuration('2h'), + expected=7200, + ) +) ++ test.case.new( + name='parseDuration - combined minutes and seconds', + test=test.expect.eq( + actual=units.parseDuration('4m30s'), + expected=270, + ) +) ++ test.case.new( + name='parseDuration - combined hours and fractional seconds', + test=test.expect.eq( + actual=units.parseDuration('1h30.5s'), + expected=3600 + 30.5, + ) +) ++ test.case.new( + name='parseDuration - combined hours and minutes', + test=test.expect.eq( + actual=units.parseDuration('1h30m'), + expected=5400, + ) +) ++ test.case.new( + name='parseDuration - combined hours and milliseconds', + test=test.expect.eq( + actual=units.parseDuration('1h500ms'), + expected=3600 + 0.5, + ) +) + +// formatDuration tests ++ test.case.new( + name='formatDuration - milliseconds', + test=test.expect.eq( + actual=units.formatDuration(0.5), + expected='500ms', + ) +) ++ test.case.new( + name='formatDuration - seconds', + test=test.expect.eq( + actual=units.formatDuration(45), + expected='45s', + ) +) ++ test.case.new( + name='formatDuration - minutes', + test=test.expect.eq( + actual=units.formatDuration(300), + expected='5m', + ) +) ++ test.case.new( + name='formatDuration - hours', + test=test.expect.eq( + actual=units.formatDuration(7200), + expected='2h', + ) +) ++ test.case.new( + name='formatDuration - combined minutes and seconds', + test=test.expect.eq( + actual=units.formatDuration(270), + expected='4m30s', + ) +) ++ test.case.new( + name='formatDuration - combined hours and minutes', + test=test.expect.eq( + actual=units.formatDuration(5400), + expected='1h30m', + ) +) ++ test.case.new( + name='formatDuration - combined hours and minutes and seconds', + test=test.expect.eq( + actual=units.formatDuration(5400 + 30), + expected='1h30m30s', + ) +) ++ test.case.new( + name='formatDuration - combined hours and minutes and seconds and milliseconds', + test=test.expect.eq( + actual=units.formatDuration(5400 + 30 + 0.5), + expected='1h30m30s500ms', + ) +) + ++ test.case.new( + name='formatDuration - combined hours and milliseconds', + test=test.expect.eq( + actual=units.formatDuration(3600 + 0.5), + expected='1h500ms', + ) +) diff --git a/vendor/github.com/jsonnet-libs/xtd/units.libsonnet b/vendor/github.com/jsonnet-libs/xtd/units.libsonnet new file mode 100644 index 00000000..9d3bdcab --- /dev/null +++ b/vendor/github.com/jsonnet-libs/xtd/units.libsonnet @@ -0,0 +1,93 @@ +local d = import 'github.com/jsonnet-libs/docsonnet/doc-util/main.libsonnet'; + +{ + '#': d.pkg( + name='units', + url='github.com/jsonnet-libs/xtd/units.libsonnet', + help='`units` implements helper functions for converting units.', + ), + + '#parseKubernetesCPU':: d.fn( + ||| + `parseKubernetesCPU` parses a Kubernetes CPU string/number into a number of cores. + The function assumes the input is in a correct Kubernetes format, i.e., an integer, a float, + a string representation of an integer or a float, or a string containing a number ending with 'm' + representing a number of millicores. + |||, + [ + d.arg('input', d.T.any), + ] + ), + parseKubernetesCPU(input): + if std.isString(input) && std.endsWith(input, 'm') then std.parseJson(std.rstripChars(input, 'm')) / 1000 + else if std.isString(input) then std.parseJson(input) + else if std.isNumber(input) then input + else 0, + + '#siToBytes':: d.fn( + ||| + `siToBytes` converts Kubernetes byte units to bytes. + Only works for limited set of SI prefixes: Ki, Mi, Gi, Ti. + |||, + [ + d.arg('str', d.T.string), + ] + ), + siToBytes(str): + local siToBytesDecimal(str) = + if std.endsWith(str, 'Ki') then + std.parseJson(std.rstripChars(str, 'Ki')) * std.pow(2, 10) + else if std.endsWith(str, 'Mi') then + std.parseJson(std.rstripChars(str, 'Mi')) * std.pow(2, 20) + else if std.endsWith(str, 'Gi') then + std.parseJson(std.rstripChars(str, 'Gi')) * std.pow(2, 30) + else if std.endsWith(str, 'Ti') then + std.parseJson(std.rstripChars(str, 'Ti')) * std.pow(2, 40) + else + std.parseJson(str); + std.floor(siToBytesDecimal(str)), + + '#parseDuration':: d.fn( + ||| + `parseDuration` parses a duration string and returns the number of seconds. + Handles milliseconds (ms), seconds (s), minutes (m), hours (h), and combined formats like "4m30s" or "1h30m". + |||, + [ + d.arg('duration', d.T.string), + ] + ), + parseDuration(duration): + local replaced = std.strReplace(duration, 'ms', 'n'); // replace ms with n to avoid confusion with minutes + + local splitH = std.split(replaced, 'h'); + local hours = if std.length(splitH) > 1 then std.parseJson(splitH[0]) else 0; + local withoutHours = if std.length(splitH) > 1 then splitH[1] else replaced; + + local splitM = std.split(withoutHours, 'm'); + local minutes = if std.length(splitM) > 1 then std.parseJson(splitM[0]) else 0; + local withoutMinutes = if std.length(splitM) > 1 then splitM[1] else withoutHours; + + local splitS = std.split(withoutMinutes, 's'); + local seconds = if std.length(splitS) > 1 then std.parseJson(splitS[0]) else 0; + local withoutSeconds = if std.length(splitS) > 1 then splitS[1] else withoutMinutes; + + local splitN = std.split(withoutSeconds, 'n'); + local milliseconds = if std.length(splitN) > 1 then std.parseJson(splitN[0]) else 0; + + hours * 3600 + minutes * 60 + seconds + milliseconds / 1000, + + '#formatDuration':: d.fn( + ||| + `formatDuration` formats a number of seconds into a human-readable duration string. + Returns the duration in the smallest appropriate unit (s, m, h, or combined formats like "4m30s"). + |||, + [ + d.arg('seconds', d.T.number), + ] + ), + formatDuration(seconds): + (if std.floor(seconds / 3600) > 0 then '%dh' % (seconds / 3600) else '') + + (if std.floor((seconds % 3600) / 60) > 0 then '%dm' % ((seconds % 3600) / 60) else '') + + (if (seconds % 60) > 1 then '%ds' % (seconds % 60) else '') + + (if seconds % 1 > 0 then '%dms' % ((seconds % 1) * 1000) else ''), +} diff --git a/vendor/github.com/prometheus-operator/kube-prometheus/jsonnet/kube-prometheus/versions.json b/vendor/github.com/prometheus-operator/kube-prometheus/jsonnet/kube-prometheus/versions.json index 3b03e0d9..747a4154 100644 --- a/vendor/github.com/prometheus-operator/kube-prometheus/jsonnet/kube-prometheus/versions.json +++ b/vendor/github.com/prometheus-operator/kube-prometheus/jsonnet/kube-prometheus/versions.json @@ -1,13 +1,13 @@ { - "alertmanager": "0.28.1", + "alertmanager": "0.29.0", "blackboxExporter": "0.27.0", - "grafana": "12.2.0", + "grafana": "12.2.1", "kubeStateMetrics": "2.17.0", - "nodeExporter": "1.9.1", - "prometheus": "3.6.0", + "nodeExporter": "1.10.2", + "prometheus": "3.7.3", "prometheusAdapter": "0.12.0", - "prometheusOperator": "0.86.0", + "prometheusOperator": "0.86.2", "kubeRbacProxy": "0.20.0", "configmapReload": "0.15.0", - "pyrra": "0.8.4" + "pyrra": "0.9.1" } diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json index e8a57575..ae6e817b 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.19.0", - "operator.prometheus.io/version": "0.86.1" + "operator.prometheus.io/version": "0.86.2" }, "name": "alertmanagerconfigs.monitoring.coreos.com" }, diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagers-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagers-crd.json index a9142ce0..257469d6 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagers-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/alertmanagers-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.19.0", - "operator.prometheus.io/version": "0.86.1" + "operator.prometheus.io/version": "0.86.2" }, "name": "alertmanagers.monitoring.coreos.com" }, diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/podmonitors-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/podmonitors-crd.json index a8fc2f54..6b57dfc7 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/podmonitors-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/podmonitors-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.19.0", - "operator.prometheus.io/version": "0.86.1" + "operator.prometheus.io/version": "0.86.2" }, "name": "podmonitors.monitoring.coreos.com" }, diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/probes-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/probes-crd.json index 9799471d..ab9d21c9 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/probes-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/probes-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.19.0", - "operator.prometheus.io/version": "0.86.1" + "operator.prometheus.io/version": "0.86.2" }, "name": "probes.monitoring.coreos.com" }, diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheus-operator.libsonnet b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheus-operator.libsonnet index ed243dd8..46d2adb6 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheus-operator.libsonnet +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheus-operator.libsonnet @@ -141,7 +141,7 @@ function(params) { verbs: ['get', 'list', 'watch'], }, { - apiGroups: [''], + apiGroups: ['events.k8s.io'], resources: ['events'], verbs: ['patch', 'create'], }, diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheusagents-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheusagents-crd.json index 94a41aa6..3d61d214 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheusagents-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheusagents-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.19.0", - "operator.prometheus.io/version": "0.86.1" + "operator.prometheus.io/version": "0.86.2" }, "name": "prometheusagents.monitoring.coreos.com" }, diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheuses-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheuses-crd.json index 2267ea6a..d7a39ee0 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheuses-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheuses-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.19.0", - "operator.prometheus.io/version": "0.86.1" + "operator.prometheus.io/version": "0.86.2" }, "name": "prometheuses.monitoring.coreos.com" }, diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheusrules-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheusrules-crd.json index f2b99b03..74b804cc 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheusrules-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/prometheusrules-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.19.0", - "operator.prometheus.io/version": "0.86.1" + "operator.prometheus.io/version": "0.86.2" }, "name": "prometheusrules.monitoring.coreos.com" }, diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/scrapeconfigs-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/scrapeconfigs-crd.json index 17353934..08a888cb 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/scrapeconfigs-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/scrapeconfigs-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.19.0", - "operator.prometheus.io/version": "0.86.1" + "operator.prometheus.io/version": "0.86.2" }, "name": "scrapeconfigs.monitoring.coreos.com" }, diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/servicemonitors-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/servicemonitors-crd.json index 2b61f9a1..d867d0b4 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/servicemonitors-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/servicemonitors-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.19.0", - "operator.prometheus.io/version": "0.86.1" + "operator.prometheus.io/version": "0.86.2" }, "name": "servicemonitors.monitoring.coreos.com" }, diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/thanosrulers-crd.json b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/thanosrulers-crd.json index ee8cfed1..a1f3544a 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/thanosrulers-crd.json +++ b/vendor/github.com/prometheus-operator/prometheus-operator/jsonnet/prometheus-operator/thanosrulers-crd.json @@ -4,7 +4,7 @@ "metadata": { "annotations": { "controller-gen.kubebuilder.io/version": "v0.19.0", - "operator.prometheus.io/version": "0.86.1" + "operator.prometheus.io/version": "0.86.2" }, "name": "thanosrulers.monitoring.coreos.com" },