From 0780d255edf8df57589cc7e26e76e06d71109193 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Mon, 9 Oct 2023 19:48:39 +0100 Subject: [PATCH] Remove grafana-cloud I've migrated back to Uptime Robot, for simplicity. Sadly their API limits make it almost impossible to properly Terraform. --- terraform/.terraform.lock.hcl | 35 ---------- terraform/grafana_cloud.tf | 118 ---------------------------------- terraform/providers.tf | 7 -- terraform/terraform.tf | 4 -- terraform/variables.tf | 8 --- 5 files changed, 172 deletions(-) delete mode 100644 terraform/grafana_cloud.tf diff --git a/terraform/.terraform.lock.hcl b/terraform/.terraform.lock.hcl index 9b04c11..50da3b5 100644 --- a/terraform/.terraform.lock.hcl +++ b/terraform/.terraform.lock.hcl @@ -68,41 +68,6 @@ provider "registry.terraform.io/go-gandi/gandi" { ] } -provider "registry.terraform.io/grafana/grafana" { - version = "1.39.0" - constraints = "1.39.0" - hashes = [ - "h1:1mM6Lo7QLyOsRYp3dPAFPmBcFHqyJO/YK6l92zjQXNg=", - "h1:C5qvkdvImXqdUu7W8ISdv7h1GryA4SGi4ea2CxyNFew=", - "h1:DQQX+e1cs+cEZsL+Q5EMJ4IuHe0tWbKQ0UaqB3INuhc=", - "h1:EWB6w80b9MBMWRJcZhznYLBmAl0cDXXOqouduPhOz50=", - "h1:Nl4nVj1TUl81opVp7In4NCnwSrbj3RSSvAH3jocBwl4=", - "h1:X+qxgNRQHoymJtzB5iO91TP8/Qo5oG0Cyy39Y09+M4Q=", - "h1:XnopxRTFHnNQ7CXBKgEu8+/0pUyeyAF4Vnw2SNF2UYM=", - "h1:ZvOO4RcqIgR4X16vOjqoAtigKSvFZ2YCoq5T6plaCds=", - "h1:h3hwjn2l0PGsz5gPK+qfXggOj4HG31HUJiGsIm9FyRY=", - "h1:iLOhpNj4n5iVhGM8AqeQ2kfi36MbEXUFsOjiyJABYv8=", - "h1:kIpAobauPuPVyqH9GxENq3V+8q2xdinEDDjlsHTXMLI=", - "h1:p3/FqgDiBmkZcLkuIPsZdLfh3m0VRAg1mRJI+icQXlQ=", - "h1:vGiT7sf1y+8ytOEGTJAOpCEvhYV9+g3cpyh8w0+q0d4=", - "h1:z7cRviSsuqmSf5yPc4Iiv0Pb9ckxNwZlskSNwb1ynyE=", - "zh:44a628995f19af4aaffd1850636d53629b378bb024294315412e5dd38b44346b", - "zh:4728b1852e8373e5bfdecb08516eca6a23d1a839aeec70272f4aacce87371987", - "zh:58990894ceeebb389202b15d1d4566b1ef50b2f1ad5b8a74843f6cce1fa3d8b1", - "zh:60d5258498f6f3d223c3d2fbdfd80c48f7f94f848afd2d020435d3adfe40181d", - "zh:6511cfcac3e94307af9a934fa947ea7f35c807ad27fff4e4c69f3355d22ded38", - "zh:7b68d76e3e423aaedb4a76b73a2cc5f92d3647512d0291cd9cae1f0bce4b2053", - "zh:9819f231ff2dbac0e03a292ef3174b5b219e0611e41991afe8fe2b1592d43c24", - "zh:a582a002c78eece4361433f661db2c351864ef9b73ac8208fbad39897d93de95", - "zh:a8f6bedc2c21e8b300eeffe892105e0fd2d25fef26f58ed573404f94090b3439", - "zh:b65ee5850289459e8a6d21d2229756405aec897e23794c452c21e00c6ff81c6f", - "zh:ce5ca97ae36c39a5aa1fdf5714b8204d98d32d33009febd0758e6414a032727b", - "zh:da1e8b938b7f93990a3e960b4bcb4768c8f6187161646dfcbd47b636e4725d8c", - "zh:f22131b245519ee605b82ff13ce686b1f5301b8293532c97f4de8a5a2cdf2153", - "zh:fe92388019044cdae3e7112bac5896bc0c3523e1065764f0c88308edae185199", - ] -} - provider "registry.terraform.io/hashicorp/aws" { version = "4.67.0" constraints = "4.67.0" diff --git a/terraform/grafana_cloud.tf b/terraform/grafana_cloud.tf deleted file mode 100644 index 562806c..0000000 --- a/terraform/grafana_cloud.tf +++ /dev/null @@ -1,118 +0,0 @@ -data "grafana_synthetic_monitoring_probes" "main" {} - -locals { - partial_global_probes = [ - data.grafana_synthetic_monitoring_probes.main.probes.CapeTown, - data.grafana_synthetic_monitoring_probes.main.probes.Frankfurt, - data.grafana_synthetic_monitoring_probes.main.probes.London, - data.grafana_synthetic_monitoring_probes.main.probes.Mumbai, - data.grafana_synthetic_monitoring_probes.main.probes.NewYork, - data.grafana_synthetic_monitoring_probes.main.probes.NorthCalifornia, - data.grafana_synthetic_monitoring_probes.main.probes.SaoPaulo, - data.grafana_synthetic_monitoring_probes.main.probes.Seoul, - data.grafana_synthetic_monitoring_probes.main.probes.Singapore, - data.grafana_synthetic_monitoring_probes.main.probes.Sydney, - data.grafana_synthetic_monitoring_probes.main.probes.Toronto, - ] -} - -resource "grafana_synthetic_monitoring_check" "vps_ping" { - for_each = { - casey = linode_instance.casey.ip_address - walker = vultr_instance.walker.main_ip - } - - job = "${each.key} v4" - target = each.value - enabled = true - probes = local.partial_global_probes - alert_sensitivity = "medium" - - frequency = 120 * 1000 # 2 minutes - - settings { - ping { - ip_version = "V4" - } - } -} - -resource "grafana_synthetic_monitoring_check" "vps_ping_v6" { - for_each = { - casey = split("/", linode_instance.casey.ipv6)[0] - walker = vultr_instance.walker.v6_main_ip - } - - job = "${each.key} v6" - target = each.value - enabled = true - probes = local.partial_global_probes - alert_sensitivity = "medium" - - frequency = 120 * 1000 # 2 minutes - - settings { - ping { - ip_version = "V6" - } - } -} - - -resource "grafana_synthetic_monitoring_check" "personal_website" { - job = "Personal Website" - target = "https://theorangeone.net/.health/" - enabled = true - probes = local.partial_global_probes - alert_sensitivity = "medium" - timeout = 5000 # 5 seconds - - frequency = 120 * 1000 # 2 minutes - - settings { - http { - ip_version = "Any" - method = "GET" - } - } -} - - -resource "grafana_synthetic_monitoring_check" "grafana" { - job = "Grafana" - target = "https://grafana.jakehoward.tech/api/health" - enabled = true - probes = [ - data.grafana_synthetic_monitoring_probes.main.probes.London - ] - alert_sensitivity = "medium" - - frequency = 120 * 1000 # 2 minutes - - settings { - http { - ip_version = "Any" - method = "GET" - } - } -} - - -resource "grafana_synthetic_monitoring_check" "whoami" { - job = "Whoami" - target = "https://whoami.theorangeone.net" - enabled = true - probes = [ - data.grafana_synthetic_monitoring_probes.main.probes.London - ] - alert_sensitivity = "medium" - - frequency = 120 * 1000 # 2 minutes - - settings { - http { - ip_version = "Any" - method = "GET" - } - } -} diff --git a/terraform/providers.tf b/terraform/providers.tf index 74ebc6d..7bbc680 100644 --- a/terraform/providers.tf +++ b/terraform/providers.tf @@ -21,13 +21,6 @@ provider "gandi" { key = var.gandi_api_key } -provider "grafana" { - url = "https://theorangeone.grafana.net" - auth = var.grafana_cloud_api_key - sm_access_token = var.grafana_cloud_synthetic_monitoring_token - sm_url = "https://synthetic-monitoring-api-gb-south.grafana.net" -} - provider "b2" { application_key = var.backblaze_application_key application_key_id = var.backblaze_application_key_id diff --git a/terraform/terraform.tf b/terraform/terraform.tf index 492a0d9..7c9feaa 100644 --- a/terraform/terraform.tf +++ b/terraform/terraform.tf @@ -20,10 +20,6 @@ terraform { source = "go-gandi/gandi" version = "2.2.3" } - grafana = { - source = "grafana/grafana" - version = "1.39.0" - } b2 = { source = "Backblaze/b2" version = "0.8.4" diff --git a/terraform/variables.tf b/terraform/variables.tf index ac7c365..98b6bdd 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -18,14 +18,6 @@ variable "gandi_api_key" { sensitive = true } -variable "grafana_cloud_api_key" { - sensitive = true -} - -variable "grafana_cloud_synthetic_monitoring_token" { - sensitive = true -} - variable "backblaze_application_key" { sensitive = true }