Anzahl der NutzerInnen und Router in einem Graphen.

dashboard/status-group-render.json.in

@@ -154,105 +154,109 @@
    "titleSize" : "h6"
   },
   {
-   "collapse" : true,
-   "height" : 250,
-   "panels" : [
-    {
-     "aliasColors" : {
-      "Routeranzahl" : "#65c5db"
-     },
-     "bars" : false,
-     "dashLength" : 10,
-     "dashes" : false,
-     "datasource" : null,
-     "decimals" : 0,
-     "fill" : 1,
-     "id" : 5,
-     "legend" : {
-      "alignAsTable" : true,
-      "avg" : true,
-      "current" : true,
-      "hideEmpty" : true,
-      "hideZero" : false,
-      "max" : true,
-      "min" : true,
-      "rightSide" : false,
-      "show" : true,
-      "total" : false,
-      "values" : true
-     },
-     "lines" : true,
-     "linewidth" : 1,
-     "links" : [
-     ],
-     "nullPointMode" : "null",
-     "percentage" : false,
-     "pointradius" : 5,
-     "points" : false,
-     "renderer" : "flot",
-     "seriesOverrides" : [
-     ],
-     "spaceLength" : 10,
-     "span" : 12,
-     "stack" : false,
-     "steppedLine" : false,
-     "targets" : [
-      {
-       "expr" : "count(%%PROM_STATS_PREFIX%%%%PROM_SEPERATOR%%clients{hostname=~\"([[regex]])\"})",
-       "format" : "time_series",
-       "hide" : false,
-       "instant" : false,
-       "intervalFactor" : 2,
-       "legendFormat" : "Routeranzahl",
-       "refId" : "A"
-      }
-     ],
-     "thresholds" : [
-     ],
-     "timeFrom" : null,
-     "timeShift" : null,
-     "title" : "Anzahl der Router in der Gruppe '[[group]]'",
-     "tooltip" : {
-      "shared" : true,
-      "sort" : 0,
-      "value_type" : "individual"
-     },
-     "type" : "graph",
-     "xaxis" : {
-      "buckets" : null,
-      "mode" : "time",
-      "name" : null,
-      "show" : true,
-      "values" : [
-      ]
-     },
-     "yaxes" : [
-      {
-       "decimals" : 0,
-       "format" : "short",
-       "label" : "",
-       "logBase" : 1,
-       "max" : null,
-       "min" : "0",
-       "show" : true
-      },
-      {
-       "format" : "short",
-       "label" : null,
-       "logBase" : 1,
-       "max" : null,
-       "min" : null,
-       "show" : false
-      }
-     ]
-    }
-   ],
-   "repeat" : null,
-   "repeatIteration" : null,
-   "repeatRowId" : null,
-   "showTitle" : false,
-   "title" : "Anzahl der Router in der Gruppe '[[group]]'",
-   "titleSize" : "h6"
+      "collapse": true,
+      "height": 250,
+      "panels": [
+        {
+          "aliasColors": {
+            "Router": "#1f78c1",
+            "Routeranzahl": "#1f78c1"
+          },
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": null,
+          "decimals": 0,
+          "fill": 0,
+          "id": 5,
+          "legend": {
+            "alignAsTable": true,
+            "avg": true,
+            "current": true,
+            "hideEmpty": true,
+            "hideZero": false,
+            "max": true,
+            "min": true,
+            "rightSide": false,
+            "show": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 2,
+          "links": [],
+          "nullPointMode": "null",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "span": 12,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "count(%%PROM_STATS_PREFIX%%%%PROM_SEPERATOR%%clients{hostname=~\"([[regex]])\"})",
+              "format": "time_series",
+              "hide": false,
+              "instant": false,
+              "intervalFactor": 2,
+              "legendFormat": "Router",
+              "refId": "A"
+            },
+            {
+              "expr": "sum(%%PROM_STATS_PREFIX%%%%PROM_SEPERATOR%%clients{hostname=~\"([[regex]])\"})",
+              "format": "time_series",
+              "intervalFactor": 2,
+              "legendFormat": "NutzerInnen",
+              "refId": "B"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Gruppe '[[group]]': Anzahl NutzerInnen und Router",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "decimals": 0,
+              "format": "short",
+              "label": "NutzerInnen",
+              "logBase": 1,
+              "max": null,
+              "min": "0",
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": "Router",
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ]
+        }
+      ],
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Gruppe '[[group]]': Anzahl der NutzerInnen und Router",
+      "titleSize": "h6"
   },
   {
    "collapse" : true,

dashboard/status-group.json.in

@@ -154,105 +154,109 @@
    "titleSize" : "h6"
   },
   {
-   "collapse" : true,
-   "height" : 250,
-   "panels" : [
-    {
-     "aliasColors" : {
-      "Routeranzahl" : "#65c5db"
-     },
-     "bars" : false,
-     "dashLength" : 10,
-     "dashes" : false,
-     "datasource" : null,
-     "decimals" : 0,
-     "fill" : 1,
-     "id" : 5,
-     "legend" : {
-      "alignAsTable" : true,
-      "avg" : true,
-      "current" : true,
-      "hideEmpty" : true,
-      "hideZero" : false,
-      "max" : false,
-      "min" : false,
-      "rightSide" : true,
-      "show" : true,
-      "total" : false,
-      "values" : true
-     },
-     "lines" : true,
-     "linewidth" : 1,
-     "links" : [
-     ],
-     "nullPointMode" : "null",
-     "percentage" : false,
-     "pointradius" : 5,
-     "points" : false,
-     "renderer" : "flot",
-     "seriesOverrides" : [
-     ],
-     "spaceLength" : 10,
-     "span" : 12,
-     "stack" : false,
-     "steppedLine" : false,
-     "targets" : [
-      {
-       "expr" : "count(%%PROM_STATS_PREFIX%%%%PROM_SEPERATOR%%clients{hostname=~\"([[regex]])\"})",
-       "format" : "time_series",
-       "hide" : false,
-       "instant" : false,
-       "intervalFactor" : 2,
-       "legendFormat" : "Routeranzahl",
-       "refId" : "A"
-      }
-     ],
-     "thresholds" : [
-     ],
-     "timeFrom" : null,
-     "timeShift" : null,
-     "title" : "Anzahl der Router in der Gruppe '[[group]]'",
-     "tooltip" : {
-      "shared" : true,
-      "sort" : 0,
-      "value_type" : "individual"
-     },
-     "type" : "graph",
-     "xaxis" : {
-      "buckets" : null,
-      "mode" : "time",
-      "name" : null,
-      "show" : true,
-      "values" : [
-      ]
-     },
-     "yaxes" : [
-      {
-       "decimals" : 0,
-       "format" : "short",
-       "label" : "",
-       "logBase" : 1,
-       "max" : null,
-       "min" : "0",
-       "show" : true
-      },
-      {
-       "format" : "short",
-       "label" : null,
-       "logBase" : 1,
-       "max" : null,
-       "min" : null,
-       "show" : false
-      }
-     ]
-    }
-   ],
-   "repeat" : null,
-   "repeatIteration" : null,
-   "repeatRowId" : null,
-   "showTitle" : false,
-   "title" : "Anzahl der Router in der Gruppe '[[group]]'",
-   "titleSize" : "h6"
+      "collapse": true,
+      "height": 250,
+      "panels": [
+        {
+          "aliasColors": {
+            "Router": "#1f78c1",
+            "Routeranzahl": "#1f78c1"
+          },
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": null,
+          "decimals": 0,
+          "fill": 0,
+          "id": 5,
+          "legend": {
+            "alignAsTable": true,
+            "avg": true,
+            "current": true,
+            "hideEmpty": true,
+            "hideZero": false,
+            "max": false,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "total": false,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 2,
+          "links": [],
+          "nullPointMode": "null",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "span": 12,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "expr": "count(%%PROM_STATS_PREFIX%%%%PROM_SEPERATOR%%clients{hostname=~\"([[regex]])\"})",
+              "format": "time_series",
+              "hide": false,
+              "instant": false,
+              "intervalFactor": 2,
+              "legendFormat": "Router",
+              "refId": "A"
+            },
+            {
+              "expr": "sum(%%PROM_STATS_PREFIX%%%%PROM_SEPERATOR%%clients{hostname=~\"([[regex]])\"})",
+              "format": "time_series",
+              "intervalFactor": 2,
+              "legendFormat": "NutzerInnen",
+              "refId": "B"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Gruppe '[[group]]': Anzahl NutzerInnen und Router",
+          "tooltip": {
+            "shared": true,
+            "sort": 0,
+            "value_type": "individual"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "decimals": 0,
+              "format": "short",
+              "label": "NutzerInnen",
+              "logBase": 1,
+              "max": null,
+              "min": "0",
+              "show": true
+            },
+            {
+              "format": "short",
+              "label": "Router",
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            }
+          ]
+        }
+      ],
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Gruppe '[[group]]': Anzahl der NutzerInnen und Router",
+      "titleSize": "h6"
   },
   {
    "collapse" : true,