20171228 dashboard/status-*.json.in (Knotentabelle für status-group und -mesh ergänzt, benötigt Grafana 4.6 wg. instant queries)

dashboard/status-group-render.json.in

@@ -126,7 +126,7 @@
    "repeatIteration" : null,
    "repeatRowId" : null,
    "showTitle" : false,
-   "title" : "Dashboard Row",
+   "title" : "[[group]] (clients)",
    "titleSize" : "h6"
   },
   {
@@ -150,106 +150,322 @@
    "repeatIteration" : null,
    "repeatRowId" : null,
    "showTitle" : false,
-   "title" : "Dashboard Row",
+   "title" : "Links zu [[hostname]], Node ID [[node_id]]",
    "titleSize" : "h6"
   },
-   {
-     "collapse": false,
-     "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": "Dashboard Row",
-      "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" : "500",
+   "panels" : [
+    {
+     "columns" : [
+     ],
+     "datasource" : null,
+     "fontSize" : "100%",
+     "id" : 7,
+     "links" : [
+     ],
+     "pageSize" : null,
+     "scroll" : true,
+     "showHeader" : true,
+     "sort" : {
+      "col" : 5,
+      "desc" : false
+     },
+     "span" : 12,
+     "styles" : [
+      {
+       "alias" : "Time",
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "pattern" : "Time",
+       "type" : "hidden"
+      },
+      {
+       "alias" : "",
+       "colorMode" : null,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "decimals" : 2,
+       "pattern" : "\/__name__|Value\/",
+       "thresholds" : [
+       ],
+       "type" : "hidden",
+       "unit" : "short"
+      },
+      {
+       "unit" : "short",
+       "type" : "string",
+       "alias" : "Autoupd.",
+       "decimals" : 2,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "colorMode" : null,
+       "pattern" : "autoupdater",
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "thresholds" : [
+       ]
+      },
+      {
+       "unit" : "short",
+       "type" : "string",
+       "alias" : "Branch",
+       "decimals" : 2,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "colorMode" : null,
+       "pattern" : "branch",
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "thresholds" : [
+       ]
+      },
+      {
+       "unit" : "short",
+       "type" : "string",
+       "alias" : "Firmware",
+       "decimals" : 2,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "colorMode" : null,
+       "pattern" : "firmware",
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "thresholds" : [
+       ]
+      },
+      {
+       "unit" : "short",
+       "type" : "string",
+       "alias" : "Hardware",
+       "decimals" : 2,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "colorMode" : null,
+       "pattern" : "model",
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "thresholds" : [
+       ]
+      },
+      {
+       "alias" : "Routername",
+       "colorMode" : null,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "decimals" : 2,
+       "link" : true,
+       "linkTargetBlank" : true,
+       "linkTooltip" : "zur Statusseite f\u00FCr $__cell",
+       "linkUrl" : "%%DASHBOARD_PATH%%%%DASHBOARD_PREFIX%%status.json?var-hostname=$__cell",
+       "pattern" : "hostname",
+       "thresholds" : [
+       ],
+       "type" : "string",
+       "unit" : "short"
+      },
+      {
+       "unit" : "short",
+       "type" : "string",
+       "alias" : "Node ID",
+       "decimals" : 2,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "colorMode" : null,
+       "pattern" : "node_id",
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "thresholds" : [
+       ]
+      },
+      {
+       "unit" : "short",
+       "type" : "string",
+       "alias" : "Meshinterfaces",
+       "decimals" : 2,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "colorMode" : null,
+       "pattern" : "interfaces",
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "thresholds" : [
+       ]
+      },
+      {
+       "unit" : "short",
+       "type" : "string",
+       "alias" : "Gateway",
+       "decimals" : 2,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "colorMode" : null,
+       "pattern" : "gateway",
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "thresholds" : [
+       ]
+      },
+      {
+       "alias" : "",
+       "colorMode" : null,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "decimals" : 2,
+       "pattern" : "\/.*\/",
+       "thresholds" : [
+       ],
+       "type" : "string",
+       "unit" : "short"
+      }
+     ],
+     "targets" : [
+      {
+       "expr" : "max(%%PROM_INFO_PREFIX%%{hostname=~\"[[regex]]\"}) by (autoupdater,branch,firmware,gateway,hostname,interfaces,model,node_id)",
+       "format" : "table",
+       "instant" : true,
+       "intervalFactor" : 2,
+       "refId" : "A"
+      }
+     ],
+     "title" : "Liste der Router in Gruppe '[[group]]'",
+     "transform" : "table",
+     "type" : "table"
+    }
+   ],
+   "repeat" : null,
+   "repeatIteration" : null,
+   "repeatRowId" : null,
+   "showTitle" : false,
+   "title" : "Liste der Router in Gruppe '[[group]]'",
+   "titleSize" : "h6"
+  }
  ],
  "schemaVersion" : 14,
  "style" : "dark",

dashboard/status-group.json.in

@@ -126,7 +126,7 @@
    "repeatIteration" : null,
    "repeatRowId" : null,
    "showTitle" : false,
-   "title" : "Dashboard Row",
+   "title" : "[[group]] (clients)",
    "titleSize" : "h6"
   },
   {
@@ -150,106 +150,322 @@
    "repeatIteration" : null,
    "repeatRowId" : null,
    "showTitle" : false,
-   "title" : "Dashboard Row",
+   "title" : "Links zu [[hostname]], Node ID [[node_id]]",
    "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" : "500",
+   "panels" : [
     {
-      "collapse": false,
-      "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": "Dashboard Row",
-      "titleSize": "h6"
+     "columns" : [
+     ],
+     "datasource" : null,
+     "fontSize" : "100%",
+     "id" : 7,
+     "links" : [
+     ],
+     "pageSize" : null,
+     "scroll" : true,
+     "showHeader" : true,
+     "sort" : {
+      "col" : 5,
+      "desc" : false
+     },
+     "span" : 12,
+     "styles" : [
+      {
+       "alias" : "Time",
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "pattern" : "Time",
+       "type" : "hidden"
+      },
+      {
+       "alias" : "",
+       "colorMode" : null,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "decimals" : 2,
+       "pattern" : "\/__name__|Value\/",
+       "thresholds" : [
+       ],
+       "type" : "hidden",
+       "unit" : "short"
+      },
+      {
+       "unit" : "short",
+       "type" : "string",
+       "alias" : "Autoupd.",
+       "decimals" : 2,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "colorMode" : null,
+       "pattern" : "autoupdater",
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "thresholds" : [
+       ]
+      },
+      {
+       "unit" : "short",
+       "type" : "string",
+       "alias" : "Branch",
+       "decimals" : 2,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "colorMode" : null,
+       "pattern" : "branch",
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "thresholds" : [
+       ]
+      },
+      {
+       "unit" : "short",
+       "type" : "string",
+       "alias" : "Firmware",
+       "decimals" : 2,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "colorMode" : null,
+       "pattern" : "firmware",
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "thresholds" : [
+       ]
+      },
+      {
+       "unit" : "short",
+       "type" : "string",
+       "alias" : "Hardware",
+       "decimals" : 2,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "colorMode" : null,
+       "pattern" : "model",
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "thresholds" : [
+       ]
+      },
+      {
+       "alias" : "Routername",
+       "colorMode" : null,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "decimals" : 2,
+       "link" : true,
+       "linkTargetBlank" : true,
+       "linkTooltip" : "zur Statusseite f\u00FCr $__cell",
+       "linkUrl" : "%%DASHBOARD_PATH%%%%DASHBOARD_PREFIX%%status.json?var-hostname=$__cell",
+       "pattern" : "hostname",
+       "thresholds" : [
+       ],
+       "type" : "string",
+       "unit" : "short"
+      },
+      {
+       "unit" : "short",
+       "type" : "string",
+       "alias" : "Node ID",
+       "decimals" : 2,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "colorMode" : null,
+       "pattern" : "node_id",
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "thresholds" : [
+       ]
+      },
+      {
+       "unit" : "short",
+       "type" : "string",
+       "alias" : "Meshinterfaces",
+       "decimals" : 2,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "colorMode" : null,
+       "pattern" : "interfaces",
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "thresholds" : [
+       ]
+      },
+      {
+       "unit" : "short",
+       "type" : "string",
+       "alias" : "Gateway",
+       "decimals" : 2,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "colorMode" : null,
+       "pattern" : "gateway",
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "thresholds" : [
+       ]
+      },
+      {
+       "alias" : "",
+       "colorMode" : null,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "decimals" : 2,
+       "pattern" : "\/.*\/",
+       "thresholds" : [
+       ],
+       "type" : "string",
+       "unit" : "short"
+      }
+     ],
+     "targets" : [
+      {
+       "expr" : "max(%%PROM_INFO_PREFIX%%{hostname=~\"[[regex]]\"}) by (autoupdater,branch,firmware,gateway,hostname,interfaces,model,node_id)",
+       "format" : "table",
+       "instant" : true,
+       "intervalFactor" : 2,
+       "refId" : "A"
+      }
+     ],
+     "title" : "Liste der Router in Gruppe '[[group]]'",
+     "transform" : "table",
+     "type" : "table"
     }
+   ],
+   "repeat" : null,
+   "repeatIteration" : null,
+   "repeatRowId" : null,
+   "showTitle" : false,
+   "title" : "Liste der Router in Gruppe '[[group]]'",
+   "titleSize" : "h6"
+  }
  ],
  "schemaVersion" : 14,
  "style" : "dark",

dashboard/status-mesh-render.json.in

@@ -64,7 +64,7 @@
        "expr" : "sum(floor(%%PROM_GRAPH_PREFIX%%%%PROM_SEPERATOR%%mesh))",
        "format" : "time_series",
        "intervalFactor" : 2,
-       "legendFormat" : "Knoten",
+       "legendFormat" : "Router",
        "refId" : "B",
        "step" : 240
       },
@@ -81,7 +81,7 @@
      ],
      "timeFrom" : null,
      "timeShift" : null,
-     "title" : "Meshes, Knoten, Links - zZ [[mesh_count]], [[node_sum]], [[link_sum]]",
+     "title" : "Meshes, Router, Links - zZ [[mesh_count]], [[node_sum]], [[link_sum]]",
      "tooltip" : {
       "shared" : true,
       "sort" : 0,
@@ -160,7 +160,7 @@
    "repeatIteration" : null,
    "repeatRowId" : null,
    "showTitle" : false,
-   "title" : "[[mesh_count]] Meshes mit insgesamt [[node_sum]] Knoten und [[link_sum]] Links",
+   "title" : "[[mesh_count]] Meshes mit insgesamt [[node_sum]] Routern und [[link_sum]] Links",
    "titleSize" : "h6"
   },
   {
@@ -229,7 +229,7 @@
      ],
      "timeFrom" : null,
      "timeShift" : null,
