fix: lb metrics

terraform/monitoring/dashboard.jsonnet

@@ -63,6 +63,7 @@ dashboard.new(
     panels.history.registrations(ds, vars)      { gridPos: pos._1 },
 
   row.new('Load Balancer'),
+    panels.lb.active_connections(ds, vars)      { gridPos: pos._2 },
     panels.lb.healthy_hosts(ds, vars)           { gridPos: pos._2 },
 
   row.new('Database'),

terraform/monitoring/panels/lb/active_connections.libsonnet

@@ -0,0 +1,24 @@
+local grafana   = import '../../grafonnet-lib/grafana.libsonnet';
+local defaults  = import '../../grafonnet-lib/defaults.libsonnet';
+
+local panels    = grafana.panels;
+local targets   = grafana.targets;
+
+{
+  new(ds, vars)::
+    panels.timeseries(
+      title       = 'Active Connections',
+      datasource  = ds.cloudwatch,
+    )
+    .configure(defaults.configuration.timeseries)
+
+    .addTarget(targets.cloudwatch(
+      datasource      = ds.cloudwatch,
+      namespace     = 'AWS/ApplicationELB',
+      metricName    = 'ActiveConnectionCount',
+      dimensions    = {
+        LoadBalancer: vars.load_balancer
+      },
+      statistic     = 'Average',
+    ))
+}

terraform/monitoring/panels/lb/healthy_hosts.libsonnet

@@ -19,19 +19,18 @@ local _configuration = defaults.configuration.timeseries
     .configure(_configuration)
 
     .addTarget(targets.cloudwatch(
-      alias           = "eu-central-1",
       datasource      = ds.cloudwatch,
       metricQueryType = grafana.target.cloudwatch.metricQueryTypes.query,
 
       dimensions    = {
         TargetGroup: vars.target_group
       },
       metricName    = 'HealthyHostCount',
-      namespace     = 'AWS/NetworkELB',
+      namespace     = 'AWS/ApplicationELB',
       sql           = {
         from: {
           property: {
-            name: "AWS/NetworkELB",
+            name: "AWS/ApplicationELB",
             type: "string"
           },
           type: "property"
@@ -63,7 +62,7 @@ local _configuration = defaults.configuration.timeseries
           type: "and"
         }
       },
-      sqlExpression = "SELECT MAX(HealthyHostCount) FROM \"AWS/NetworkELB\" WHERE LoadBalancer = '%s'" % [vars.load_balancer],
+      sqlExpression = "SELECT MAX(HealthyHostCount) FROM \"AWS/ApplicationELB\" WHERE LoadBalancer = '%s'" % [vars.load_balancer],
       statistic     = 'Maximum',
     ))
 }

terraform/monitoring/panels/panels.libsonnet

@@ -22,6 +22,7 @@
   },
 
   lb: {
+    active_connections:             (import 'lb/active_connections.libsonnet'       ).new,
     healthy_hosts:                  (import 'lb/healthy_hosts.libsonnet'            ).new,
   }
 }