From 326e18cd8ff4efd98a7466c175a678c8797d5183 Mon Sep 17 00:00:00 2001 From: Pete Wall Date: Sun, 9 Feb 2025 08:43:10 -0600 Subject: [PATCH] Make it possible to skip mysql logs integration (#1218) * Make it possible to skip mysql logs integration Signed-off-by: Pete Wall * Catch more instances Signed-off-by: Pete Wall --------- Signed-off-by: Pete Wall --- .../templates/_integration_mysql_logs.tpl | 6 ++---- .../tests/mysql_metrics_test.yaml | 5 +++++ .../examples/features/integrations/mysql/README.md | 3 +-- .../features/integrations/mysql/alloy-logs.alloy | 14 -------------- .../features/integrations/mysql/output.yaml | 14 -------------- .../features/integrations/mysql/values.yaml | 3 +-- 6 files changed, 9 insertions(+), 36 deletions(-) diff --git a/charts/k8s-monitoring/charts/feature-integrations/templates/_integration_mysql_logs.tpl b/charts/k8s-monitoring/charts/feature-integrations/templates/_integration_mysql_logs.tpl index 4c9d52aa4..97262474d 100644 --- a/charts/k8s-monitoring/charts/feature-integrations/templates/_integration_mysql_logs.tpl +++ b/charts/k8s-monitoring/charts/feature-integrations/templates/_integration_mysql_logs.tpl @@ -3,16 +3,14 @@ {{- $defaultValues := "integrations/mysql-values.yaml" | .Files.Get | fromYaml }} {{- $logsEnabled := false }} {{- range $instance := .Values.mysql.instances }} - {{- with merge $instance $defaultValues (dict "type" "integration.mysql") }} - {{- $logsEnabled = or $logsEnabled $instance.logs.enabled }} - {{- end }} + {{- $logsEnabled = or $logsEnabled (dig "logs" "enabled" true $instance) }} {{- end }} {{- $logsEnabled -}} {{- end }} {{- define "integrations.mysql.logs.discoveryRules" }} {{- range $instance := $.Values.mysql.instances }} - {{- if $instance.logs.enabled }} + {{- if ne (dig "logs" "enabled" true $instance) false }} {{- $labelList := list }} {{- $valueList := list }} {{- if .logs.namespaces }} diff --git a/charts/k8s-monitoring/charts/feature-integrations/tests/mysql_metrics_test.yaml b/charts/k8s-monitoring/charts/feature-integrations/tests/mysql_metrics_test.yaml index 0a2d9c9bf..ee4b99720 100644 --- a/charts/k8s-monitoring/charts/feature-integrations/tests/mysql_metrics_test.yaml +++ b/charts/k8s-monitoring/charts/feature-integrations/tests/mysql_metrics_test.yaml @@ -16,6 +16,7 @@ tests: auth: username: db-admin password: db-password + logs: {enabled: false} asserts: - template: configmap.yaml isKind: @@ -84,9 +85,11 @@ tests: exporter: dataSource: host: database.test.svc + logs: {enabled: false} - name: staging-db exporter: dataSourceName: "root:password@database.staging.svc:3306/" + logs: {enabled: false} - name: prod-db exporter: dataSource: @@ -94,6 +97,7 @@ tests: auth: username: db-admin password: db-password + logs: {enabled: false} asserts: - template: configmap.yaml isKind: @@ -210,6 +214,7 @@ tests: create: false name: test-database-mysql namespace: mysql + logs: {enabled: false} asserts: - template: configmap.yaml isKind: diff --git a/charts/k8s-monitoring/docs/examples/features/integrations/mysql/README.md b/charts/k8s-monitoring/docs/examples/features/integrations/mysql/README.md index b81a5dbcd..a77006a2c 100644 --- a/charts/k8s-monitoring/docs/examples/features/integrations/mysql/README.md +++ b/charts/k8s-monitoring/docs/examples/features/integrations/mysql/README.md @@ -28,8 +28,7 @@ integrations: exporter: dataSourceName: "root:password@database.staging.svc:3306/" logs: - labelSelectors: - app.kubernetes.io/instance: staging-db + enabled: false - name: prod-db exporter: diff --git a/charts/k8s-monitoring/docs/examples/features/integrations/mysql/alloy-logs.alloy b/charts/k8s-monitoring/docs/examples/features/integrations/mysql/alloy-logs.alloy index 6cee613c1..765337982 100644 --- a/charts/k8s-monitoring/docs/examples/features/integrations/mysql/alloy-logs.alloy +++ b/charts/k8s-monitoring/docs/examples/features/integrations/mysql/alloy-logs.alloy @@ -117,20 +117,6 @@ declare "pod_logs" { source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_name"] target_label = "app_kubernetes_io_name" } - rule { - source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_instance"] - separator = ";" - regex = "(?:staging-db)" - target_label = "integration" - replacement = "mysql" - } - rule { - source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_instance"] - separator = ";" - regex = "(?:staging-db)" - target_label = "instance" - replacement = "staging-db" - } rule { source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_instance"] separator = ";" diff --git a/charts/k8s-monitoring/docs/examples/features/integrations/mysql/output.yaml b/charts/k8s-monitoring/docs/examples/features/integrations/mysql/output.yaml index de3bbf590..de3c6c3f5 100644 --- a/charts/k8s-monitoring/docs/examples/features/integrations/mysql/output.yaml +++ b/charts/k8s-monitoring/docs/examples/features/integrations/mysql/output.yaml @@ -342,20 +342,6 @@ data: source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_name"] target_label = "app_kubernetes_io_name" } - rule { - source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_instance"] - separator = ";" - regex = "(?:staging-db)" - target_label = "integration" - replacement = "mysql" - } - rule { - source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_instance"] - separator = ";" - regex = "(?:staging-db)" - target_label = "instance" - replacement = "staging-db" - } rule { source_labels = ["__meta_kubernetes_pod_label_app_kubernetes_io_instance"] separator = ";" diff --git a/charts/k8s-monitoring/docs/examples/features/integrations/mysql/values.yaml b/charts/k8s-monitoring/docs/examples/features/integrations/mysql/values.yaml index 1cb12cff3..6878bd159 100644 --- a/charts/k8s-monitoring/docs/examples/features/integrations/mysql/values.yaml +++ b/charts/k8s-monitoring/docs/examples/features/integrations/mysql/values.yaml @@ -17,8 +17,7 @@ integrations: exporter: dataSourceName: "root:password@database.staging.svc:3306/" logs: - labelSelectors: - app.kubernetes.io/instance: staging-db + enabled: false - name: prod-db exporter: