@hiiretail/gcp-infra-cli 0.82.0 → 0.82.2

package/generators/organization/clan-project/templates/tribe/terragrunt.hcl

@@ -41,13 +41,19 @@ inputs = {
     "roles/container.viewer",
     "roles/compute.viewer",
     "roles/errorreporting.user",
-    "roles/monitoring.editor",
     "roles/logging.viewer",
     "roles/logging.configWriter",
     "roles/cloudtrace.user",
     "roles/pubsub.viewer",
     "roles/run.viewer",
     "roles/viewer",
+    "roles/monitoring.viewer",
+    "roles/monitoring.uptimeCheckConfigViewer",
+    "roles/monitoring.servicesViewer",
+    "roles/monitoring.notificationChannelViewer",
+    "roles/monitoring.metricsScopesViewer",
+    "roles/monitoring.dashboardEditor",
+    "roles/monitoring.alertPolicyViewer"
   ]
 
   roles_map = [

package/generators/resources/monitoring/index.js

@@ -128,7 +128,7 @@ module.exports = class extends BaseGenerator {
       const oldYaml = yaml.load(fs.readFileSync(yamlPath, 'utf8')) || [];
       const newYaml = await handleUptimeChecks(oldYaml, uptimeCheckTemplates, this.answers);
 
-      fs.writeFileSync(yamlPath, yaml.dump(newYaml));
+      fs.writeFileSync(yamlPath, yaml.dump(newYaml, { lineWidth: 250, noArrayIndent: true }));
     }
 
     if (monitoringResource === 'slos') {
@@ -141,7 +141,7 @@ module.exports = class extends BaseGenerator {
       const oldYaml = yaml.load(fs.readFileSync(yamlPath, 'utf8')) || [];
       const newYaml = await handleSlos(oldYaml, sloTemplates, this.answers);
 
-      fs.writeFileSync(yamlPath, yaml.dump(newYaml));
+      fs.writeFileSync(yamlPath, yaml.dump(newYaml, { lineWidth: 250, noArrayIndent: true }));
     }
 
     if (monitoringResource === 'alerts') {
@@ -153,7 +153,7 @@ module.exports = class extends BaseGenerator {
       const newYaml = await handleAlerts(oldYaml, alertTemplates,
         { ...this.answers, clan: defaultClan });
 
-      fs.writeFileSync(yamlPath, yaml.dump(newYaml));
+      fs.writeFileSync(yamlPath, yaml.dump(newYaml, { lineWidth: 250, noArrayIndent: true }));
     }
   }
 

package/generators/resources/monitoring/templates/alerts/alerts.yaml

@@ -103,19 +103,22 @@ cloud_sql:
     documentation:
       content: <% if (runbookLink) { %>[Runbook](<%-runbookLink%>)<%} else { %> <% } %>
   query_over_1s:
-    display_name: "[P4] <%-clan%> - CloudSQL | Query resolve time"
+    display_name: "[P4] <%-clan%> - CloudSQL | Slow query"
     conditions:
-      - display_name: Cloud SQL Instance Database - Per query execution times above 1000 ms
+      - display_name: Cloud SQL - Slow query latency
         condition_threshold:
           filter: |
+            metric.type="cloudsql.googleapis.com/database/postgresql/insights/perquery/latencies"
             resource.type="cloudsql_instance_database"
-            metric.type="cloudsql.googleapis.com/database/postgresql/insights/perquery/execution_time"
             resource.labels.project_id="<%-projectId%>"
           threshold_value: 1000000
           aggregations:
             - alignment_period: 60s
               per_series_aligner: ALIGN_DELTA
-              group_by_fields: ["resource.label.resource_id"]
+              cross_series_reducer: REDUCE_PERCENTILE_99
+              group_by_fields:
+                - metric.label.querystring
+                - resource.label.resource_id
     documentation:
       content: <% if (runbookLink) { %>[Runbook](<%-runbookLink%>)<%} else { %> <% } %>
 memorystore:
@@ -239,6 +242,8 @@ cloud_function:
           aggregations:
             - alignment_period: 60s
               per_series_aligner: ALIGN_COUNT
-              group_by_fields: ["metric.label.status", "resource.label.function_name"]
+              group_by_fields:
+                - metric.label.status
+                - resource.label.function_name
     documentation:
       content: <% if (runbookLink) { %>[Runbook](<%-runbookLink%>)<%} else { %> <% } %>

package/generators/resources/monitoring/templates/notification-channels/terragrunt.hcl

@@ -18,7 +18,5 @@ locals {
 inputs = merge(local.project_vars.locals, local.common_vars.locals,
   {
     clan_project_id  = local.project_vars.locals.project_id
-    # Use var below if we decide to go with hiiretail-monitoring-prod project
-    #tribe_project_id = local.common_vars.locals.monitoring_project_id
   }
 )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hiiretail/gcp-infra-cli",
-  "version": "0.82.0",
+  "version": "0.82.2",
   "description": "Infrastructure as code generator for GCP.",
   "main": "src/cli.js",
   "bin": {

package/generators/resources/monitoring/templates/cloudfunction/terragrunt.hcl

@@ -1,34 +0,0 @@
-# Terragrunt will copy the Terraform configurations specified by the source parameter, along with any files in the
-# working directory, into a temporary folder, and execute your Terraform commands in that folder.
-terraform {
-  source = "git::https://github.com/extenda/tf-module-gcp-monitoring//?ref=v0.1.6"
-}
-
-# Include all settings from the root terragrunt.hcl file
-include {
-  path = find_in_parent_folders("terragrunt_root.hcl")
-}
-
-dependency "notification_channels" {
-  config_path  = "../notification-channels"
-  mock_outputs = {
-    notification_channels = ["dummy-channel"]
-  }
-}
-
-locals {
-  project_vars = read_terragrunt_config(find_in_parent_folders("project.hcl"))
-  common_vars  = read_terragrunt_config(find_in_parent_folders("common.hcl"))
-}
-
-# These are the variables we have to pass in to use the module specified in the terragrunt configuration above
-inputs = merge(local.project_vars.locals, local.common_vars.locals,
-  {
-    clan_project_id          = local.project_vars.locals.project_id
-    notification_channels    = dependency.notification_channels.outputs.notification_channels
-    cloudfunction_monitoring = true
-    user_labels           = {
-      cc = local.common_vars.locals.cost_center
-    }
-  }
-)

package/generators/resources/monitoring/templates/cloudrun/terragrunt.hcl

@@ -1,34 +0,0 @@
-# Terragrunt will copy the Terraform configurations specified by the source parameter, along with any files in the
-# working directory, into a temporary folder, and execute your Terraform commands in that folder.
-terraform {
-  source = "git::https://github.com/extenda/tf-module-gcp-monitoring//?ref=v0.1.6"
-}
-
-# Include all settings from the root terragrunt.hcl file
-include {
-  path = find_in_parent_folders("terragrunt_root.hcl")
-}
-
-dependency "notification_channels" {
-  config_path  = "../notification-channels"
-  mock_outputs = {
-    notification_channels = ["dummy-channel"]
-  }
-}
-
-locals {
-  project_vars = read_terragrunt_config(find_in_parent_folders("project.hcl"))
-  common_vars  = read_terragrunt_config(find_in_parent_folders("common.hcl"))
-}
-
-# These are the variables we have to pass in to use the module specified in the terragrunt configuration above
-inputs = merge(local.project_vars.locals, local.common_vars.locals,
-  {
-    clan_project_id       = local.project_vars.locals.project_id
-    notification_channels = dependency.notification_channels.outputs.notification_channels
-    cloudrun_monitoring   = true
-    user_labels           = {
-      cc = local.common_vars.locals.cost_center
-    }
-  }
-)

package/generators/resources/monitoring/templates/dataflow/terragrunt.hcl

@@ -1,34 +0,0 @@
-# Terragrunt will copy the Terraform configurations specified by the source parameter, along with any files in the
-# working directory, into a temporary folder, and execute your Terraform commands in that folder.
-terraform {
-  source = "git::https://github.com/extenda/tf-module-gcp-monitoring//?ref=v0.1.6"
-}
-
-# Include all settings from the root terragrunt.hcl file
-include {
-  path = find_in_parent_folders("terragrunt_root.hcl")
-}
-
-dependency "notification_channels" {
-  config_path  = "../notification-channels"
-  mock_outputs = {
-    notification_channels = ["dummy-channel"]
-  }
-}
-
-locals {
-  project_vars = read_terragrunt_config(find_in_parent_folders("project.hcl"))
-  common_vars  = read_terragrunt_config(find_in_parent_folders("common.hcl"))
-}
-
-# These are the variables we have to pass in to use the module specified in the terragrunt configuration above
-inputs = merge(local.project_vars.locals, local.common_vars.locals,
-  {
-    clan_project_id       = local.project_vars.locals.project_id
-    notification_channels = dependency.notification_channels.outputs.notification_channels
-    dataflow_monitoring   = true
-    user_labels           = {
-      cc = local.common_vars.locals.cost_center
-    }
-  }
-)