npm - @hiiretail/gcp-infra-cli - Versions diffs - 0.102.5 → 0.103.0 - Mend

@hiiretail/gcp-infra-cli 0.102.5 → 0.103.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

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

@@ -77,29 +77,12 @@ module.exports = class extends BaseGenerator {
         message: 'Please provide the project ID:',
         validate: required && validate.projectId,
       },
-      {
-        when: (response) => ['uptime-checks', 'alerts'].includes(response.monitoringResource),
-        type: 'input',
-        name: 'systemName',
-        message: 'Please provide three-letter system name (ex: sre, pnp, iam...):',
-        default: () => {
-          const gitPath = path.resolve(process.cwd(), '.git');
-          if (fs.existsSync(gitPath)) {
-            const repoName = path.basename(process.cwd());
-            const regex = /-([a-z]{3})-/i;
-            const match = regex.exec(repoName);
-            return match ? match[1] : '';
-          }
-          return '';
-        },
-        validate: required && validate.systemName,
-      },
       {
         when: (response) => response.monitoringResource === 'uptime-checks',
         type: 'input',
         name: 'serviceName',
         message: 'Please provide the namespace where the service resides:',
-        default: (response) => `${response.systemName}-service`,
+        default: (response) => `${response.clan}-service`,
         validate: required && validate.serviceName,
       },
       {

package/generators/common-resources/monitoring/templates/alerts/generic-infra.yaml CHANGED Viewed

@@ -1,3 +1,121 @@
+cloud_function:
+  failed_execution:
+    display_name: "[P2] <%-clan%> - Cloud Function | Failed job execution"
+    conditions:
+      - display_name: Cloud Function - Execution error count
+        condition_threshold:
+          filter: |
+            resource.type="cloud_function"
+            metric.type="cloudfunctions.googleapis.com/function/execution_count"
+            metric.label.status!="ok"
+            resource.labels.project_id="<%-projectId%>"
+          threshold_value: 0
+          duration: 60s
+          aggregations:
+            - alignment_period: 60s
+              per_series_aligner: ALIGN_COUNT
+              group_by_fields:
+                - metric.label.status
+                - resource.label.function_name
+    documentation:
+      subject: 'Function: `$${resource.label.function_name}`'
+cloud_run:
+  error_count:
+    display_name: "[P3] <%-clan%> - Cloud Run | Error rate"
+    conditions:
+      - display_name: Error rate above threshold for more than 5 minutes
+        condition_threshold:
+          filter: |
+            resource.type="cloud_run_revision"
+            metric.type="run.googleapis.com/request_count"
+            metric.label.response_code_class="5xx"
+            resource.labels.project_id="<%-projectId%>"
+          threshold_value: 0.05
+          duration: 300s
+          aggregations:
+            - alignment_period: 60s
+              per_series_aligner: ALIGN_RATE
+              cross_series_reducer: REDUCE_SUM
+              group_by_fields:
+                - resource.label.service_name
+    documentation:
+      subject: 'Service: `$${resource.label.service_name}`'
+  request_latency:
+    display_name: "[P3] <%-clan%> - Cloud Run | Request Latency"
+    conditions:
+      - display_name: Request latency (p95) above threshold for more than 5 minutes
+        condition_threshold:
+          filter: |
+            resource.type="cloud_run_revision"
+            metric.type="run.googleapis.com/request_latencies"
+            resource.labels.project_id="<%-projectId%>"
+          threshold_value: 500
+          duration: 300s
+          aggregations:
+            - alignment_period: 60s
+              per_series_aligner: ALIGN_DELTA
+              cross_series_reducer: REDUCE_PERCENTILE_95
+              group_by_fields:
+                - resource.label.service_name
+    documentation:
+      subject: 'Service: `$${resource.label.service_name}`'
+  cpu_utilization:
+    display_name: "[P3] <%-clan%> - Cloud Run | CPU Utilization"
+    conditions:
+      - display_name: CPU utilization above threshold for more than 5 minutes
+        condition_threshold:
+          filter: |
+            resource.type="cloud_run_revision"
+            metric.type="run.googleapis.com/container/cpu/utilizations"
+            resource.labels.project_id="<%-projectId%>"
+          threshold_value: 0.8
+          duration: 300s
+          aggregations:
+            - alignment_period: 60s
+              per_series_aligner: ALIGN_MEAN
+              cross_series_reducer: REDUCE_PERCENTILE_99
+              group_by_fields:
+                - resource.label.service_name
+    documentation:
+      subject: 'Service: `$${resource.label.service_name}`'
+  memory_utilization:
+    display_name: "[P3] <%-clan%> - Cloud Run | Memory Utilization"
+    conditions:
+      - display_name: Memory utilization above threshold for more than 5 minutes
+        condition_threshold:
+          filter: |
+            resource.type="cloud_run_revision"
+            metric.type="run.googleapis.com/container/memory/utilizations"
+            resource.labels.project_id="<%-projectId%>"
+          threshold_value: 0.8
+          duration: 300s
+          aggregations:
+            - alignment_period: 60s
+              per_series_aligner: ALIGN_MEAN
+              cross_series_reducer: REDUCE_PERCENTILE_99
+              group_by_fields:
+                - resource.label.service_name
+    documentation:
+      subject: 'Service: `$${resource.label.service_name}`'
+  startup_latency:
+    display_name: "[P4] <%-clan%> - Cloud Run | Startup Latency"
+    conditions:
+      - display_name: Cloud Run - Startup Latency
+        condition_threshold:
+          filter: |
+            resource.type="cloud_run_revision"
+            metric.type="run.googleapis.com/container/startup_latencies"
+            resource.labels.project_id="<%-projectId%>"
+          threshold_value: 2000
+          duration: 300s
+          aggregations:
+            - alignment_period: 60s
+              per_series_aligner: ALIGN_DELTA
+              cross_series_reducer: REDUCE_PERCENTILE_99
+              group_by_fields:
+                - resource.label.service_name
+    documentation:
+      subject: 'Service: `$${resource.label.service_name}`'
 cloud_scheduler:
   failed_job:
     display_name: "[P4] <%-clan%> - Cloud Scheduler | Job Failed"
@@ -169,6 +287,43 @@ cloud_sql:
                 - resource.label.database_id
     documentation:
       subject: 'Database: `$${resource.label.database_id}`'
+firestore:
+  request_latencies:
+    display_name: "[P3] <%-clan%> - Firestore | High request latencies"
+    conditions:
+      - display_name: Firestore - Request latencies are above 1s for more than 5 minutes
+        condition_threshold:
+          filter: |
+            metric.type="firestore.googleapis.com/api/request_latencies"
+            resource.type="firestore.googleapis.com/Database"
+          threshold_value: 1
+          duration: 300s
+          aggregations:
+            - alignment_period: 60s
+              per_series_aligner: ALIGN_DELTA
+              cross_series_reducer: REDUCE_PERCENTILE_95
+              group_by_fields:
+                - resource.label.database_id
+    documentation:
+      subject: 'Database: `$${resource.label.database_id}`'
+  failed_commits:
+    display_name: "[P3] <%-clan%> - Firestore | High failed commits errors"
+    conditions:
+      - display_name: Firestore - Failed commits errors are above 2/sec for more than 1 minute
+        condition_threshold:
+          filter: |
+            metric.type="firestore.googleapis.com/api/request_count"
+            resource.type="datastore_request"
+            metric.label."api_method"="Commit"
+            metric.label."response_code"!="OK"
+          threshold_value: 2
+          duration: 60s
+          aggregations:
+            - alignment_period: 60s
+              per_series_aligner: ALIGN_RATE
+              cross_series_reducer: REDUCE_SUM
+              group_by_fields:
+                - metric.label."response_code"
 memorystore:
   memory_over_50:
     display_name: "[P3] <%-clan%> - Memorystore | Memory over 50%"
@@ -416,124 +571,6 @@ pub_sub:
                 - resource.label.subscription_id
     documentation:
       subject: 'Subscription: `$${resource.label.subscription_id}`'
-cloud_function:
-  failed_execution:
-    display_name: "[P2] <%-clan%> - Cloud Function | Failed job execution"
-    conditions:
-      - display_name: Cloud Function - Execution error count
-        condition_threshold:
-          filter: |
-            resource.type="cloud_function"
-            metric.type="cloudfunctions.googleapis.com/function/execution_count"
-            metric.label.status!="ok"
-            resource.labels.project_id="<%-projectId%>"
-          threshold_value: 0
-          duration: 60s
-          aggregations:
-            - alignment_period: 60s
-              per_series_aligner: ALIGN_COUNT
-              group_by_fields:
-                - metric.label.status
-                - resource.label.function_name
-    documentation:
-      subject: 'Function: `$${resource.label.function_name}`'
-cloud_run:
-  error_count:
-    display_name: "[P3] <%-clan%> - Cloud Run | Error rate"
-    conditions:
-      - display_name: Error rate above threshold for more than 5 minutes
-        condition_threshold:
-          filter: |
-            resource.type="cloud_run_revision"
-            metric.type="run.googleapis.com/request_count"
-            metric.label.response_code_class="5xx"
-            resource.labels.project_id="<%-projectId%>"
-          threshold_value: 0.05
-          duration: 300s
-          aggregations:
-            - alignment_period: 60s
-              per_series_aligner: ALIGN_RATE
-              cross_series_reducer: REDUCE_SUM
-              group_by_fields:
-                - resource.label.service_name
-    documentation:
-      subject: 'Service: `$${resource.label.service_name}`'
-  request_latency:
-    display_name: "[P3] <%-clan%> - Cloud Run | Request Latency"
-    conditions:
-      - display_name: Request latency (p95) above threshold for more than 5 minutes
-        condition_threshold:
-          filter: |
-            resource.type="cloud_run_revision"
-            metric.type="run.googleapis.com/request_latencies"
-            resource.labels.project_id="<%-projectId%>"
-          threshold_value: 500
-          duration: 300s
-          aggregations:
-            - alignment_period: 60s
-              per_series_aligner: ALIGN_DELTA
-              cross_series_reducer: REDUCE_PERCENTILE_95
-              group_by_fields:
-                - resource.label.service_name
-    documentation:
-      subject: 'Service: `$${resource.label.service_name}`'
-  cpu_utilization:
-    display_name: "[P3] <%-clan%> - Cloud Run | CPU Utilization"
-    conditions:
-      - display_name: CPU utilization above threshold for more than 5 minutes
-        condition_threshold:
-          filter: |
-            resource.type="cloud_run_revision"
-            metric.type="run.googleapis.com/container/cpu/utilizations"
-            resource.labels.project_id="<%-projectId%>"
-          threshold_value: 0.8
-          duration: 300s
-          aggregations:
-            - alignment_period: 60s
-              per_series_aligner: ALIGN_MEAN
-              cross_series_reducer: REDUCE_PERCENTILE_99
-              group_by_fields:
-                - resource.label.service_name
-    documentation:
-      subject: 'Service: `$${resource.label.service_name}`'
-  memory_utilization:
-    display_name: "[P3] <%-clan%> - Cloud Run | Memory Utilization"
-    conditions:
-      - display_name: Memory utilization above threshold for more than 5 minutes
-        condition_threshold:
-          filter: |
-            resource.type="cloud_run_revision"
-            metric.type="run.googleapis.com/container/memory/utilizations"
-            resource.labels.project_id="<%-projectId%>"
-          threshold_value: 0.8
-          duration: 300s
-          aggregations:
-            - alignment_period: 60s
-              per_series_aligner: ALIGN_MEAN
-              cross_series_reducer: REDUCE_PERCENTILE_99
-              group_by_fields:
-                - resource.label.service_name
-    documentation:
-      subject: 'Service: `$${resource.label.service_name}`'
-  startup_latency:
-    display_name: "[P4] <%-clan%> - Cloud Run | Startup Latency"
-    conditions:
-      - display_name: Cloud Run - Startup Latency
-        condition_threshold:
-          filter: |
-            resource.type="cloud_run_revision"
-            metric.type="run.googleapis.com/container/startup_latencies"
-            resource.labels.project_id="<%-projectId%>"
-          threshold_value: 2000
-          duration: 300s
-          aggregations:
-            - alignment_period: 60s
-              per_series_aligner: ALIGN_DELTA
-              cross_series_reducer: REDUCE_PERCENTILE_99
-              group_by_fields:
-                - resource.label.service_name
-    documentation:
-      subject: 'Service: `$${resource.label.service_name}`'
 spanner:
   cpu_utilization_by_priority:
     display_name: "[P2] <%-clan%> - Spanner | CPU Utilization"
@@ -573,7 +610,7 @@ spanner:
                 - metric.label.status
                 - resource.label.database
     documentation:
-      subject: 'Instance: `$${resource.label.instance_id}`, Database: `$${resource.label.database}}`'
+      subject: 'Instance: `$${resource.label.instance_id}`, Database: `$${resource.label.database}`'
   request_latencies:
     display_name: '[P3] <%-clan%> - Spanner | API transaction latency'
     conditions:

package/package.json CHANGED Viewed

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