-     "title" : "clients im Mesh des Knotens [[mesh_name]]",
+     "title" : "clients im Mesh des Routers [[mesh_name]]",
      "tooltip" : {
       "shared" : true,
       "sort" : 1,
@@ -269,7 +269,7 @@
    "repeatIteration" : null,
    "repeatRowId" : null,
    "showTitle" : false,
-   "title" : "Dashboard Row",
+   "title" : "clients im Mesh des Routers [[mesh_name]]",
    "titleSize" : "h6"
   },
   {
@@ -277,7 +277,7 @@
    "height" : "100",
    "panels" : [
     {
-     "content" : "<p>Links zu Router [[hostname]], Node ID [[node_id]]: <a href=\"%%DASHBOARD_PATH%%%%DASHBOARD_PREFIX%%status.json?var-hostname=[[hostname]]&var-node_id=[[node_id]]\">Status Dashboard<\/a>, <a href=\"%%MAP_NODE_URL%%[[node_id]]\">Map<\/a>.<\/p>\n",
+     "content" : "<p>Links zu Router [[hostname]], Node ID [[node_id]]: <a href=\"%%DASHBOARD_PATH%%%%DASHBOARD_PREFIX%%status-render.json?var-hostname=[[hostname]]&var-node_id=[[node_id]]\">Status Dashboard<\/a>, <a href=\"%%MAP_NODE_URL%%[[node_id]]\">Map<\/a>.<\/p>\n",
      "height" : "80px",
      "id" : 4,
      "links" : [
@@ -293,7 +293,320 @@
    "repeatIteration" : null,
    "repeatRowId" : null,
    "showTitle" : false,
-   "title" : "Dashboard Row",
+   "title" : "Links zu [[hostname]], Node ID [[node_id]]",
+   "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{node_id=~\"([[regex]])\"})",
+       "format" : "time_series",
+       "hide" : false,
+       "instant" : false,
+       "intervalFactor" : 2,
+       "legendFormat" : "Routeranzahl",
+       "refId" : "A"
+      }
+     ],
+     "thresholds" : [
+     ],
+     "timeFrom" : null,
+     "timeShift" : null,
+     "title" : "Anzahl der Router im Mesh '[[mesh_name]]'",
+     "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 im Mesh '[[mesh_name]]'",
+   "titleSize" : "h6"
+  },
+  {
+   "collapse" : true,
+   "height" : "500",
+   "panels" : [
+    {
+     "columns" : [
+     ],
+     "datasource" : null,
+     "fontSize" : "100%",
+     "id" : 7,
+     "links" : [
+     ],
+     "pageSize" : null,
+     "scroll" : true,
+     "showHeader" : true,
+     "sort" : {
+      "col" : 5,
+      "desc" : false
+     },
+     "span" : 12,
+     "styles" : [
+      {
+       "alias" : "Time",
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "pattern" : "Time",
+       "type" : "hidden"
+      },
+      {
+       "alias" : "",
+       "colorMode" : null,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "decimals" : 2,
+       "pattern" : "\/__name__|Value\/",
+       "thresholds" : [
+       ],
+       "type" : "hidden",
+       "unit" : "short"
+      },
+      {
+       "unit" : "short",
+       "type" : "string",
+       "alias" : "Autoupd.",
+       "decimals" : 2,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "colorMode" : null,
+       "pattern" : "autoupdater",
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "thresholds" : [
+       ]
+      },
+      {
+       "unit" : "short",
+       "type" : "string",
+       "alias" : "Branch",
+       "decimals" : 2,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "colorMode" : null,
+       "pattern" : "branch",
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "thresholds" : [
+       ]
+      },
+      {
+       "unit" : "short",
+       "type" : "string",
+       "alias" : "Firmware",
+       "decimals" : 2,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "colorMode" : null,
+       "pattern" : "firmware",
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "thresholds" : [
+       ]
+      },
+      {
+       "unit" : "short",
+       "type" : "string",
+       "alias" : "Hardware",
+       "decimals" : 2,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "colorMode" : null,
+       "pattern" : "model",
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "thresholds" : [
+       ]
+      },
+      {
+       "alias" : "Routername",
+       "colorMode" : null,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "decimals" : 2,
+       "link" : true,
+       "linkTargetBlank" : true,
+       "linkTooltip" : "zur Statusseite f\u00FCr $__cell",
+       "linkUrl" : "%%DASHBOARD_PATH%%%%DASHBOARD_PREFIX%%status-render.json?var-hostname=$__cell",
+       "pattern" : "hostname",
+       "thresholds" : [
+       ],
+       "type" : "string",
+       "unit" : "short"
+      },
+      {
+       "unit" : "short",
+       "type" : "string",
+       "alias" : "Node ID",
+       "decimals" : 2,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "colorMode" : null,
+       "pattern" : "node_id",
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "thresholds" : [
+       ]
+      },
+      {
+       "unit" : "short",
+       "type" : "string",
+       "alias" : "Meshinterfaces",
+       "decimals" : 2,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "colorMode" : null,
+       "pattern" : "interfaces",
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "thresholds" : [
+       ]
+      },
+      {
+       "unit" : "short",
+       "type" : "string",
+       "alias" : "Gateway",
+       "decimals" : 2,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "colorMode" : null,
+       "pattern" : "gateway",
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "thresholds" : [
+       ]
+      },
+      {
+       "alias" : "",
+       "colorMode" : null,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "decimals" : 2,
+       "pattern" : "\/.*\/",
+       "thresholds" : [
+       ],
+       "type" : "string",
+       "unit" : "short"
+      }
+     ],
+     "targets" : [
+      {
+       "expr" : "max(%%PROM_INFO_PREFIX%%{node_id=~\"[[regex]]\"}) by (autoupdater,branch,firmware,gateway,hostname,interfaces,model,node_id)",
+       "format" : "table",
+       "instant" : true,
+       "intervalFactor" : 2,
+       "refId" : "A"
+      }
+     ],
+     "title" : "Liste der Router im Mesh '[[mesh_name]]'",
+     "transform" : "table",
+     "type" : "table"
+    }
+   ],
+   "repeat" : null,
+   "repeatIteration" : null,
+   "repeatRowId" : null,
+   "showTitle" : false,
+   "title" : "Liste der Router im Mesh '[[mesh_name]]'",
    "titleSize" : "h6"
   }
  ],
@@ -363,7 +676,7 @@
     ],
     "query" : "query_result(max(max_over_time(%%PROM_GRAPH_PREFIX%%%%PROM_SEPERATOR%%mesh{node_id=\"[[mesh_id]]\"}[1d])) by (members) == scalar(max(max_over_time(%%PROM_GRAPH_PREFIX%%%%PROM_SEPERATOR%%mesh{node_id=\"[[mesh_id]]\"}[1d]))))",
     "refresh" : 2,
