extra charts für clients und traffic hinzugefügt.

dashboard/status-render.json.in

@@ -1096,6 +1096,253 @@
    "titleSize" : "h6"
   },
   {
+   "collapse" : false,
+   "height" : 250,
+   "panels" : [
+    {
+     "aliasColors" : {
+      "RX" : "#E24D42",
+      "clients " : "#447EBC",
+      "uplink" : "#052B51"
+     },
+     "bars" : false,
+     "dashLength" : 10,
+     "dashes" : false,
+     "datasource" : null,
+     "fill" : 1,
+     "id" : 25,
+     "legend" : {
+      "alignAsTable" : true,
+      "avg" : true,
+      "current" : true,
+      "hideEmpty" : true,
+      "hideZero" : false,
+      "max" : true,
+      "min" : true,
+      "rightSide" : false,
+      "show" : true,
+      "sortDesc" : true,
+      "total" : false,
+      "values" : true
+     },
+     "lines" : true,
+     "linewidth" : 2,
+     "links" : [
+     ],
+     "nullPointMode" : "null",
+     "percentage" : false,
+     "pointradius" : 5,
+     "points" : false,
+     "renderer" : "flot",
+     "seriesOverrides" : [
+      {
+       "alias" : "\/.*clients.*\/",
+       "color" : "#70dbed",
+       "yaxis" : 1
+      }
+     ],
+     "spaceLength" : 10,
+     "span" : 12,
+     "stack" : false,
+     "steppedLine" : false,
+     "targets" : [
+      {
+       "expr" : "ffdo_nodes_detail_clients{hostname=\"[[hostname]]\"}",
+       "format" : "time_series",
+       "intervalFactor" : 2,
+       "legendFormat" : "clients",
+       "refId" : "C",
+       "step" : 120
+      },
+      {
+       "expr" : "%%PROM_STATS_PREFIX%%%%PROM_SEPERATOR%%uplink{hostname=\"[[hostname]]\"}",
+       "format" : "time_series",
+       "hide" : true,
+       "intervalFactor" : 2,
+       "legendFormat" : "uplink",
+       "refId" : "D",
+       "step" : 120
+      }
+     ],
+     "thresholds" : [
+     ],
+     "timeFrom" : null,
+     "timeShift" : null,
+     "title" : "NutzerInnen von [[hostname]] (aktuell: [[clients]])",
+     "tooltip" : {
+      "shared" : true,
+      "sort" : 0,
+      "value_type" : "individual"
+     },
+     "transparent" : true,
+     "type" : "graph",
+     "xaxis" : {
+      "buckets" : null,
+      "mode" : "time",
+      "name" : null,
+      "show" : true,
+      "values" : [
+      ]
+     },
+     "yaxes" : [
+      {
+       "decimals" : 0,
+       "format" : "none",
+       "label" : "",
+       "logBase" : 1,
+       "max" : null,
+       "min" : "0",
+       "show" : true
+      },
+      {
+       "format" : "bps",
+       "label" : "",
+       "logBase" : 1,
+       "max" : null,
+       "min" : null,
+       "show" : false
+      }
+     ]
+    }
+   ],
+   "repeat" : null,
+   "repeatIteration" : null,
+   "repeatRowId" : null,
+   "showTitle" : false,
+   "title" : "clients on router - single chart",
+   "titleSize" : "h6"
+  },
+  {
+   "collapse" : false,
+   "height" : 250,
+   "panels" : [
+    {
+     "aliasColors" : {
+      "RX" : "#E24D42",
+      "clients " : "#447EBC",
+      "uplink" : "#052B51"
+     },
+     "bars" : false,
+     "dashLength" : 10,
+     "dashes" : false,
+     "datasource" : null,
+     "fill" : 1,
+     "id" : 26,
+     "legend" : {
+      "alignAsTable" : true,
+      "avg" : true,
+      "current" : true,
+      "hideEmpty" : true,
+      "hideZero" : true,
+      "max" : true,
+      "min" : true,
+      "rightSide" : false,
+      "show" : true,
+      "sortDesc" : true,
+      "total" : false,
+      "values" : true
+     },
+     "lines" : true,
+     "linewidth" : 2,
+     "links" : [
+     ],
+     "nullPointMode" : "null",
+     "percentage" : false,
+     "pointradius" : 5,
+     "points" : false,
+     "renderer" : "flot",
+     "seriesOverrides" : [
+      {
+       "alias" : "RX",
+       "color" : "#b7dbab"
+      },
+      {
+       "alias" : "TX",
+       "color" : "#ea6460",
+       "transform" : "negative-Y"
+      }
+     ],
+     "spaceLength" : 10,
+     "span" : 12,
+     "stack" : false,
+     "steppedLine" : false,
+     "targets" : [
+      {
+       "expr" : "8*rate(%%PROM_STATS_PREFIX%%%%PROM_SEPERATOR%%rx{hostname=\"[[hostname]]\"}[5m])",
+       "format" : "time_series",
+       "hide" : false,
+       "intervalFactor" : 2,
+       "legendFormat" : "RX",
+       "refId" : "A",
+       "step" : 120
+      },
+      {
+       "expr" : "8*rate(%%PROM_STATS_PREFIX%%%%PROM_SEPERATOR%%tx{hostname=\"[[hostname]]\"}[5m])",
+       "format" : "time_series",
+       "intervalFactor" : 2,
+       "legendFormat" : "TX",
+       "refId" : "B",
+       "step" : 120
+      },
+      {
+       "expr" : "%%PROM_STATS_PREFIX%%%%PROM_SEPERATOR%%uplink{hostname=\"[[hostname]]\"}",
+       "format" : "time_series",
+       "hide" : true,
+       "intervalFactor" : 2,
+       "legendFormat" : "uplink",
+       "refId" : "D",
+       "step" : 120
+      }
+     ],
+     "thresholds" : [
+     ],
+     "timeFrom" : null,
+     "timeShift" : null,
+     "title" : "traffic [[hostname]]",
+     "tooltip" : {
+      "shared" : true,
+      "sort" : 0,
+      "value_type" : "individual"
+     },
+     "transparent" : true,
+     "type" : "graph",
+     "xaxis" : {
+      "buckets" : null,
+      "mode" : "time",
+      "name" : null,
+      "show" : true,
+      "values" : [
+      ]
+     },
+     "yaxes" : [
+      {
+       "decimals" : 0,
+       "format" : "bps",
+       "label" : "",
+       "logBase" : 1,
+       "max" : null,
+       "min" : null,
+       "show" : true
+      },
+      {
+       "format" : "bps",
+       "label" : "",
+       "logBase" : 1,
+       "max" : null,
+       "min" : null,
+       "show" : false
+      }
+     ]
+    }
+   ],
+   "repeat" : null,
+   "repeatIteration" : null,
+   "repeatRowId" : null,
+   "showTitle" : false,
+   "title" : "traffic on router - single chart",
+   "titleSize" : "h6"
+  },
+  {
    "collapse" : true,
    "height" : "250",
    "panels" : [

dashboard/status.json.in

@@ -1097,6 +1097,253 @@
   },
   {
    "collapse" : true,
+   "height" : 250,
+   "panels" : [
+    {
+     "aliasColors" : {
+      "RX" : "#E24D42",
+      "clients " : "#447EBC",
+      "uplink" : "#052B51"
+     },
+     "bars" : false,
+     "dashLength" : 10,
+     "dashes" : false,
+     "datasource" : null,
+     "fill" : 1,
+     "id" : 25,
+     "legend" : {
+      "alignAsTable" : true,
+      "avg" : true,
+      "current" : true,
+      "hideEmpty" : true,
+      "hideZero" : false,
+      "max" : true,
+      "min" : true,
+      "rightSide" : true,
+      "show" : true,
+      "sortDesc" : true,
+      "total" : false,
+      "values" : true
+     },
+     "lines" : true,
+     "linewidth" : 2,
+     "links" : [
+     ],
+     "nullPointMode" : "null",
+     "percentage" : false,
+     "pointradius" : 5,
+     "points" : false,
+     "renderer" : "flot",
+     "seriesOverrides" : [
+      {
+       "alias" : "\/.*clients.*\/",
+       "color" : "#70dbed",
+       "yaxis" : 1
+      }
+     ],
+     "spaceLength" : 10,
+     "span" : 12,
+     "stack" : false,
+     "steppedLine" : false,
+     "targets" : [
+      {
+       "expr" : "ffdo_nodes_detail_clients{hostname=\"[[hostname]]\"}",
+       "format" : "time_series",
+       "intervalFactor" : 2,
+       "legendFormat" : "clients",
+       "refId" : "C",
+       "step" : 120
+      },
+      {
+       "expr" : "%%PROM_STATS_PREFIX%%%%PROM_SEPERATOR%%uplink{hostname=\"[[hostname]]\"}",
+       "format" : "time_series",
+       "hide" : true,
+       "intervalFactor" : 2,
+       "legendFormat" : "uplink",
+       "refId" : "D",
+       "step" : 120
+      }
+     ],
+     "thresholds" : [
+     ],
+     "timeFrom" : null,
+     "timeShift" : null,
+     "title" : "NutzerInnen von [[hostname]] (aktuell: [[clients]])",
+     "tooltip" : {
+      "shared" : true,
+      "sort" : 0,
+      "value_type" : "individual"
+     },
+     "transparent" : true,
+     "type" : "graph",
+     "xaxis" : {
+      "buckets" : null,
+      "mode" : "time",
+      "name" : null,
+      "show" : true,
+      "values" : [
+      ]
+     },
+     "yaxes" : [
+      {
+       "decimals" : 0,
+       "format" : "none",
+       "label" : "",
+       "logBase" : 1,
+       "max" : null,
+       "min" : "0",
+       "show" : true
+      },
+      {
+       "format" : "bps",
+       "label" : "",
+       "logBase" : 1,
+       "max" : null,
+       "min" : null,
+       "show" : false
+      }
+     ]
+    }
+   ],
+   "repeat" : null,
+   "repeatIteration" : null,
+   "repeatRowId" : null,
+   "showTitle" : false,
+   "title" : "clients on router - single chart",
+   "titleSize" : "h6"
+  },
+  {
+   "collapse" : true,
+   "height" : 250,
+   "panels" : [
+    {
+     "aliasColors" : {
+      "RX" : "#E24D42",
+      "clients " : "#447EBC",
+      "uplink" : "#052B51"
+     },
+     "bars" : false,
+     "dashLength" : 10,
+     "dashes" : false,
+     "datasource" : null,
+     "fill" : 1,
+     "id" : 26,
+     "legend" : {
+      "alignAsTable" : true,
+      "avg" : true,
+      "current" : true,
+      "hideEmpty" : true,
+      "hideZero" : true,
+      "max" : true,
+      "min" : false,
+      "rightSide" : true,
+      "show" : true,
+      "sortDesc" : true,
+      "total" : false,
+      "values" : true
+     },
+     "lines" : true,
+     "linewidth" : 2,
+     "links" : [
+     ],
+     "nullPointMode" : "null",
+     "percentage" : false,
+     "pointradius" : 5,
+     "points" : false,
+     "renderer" : "flot",
+     "seriesOverrides" : [
+      {
+       "alias" : "RX",
+       "color" : "#b7dbab"
+      },
+      {
+       "alias" : "TX",
+       "color" : "#ea6460",
+       "transform" : "negative-Y"
+      }
+     ],
+     "spaceLength" : 10,
+     "span" : 12,
+     "stack" : false,
+     "steppedLine" : false,
+     "targets" : [
+      {
+       "expr" : "8*rate(%%PROM_STATS_PREFIX%%%%PROM_SEPERATOR%%rx{hostname=\"[[hostname]]\"}[5m])",
+       "format" : "time_series",
+       "hide" : false,
+       "intervalFactor" : 2,
+       "legendFormat" : "RX",
+       "refId" : "A",
+       "step" : 120
+      },
+      {
+       "expr" : "8*rate(%%PROM_STATS_PREFIX%%%%PROM_SEPERATOR%%tx{hostname=\"[[hostname]]\"}[5m])",
+       "format" : "time_series",
+       "intervalFactor" : 2,
+       "legendFormat" : "TX",
+       "refId" : "B",
+       "step" : 120
+      },
+      {
+       "expr" : "%%PROM_STATS_PREFIX%%%%PROM_SEPERATOR%%uplink{hostname=\"[[hostname]]\"}",
+       "format" : "time_series",
+       "hide" : true,
+       "intervalFactor" : 2,
+       "legendFormat" : "uplink",
+       "refId" : "D",
+       "step" : 120
+      }
+     ],
+     "thresholds" : [
+     ],
+     "timeFrom" : null,
+     "timeShift" : null,
+     "title" : "traffic [[hostname]]",
+     "tooltip" : {
+      "shared" : true,
+      "sort" : 0,
+      "value_type" : "individual"
+     },
+     "transparent" : true,
+     "type" : "graph",
+     "xaxis" : {
+      "buckets" : null,
+      "mode" : "time",
+      "name" : null,
+      "show" : true,
+      "values" : [
+      ]
+     },
+     "yaxes" : [
+      {
+       "decimals" : 0,
+       "format" : "bps",
+       "label" : "",
+       "logBase" : 1,
+       "max" : null,
+       "min" : null,
+       "show" : true
+      },
+      {
+       "format" : "bps",
+       "label" : "",
+       "logBase" : 1,
+       "max" : null,
+       "min" : null,
+       "show" : false
+      }
+     ]
+    }
+   ],
+   "repeat" : null,
+   "repeatIteration" : null,
+   "repeatRowId" : null,
+   "showTitle" : false,
+   "title" : "traffic on router - single chart",
+   "titleSize" : "h6"
+  },
+  {
+   "collapse" : true,
    "height" : "250",
    "panels" : [
     {