From db37ba47139075680139f286a1f79601355a2780 Mon Sep 17 00:00:00 2001 From: Kalin Krustev Date: Wed, 20 Nov 2024 07:43:47 +0000 Subject: [PATCH 1/3] fix: configurable chart repository for grafana, prometheus, tempo, loki --- .../monitoring/install/kustomization.yaml.tpl | 10 +++++----- terraform/k8s/default-config/common-vars.yaml | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/terraform/gitops/generate-files/templates/monitoring/install/kustomization.yaml.tpl b/terraform/gitops/generate-files/templates/monitoring/install/kustomization.yaml.tpl index fe05f8cd7..e0a5a1bf5 100644 --- a/terraform/gitops/generate-files/templates/monitoring/install/kustomization.yaml.tpl +++ b/terraform/gitops/generate-files/templates/monitoring/install/kustomization.yaml.tpl @@ -19,25 +19,25 @@ helmCharts: - name: kube-prometheus releaseName: ${prometheus_operator_release_name} version: ${prometheus_operator_version} - repo: oci://registry-1.docker.io/bitnamicharts + repo: ${prometheus_operator_repo} valuesFile: values-prom-operator.yaml namespace: ${monitoring_namespace} - name: grafana-operator releaseName: grafana version: ${grafana_operator_version} - repo: oci://registry-1.docker.io/bitnamicharts + repo: ${grafana_operator_repo} valuesFile: values-grafana-operator.yaml namespace: ${monitoring_namespace} - name: grafana-loki releaseName: ${loki_release_name} version: ${loki_chart_version} - repo: oci://registry-1.docker.io/bitnamicharts + repo: ${loki_repo} valuesFile: values-loki.yaml namespace: ${monitoring_namespace} - name: grafana-tempo releaseName: tempo version: ${tempo_chart_version} - repo: oci://registry-1.docker.io/bitnamicharts + repo: ${tempo_repo} valuesFile: values-tempo.yaml namespace: ${monitoring_namespace} - name: opentelemetry-operator @@ -51,4 +51,4 @@ helmCharts: version: ${prometheus_process_exporter_version} repo: https://raw.githubusercontent.com/mumoshu/prometheus-process-exporter/master/docs valuesFile: values-process-exporter.yaml - namespace: ${monitoring_namespace} + namespace: ${monitoring_namespace} diff --git a/terraform/k8s/default-config/common-vars.yaml b/terraform/k8s/default-config/common-vars.yaml index a5d5abaa3..40b92b471 100644 --- a/terraform/k8s/default-config/common-vars.yaml +++ b/terraform/k8s/default-config/common-vars.yaml @@ -24,12 +24,16 @@ opentelemetry_chart_version: 0.56.0 opentelemetry_enabled: false opentelemetry_namespace_filtering_enable: false prometheus_crd_version: 8.0.1 +prometheus_operator_repo: oci://registry-1.docker.io/bitnamicharts prometheus_operator_version: 8.22.8 prometheus_process_exporter_version: 0.4.2 +grafana_operator_repo: oci://registry-1.docker.io/bitnamicharts grafana_operator_version: 3.5.11 grafana_version: 10.2.3 grafana_dashboard_tag: v16.3.0-snapshot.24 # TODO: update once v16.1.x is published +tempo_repo: oci://registry-1.docker.io/bitnamicharts tempo_chart_version: 3.1.0 +loki_repo: oci://registry-1.docker.io/bitnamicharts loki_chart_version: 2.13.0 loki_ingester_pvc_size: 10Gi prometheus_pvc_size: 50Gi From f0ffc3194c1cd900d8b3f1d3d830ce2334615ca6 Mon Sep 17 00:00:00 2001 From: Kalin Krustev Date: Wed, 20 Nov 2024 08:37:23 +0000 Subject: [PATCH 2/3] fix: configurable chart repository for grafana, prometheus, tempo, loki --- terraform/gitops/k8s-cluster-config/monitoring.tf | 5 +++++ terraform/k8s/default-config/common-vars.yaml | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/terraform/gitops/k8s-cluster-config/monitoring.tf b/terraform/gitops/k8s-cluster-config/monitoring.tf index 88383a26c..752aa028c 100644 --- a/terraform/gitops/k8s-cluster-config/monitoring.tf +++ b/terraform/gitops/k8s-cluster-config/monitoring.tf @@ -3,14 +3,18 @@ module "generate_monitoring_files" { var_map = { grafana_crd_version_tag = try(var.common_var_map.grafana_crd_version_tag, local.grafana_crd_version_tag) prometheus_crd_version = try(var.common_var_map.prometheus_crd_version, local.prometheus_crd_version) + loki_repo = try(var.common_var_map.loki_repo, local.bitnami_repo) loki_chart_version = try(var.common_var_map.loki_chart_version, local.loki_chart_version) + prometheus_operator_repo = try(var.common_var_map.prometheus_operator_repo, local.bitnami_repo) prometheus_operator_version = try(var.common_var_map.prometheus_operator_version, local.prometheus_operator_version) prometheus_operator_release_name = local.prometheus_operator_release_name prometheus_process_exporter_version = try(var.common_var_map.prometheus_process_exporter_version, local.prometheus_process_exporter_version) loki_release_name = local.loki_release_name + grafana_chart_repo = try(var.common_var_map.grafana_chart_repo, local.bitnami_repo) grafana_operator_version = try(var.common_var_map.grafana_operator_version, local.grafana_operator_version) grafana_version = try(var.common_var_map.grafana_version, local.grafana_version) grafana_dashboard_tag = try(var.common_var_map.grafana_dashboard_tag, local.grafana_dashboard_tag) + tempo_repo = try(var.common_var_map.tempo_repo, local.bitnami_repo) tempo_chart_version = try(var.common_var_map.tempo_chart_version, local.tempo_chart_version) opentelemetry_chart_version = try(var.common_var_map.opentelemetry_chart_version, local.opentelemetry_chart_version) monitoring_namespace = var.monitoring_namespace @@ -125,6 +129,7 @@ variable "monitoring_namespace" { } locals { + bitnami_repo = "oci://registry-1.docker.io/bitnamicharts" grafana_crd_version_tag = "v5.6.0" prometheus_crd_version = "8.0.1" opentelemetry_chart_version = "0.56.0" diff --git a/terraform/k8s/default-config/common-vars.yaml b/terraform/k8s/default-config/common-vars.yaml index 40b92b471..a5d5abaa3 100644 --- a/terraform/k8s/default-config/common-vars.yaml +++ b/terraform/k8s/default-config/common-vars.yaml @@ -24,16 +24,12 @@ opentelemetry_chart_version: 0.56.0 opentelemetry_enabled: false opentelemetry_namespace_filtering_enable: false prometheus_crd_version: 8.0.1 -prometheus_operator_repo: oci://registry-1.docker.io/bitnamicharts prometheus_operator_version: 8.22.8 prometheus_process_exporter_version: 0.4.2 -grafana_operator_repo: oci://registry-1.docker.io/bitnamicharts grafana_operator_version: 3.5.11 grafana_version: 10.2.3 grafana_dashboard_tag: v16.3.0-snapshot.24 # TODO: update once v16.1.x is published -tempo_repo: oci://registry-1.docker.io/bitnamicharts tempo_chart_version: 3.1.0 -loki_repo: oci://registry-1.docker.io/bitnamicharts loki_chart_version: 2.13.0 loki_ingester_pvc_size: 10Gi prometheus_pvc_size: 50Gi From ffcaa7d3f12075610961b98673d3dbe15739f67f Mon Sep 17 00:00:00 2001 From: Kalin Krustev Date: Wed, 20 Nov 2024 09:08:32 +0000 Subject: [PATCH 3/3] fix: configurable chart repository for grafana, prometheus, tempo, loki --- terraform/gitops/k8s-cluster-config/monitoring.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/gitops/k8s-cluster-config/monitoring.tf b/terraform/gitops/k8s-cluster-config/monitoring.tf index 752aa028c..0614d056e 100644 --- a/terraform/gitops/k8s-cluster-config/monitoring.tf +++ b/terraform/gitops/k8s-cluster-config/monitoring.tf @@ -10,7 +10,7 @@ module "generate_monitoring_files" { prometheus_operator_release_name = local.prometheus_operator_release_name prometheus_process_exporter_version = try(var.common_var_map.prometheus_process_exporter_version, local.prometheus_process_exporter_version) loki_release_name = local.loki_release_name - grafana_chart_repo = try(var.common_var_map.grafana_chart_repo, local.bitnami_repo) + grafana_operator_repo = try(var.common_var_map.grafana_operator_repo, local.bitnami_repo) grafana_operator_version = try(var.common_var_map.grafana_operator_version, local.grafana_operator_version) grafana_version = try(var.common_var_map.grafana_version, local.grafana_version) grafana_dashboard_tag = try(var.common_var_map.grafana_dashboard_tag, local.grafana_dashboard_tag)