Fix: qed_server_instances metric didn't show up. Dashboards improved.

BBVA · Apr 2, 2019 · 126eead · 126eead
1 parent 9ac5a54
commit 126eead
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/deploy/aws/provision/files/grafana/dashboards/Host.json b/deploy/aws/provision/files/grafana/dashboards/Host.json
@@ -16,7 +16,7 @@
   "editable": true,
   "gnetId": 179,
   "graphTooltip": 1,
-  "iteration": 1554125286571,
+  "iteration": 1554212331104,
   "links": [],
   "panels": [
     {
@@ -29,7 +29,8 @@
         "#d44a3a"
       ],
       "datasource": "Prometheus",
-      "format": "s",
+      "decimals": 1,
+      "format": "dtdurations",
       "gauge": {
         "maxValue": 100,
         "minValue": 0,

diff --git a/deploy/aws/provision/files/grafana/dashboards/QED.json b/deploy/aws/provision/files/grafana/dashboards/QED.json
@@ -15,7 +15,7 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 2,
-  "iteration": 1554125967496,
+  "iteration": 1554198725913,
   "links": [],
   "panels": [
     {
@@ -68,7 +68,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(qed_instances_count)",
+          "expr": "sum(qed_server_instances)",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "QEDs",
@@ -215,7 +215,7 @@
       "tableColumn": "Value",
       "targets": [
         {
-          "expr": "sum(qed_balloon_add_total) / sum(qed_instances_count)",
+          "expr": "sum(qed_balloon_add_total) / sum(qed_server_instances)",
           "format": "time_series",
           "hide": false,
           "instant": false,
@@ -1624,7 +1624,7 @@
       "valueName": "delta"
     }
   ],
-  "refresh": false,
+  "refresh": "10s",
   "schemaVersion": 18,
   "style": "dark",
   "tags": [],

diff --git a/server/metrics.go b/server/metrics.go
@@ -32,8 +32,10 @@ func newServerMetrics() *serverMetrics {
 	return &serverMetrics{
 		Instances: prometheus.NewGauge(
 			prometheus.GaugeOpts{
-				Name: "instances",
-				Help: "Number of QED servers currently running",
+				Namespace: namespace,
+				Subsystem: subsystem,
+				Name:      "instances",
+				Help:      "Number of QED servers currently running",
 			},
 		),
 	}