Sanitize company references and update Vault/Grafana endpoints

environments/dev/Seahorse/backend.tf

@@ -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
-  }
 }

environments/dev/Seahorse/main.tf

@@ -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

environments/dev/Seahorse/providers.tf

@@ -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
 }

environments/dev/adibrov/backend.tf

@@ -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                         = "a.dibrov-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
-  }
 }

environments/dev/adibrov/main.tf

@@ -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

environments/dev/adibrov/providers.tf

@@ -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
 }