diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 34b79bf6..bead5710 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -18,7 +18,7 @@ "subdir": "contrib/mixin" } }, - "version": "472662fee06f79e68acf14d9ec4b4168dd59e490", + "version": "f072712e29a2dafc92e7cfb3c76cea60e0d508b2", "sum": "XmXkOCriQIZmXwlIIFhqlJMa0e6qGWdxZD+ZDYaN0Po=" }, { @@ -28,7 +28,7 @@ "subdir": "operations/observability/mixins" } }, - "version": "96a792181a7791302b15c3d1b21338a5d337bd33", + "version": "f1c1f29e42f2956861189bf073b728c02cef376a", "sum": "wvuIMANAM9nLAR9RmTl2J7ZkFOV/XtIQ8LwKApfydKc=", "name": "gitpod" }, @@ -89,7 +89,7 @@ "subdir": "grafana-builder" } }, - "version": "6226b75e3f026d26e56103df08b7350b26b7a183", + "version": "da2e332f4ad19bc0e808fb70fcde951b0d9041e1", "sum": "G7B6E5sqWirDbMWRhifbLRfGgRFbIh9WCYa6X3kMh6g=" }, { @@ -99,7 +99,7 @@ "subdir": "mixin-utils" } }, - "version": "6226b75e3f026d26e56103df08b7350b26b7a183", + "version": "da2e332f4ad19bc0e808fb70fcde951b0d9041e1", "sum": "VAik6Sh5MD5H1Km1gSIXG4rwQ4m4zyw7odP5TKu3bGo=" }, { @@ -129,8 +129,8 @@ "subdir": "" } }, - "version": "1da53ae8652b014b34a0c2346fc67e0bbca7559c", - "sum": "g1CTW1CQwszC4bhp1nHrg7bHzIttvLGPmlKUAhLDzUI=" + "version": "eb631d882a2c917cd9a5fc237cc2d0f37f8f890f", + "sum": "7E/dvR6uooYrdb9GPx25tefet1YC1ijVcMrVntU+o+4=" }, { "source": { @@ -159,8 +159,8 @@ "subdir": "jsonnet/kube-prometheus" } }, - "version": "4181356aa78a26f80a56c07238253e19eae374f7", - "sum": "Y4zoEK4+AyASCUDOeN9eRnbIFpnuKZKMxFGQ2HPjS1U=" + "version": "2fe94c33794784a33b4bbe4fc074e057773b169a", + "sum": "JpJEQX7aQIVrtbwqFMekRu2v1MngQIdBKnVKax8G+74=" }, { "source": { @@ -169,7 +169,7 @@ "subdir": "jsonnet/mixin" } }, - "version": "ba794f47ffbfa4e07f85c73d1a9138f2f01322cd", + "version": "99f0cfdba694ca851bbc0d3ae478148b2e6ace09", "sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=", "name": "prometheus-operator-mixin" }, @@ -180,8 +180,8 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "ba794f47ffbfa4e07f85c73d1a9138f2f01322cd", - "sum": "sXZVmJX3i3DKDE/zm6fggQ0AYV6mJCAJ62/ugCgMXz0=" + "version": "99f0cfdba694ca851bbc0d3ae478148b2e6ace09", + "sum": "czJJUpeAtiksUzha5wkbTuswffY5fiPAFpBhEymiaWU=" }, { "source": { @@ -190,7 +190,7 @@ "subdir": "doc/alertmanager-mixin" } }, - "version": "4534c9ac53d6bf502c27bc8fdd24341e9d4f2ba8", + "version": "2c2c68cc969f355c09cabece00af2bd70340eaa0", "sum": "j5prvRrJdoCv7n45l5Uy2ghl1IDb9BBUqjwCDs4ZJoQ=", "name": "alertmanager" }, @@ -211,7 +211,7 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "2c04f2d7b1a7bbd260ffae70d1bd57b20c0c0d4f", + "version": "789fddf25aaf1defafabadf6ce90413b9a69f72d", "sum": "1+e8HismURh2GEbJPRIxI30M1nsrIuIh0TRUhwylqf4=", "name": "prometheus" }, @@ -222,7 +222,7 @@ "subdir": "jsonnet/controller-gen" } }, - "version": "1190f25c796e57f03720f82a09b117a5ef2a8e69", + "version": "9349cf03857a723a16cdfc13b7920401de6c0041", "sum": "O3c9Uurei8MWAY0Ad7DOL1fMqSgdHyHB7MpHsxSITKM=", "name": "pyrra" }, @@ -233,7 +233,7 @@ "subdir": "mixin" } }, - "version": "49a560d09dfa62d396b8070ceb9a31acc6464511", + "version": "696193cc3562591c3c28394d33860ce909a66bca", "sum": "ieCD4eMgGbOlrI8GmckGPHBGQDcLasE1rULYq56W/bs=", "name": "thanos-mixin" }, diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusCustomResourceDefinition.yaml index 3786215d..983f3c07 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusCustomResourceDefinition.yaml @@ -5376,6 +5376,18 @@ spec: Configures optional translation of OTLP explicit bucket histograms into native histograms with custom buckets. It requires Prometheus >= v3.4.0. type: boolean + ignoreResourceAttributes: + description: |- + List of OpenTelemetry resource attributes to ignore when `promoteAllResourceAttributes` is true. + + It requires `promoteAllResourceAttributes` to be true. + It requires Prometheus >= v3.5.0. + items: + minLength: 1 + type: string + minItems: 1 + type: array + x-kubernetes-list-type: set keepIdentifyingResourceAttributes: description: |- Enables adding `service.name`, `service.namespace` and `service.instance.id` @@ -5383,8 +5395,17 @@ spec: It requires Prometheus >= v3.1.0. type: boolean + promoteAllResourceAttributes: + description: |- + Promote all resource attributes to metric labels except the ones defined in `ignoreResourceAttributes`. + + Cannot be true when `promoteResourceAttributes` is defined. + It requires Prometheus >= v3.5.0. + type: boolean promoteResourceAttributes: - description: List of OpenTelemetry Attributes that should be promoted to metric labels, defaults to none. + description: |- + List of OpenTelemetry Attributes that should be promoted to metric labels, defaults to none. + Cannot be defined when `promoteAllResourceAttributes` is true. items: minLength: 1 type: string diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusagentCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusagentCustomResourceDefinition.yaml index 07a10916..9113f809 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusagentCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0prometheusagentCustomResourceDefinition.yaml @@ -4649,6 +4649,18 @@ spec: Configures optional translation of OTLP explicit bucket histograms into native histograms with custom buckets. It requires Prometheus >= v3.4.0. type: boolean + ignoreResourceAttributes: + description: |- + List of OpenTelemetry resource attributes to ignore when `promoteAllResourceAttributes` is true. + + It requires `promoteAllResourceAttributes` to be true. + It requires Prometheus >= v3.5.0. + items: + minLength: 1 + type: string + minItems: 1 + type: array + x-kubernetes-list-type: set keepIdentifyingResourceAttributes: description: |- Enables adding `service.name`, `service.namespace` and `service.instance.id` @@ -4656,8 +4668,17 @@ spec: It requires Prometheus >= v3.1.0. type: boolean + promoteAllResourceAttributes: + description: |- + Promote all resource attributes to metric labels except the ones defined in `ignoreResourceAttributes`. + + Cannot be true when `promoteResourceAttributes` is defined. + It requires Prometheus >= v3.5.0. + type: boolean promoteResourceAttributes: - description: List of OpenTelemetry Attributes that should be promoted to metric labels, defaults to none. + description: |- + List of OpenTelemetry Attributes that should be promoted to metric labels, defaults to none. + Cannot be defined when `promoteAllResourceAttributes` is true. items: minLength: 1 type: string @@ -10282,6 +10303,8 @@ spec: rule: '!(has(self.mode) && self.mode == ''DaemonSet'' && has(self.shards) && self.shards > 1)' - message: persistentVolumeClaimRetentionPolicy cannot be set when mode is DaemonSet rule: '!(has(self.mode) && self.mode == ''DaemonSet'' && has(self.persistentVolumeClaimRetentionPolicy))' + - message: scrapeConfigSelector cannot be set when mode is DaemonSet + rule: '!(has(self.mode) && self.mode == ''DaemonSet'' && has(self.scrapeConfigSelector))' status: description: |- Most recent observed status of the Prometheus cluster. Read-only. diff --git a/monitoring-satellite/manifests/crds/prometheusOperator-0thanosrulerCustomResourceDefinition.yaml b/monitoring-satellite/manifests/crds/prometheusOperator-0thanosrulerCustomResourceDefinition.yaml index 4ab4eb5c..968c999c 100644 --- a/monitoring-satellite/manifests/crds/prometheusOperator-0thanosrulerCustomResourceDefinition.yaml +++ b/monitoring-satellite/manifests/crds/prometheusOperator-0thanosrulerCustomResourceDefinition.yaml @@ -2505,6 +2505,22 @@ spec: - Default - None type: string + enableFeatures: + description: |- + Enable access to Thanos Ruler feature flags. By default, no features are enabled. + + Enabling features which are disabled by default is entirely outside the + scope of what the maintainers will support and by doing so, you accept + that this behaviour may break at any time without notice. + + For more information see https://thanos.io/tip/components/rule.md/ + + It requires Thanos >= 0.39.0. + items: + minLength: 1 + type: string + type: array + x-kubernetes-list-type: set enableServiceLinks: description: Indicates whether information about services should be injected into pod's environment variables type: boolean @@ -5384,6 +5400,10 @@ spec: description: Number of thanos ruler instances to deploy. format: int32 type: integer + resendDelay: + description: Minimum amount of time to wait before resending an alert to Alertmanager. + pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$ + type: string resources: description: |- Resources defines the resource requirements for single Pods. @@ -5466,6 +5486,13 @@ spec: format: int32 minimum: 1 type: integer + ruleGracePeriod: + description: |- + Minimum duration between alert and restored "for" state. + This is maintained only for alerts with configured "for" time greater than grace period. + It requires Thanos >= v0.30.0. + pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$ + type: string ruleNamespaceSelector: description: |- Namespaces to be selected for Rules discovery. If unspecified, only diff --git a/monitoring-satellite/manifests/grafana/config.yaml b/monitoring-satellite/manifests/grafana/config.yaml index bab9008d..21795e3a 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.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana-config namespace: monitoring-satellite stringData: diff --git a/monitoring-satellite/manifests/grafana/dashboardDatasources.yaml b/monitoring-satellite/manifests/grafana/dashboardDatasources.yaml index 1c6dd38e..63b3f90c 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.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana-datasources namespace: monitoring-satellite stringData: diff --git a/monitoring-satellite/manifests/grafana/dashboardDefinitions.yaml b/monitoring-satellite/manifests/grafana/dashboardDefinitions.yaml index 6a264c33..12dd6a2c 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 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.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana-dashboard-pod-total namespace: monitoring-satellite - apiVersion: v1 @@ -57975,7 +57975,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana-dashboard-prometheus-remote-write namespace: monitoring-satellite - apiVersion: v1 @@ -58815,7 +58815,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana-dashboard-prometheus namespace: monitoring-satellite - apiVersion: v1 @@ -59470,7 +59470,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana-dashboard-proxy namespace: monitoring-satellite - apiVersion: v1 @@ -60071,7 +60071,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana-dashboard-scheduler namespace: monitoring-satellite - apiVersion: v1 @@ -60657,7 +60657,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana-dashboard-workload-total namespace: monitoring-satellite - apiVersion: v1 @@ -62064,7 +62064,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana-dashboard-gitpod-component-dashboard namespace: monitoring-satellite - apiVersion: v1 @@ -63469,7 +63469,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana-dashboard-gitpod-component-db namespace: monitoring-satellite - apiVersion: v1 @@ -65331,7 +65331,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana-dashboard-gitpod-component-proxy namespace: monitoring-satellite - apiVersion: v1 @@ -65938,7 +65938,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana-dashboard-gitpod-component-server-garbage-collector namespace: monitoring-satellite - apiVersion: v1 @@ -68461,7 +68461,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana-dashboard-gitpod-component-server namespace: monitoring-satellite - apiVersion: v1 @@ -69329,7 +69329,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana-dashboard-gitpod-component-usage namespace: monitoring-satellite - apiVersion: v1 @@ -71838,7 +71838,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana-dashboard-gitpod-component-ws-manager-bridge namespace: monitoring-satellite - apiVersion: v1 @@ -72833,7 +72833,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana-dashboard-gitpod-components-spicedb namespace: monitoring-satellite - apiVersion: v1 @@ -73756,7 +73756,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana-dashboard-gitpod-meta-overview namespace: monitoring-satellite - apiVersion: v1 @@ -74301,7 +74301,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana-dashboard-gitpod-meta-services namespace: monitoring-satellite - apiVersion: v1 @@ -75862,7 +75862,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana-dashboard-gitpod-slo-login namespace: monitoring-satellite - apiVersion: v1 @@ -78732,7 +78732,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana-dashboard-gitpod-component-agent-smith namespace: monitoring-satellite - apiVersion: v1 @@ -81300,7 +81300,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana-dashboard-gitpod-component-content-service namespace: monitoring-satellite - apiVersion: v1 @@ -83925,7 +83925,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana-dashboard-gitpod-component-image-builder namespace: monitoring-satellite - apiVersion: v1 @@ -86946,7 +86946,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana-dashboard-gitpod-component-registry-facade namespace: monitoring-satellite - apiVersion: v1 @@ -90385,7 +90385,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana-dashboard-gitpod-component-ws-daemon namespace: monitoring-satellite - apiVersion: v1 @@ -94740,7 +94740,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana-dashboard-gitpod-component-ws-manager-mk2 namespace: monitoring-satellite - apiVersion: v1 @@ -96148,7 +96148,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana-dashboard-gitpod-component-ws-proxy namespace: monitoring-satellite - apiVersion: v1 @@ -96585,7 +96585,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana-dashboard-gitpod-network-limiting namespace: monitoring-satellite - apiVersion: v1 @@ -96888,7 +96888,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana-dashboard-gitpod-node-ephemeral-storage namespace: monitoring-satellite - apiVersion: v1 @@ -97650,7 +97650,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana-dashboard-gitpod-node-problem-detector namespace: monitoring-satellite - apiVersion: v1 @@ -97913,7 +97913,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana-dashboard-gitpod-node-swap namespace: monitoring-satellite - apiVersion: v1 @@ -98589,7 +98589,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana-dashboard-gitpod-psi namespace: monitoring-satellite - apiVersion: v1 @@ -100704,7 +100704,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana-dashboard-gitpod-workspace-coredns namespace: monitoring-satellite - apiVersion: v1 @@ -101178,7 +101178,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana-dashboard-gitpod-workspace-psi namespace: monitoring-satellite - apiVersion: v1 @@ -101787,7 +101787,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana-dashboard-gitpod-workspace-registry-facade-blobsource namespace: monitoring-satellite - apiVersion: v1 @@ -102589,7 +102589,7 @@ items: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.0.2 + app.kubernetes.io/version: 12.1.0 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 02649992..92189219 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.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana-dashboards namespace: monitoring-satellite diff --git a/monitoring-satellite/manifests/grafana/deployment.yaml b/monitoring-satellite/manifests/grafana/deployment.yaml index bdf7168e..ae967d01 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.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana namespace: monitoring-satellite spec: @@ -18,14 +18,14 @@ spec: template: metadata: annotations: - checksum/grafana-config: 758c43a8c5194ff59b120b57e586a06e - checksum/grafana-dashboardproviders: f34d3fc24d20b6d65efcfebdfe7fd743 - checksum/grafana-datasources: 7ba45ea72bd101994a831d7a50abb442 + checksum/grafana-config: 30010bf26c044a720fe980a96f5642c3 + checksum/grafana-dashboardproviders: 188d3e6a553477b6c4aa9fd1bb0d719f + checksum/grafana-datasources: 5ff1a125f0d9030cad56765a50e87a4b labels: app.kubernetes.io/component: grafana app.kubernetes.io/name: grafana app.kubernetes.io/part-of: kube-prometheus - app.kubernetes.io/version: 12.0.2 + app.kubernetes.io/version: 12.1.0 spec: automountServiceAccountToken: false containers: @@ -36,7 +36,7 @@ spec: value: Admin - name: GF_AUTH_DISABLE_LOGIN_FORM value: "true" - image: grafana/grafana:12.0.2 + image: grafana/grafana:12.1.0 name: grafana ports: - containerPort: 3000 diff --git a/monitoring-satellite/manifests/grafana/prometheusRule.yaml b/monitoring-satellite/manifests/grafana/prometheusRule.yaml index b3916d99..73708858 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.0.2 + app.kubernetes.io/version: 12.1.0 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 c03945a9..8f903520 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.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana namespace: monitoring-satellite spec: diff --git a/monitoring-satellite/manifests/grafana/serviceAccount.yaml b/monitoring-satellite/manifests/grafana/serviceAccount.yaml index 3f711807..7ce28672 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.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana namespace: monitoring-satellite diff --git a/monitoring-satellite/manifests/grafana/serviceMonitor.yaml b/monitoring-satellite/manifests/grafana/serviceMonitor.yaml index ca29768f..72b8998d 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.0.2 + app.kubernetes.io/version: 12.1.0 name: grafana namespace: monitoring-satellite spec: diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/alerts/kubelet.libsonnet b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/alerts/kubelet.libsonnet index c47aff89..9ed3b8f8 100644 --- a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/alerts/kubelet.libsonnet +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/alerts/kubelet.libsonnet @@ -164,7 +164,18 @@ local utils = import '../lib/utils.libsonnet'; { alert: 'KubeletPodStartUpLatencyHigh', expr: ||| - histogram_quantile(0.99, sum(rate(kubelet_pod_worker_duration_seconds_bucket{%(kubeletSelector)s}[5m])) by (%(clusterLabel)s, instance, le)) * on(%(clusterLabel)s, instance) group_left(node) kubelet_node_name{%(kubeletSelector)s} > 60 + histogram_quantile(0.99, + sum by (%(clusterLabel)s, instance, le) ( + topk by (%(clusterLabel)s, instance, le, operation_type) (1, + rate(kubelet_pod_worker_duration_seconds_bucket{%(kubeletSelector)s}[5m]) + ) + ) + ) + * on(%(clusterLabel)s, instance) group_left(node) + topk by (%(clusterLabel)s, instance, node) (1, + kubelet_node_name{%(kubeletSelector)s} + ) + > 60 ||| % $._config, 'for': '15m', labels: { diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/alerts/resource_alerts.libsonnet b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/alerts/resource_alerts.libsonnet index ad662f07..f2930573 100644 --- a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/alerts/resource_alerts.libsonnet +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/alerts/resource_alerts.libsonnet @@ -1,6 +1,61 @@ local utils = import '../lib/utils.libsonnet'; { + local kubeOvercommitExpression(resource) = if $._config.showMultiCluster then + ||| + # Non-HA clusters. + ( + ( + sum by(%(clusterLabel)s) (namespace_%(resource)s:kube_pod_container_resource_requests:sum{%(ignoringOverprovisionedWorkloadSelector)s}) + - + sum by(%(clusterLabel)s) (kube_node_status_allocatable{%(kubeStateMetricsSelector)s,resource="%(resource)s"}) > 0 + ) + and + count by (%(clusterLabel)s) (max by (%(clusterLabel)s, node) (kube_node_role{%(kubeStateMetricsSelector)s, role="control-plane"})) < 3 + ) + or + # HA clusters. + ( + sum by(%(clusterLabel)s) (namespace_%(resource)s:kube_pod_container_resource_requests:sum{%(ignoringOverprovisionedWorkloadSelector)s}) + - + ( + # Skip clusters with only one allocatable node. + ( + sum by (%(clusterLabel)s) (kube_node_status_allocatable{%(kubeStateMetricsSelector)s,resource="%(resource)s"}) + - + max by (%(clusterLabel)s) (kube_node_status_allocatable{%(kubeStateMetricsSelector)s,resource="%(resource)s"}) + ) > 0 + ) > 0 + ) + ||| % $._config { resource: resource } + else + ||| + # Non-HA clusters. + ( + ( + sum(namespace_%(resource)s:kube_pod_container_resource_requests:sum{%(ignoringOverprovisionedWorkloadSelector)s}) + - + sum(kube_node_status_allocatable{resource="%(resource)s", %(kubeStateMetricsSelector)s}) > 0 + ) + and + count(max by (node) (kube_node_role{%(kubeStateMetricsSelector)s, role="control-plane"})) < 3 + ) + or + # HA clusters. + ( + sum(namespace_%(resource)s:kube_pod_container_resource_requests:sum{%(ignoringOverprovisionedWorkloadSelector)s}) + - + ( + # Skip clusters with only one allocatable node. + ( + sum(kube_node_status_allocatable{resource="%(resource)s", %(kubeStateMetricsSelector)s}) + - + max(kube_node_status_allocatable{resource="%(resource)s", %(kubeStateMetricsSelector)s}) + ) > 0 + ) > 0 + ) + ||| % $._config { resource: resource }, + _config+:: { kubeStateMetricsSelector: error 'must provide selector for kube-state-metrics', nodeExporterSelector: error 'must provide selector for node-exporter', @@ -31,43 +86,12 @@ local utils = import '../lib/utils.libsonnet'; }, annotations: { summary: 'Cluster has overcommitted CPU resource requests.', + description: 'Cluster%s has overcommitted CPU resource requests for Pods by {{ printf "%%.2f" $value }} CPU shares and cannot tolerate node failure.' % [ + utils.ifShowMultiCluster($._config, ' {{ $labels.%(clusterLabel)s }}' % $._config), + ], }, 'for': '10m', - } + - if $._config.showMultiCluster then { - expr: ||| - (sum(namespace_cpu:kube_pod_container_resource_requests:sum{%(ignoringOverprovisionedWorkloadSelector)s}) by (%(clusterLabel)s) - - sum(kube_node_status_allocatable{%(kubeStateMetricsSelector)s,resource="cpu"}) by (%(clusterLabel)s) > 0 - and - count by (%(clusterLabel)s) (max by (%(clusterLabel)s, node) (kube_node_role{%(kubeStateMetricsSelector)s, role="control-plane"})) < 3) - or - (sum(namespace_cpu:kube_pod_container_resource_requests:sum{%(ignoringOverprovisionedWorkloadSelector)s}) by (%(clusterLabel)s) - - (sum(kube_node_status_allocatable{%(kubeStateMetricsSelector)s,resource="cpu"}) by (%(clusterLabel)s) - - max(kube_node_status_allocatable{%(kubeStateMetricsSelector)s,resource="cpu"}) by (%(clusterLabel)s)) > 0 - and - (sum(kube_node_status_allocatable{%(kubeStateMetricsSelector)s,resource="cpu"}) by (%(clusterLabel)s) - - max(kube_node_status_allocatable{%(kubeStateMetricsSelector)s,resource="cpu"}) by (%(clusterLabel)s)) > 0) - ||| % $._config, - annotations+: { - description: 'Cluster {{ $labels.%(clusterLabel)s }} has overcommitted CPU resource requests for Pods by {{ printf "%%.2f" $value }} CPU shares and cannot tolerate node failure.' % $._config, - }, - } else { - expr: ||| - (sum(namespace_cpu:kube_pod_container_resource_requests:sum{%(ignoringOverprovisionedWorkloadSelector)s}) - - sum(kube_node_status_allocatable{resource="cpu", %(kubeStateMetricsSelector)s}) > 0 - and - count(max by (node) (kube_node_role{%(kubeStateMetricsSelector)s, role="control-plane"})) < 3) - or - (sum(namespace_cpu:kube_pod_container_resource_requests:sum{%(ignoringOverprovisionedWorkloadSelector)s}) - - (sum(kube_node_status_allocatable{resource="cpu", %(kubeStateMetricsSelector)s}) - - max(kube_node_status_allocatable{resource="cpu", %(kubeStateMetricsSelector)s})) > 0 - and - (sum(kube_node_status_allocatable{resource="cpu", %(kubeStateMetricsSelector)s}) - - max(kube_node_status_allocatable{resource="cpu", %(kubeStateMetricsSelector)s})) > 0) - ||| % $._config, - annotations+: { - description: 'Cluster has overcommitted CPU resource requests for Pods by {{ $value }} CPU shares and cannot tolerate node failure.' % $._config, - }, + expr: kubeOvercommitExpression('cpu'), }, { alert: 'KubeMemoryOvercommit', @@ -76,43 +100,12 @@ local utils = import '../lib/utils.libsonnet'; }, annotations: { summary: 'Cluster has overcommitted memory resource requests.', + description: 'Cluster%s has overcommitted memory resource requests for Pods by {{ $value | humanize }} bytes and cannot tolerate node failure.' % [ + utils.ifShowMultiCluster($._config, ' {{ $labels.%(clusterLabel)s }}' % $._config), + ], }, 'for': '10m', - } + - if $._config.showMultiCluster then { - expr: ||| - (sum(namespace_memory:kube_pod_container_resource_requests:sum{%(ignoringOverprovisionedWorkloadSelector)s}) by (%(clusterLabel)s) - - sum(kube_node_status_allocatable{resource="memory", %(kubeStateMetricsSelector)s}) by (%(clusterLabel)s) > 0 - and - count by (%(clusterLabel)s) (max by (%(clusterLabel)s, node) (kube_node_role{%(kubeStateMetricsSelector)s, role="control-plane"})) < 3) - or - (sum(namespace_memory:kube_pod_container_resource_requests:sum{%(ignoringOverprovisionedWorkloadSelector)s}) by (%(clusterLabel)s) - - (sum(kube_node_status_allocatable{resource="memory", %(kubeStateMetricsSelector)s}) by (%(clusterLabel)s) - - max(kube_node_status_allocatable{resource="memory", %(kubeStateMetricsSelector)s}) by (%(clusterLabel)s)) > 0 - and - (sum(kube_node_status_allocatable{resource="memory", %(kubeStateMetricsSelector)s}) by (%(clusterLabel)s) - - max(kube_node_status_allocatable{resource="memory", %(kubeStateMetricsSelector)s}) by (%(clusterLabel)s)) > 0) - ||| % $._config, - annotations+: { - description: 'Cluster {{ $labels.%(clusterLabel)s }} has overcommitted memory resource requests for Pods by {{ $value | humanize }} bytes and cannot tolerate node failure.' % $._config, - }, - } else { - expr: ||| - (sum(namespace_memory:kube_pod_container_resource_requests:sum{%(ignoringOverprovisionedWorkloadSelector)s}) - - sum(kube_node_status_allocatable{resource="memory", %(kubeStateMetricsSelector)s}) > 0 - and - count(max by (node) (kube_node_role{%(kubeStateMetricsSelector)s, role="control-plane"})) < 3) - or - (sum(namespace_memory:kube_pod_container_resource_requests:sum{%(ignoringOverprovisionedWorkloadSelector)s}) - - (sum(kube_node_status_allocatable{resource="memory", %(kubeStateMetricsSelector)s}) - - max(kube_node_status_allocatable{resource="memory", %(kubeStateMetricsSelector)s})) > 0 - and - (sum(kube_node_status_allocatable{resource="memory", %(kubeStateMetricsSelector)s}) - - max(kube_node_status_allocatable{resource="memory", %(kubeStateMetricsSelector)s})) > 0) - ||| % $._config, - annotations+: { - description: 'Cluster has overcommitted memory resource requests for Pods by {{ $value | humanize }} bytes and cannot tolerate node failure.', - }, + expr: kubeOvercommitExpression('memory'), }, { alert: 'KubeCPUQuotaOvercommit', diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/tests/kubelet-test.yaml b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/tests/kubelet-test.yaml index 11e318af..b551c5f7 100644 --- a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/tests/kubelet-test.yaml +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/tests/kubelet-test.yaml @@ -1,5 +1,6 @@ rule_files: - ../prometheus_rules.yaml +- ../prometheus_alerts.yaml evaluation_interval: 1m @@ -26,3 +27,38 @@ tests: labels: 'node_quantile:kubelet_pleg_relist_duration_seconds:histogram_quantile{cluster="cluster",instance="ip-172-0-0-1", node="ip-172-0-0-1", quantile="0.9"}' - value: 0.99 labels: 'node_quantile:kubelet_pleg_relist_duration_seconds:histogram_quantile{cluster="cluster",instance="ip-172-0-0-1", node="ip-172-0-0-1", quantile="0.99"}' + +- name: "KubeletPodStartUpLatencyHigh alert test, including duplicate series check" + interval: 1m + input_series: + - series: 'kubelet_pod_worker_duration_seconds_bucket{cluster="cluster",instance="ip-172-0-0-1",job="kubelet",le="+Inf"}' + values: '0+1x16' + - series: 'kubelet_pod_worker_duration_seconds_bucket{cluster="cluster",instance="ip-172-0-0-1",job="kubelet",le="+Inf",dupe="dupe"}' + values: '0+1x16' + - series: 'kubelet_pod_worker_duration_seconds_bucket{cluster="cluster",instance="ip-172-0-0-1",job="kubelet",le="99"}' + values: '0+1x16' + - series: 'kubelet_pod_worker_duration_seconds_bucket{cluster="cluster",instance="ip-172-0-0-1",job="kubelet",le="99",dupe="dupe"}' + values: '0+1x16' + - series: 'kubelet_pod_worker_duration_seconds_count{cluster="cluster",instance="ip-172-0-0-1",job="kubelet"}' + values: '0+1x16' + - series: 'kubelet_pod_worker_duration_seconds_count{cluster="cluster",instance="ip-172-0-0-1",job="kubelet",dupe="dupe"}' + values: '0+1x16' + - series: 'kubelet_node_name{cluster="cluster",node="ip-172-0-0-1",instance="ip-172-0-0-1",job="kubelet"}' + values: '1x16' + - series: 'kubelet_node_name{cluster="cluster",node="ip-172-0-0-1",instance="ip-172-0-0-1",job="kubelet",dupe="dupe"}' + values: '1x16' + alert_rule_test: + - eval_time: 15m + alertname: KubeletPodStartUpLatencyHigh + - eval_time: 16m + alertname: KubeletPodStartUpLatencyHigh + exp_alerts: + - exp_labels: + severity: warning + cluster: cluster + instance: ip-172-0-0-1 + node: ip-172-0-0-1 + exp_annotations: + summary: "Kubelet Pod startup latency is too high." + description: "Kubelet Pod startup 99th percentile latency is 98.01 seconds on node ip-172-0-0-1." + runbook_url: "https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubeletpodstartuplatencyhigh" diff --git a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/tests/tests.yaml b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/tests/tests.yaml index 5e600b65..01f3f004 100644 --- a/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/tests/tests.yaml +++ b/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/tests/tests.yaml @@ -1444,7 +1444,7 @@ tests: - exp_labels: severity: warning exp_annotations: - description: Cluster has overcommitted CPU resource requests for Pods by 0.10000000000000009 CPU shares and cannot tolerate node failure. + description: Cluster has overcommitted CPU resource requests for Pods by 0.10 CPU shares and cannot tolerate node failure. runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubecpuovercommit summary: Cluster has overcommitted CPU resource requests. @@ -1472,7 +1472,7 @@ tests: - exp_labels: severity: warning exp_annotations: - description: Cluster has overcommitted CPU resource requests for Pods by 0.20000000000000018 CPU shares and cannot tolerate node failure. + description: Cluster has overcommitted CPU resource requests for Pods by 0.20 CPU shares and cannot tolerate node failure. runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubecpuovercommit summary: Cluster has overcommitted CPU resource requests. @@ -1504,7 +1504,7 @@ tests: - exp_labels: severity: warning exp_annotations: - description: Cluster has overcommitted CPU resource requests for Pods by 0.20000000000000062 CPU shares and cannot tolerate node failure. + description: Cluster has overcommitted CPU resource requests for Pods by 0.20 CPU shares and cannot tolerate node failure. runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubecpuovercommit summary: Cluster has overcommitted CPU resource requests. 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 b3fa472a..4b95facf 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,7 +1,7 @@ { "alertmanager": "0.28.1", "blackboxExporter": "0.27.0", - "grafana": "12.0.2", + "grafana": "12.1.0", "kubeStateMetrics": "2.16.0", "nodeExporter": "1.9.1", "prometheus": "3.5.0", 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 2c375eb9..63649670 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 @@ -4115,12 +4115,26 @@ "description": "Configures optional translation of OTLP explicit bucket histograms into native histograms with custom buckets.\nIt requires Prometheus >= v3.4.0.", "type": "boolean" }, + "ignoreResourceAttributes": { + "description": "List of OpenTelemetry resource attributes to ignore when `promoteAllResourceAttributes` is true.\n\nIt requires `promoteAllResourceAttributes` to be true.\nIt requires Prometheus >= v3.5.0.", + "items": { + "minLength": 1, + "type": "string" + }, + "minItems": 1, + "type": "array", + "x-kubernetes-list-type": "set" + }, "keepIdentifyingResourceAttributes": { "description": "Enables adding `service.name`, `service.namespace` and `service.instance.id`\nresource attributes to the `target_info` metric, on top of converting them into the `instance` and `job` labels.\n\nIt requires Prometheus >= v3.1.0.", "type": "boolean" }, + "promoteAllResourceAttributes": { + "description": "Promote all resource attributes to metric labels except the ones defined in `ignoreResourceAttributes`.\n\nCannot be true when `promoteResourceAttributes` is defined.\nIt requires Prometheus >= v3.5.0.", + "type": "boolean" + }, "promoteResourceAttributes": { - "description": "List of OpenTelemetry Attributes that should be promoted to metric labels, defaults to none.", + "description": "List of OpenTelemetry Attributes that should be promoted to metric labels, defaults to none.\nCannot be defined when `promoteAllResourceAttributes` is true.", "items": { "minLength": 1, "type": "string" @@ -8921,6 +8935,10 @@ { "message": "persistentVolumeClaimRetentionPolicy cannot be set when mode is DaemonSet", "rule": "!(has(self.mode) && self.mode == 'DaemonSet' && has(self.persistentVolumeClaimRetentionPolicy))" + }, + { + "message": "scrapeConfigSelector cannot be set when mode is DaemonSet", + "rule": "!(has(self.mode) && self.mode == 'DaemonSet' && has(self.scrapeConfigSelector))" } ] }, 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 a1a57f42..2dfc36d7 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 @@ -4766,12 +4766,26 @@ "description": "Configures optional translation of OTLP explicit bucket histograms into native histograms with custom buckets.\nIt requires Prometheus >= v3.4.0.", "type": "boolean" }, + "ignoreResourceAttributes": { + "description": "List of OpenTelemetry resource attributes to ignore when `promoteAllResourceAttributes` is true.\n\nIt requires `promoteAllResourceAttributes` to be true.\nIt requires Prometheus >= v3.5.0.", + "items": { + "minLength": 1, + "type": "string" + }, + "minItems": 1, + "type": "array", + "x-kubernetes-list-type": "set" + }, "keepIdentifyingResourceAttributes": { "description": "Enables adding `service.name`, `service.namespace` and `service.instance.id`\nresource attributes to the `target_info` metric, on top of converting them into the `instance` and `job` labels.\n\nIt requires Prometheus >= v3.1.0.", "type": "boolean" }, + "promoteAllResourceAttributes": { + "description": "Promote all resource attributes to metric labels except the ones defined in `ignoreResourceAttributes`.\n\nCannot be true when `promoteResourceAttributes` is defined.\nIt requires Prometheus >= v3.5.0.", + "type": "boolean" + }, "promoteResourceAttributes": { - "description": "List of OpenTelemetry Attributes that should be promoted to metric labels, defaults to none.", + "description": "List of OpenTelemetry Attributes that should be promoted to metric labels, defaults to none.\nCannot be defined when `promoteAllResourceAttributes` is true.", "items": { "minLength": 1, "type": "string" 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 8f42cb39..9249b9e0 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 @@ -2260,6 +2260,15 @@ ], "type": "string" }, + "enableFeatures": { + "description": "Enable access to Thanos Ruler feature flags. By default, no features are enabled.\n\nEnabling features which are disabled by default is entirely outside the\nscope of what the maintainers will support and by doing so, you accept\nthat this behaviour may break at any time without notice.\n\nFor more information see https://thanos.io/tip/components/rule.md/\n\nIt requires Thanos >= 0.39.0.", + "items": { + "minLength": 1, + "type": "string" + }, + "type": "array", + "x-kubernetes-list-type": "set" + }, "enableServiceLinks": { "description": "Indicates whether information about services should be injected into pod's environment variables", "type": "boolean" @@ -4959,6 +4968,11 @@ "format": "int32", "type": "integer" }, + "resendDelay": { + "description": "Minimum amount of time to wait before resending an alert to Alertmanager.", + "pattern": "^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$", + "type": "string" + }, "resources": { "description": "Resources defines the resource requirements for single Pods.\nIf not provided, no requests/limits will be set", "properties": { @@ -5038,6 +5052,11 @@ "minimum": 1, "type": "integer" }, + "ruleGracePeriod": { + "description": "Minimum duration between alert and restored \"for\" state.\nThis is maintained only for alerts with configured \"for\" time greater than grace period.\nIt requires Thanos >= v0.30.0.", + "pattern": "^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$", + "type": "string" + }, "ruleNamespaceSelector": { "description": "Namespaces to be selected for Rules discovery. If unspecified, only\nthe same namespace as the ThanosRuler object is in is used.", "properties": {