@hiiretail/gcp-infra-cli 0.79.0 → 0.80.1

package/generators/init/clan-infra/validate.js

@@ -1,8 +1,8 @@
 const validate = {};
 
 validate.jiraProjectKey = (input) => {
-  if (!/\s/.test(input) && input === input.toUpperCase()) return true;
-  return 'Must be uppercase and not contain any whitepace';
+  if (!/\s/.test(input) && input === input.toLowerCase()) return true;
+  return 'Must be lowercase and not contain any whitepace';
 };
 
 module.exports = validate;

package/generators/resources/monitoring/index.js

@@ -7,10 +7,12 @@ const { required } = require('../../../src/validators');
 const validate = require('./validate');
 const { handleSlos, handleAlerts, handleUptimeChecks } = require('./handle-yaml');
 const { getProjectId } = require('../pubsub/get-gcp-projects');
+const getTribeAndClanName = require('../../init/clan-infra/tribe-clan-repo');
 
 const uptimeCheckTemplates = yaml.load(fs.readFileSync(`${__dirname}/templates/uptime-checks/uptime-checks.yaml`));
 const alertTemplates = yaml.load(fs.readFileSync(`${__dirname}/templates/alerts/alerts.yaml`));
 const sloTemplates = yaml.load(fs.readFileSync(`${__dirname}/templates/slos/slos.yaml`));