-    "regex" : "/.*members=\"([^\"]+)\"./",
+    "regex" : "\/.*members=\"([^\"]+)\".\/",
     "sort" : 0,
     "tagValuesQuery" : "",
     "tags" : [
@@ -379,7 +692,7 @@
     "datasource" : null,
     "hide" : 0,
     "includeAll" : false,
-    "label" : "Knoten ausw\u00E4hlen:",
+    "label" : "Router ausw\u00E4hlen:",
     "multi" : false,
     "name" : "hostname",
     "options" : [

dashboard/status-mesh.json.in

@@ -64,7 +64,7 @@
        "expr" : "sum(floor(%%PROM_GRAPH_PREFIX%%%%PROM_SEPERATOR%%mesh))",
        "format" : "time_series",
        "intervalFactor" : 2,
-       "legendFormat" : "Knoten",
+       "legendFormat" : "Router",
        "refId" : "B",
        "step" : 240
       },
@@ -81,7 +81,7 @@
      ],
      "timeFrom" : null,
      "timeShift" : null,
-     "title" : "Meshes, Knoten, Links - zZ [[mesh_count]], [[node_sum]], [[link_sum]]",
+     "title" : "Meshes, Router, Links - zZ [[mesh_count]], [[node_sum]], [[link_sum]]",
      "tooltip" : {
       "shared" : true,
       "sort" : 0,
@@ -160,7 +160,7 @@
    "repeatIteration" : null,
    "repeatRowId" : null,
    "showTitle" : false,
-   "title" : "[[mesh_count]] Meshes mit insgesamt [[node_sum]] Knoten und [[link_sum]] Links",
+   "title" : "[[mesh_count]] Meshes mit insgesamt [[node_sum]] Routern und [[link_sum]] Links",
    "titleSize" : "h6"
   },
   {
@@ -229,7 +229,7 @@
      ],
      "timeFrom" : null,
      "timeShift" : null,
