From 00bc0c7ef763dbf68c23ea668cb3baf45741f1aa Mon Sep 17 00:00:00 2001 From: Dustin Kaiser Date: Mon, 16 Dec 2024 10:50:04 +0100 Subject: [PATCH] Make osparc-config dotenv-precommit pass: Use all caps env-vars --- services/monitoring/grafana/terraform/datasources.tf | 6 +++--- services/monitoring/grafana/terraform/main.tf | 4 ++-- services/monitoring/grafana/terraform/variables.tf | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/services/monitoring/grafana/terraform/datasources.tf b/services/monitoring/grafana/terraform/datasources.tf index f8a996eb..62a5ab38 100644 --- a/services/monitoring/grafana/terraform/datasources.tf +++ b/services/monitoring/grafana/terraform/datasources.tf @@ -2,7 +2,7 @@ resource "grafana_data_source" "prometheusfederation" { type = "prometheus" name = "prometheus-federation" - url = var.prometheus_federation_url + url = var.PROMETHEUS_FEDERATION_URL basic_auth_enabled = false is_default = true } @@ -10,7 +10,7 @@ resource "grafana_data_source" "prometheusfederation" { resource "grafana_data_source" "prometheuscatchall" { type = "prometheus" name = "prometheus-catchall" - url = var.prometheus_catchall_url + url = var.PROMETHEUS_CATCHALL_URL basic_auth_enabled = false is_default = false uid = "RmZEr52nz" @@ -19,7 +19,7 @@ resource "grafana_data_source" "prometheuscatchall" { resource "grafana_data_source" "tempo" { type = "tempo" name = "tempo" - url = var.tempo_url + url = var.TEMPO_URL basic_auth_enabled = false is_default = false } diff --git a/services/monitoring/grafana/terraform/main.tf b/services/monitoring/grafana/terraform/main.tf index efe82fa6..1b0f0467 100644 --- a/services/monitoring/grafana/terraform/main.tf +++ b/services/monitoring/grafana/terraform/main.tf @@ -16,6 +16,6 @@ terraform { } provider "grafana" { - url = var.grafana_url - auth = var.grafana_auth + url = var.GRAFANA_URL + auth = var.GRAFANA_AUTH } diff --git a/services/monitoring/grafana/terraform/variables.tf b/services/monitoring/grafana/terraform/variables.tf index 113d4d54..6427b9b5 100644 --- a/services/monitoring/grafana/terraform/variables.tf +++ b/services/monitoring/grafana/terraform/variables.tf @@ -1,20 +1,20 @@ -variable "grafana_url" { +variable "GRAFANA_URL" { description = "grafana_url" sensitive = false } -variable "grafana_auth" { +variable "GRAFANA_AUTH" { description = "Username:Password" sensitive = true } -variable "prometheus_federation_url" { +variable "PROMETHEUS_FEDERATION_URL" { description = "Prometheus Federation URL" sensitive = false } -variable "prometheus_catchall_url" { +variable "PROMETHEUS_CATCHALL_URL" { description = "Prometheus Catchall URL" sensitive = false } -variable "tempo_url" { +variable "TEMPO_URL" { description = "Tempo URL" sensitive = false }