fix: grafana dashboard creation (#54)

WalletConnect · Jul 4, 2023 · 423ab4e · 423ab4e
1 parent ccc9b00
commit 423ab4e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 63 deletions.
diff --git a/terraform/monitoring/dashboard.jsonnet b/terraform/monitoring/dashboard.jsonnet
@@ -67,8 +67,8 @@ dashboard.new(
     panels.lb.healthy_hosts(ds, vars)           { gridPos: pos._2 },
 
     panels.lb.requests(ds, vars)                { gridPos: pos._3 },
-    panels.lb.error_4xx(ds, vars)               { gridPos: pos._3 },
-    panels.lb.error_5xx(ds, vars)               { gridPos: pos._3 },
+//    panels.lb.error_4xx(ds, vars)               { gridPos: pos._3 },
+//    panels.lb.error_5xx(ds, vars)               { gridPos: pos._3 },
 
   row.new('Database'),
     panels.db.cpu(ds, vars)                     { gridPos: pos._3 },

diff --git a/terraform/monitoring/panels/app/memory.libsonnet b/terraform/monitoring/panels/app/memory.libsonnet
@@ -11,6 +11,7 @@ local targets   = grafana.targets;
       datasource  = ds.cloudwatch,
     )
     .configure(defaults.overrides.memory(defaults.configuration.timeseries_resource))
+
     .setAlert(defaults.alerts.memory(
       namespace     = vars.namespace,
       title         = 'ECS',

diff --git a/terraform/monitoring/panels/lb/error_4xx.libsonnet b/terraform/monitoring/panels/lb/error_4xx.libsonnet
@@ -17,48 +17,29 @@ local _configuration = defaults.configuration.timeseries
     value : threshold,
   });
 
-local _alert(namespace, env, notifications) = grafana.alert.new(
-  namespace     = namespace,
-  name          = "%(env)s - 4XX alert"     % { env: grafana.utils.strings.capitalize(env) },
-  message       = '%(env)s - Too many 4XX'  % { env: grafana.utils.strings.capitalize(env) },
-  notifications = notifications,
-  noDataState   = 'no_data',
-  conditions    = [
-    grafana.alertCondition.new(
-      evaluatorParams = [ threshold ],
-      evaluatorType   = 'gt',
-      operatorType    = 'or',
-      queryRefId      = 'ELB',
-      queryTimeStart  = '5m',
-      queryTimeEnd    = 'now',
-      reducerType     = grafana.alert_reducers.Avg
-    ),
-    grafana.alertCondition.new(
-      evaluatorParams = [ threshold ],
-      evaluatorType   = 'gt',
-      operatorType    = 'or',
-      queryRefId      = 'Target',
-      queryTimeStart  = '5m',
-      queryTimeEnd    = 'now',
-      reducerType     = grafana.alert_reducers.Avg
-    ),
-  ],
-);
-
 {
   new(ds, vars)::
     panels.timeseries(
       title       = '4XX',
       datasource  = ds.cloudwatch,
     )
-    .configure(_configuration)
+    .configure(
+      defaults.configuration.timeseries
+        .withSoftLimit(
+          axisSoftMin = 0,
+          axisSoftMax = threshold * 1.2,
+        )
+        .withThresholdStyle(grafana.fieldConfig.thresholdStyle.dashed)
+        .addThreshold({
+          color : defaults.values.colors.critical,
+          value : threshold,
+        })
+    )
     .addPanelThreshold(
       op    = 'gt',
       value = threshold,
     )
 
-    .setAlert(_alert(vars.namespace, vars.environment, vars.notifications))
-
     .addTarget(targets.cloudwatch(
       alias       = 'ELB',
       datasource  = ds.cloudwatch,

diff --git a/terraform/monitoring/panels/lb/error_5xx.libsonnet b/terraform/monitoring/panels/lb/error_5xx.libsonnet
@@ -17,34 +17,6 @@ local _configuration = defaults.configuration.timeseries
     value : threshold,
   });
 
-local _alert(namespace, env, notifications) = grafana.alert.new(
-  namespace     = namespace,
-  name          = "%(env)s - 5XX alert"     % { env: grafana.utils.strings.capitalize(env) },
-  message       = '%(env)s - Too many 5XX'  % { env: grafana.utils.strings.capitalize(env) },
-  notifications = notifications,
-  noDataState   = 'no_data',
-  conditions    = [
-    grafana.alertCondition.new(
-      evaluatorParams = [ threshold ],
-      evaluatorType   = 'gt',
-      operatorType    = 'or',
-      queryRefId      = 'ELB',
-      queryTimeStart  = '5m',
-      queryTimeEnd    = 'now',
-      reducerType     = grafana.alert_reducers.Avg
-    ),
-    grafana.alertCondition.new(
-      evaluatorParams = [ threshold ],
-      evaluatorType   = 'gt',
-      operatorType    = 'or',
-      queryRefId      = 'Target',
-      queryTimeStart  = '5m',
-      queryTimeEnd    = 'now',
-      reducerType     = grafana.alert_reducers.Avg
-    ),
-  ],
-);
-
 {
   new(ds, vars)::
     panels.timeseries(
@@ -57,8 +29,6 @@ local _alert(namespace, env, notifications) = grafana.alert.new(
       value = threshold,
     )
 
-    .setAlert(_alert(vars.namespace, vars.environment, vars.notifications))
-
     .addTarget(targets.cloudwatch(
       alias       = 'ELB',
       datasource  = ds.cloudwatch,