-     "title" : "clients im Mesh des Knotens [[mesh_name]]",
+     "title" : "clients im Mesh des Routers [[mesh_name]]",
      "tooltip" : {
       "shared" : true,
       "sort" : 1,
@@ -269,7 +269,7 @@
    "repeatIteration" : null,
    "repeatRowId" : null,
    "showTitle" : false,
-   "title" : "Dashboard Row",
+   "title" : "clients im Mesh des Routers [[mesh_name]]",
    "titleSize" : "h6"
   },
   {
@@ -293,7 +293,320 @@
    "repeatIteration" : null,
    "repeatRowId" : null,
    "showTitle" : false,
-   "title" : "Dashboard Row",
+   "title" : "Links zu [[hostname]], Node ID [[node_id]]",
+   "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{node_id=~\"([[regex]])\"})",
+       "format" : "time_series",
+       "hide" : false,
+       "instant" : false,
+       "intervalFactor" : 2,
+       "legendFormat" : "Routeranzahl",
+       "refId" : "A"
+      }
+     ],
+     "thresholds" : [
+     ],
+     "timeFrom" : null,
+     "timeShift" : null,
+     "title" : "Anzahl der Router im Mesh '[[mesh_name]]'",
+     "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 im Mesh '[[mesh_name]]'",
+   "titleSize" : "h6"
+  },
+  {
+   "collapse" : true,
+   "height" : "500",
+   "panels" : [
+    {
+     "columns" : [
+     ],
+     "datasource" : null,
+     "fontSize" : "100%",
+     "id" : 7,
+     "links" : [
+     ],
+     "pageSize" : null,
+     "scroll" : true,
+     "showHeader" : true,
+     "sort" : {
+      "col" : 5,
+      "desc" : false
+     },
+     "span" : 12,
+     "styles" : [
+      {
+       "alias" : "Time",
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "pattern" : "Time",
+       "type" : "hidden"
+      },
+      {
+       "alias" : "",
+       "colorMode" : null,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "decimals" : 2,
+       "pattern" : "\/__name__|Value\/",
+       "thresholds" : [
+       ],
+       "type" : "hidden",
+       "unit" : "short"
+      },
+      {
+       "unit" : "short",
+       "type" : "string",
+       "alias" : "Autoupd.",
+       "decimals" : 2,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "colorMode" : null,
+       "pattern" : "autoupdater",
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "thresholds" : [
+       ]
+      },
+      {
+       "unit" : "short",
+       "type" : "string",
+       "alias" : "Branch",
+       "decimals" : 2,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "colorMode" : null,
+       "pattern" : "branch",
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "thresholds" : [
+       ]
+      },
+      {
+       "unit" : "short",
+       "type" : "string",
+       "alias" : "Firmware",
+       "decimals" : 2,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "colorMode" : null,
+       "pattern" : "firmware",
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "thresholds" : [
+       ]
+      },
+      {
+       "unit" : "short",
+       "type" : "string",
+       "alias" : "Hardware",
+       "decimals" : 2,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "colorMode" : null,
+       "pattern" : "model",
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "thresholds" : [
+       ]
+      },
+      {
+       "alias" : "Routername",
+       "colorMode" : null,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "decimals" : 2,
+       "link" : true,
+       "linkTargetBlank" : true,
+       "linkTooltip" : "zur Statusseite f\u00FCr $__cell",
+       "linkUrl" : "%%DASHBOARD_PATH%%%%DASHBOARD_PREFIX%%status.json?var-hostname=$__cell",
+       "pattern" : "hostname",
+       "thresholds" : [
+       ],
+       "type" : "string",
+       "unit" : "short"
+      },
+      {
+       "unit" : "short",
+       "type" : "string",
+       "alias" : "Node ID",
+       "decimals" : 2,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "colorMode" : null,
+       "pattern" : "node_id",
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "thresholds" : [
+       ]
+      },
+      {
+       "unit" : "short",
+       "type" : "string",
+       "alias" : "Meshinterfaces",
+       "decimals" : 2,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "colorMode" : null,
+       "pattern" : "interfaces",
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "thresholds" : [
+       ]
+      },
+      {
+       "unit" : "short",
+       "type" : "string",
+       "alias" : "Gateway",
+       "decimals" : 2,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "colorMode" : null,
+       "pattern" : "gateway",
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "thresholds" : [
+       ]
+      },
+      {
+       "alias" : "",
+       "colorMode" : null,
+       "colors" : [
+        "rgba(245, 54, 54, 0.9)",
+        "rgba(237, 129, 40, 0.89)",
+        "rgba(50, 172, 45, 0.97)"
+       ],
+       "dateFormat" : "YYYY-MM-DD HH:mm:ss",
+       "decimals" : 2,
+       "pattern" : "\/.*\/",
+       "thresholds" : [
+       ],
+       "type" : "string",
+       "unit" : "short"
+      }
+     ],
+     "targets" : [
+      {
+       "expr" : "max(%%PROM_INFO_PREFIX%%{node_id=~\"[[regex]]\"}) by (autoupdater,branch,firmware,gateway,hostname,interfaces,model,node_id)",
+       "format" : "table",
+       "instant" : true,
+       "intervalFactor" : 2,
+       "refId" : "A"
+      }
+     ],
+     "title" : "Liste der Router im Mesh '[[mesh_name]]'",
+     "transform" : "table",
+     "type" : "table"
+    }
+   ],
+   "repeat" : null,
+   "repeatIteration" : null,
+   "repeatRowId" : null,
+   "showTitle" : false,
+   "title" : "Liste der Router im Mesh '[[mesh_name]]'",
    "titleSize" : "h6"
   }
  ],
@@ -363,7 +676,7 @@
     ],
     "query" : "query_result(max(max_over_time(%%PROM_GRAPH_PREFIX%%%%PROM_SEPERATOR%%mesh{node_id=\"[[mesh_id]]\"}[1d])) by (members) == scalar(max(max_over_time(%%PROM_GRAPH_PREFIX%%%%PROM_SEPERATOR%%mesh{node_id=\"[[mesh_id]]\"}[1d]))))",
     "refresh" : 2,
-    "regex" : "/.*members=\"([^\"]+)\"./",
+    "regex" : "\/.*members=\"([^\"]+)\".\/",
     "sort" : 0,
     "tagValuesQuery" : "",
     "tags" : [
@@ -379,7 +692,7 @@
     "datasource" : null,
     "hide" : 0,
     "includeAll" : false,
-    "label" : "Knoten ausw\u00E4hlen:",
+    "label" : "Router ausw\u00E4hlen:",
     "multi" : false,
     "name" : "hostname",
     "options" : [