feat: uptime_namespace_id, taito_uptime_provider_org_id

Author: keskiju

scripts/taito-template/common.sh

@@ -108,6 +108,8 @@ sed -i "s/\${template_default_host_prod:-}/${template_default_host_prod:-}/g" ta
 # Misc providers
 sed -i "s/\${template_default_uptime_provider:-}/${template_default_uptime_provider:-}/g" taito-config.sh
 sed -i "s/\${template_default_uptime_provider_prod:-}/${template_default_uptime_provider_prod:-}/g" taito-config.sh
+sed -i "s/\${template_default_uptime_provider_org_id:-}/${template_default_uptime_provider_org_id:-}/g" taito-config.sh
+sed -i "s/\${template_default_uptime_provider_org_id_prod:-}/${template_default_uptime_provider_org_id_prod:-}/g" taito-config.sh
 
 # CI/CD
 sed -i "s/\${template_default_ci_provider:?}/${template_default_ci_provider}/g" taito-config.sh

scripts/terraform/common/gcloud-uptime/uptime.tf

@@ -1,7 +1,7 @@
 resource "google_monitoring_uptime_check_config" "https" {
   count = "${length(var.taito_uptime_targets)}"
 
-  project = "${var.taito_zone}"
+  project = "${var.taito_uptime_namespace_id}"
   display_name = "${var.taito_project}-${var.taito_env}-${element(var.taito_uptime_targets, count.index)}"
   timeout = "${element(var.taito_uptime_timeouts, count.index)}"
 
@@ -24,7 +24,7 @@ resource "google_monitoring_alert_policy" "https" {
   count = "${length(var.taito_uptime_targets) > 0 ? 1 : 0}"
   enabled = "true"
 
-  project = "${var.taito_zone}"
+  project = "${var.taito_uptime_namespace_id}"
   display_name = "${var.taito_project}-${var.taito_env}"
   notification_channels = "${var.taito_uptime_uptime_channels}"
 

scripts/terraform/common/gcloud-uptime/variables.tf

@@ -1,7 +1,7 @@
 variable "taito_project" {}
 variable "taito_env" {}
 variable "taito_domain" {}
-variable "taito_zone" {}
+variable "taito_uptime_namespace_id" {}
 
 /* Monitoring */
 variable "taito_uptime_targets" {

scripts/terraform/gcloud-uptime/main.tf

@@ -1,15 +1,18 @@
 provider "google" {
-  project = "${var.taito_resource_namespace_id}"
-  region = "${var.taito_provider_region}"
-  zone = "${var.taito_provider_zone}"
+  project = "${var.taito_uptime_namespace_id}"
 }
 
+/*
+  NOTE: create stackdriver workspace manually:
+  https://github.com/terraform-providers/terraform-provider-google/issues/2605
+ */
 module "common-gcloud-uptime" {
   source = "../common/gcloud-uptime"
 
   taito_project = "${var.taito_project}"
   taito_env = "${var.taito_env}"
   taito_domain = "${var.taito_domain}"
+  taito_uptime_namespace_id = "${var.taito_uptime_namespace_id}"
 
   taito_uptime_targets = "${var.taito_uptime_targets}"
   taito_uptime_paths = "${var.taito_uptime_paths}"

scripts/terraform/gcloud-uptime/variables.tf

@@ -1,7 +1,7 @@
 variable "taito_project" {}
 variable "taito_env" {}
 variable "taito_domain" {}
-variable "taito_zone" {}
+variable "taito_uptime_namespace_id" {}
 
 /* Monitoring */
 variable "taito_uptime_targets" {

taito-config.sh

@@ -76,6 +76,7 @@ taito_messaging_monitoring_channel=monitoring
 
 # Uptime monitoring
 taito_uptime_provider=${template_default_uptime_provider:-}
+taito_uptime_provider_org_id=${template_default_uptime_provider_org_id:-}
 taito_uptime_targets=" admin client graphql server www "
 taito_uptime_paths=" /admin/uptimez /uptimez /graphql/uptimez /api/uptimez /docs/uptimez "
 taito_uptime_timeouts=" 5s 5s 5s 5s 5s "
@@ -183,6 +184,7 @@ case $taito_env in
 
     # Monitoring
     taito_uptime_provider=${template_default_uptime_provider_prod:-}
+    taito_uptime_provider_org_id=${template_default_uptime_provider_org_id_prod:-}
     taito_uptime_channels="${template_default_monitoring_uptime_channels_prod:-}"
 
     # CI/CD and repositories
@@ -214,6 +216,7 @@ case $taito_env in
 
     # Monitoring
     taito_uptime_provider=${template_default_uptime_provider_prod:-}
+    taito_uptime_provider_org_id=${template_default_uptime_provider_org_id_prod:-}
     taito_uptime_channels="${template_default_monitoring_uptime_channels_prod:-}"
 
     # CI/CD and repositories
@@ -253,6 +256,7 @@ esac
 
 # Provider and namespaces
 taito_resource_namespace_id=$taito_resource_namespace
+taito_uptime_namespace_id=$taito_zone
 
 # URLs
 taito_admin_url=$taito_app_url/admin/
@@ -328,7 +332,6 @@ case $taito_provider in
       ${link_urls}
       * services[:ENV]=https://console.cloud.google.com/apis/dashboard?project=$taito_resource_namespace_id Google services (:ENV)
       * logs:ENV=https://console.cloud.google.com/logs/viewer?project=$taito_zone&minLogLevel=0&expandAll=false&resource=container%2Fcluster_name%2F$kubernetes_name%2Fnamespace_id%2F$taito_namespace Logs (:ENV)
-      * uptime=https://app.google.stackdriver.com/uptime?project=$taito_zone&f.search=$taito_project Uptime monitoring (Stackdriver)
     "
 
     taito_remote_secrets="
@@ -362,6 +365,20 @@ case $taito_provider in
     ;;
 esac
 
+case $taito_uptime_provider in
+  gcloud)
+    taito_plugins="${taito_plugins/gcloud:-local/}"
+    taito_plugins="
+      gcloud:-local
+      ${taito_plugins}
+    "
+    link_urls="
+      ${link_urls}
+      * uptime=https://app.google.stackdriver.com/uptime?project=$taito_zone&f.search=$taito_project Uptime monitoring (Stackdriver)
+    "
+    ;;
+esac
+
 case $taito_ci_provider in
   bitbucket)
     taito_plugins="