+const { clan: defaultClan } = getTribeAndClanName();
 const projectId = getProjectId('prod');
 
 module.exports = class extends BaseGenerator {
@@ -35,7 +37,7 @@ module.exports = class extends BaseGenerator {
         choices: (answers) => Object.keys(alertTemplates[`${answers.alertResource}`]),
       },
       {
-        when: (response) => ['alerts', 'slos', 'uptime-checks'].includes(response.monitoringResource),
+        when: (response) => ['slos', 'uptime-checks'].includes(response.monitoringResource) || response.alertResource === 'cloud_run',
         type: 'input',
         name: 'systemName',
         message: 'Please provide three-letter system name as defined in Styra (example: sre, ptf, sda, che, pnp, iam...)',
@@ -146,8 +148,10 @@ module.exports = class extends BaseGenerator {
       const yamlPath = `${resourceDir}/alerts.yaml`;
 
       copyTemplate('alerts', resourceDir, yamlPath);
+
       const oldYaml = yaml.load(fs.readFileSync(yamlPath, 'utf8')) || [];
-      const newYaml = await handleAlerts(oldYaml, alertTemplates, this.answers);
+      const newYaml = await handleAlerts(oldYaml, alertTemplates,
+        { ...this.answers, clan: defaultClan });
 
       fs.writeFileSync(yamlPath, yaml.dump(newYaml));
     }

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

@@ -18,7 +18,7 @@ cloud_run:
       content: <% if (runbookLink) { %>[Runbook](<%-runbookLink%>)<%} else { %> <% } %>
 cloud_scheduler:
   failed_job:
-    display_name: "[P4] <%-systemName%> - Cloud Scheduler | Job Failed"
+    display_name: "[P4] <%-clan%> - Cloud Scheduler | Job Failed"
     conditions:
       - display_name: Cloud Scheduler Job - Log entries with SEVERITY=Error exceed threshold
         condition_threshold:
@@ -36,7 +36,7 @@ cloud_scheduler:
       content: <% if (runbookLink) { %>[Runbook](<%-runbookLink%>)<%} else { %> <% } %>
 cloud_sql:
   cpu_over_65:
-    display_name: "[P3] <%-systemName%> - CloudSQL | CPU over 65%"
+    display_name: "[P3] <%-clan%> - CloudSQL | CPU over 65%"
     conditions:
       - display_name: Cloud SQL Database - CPU utilization above 65% over 5 min
         condition_threshold:
@@ -53,7 +53,7 @@ cloud_sql:
     documentation:
       content: <% if (runbookLink) { %>[Runbook](<%-runbookLink%>)<%} else { %> <% } %>
   cpu_over_85:
-    display_name: "[P3] <%-systemName%> - CloudSQL | CPU over 85%"
+    display_name: "[P3] <%-clan%> - CloudSQL | CPU over 85%"
     conditions:
       - display_name: "Cloud SQL Database - CPU-usage above 85% over 1 min"
         condition_threshold:
@@ -70,7 +70,7 @@ cloud_sql:
     documentation:
       content: <% if (runbookLink) { %>[Runbook](<%-runbookLink%>)<%} else { %> <% } %>
   cpu_over_90:
-    display_name: "[P3] <%-systemName%> - CloudSQL | CPU over 90%"
+    display_name: "[P3] <%-clan%> - CloudSQL | CPU over 90%"
     conditions:
       - display_name: Cloud SQL Database - CPU-usage above 90%
         condition_threshold:
@@ -86,7 +86,7 @@ cloud_sql:
     documentation:
       content: <% if (runbookLink) { %>[Runbook](<%-runbookLink%>)<%} else { %> <% } %>
   query_over_1s:
-    display_name: "[P4] <%-systemName%> - CloudSQL | Query resolve time"
+    display_name: "[P4] <%-clan%> - CloudSQL | Query resolve time"
     conditions:
       - display_name: Cloud SQL Instance Database - Per query execution times above 1000 ms
         condition_threshold:
@@ -103,7 +103,7 @@ cloud_sql:
       content: <% if (runbookLink) { %>[Runbook](<%-runbookLink%>)<%} else { %> <% } %>
 memorystore:
   memory_over_50:
-    display_name: "[P4] <%-systemName%> - Memorystore | Memory over 50%"
+    display_name: "[P4] <%-clan%> - Memorystore | Memory over 50%"
     conditions:
       - display_name: Memorystore Redis Instance - Memory Usage above 50% over 5 min
         condition_threshold:
@@ -120,7 +120,7 @@ memorystore:
     documentation:
       content: <% if (runbookLink) { %>[Runbook](<%-runbookLink%>)<%} else { %> <% } %>
   memory_over_75:
-    display_name: "[P4] <%-systemName%> - Memorystore | Memory over 75%"
+    display_name: "[P4] <%-clan%> - Memorystore | Memory over 75%"
     conditions:
       - display_name: Memorystore Redis Instance - Memory Usage above 75% for 5min
         condition_threshold:
@@ -137,7 +137,7 @@ memorystore:
     documentation:
       content: <% if (runbookLink) { %>[Runbook](<%-runbookLink%>)<%} else { %> <% } %>
   memory_over_90:
-    display_name: "[P2] <%-systemName%> - Memorystore | Memory over 90%"
+    display_name: "[P2] <%-clan%> - Memorystore | Memory over 90%"
     conditions:
       - display_name: Memorystore Redis Instance - Memory Usage above 90%
         condition_threshold:
@@ -155,7 +155,7 @@ memorystore:
       content: <% if (runbookLink) { %>[Runbook](<%-runbookLink%>)<%} else { %> <% } %>
 pub_sub:
   unacknowledged_messages:
-    display_name: "[P3] <%-systemName%> - Pub/Sub | Undelivered message(s)"
+    display_name: "[P3] <%-clan%> - Pub/Sub | Undelivered message(s)"
     conditions:
       - display_name: Cloud Pub/Sub Subscription - Undelivered messages above 1 for 5 min
         condition_threshold:
@@ -172,7 +172,7 @@ pub_sub:
     documentation:
       content: <% if (runbookLink) { %>[Runbook](<%-runbookLink%>)<%} else { %> <% } %>
   messages_in_dlq:
-    display_name: "[P3] <%-systemName%> - Pub/Sub | Message(s) in DLQ"
+    display_name: "[P3] <%-clan%> - Pub/Sub | Message(s) in DLQ"
     conditions:
       - display_name: Cloud Pub/Sub Subscription - Number of undelivered message(s) forwarded to DLQ
         condition_threshold:
@@ -189,7 +189,7 @@ pub_sub:
     documentation:
       content: <% if (runbookLink) { %>[Runbook](<%-runbookLink%>)<%} else { %> <% } %>
   latency:
-    display_name: "[P3] <%-systemName%> - Pub/Sub | Response latency distribution"
+    display_name: "[P3] <%-clan%> - Pub/Sub | Response latency distribution"
     conditions:
       - display_name: Cloud Pub/Sub Subscription - Latency above 3s
         condition_threshold:
@@ -208,7 +208,7 @@ pub_sub:
       content: <% if (runbookLink) { %>[Runbook](<%-runbookLink%>)<%} else { %> <% } %>
 cloud_function:
   failed_execution:
-    display_name: "[P2] <%-systemName%> - Cloud Function | Failed job execution"
+    display_name: "[P2] <%-clan%> - Cloud Function | Failed job execution"
     conditions:
       - display_name: Cloud Function - Execution error count
         condition_threshold:

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

@@ -18,6 +18,7 @@ dependency "notification_channels" {
 
 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
@@ -29,5 +30,11 @@ inputs = merge(
     notification_channels   = dependency.notification_channels.outputs.notification_channels,
     telemetry_resource_name = "//container.googleapis.com/projects/${lookup(local.project_vars.locals, "monitoring_project_id", local.project_vars.locals.tribe_project_id)}/locations/europe-west1/clusters/k8s-cluster/k8s/namespaces/<%-serviceName%>"
     slos                    = yamldecode(file("${get_terragrunt_dir()}/slos.yaml")),
+    documentation           = "[Alerting guidelines](https://confluence.extendaretail.com/x/71fhBg)"
+    user_labels             = {
+      cc                = local.common_vars.locals.cost_center
+      clan              = local.common_vars.locals.clan_name
+      jira_project_key  = lookup(local.common_vars.locals, "jira_project_key", null)
+    },
   }
 )

package/package.json

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