@hiiretail/gcp-infra-cli 0.92.2 → 0.92.4

package/generators/common-resources/memorystore/templates/redis-instance/spec.hcl

@@ -2,4 +2,15 @@ locals {
   tier           = "<%-tier%>"
   connect_mode   = "PRIVATE_SERVICE_ACCESS"
   memory_size_gb = "1" # memory size in GiB
+  read_replicas_mode      = "READ_REPLICAS_DISABLED"
+  transit_encryption_mode = "DISABLED"
+  maintenance_policy = {
+    day = "MONDAY"
+    start_time = {
+      hours   = 0
+      minutes = 0
+      seconds = 0
+      nanos   = 0
+    }
+  }
 }

package/generators/common-resources/memorystore/templates/redis-instance/terragrunt.hcl

@@ -1,7 +1,7 @@
 # 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/terraform-google-modules/terraform-google-memorystore//?ref=v1.1.0"
+  source = "git::https://github.com/terraform-google-modules/terraform-google-memorystore//?ref=v8.0.0"
 }
 
 # Include all settings from the root terragrunt.hcl file

package/generators/common-resources/monitoring/handle-yaml.js

@@ -21,16 +21,6 @@ const handleAlerts = (alerts, templates, answers) => {
   return alerts;
 };
 
-const handleSlos = (slos, templates, answers) => {
-  const template = templates[`${answers.sli}`];
-  const newSLO = JSON.parse(ejs.render(JSON.stringify(template), answers));
-
-  if (answers.burnRateAlert === 'no') newSLO.alert = false;
-
-  slos.push(newSLO);
-  return slos;
-};
-
 const handleUptimeChecks = (slos, templates, answers) => {
   const newCheck = JSON.parse(ejs.render(JSON.stringify(templates), answers));
 
@@ -40,7 +30,6 @@ const handleUptimeChecks = (slos, templates, answers) => {
 
 module.exports = {
   handleAlerts,
-  handleSlos,
   handleUptimeChecks,
   cleanAlerts,
 };

package/generators/common-resources/monitoring/index.js

@@ -5,11 +5,10 @@ const yaml = require('js-yaml');
 const BaseGenerator = require('../../../src/BaseGenerator');
 const { required } = require('../../../src/validators');
 const validate = require('./validate');
-const { handleSlos, handleAlerts, handleUptimeChecks } = require('./handle-yaml');
+const { handleAlerts, handleUptimeChecks } = require('./handle-yaml');
 
 const uptimeCheckTemplates = yaml.load(fs.readFileSync(`${__dirname}/templates/uptime-checks/uptime-checks.yaml`));
 const alertTemplates = yaml.load(fs.readFileSync(`${__dirname}/templates/alerts/service.yaml`));
-const sloTemplates = yaml.load(fs.readFileSync(`${__dirname}/templates/slos/slos.yaml`));
 
 module.exports = class extends BaseGenerator {
   async prompting() {
@@ -21,7 +20,6 @@ module.exports = class extends BaseGenerator {
         choices: [
           // 'alerts', // Temporarily disabled due to migration to GKE Autopilot
           'uptime-checks',
-          // 'slos' // Temporarily disabled due to migration to GKE Autopilot
         ],
       },
       {
@@ -31,14 +29,14 @@ module.exports = class extends BaseGenerator {
         choices: Object.keys(alertTemplates),
       },
       {
-        when: (response) => ['slos', 'uptime-checks', 'alerts'].includes(response.monitoringResource),
+        when: (response) => ['uptime-checks', 'alerts'].includes(response.monitoringResource),
         type: 'input',
         name: 'systemName',
         message: 'Please provide three-letter system name as defined in Styra (example: sre, ptf, sda, che, pnp, iam...)',
         validate: required && validate.systemName,
       },
       {
-        when: (response) => ['slos', 'uptime-checks', 'alerts'].includes(response.monitoringResource),
+        when: (response) => ['uptime-checks', 'alerts'].includes(response.monitoringResource),
         type: 'input',
         name: 'serviceName',
         message: 'Please provide the namespace where the service resides',
@@ -66,28 +64,6 @@ module.exports = class extends BaseGenerator {
         default: '/health',
         validate: required,
       },
-      {
-        when: (response) => response.monitoringResource === 'slos',
-        type: 'list',
-        name: 'sli',
-        message: 'Please select the SLI',
-        choices: Object.keys(sloTemplates),
-      },
-      {
-        when: (response) => response.monitoringResource === 'slos' && response.sli === 'availability',
-        type: 'input',
-        name: 'uptimeCheckId',
-        message: 'Please provide the "Uptime Check ID" (NOTE: The "Uptime check" needs to have been created first in order to fetch the ID)',
-        validate: required,
-      },
-      {
-        when: (response) => response.monitoringResource === 'slos',
-        type: 'list',
-        name: 'burnRateAlert',
-        message: 'Please select yes if you want to have burn-rate alerts included',
-        default: 'yes',
-        choices: ['yes', 'no'],
-      },
     ]);
   }
 
@@ -118,19 +94,6 @@ module.exports = class extends BaseGenerator {
       fs.writeFileSync(yamlPath, yaml.dump(newYaml, { lineWidth: 250, noArrayIndent: true }));
     }
 
-    if (monitoringResource === 'slos') {
-      const service = serviceName.replace(/ /g, '-').toLowerCase();
-      const servicePath = path.join(process.cwd(), 'infra', 'prod', 'monitoring', monitoringResource, service);
-      const yamlPath = `${servicePath}/slos.yaml`;
-
-      copyTemplate('slos', servicePath, yamlPath);
-
-      const oldYaml = yaml.load(fs.readFileSync(yamlPath, 'utf8')) || [];
-      const newYaml = await handleSlos(oldYaml, sloTemplates, this.answers);
-
-      fs.writeFileSync(yamlPath, yaml.dump(newYaml, { lineWidth: 250, noArrayIndent: true }));
-    }
-
     if (monitoringResource === 'uptime-checks') {
       const yamlPath = `${resourceDir}/uptime-checks.yaml`;
 

package/generators/common-resources/monitoring/templates/alerts/terragrunt.hcl

@@ -1,7 +1,7 @@
 # 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-alert-policy//?ref=v1.1.1"
+  source = "git::https://github.com/extenda/tf-module-gcp-alert-policy//?ref=v2.0.0"
 }
 
 # Include all settings from the root terragrunt.hcl file

package/package.json

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

package/generators/common-resources/monitoring/templates/slos/slos.yaml

@@ -1,41 +0,0 @@
-availability:
-  display_name: Month - Availability
-  slo_id: month-availability
-  goal: 0.998
-  calendar_period: MONTH
-  type: windows_based_sli
-  method: boolean_filter
-  window_period: 60s
-  metric_filter: |
-    metric.type="monitoring.googleapis.com/uptime_check/check_passed"
-    resource.type="uptime_url"
-    metric.labels.check_id="<%-uptimeCheckId%>"
-error-rate:
-  display_name: Month - Error rate
-  slo_id: month-error-rate
-  goal: 0.998
-  calendar_period: MONTH
-  type: request_based_sli
-  method: good_total_ratio
-  bad_service_filter: |
-    metric.type="knative.dev/serving/revision/request_count"
-    resource.type="knative_revision"
-    metric.labels.response_code_class="5xx"
-    resource.labels.service_name="<%-serviceName%>"
-  total_service_filter: |
-    metric.type="knative.dev/serving/revision/request_count"
-    resource.type="knative_revision"
-    resource.labels.service_name="<%-serviceName%>"
-latency:
-  display_name: Month - Latency
-  slo_id: month-latency
-  goal: 0.95
-  calendar_period: MONTH
-  type: request_based_sli
-  method: distribution_cut
-  range_min: 0
-  range_max: 500
-  metric_filter: |
-    metric.type="knative.dev/serving/revision/request_latencies"
-    resource.type="knative_revision"
-    resource.labels.service_name="<%-serviceName%>"

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

@@ -1,41 +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-slo//?ref=v1.0.1"
-}
-
-# 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"))
-  service_name = basename(get_terragrunt_dir())
-  system_name  = "<%-systemName%>"
-  labels = merge(local.common_vars.locals.default_user_labels, local.project_vars.locals.default_user_labels, {
-    component    = local.common_vars.locals.component
-    product      = local.common_vars.locals.product
-    tenant-alias = local.common_vars.locals.tenant_alias
-  })
-}
-
-# These are the variables we have to pass in to use the module specified in the terragrunt configuration above
-inputs = {
-  project                        = local.project_vars.locals.project_id,
-  slos                           = yamldecode(file("${get_terragrunt_dir()}/slos.yaml"))
-  service_name                   = "${local.system_name}.${local.service_name}"
-  telemetry_resource_name        = "//container.googleapis.com/projects/${local.project_vars.locals.project_id}/locations/europe-west1/clusters/k8s-cluster/k8s/namespaces/${local.service_name}"
-  notification_channel_ids       = dependency.notification_channels.outputs.notification_channels,
-  fallback_notification_channels = dependency.notification_channels.outputs.fallback_channels_ids,
-  default_user_labels            = local.labels,
-  documentation                  = "[Alerting guidelines](https://confluence.extendaretail.com/x/71fhBg)"
-}