Sanitize company references and update Vault/Grafana endpoints
Some checks failed
terraform-dev / validate (push) Failing after 18s
terraform-dev / plan (push) Has been skipped
terraform-dev / apply (push) Has been skipped

This commit is contained in:
Alexandr
2026-03-25 07:11:12 +03:00
parent 558a23d916
commit 5b4c925e99
8 changed files with 14 additions and 54 deletions

View File

@ -8,17 +8,4 @@ terraform {
source = "hashicorp/vault"
}
}
backend "s3" {
endpoints = {
s3 = "https://storage.yandexcloud.net" }
bucket = "monitoring-vcmt-core-deploy"
region = "ru-central1"
key = "dev-denis-practic/terraform.tfstate"
skip_region_validation = true
skip_credentials_validation = true
skip_requesting_account_id = true
skip_s3_checksum = true
skip_metadata_api_check = true
}
}

View File

@ -37,7 +37,7 @@ module "grafana_contact_points01" {
source = "../../../modules/grafana_contact_points"
org_id = var.org_id
env = var.env
grafana_url = "https://grafana-dev.hhmon.ru/"
grafana_url = "https://grafana.pvenode.ru/"
contact_points = local.contact_points
providers = {
grafana = grafana.grafana01

View File

@ -1,21 +1,20 @@
provider "vault" {
address = "https://vault.pyn.ru"
skip_child_token = true
}
data "vault_kv_secret_v2" "secret_ext" { # Секреты для подключения к внешним источникам (mm, clickhouse и т.д.)
mount = "app"
name = "groups/infraservice/monitoring/grafana/dev/ext"
name = "groups/monitoring/grafana/dev/ext"
}
data "vault_kv_secret_v2" "secret_int" { # Секреты для работы самой графаны
mount = "app"
name = "groups/infraservice/monitoring/grafana/dev/int"
name = "groups/monitoring/grafana/dev/int"
}
provider "grafana" {
alias = "grafana01"
url = "https://grafana-dev.hhmon.ru/"
url = "https://grafana.pvenode.ru/"
auth = data.vault_kv_secret_v2.secret_int.data["grafana_local_admin_password"]
http_headers = local.grafana_headers
}