Switch Grafana dev endpoint to local IP and re-enable contact points
All checks were successful
terraform-dev / validate (push) Successful in 5s
terraform-dev / plan (push) Successful in 5s
terraform-dev / apply (push) Has been skipped

This commit is contained in:
Alexandr
2026-03-25 09:10:16 +03:00
parent 44929ae54c
commit f60864dd8b
8 changed files with 26 additions and 12 deletions

View File

@ -37,8 +37,8 @@ module "grafana_contact_points01" {
source = "../../modules/grafana_contact_points" source = "../../modules/grafana_contact_points"
org_id = var.org_id org_id = var.org_id
env = var.env env = var.env
grafana_url = "https://grafana.pvenode.ru/" grafana_url = "http://192.168.0.106"
contact_points = local.contact_points contact_points = var.enable_contact_points ? local.contact_points : []
providers = { providers = {
grafana = grafana.grafana01 grafana = grafana.grafana01
} }
@ -48,8 +48,8 @@ module "grafana_contact_points01" {
module "grafana_notification_policies01" { module "grafana_notification_policies01" {
source = "../../modules/grafana_notification_policies" source = "../../modules/grafana_notification_policies"
org_id = var.org_id org_id = var.org_id
contact_points = local.contact_points contact_points = var.enable_contact_points ? local.contact_points : []
notification_policies = var.notification_policies notification_policies = var.enable_contact_points ? var.notification_policies : []
depends_on = [module.grafana_contact_points01] depends_on = [module.grafana_contact_points01]
providers = { providers = {
grafana = grafana.grafana01 grafana = grafana.grafana01

View File

@ -14,7 +14,7 @@ data "vault_kv_secret_v2" "secret_int" { # Секреты для работы с
provider "grafana" { provider "grafana" {
alias = "grafana01" alias = "grafana01"
url = "https://grafana.pvenode.ru/" url = "http://192.168.0.106"
auth = "admin:${data.vault_kv_secret_v2.secret_int.data["grafana_local_admin_password"]}" auth = "admin:${data.vault_kv_secret_v2.secret_int.data["grafana_local_admin_password"]}"
insecure_skip_verify = true insecure_skip_verify = true
http_headers = local.grafana_headers http_headers = local.grafana_headers

View File

@ -20,6 +20,7 @@ dashboard_uid_max_length = 40
# - This setting ensures that any changes made directly in the Grafana UI will not persist for these resources. # - This setting ensures that any changes made directly in the Grafana UI will not persist for these resources.
disable_provenance = true disable_provenance = true
enable_contact_points = true
# Grafana organization settings as an array of objects # Grafana organization settings as an array of objects
organizations = [ organizations = [

View File

@ -19,4 +19,10 @@ variable "env" {
type = string type = string
} }
variable "enable_contact_points" {
description = "Enable creation of Grafana contact points and notification policies"
type = bool
default = false
}

View File

@ -37,8 +37,8 @@ module "grafana_contact_points01" {
source = "../../modules/grafana_contact_points" source = "../../modules/grafana_contact_points"
org_id = var.org_id org_id = var.org_id
env = var.env env = var.env
grafana_url = "https://grafana.pvenode.ru/" grafana_url = "http://192.168.0.106"
contact_points = local.contact_points contact_points = var.enable_contact_points ? local.contact_points : []
providers = { providers = {
grafana = grafana.grafana01 grafana = grafana.grafana01
} }
@ -48,8 +48,8 @@ module "grafana_contact_points01" {
module "grafana_notification_policies01" { module "grafana_notification_policies01" {
source = "../../modules/grafana_notification_policies" source = "../../modules/grafana_notification_policies"
org_id = var.org_id org_id = var.org_id
contact_points = local.contact_points contact_points = var.enable_contact_points ? local.contact_points : []
notification_policies = var.notification_policies notification_policies = var.enable_contact_points ? var.notification_policies : []
depends_on = [module.grafana_contact_points01] depends_on = [module.grafana_contact_points01]
providers = { providers = {
grafana = grafana.grafana01 grafana = grafana.grafana01

View File

@ -14,7 +14,7 @@ data "vault_kv_secret_v2" "secret_int" { # Секреты для работы с
provider "grafana" { provider "grafana" {
alias = "grafana01" alias = "grafana01"
url = "https://grafana.pvenode.ru/" url = "http://192.168.0.106"
auth = "admin:${data.vault_kv_secret_v2.secret_int.data["grafana_local_admin_password"]}" auth = "admin:${data.vault_kv_secret_v2.secret_int.data["grafana_local_admin_password"]}"
insecure_skip_verify = true insecure_skip_verify = true
http_headers = local.grafana_headers http_headers = local.grafana_headers

View File

@ -20,6 +20,7 @@ dashboard_uid_max_length = 40
# - This setting ensures that any changes made directly in the Grafana UI will not persist for these resources. # - This setting ensures that any changes made directly in the Grafana UI will not persist for these resources.
disable_provenance = true disable_provenance = true
enable_contact_points = true
# Grafana organization settings as an array of objects # Grafana organization settings as an array of objects
organizations = [ organizations = [

View File

@ -19,4 +19,10 @@ variable "env" {
type = string type = string
} }
variable "enable_contact_points" {
description = "Enable creation of Grafana contact points and notification policies"
type = bool
default = false
}