From 11140a2240ec519adbe910c81973057784c3eced Mon Sep 17 00:00:00 2001 From: Quentin Bisson Date: Tue, 1 Oct 2024 22:56:40 +0200 Subject: [PATCH] Get rid of the legacy in-house slo framework (#421) * Get rid of the legacy in-house slo framework Towards giantswarm/giantswarm#31095 Getting rid of the legacy in-house slo framework * Update README.md * Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ helm/kube-prometheus-stack/README.md | 8 ++++---- helm/kube-prometheus-stack/values.yaml | 8 ++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 546b4da1..a00311e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project's packages adheres to [Semantic Versioning](http://semver.org/s ## [Unreleased] +### Removed + +- Get rid of legacy in-house slo framework. + ## [11.0.0] - 2024-06-28 ### Changed diff --git a/helm/kube-prometheus-stack/README.md b/helm/kube-prometheus-stack/README.md index aed9f2f2..8b5534f2 100644 --- a/helm/kube-prometheus-stack/README.md +++ b/helm/kube-prometheus-stack/README.md @@ -78,11 +78,11 @@ Kubernetes: `>=1.19.0-0` | kube-prometheus-stack.kube-state-metrics.collectors[8] | string | `"jobs"` | | | kube-prometheus-stack.kube-state-metrics.collectors[9] | string | `"leases"` | | | kube-prometheus-stack.kube-state-metrics.image.repository | string | `"giantswarm/kube-state-metrics"` | | -| kube-prometheus-stack.kube-state-metrics.metricLabelsAllowlist[0] | string | `"daemonsets=[application.giantswarm.io/team, app.kubernetes.io/name, app.kubernetes.io/component, app.kubernetes.io/instance, giantswarm.io/monitoring_basic_sli, giantswarm.io/service-type]"` | | -| kube-prometheus-stack.kube-state-metrics.metricLabelsAllowlist[1] | string | `"deployments=[application.giantswarm.io/team, app.kubernetes.io/name, app.kubernetes.io/component, app.kubernetes.io/instance, giantswarm.io/monitoring_basic_sli, giantswarm.io/service-type]"` | | +| kube-prometheus-stack.kube-state-metrics.metricLabelsAllowlist[0] | string | `"daemonsets=[application.giantswarm.io/team, app.kubernetes.io/name, app.kubernetes.io/component, app.kubernetes.io/instance, giantswarm.io/service-type]"` | | +| kube-prometheus-stack.kube-state-metrics.metricLabelsAllowlist[1] | string | `"deployments=[application.giantswarm.io/team, app.kubernetes.io/name, app.kubernetes.io/component, app.kubernetes.io/instance, giantswarm.io/service-type]"` | | | kube-prometheus-stack.kube-state-metrics.metricLabelsAllowlist[2] | string | `"nodes=[giantswarm.io/machine-pool, giantswarm.io/machine-deployment, ip, topology.kubernetes.io/region, topology.kubernetes.io/zone]"` | | -| kube-prometheus-stack.kube-state-metrics.metricLabelsAllowlist[3] | string | `"pods=[application.giantswarm.io/team, app.kubernetes.io/name, app.kubernetes.io/component, app.kubernetes.io/instance, giantswarm.io/monitoring_basic_sli, giantswarm.io/service-type]"` | | -| kube-prometheus-stack.kube-state-metrics.metricLabelsAllowlist[4] | string | `"statefulsets=[application.giantswarm.io/team, app.kubernetes.io/name, app.kubernetes.io/component, app.kubernetes.io/instance, giantswarm.io/monitoring_basic_sli, giantswarm.io/service-type]"` | | +| kube-prometheus-stack.kube-state-metrics.metricLabelsAllowlist[3] | string | `"pods=[application.giantswarm.io/team, app.kubernetes.io/name, app.kubernetes.io/component, app.kubernetes.io/instance, giantswarm.io/service-type]"` | | +| kube-prometheus-stack.kube-state-metrics.metricLabelsAllowlist[4] | string | `"statefulsets=[application.giantswarm.io/team, app.kubernetes.io/name, app.kubernetes.io/component, app.kubernetes.io/instance, giantswarm.io/service-type]"` | | | kube-prometheus-stack.kube-state-metrics.networkPolicy.egress[0].to[0].ipBlock.cidr | string | `"10.0.0.0/8"` | | | kube-prometheus-stack.kube-state-metrics.networkPolicy.egress[0].to[1].ipBlock.cidr | string | `"172.16.0.0/12"` | | | kube-prometheus-stack.kube-state-metrics.networkPolicy.egress[0].to[2].ipBlock.cidr | string | `"192.168.0.0/16"` | | diff --git a/helm/kube-prometheus-stack/values.yaml b/helm/kube-prometheus-stack/values.yaml index c2b5d4b5..97f05716 100644 --- a/helm/kube-prometheus-stack/values.yaml +++ b/helm/kube-prometheus-stack/values.yaml @@ -245,11 +245,11 @@ kube-prometheus-stack: metricLabelsAllowlist: - cronjobs=[application.giantswarm.io/team, app.kubernetes.io/name] - jobs=[application.giantswarm.io/team, app.kubernetes.io/name] - - daemonsets=[application.giantswarm.io/team, app.kubernetes.io/name, app.kubernetes.io/component, app.kubernetes.io/instance, giantswarm.io/monitoring_basic_sli, giantswarm.io/service-type] - - deployments=[application.giantswarm.io/team, app.kubernetes.io/name, app.kubernetes.io/component, app.kubernetes.io/instance, giantswarm.io/monitoring_basic_sli, giantswarm.io/service-type] + - daemonsets=[application.giantswarm.io/team, app.kubernetes.io/name, app.kubernetes.io/component, app.kubernetes.io/instance, giantswarm.io/service-type] + - deployments=[application.giantswarm.io/team, app.kubernetes.io/name, app.kubernetes.io/component, app.kubernetes.io/instance, giantswarm.io/service-type] - nodes=[giantswarm.io/machine-pool, giantswarm.io/machine-deployment, ip, node.kubernetes.io/instance-type, topology.kubernetes.io/region, topology.kubernetes.io/zone] - - pods=[application.giantswarm.io/team, app.kubernetes.io/name, app.kubernetes.io/component, app.kubernetes.io/instance, giantswarm.io/monitoring_basic_sli, giantswarm.io/service-type] - - statefulsets=[application.giantswarm.io/team, app.kubernetes.io/name, app.kubernetes.io/component, app.kubernetes.io/instance, giantswarm.io/monitoring_basic_sli, giantswarm.io/service-type] + - pods=[application.giantswarm.io/team, app.kubernetes.io/name, app.kubernetes.io/component, app.kubernetes.io/instance, giantswarm.io/service-type] + - statefulsets=[application.giantswarm.io/team, app.kubernetes.io/name, app.kubernetes.io/component, app.kubernetes.io/instance, giantswarm.io/service-type] networkPolicy: enabled: true flavor: kubernetes