20181012 dashboard/status-group.json.in (Zusammenführung mit der -render Variante)

dashboard/status-group-render.json.in

@@ -9,6 +9,15 @@
  "hideControls" : false,
  "id" : null,
  "links" : [
+  {
+   "icon" : "dashboard",
+   "keepTime" : true,
+   "tags" : [
+   ],
+   "title" : "Mesh",
+   "type" : "link",
+   "url" : "%%DASHBOARD_PATH%%%%DASHBOARD_PREFIX%%status-mesh-render.json?var-mesh_name=[[mesh_name]]"
+  }
  ],
  "rows" : [
   {
@@ -788,8 +797,32 @@
    "titleSize" : "h6"
   },
   {
+   "collapse" : false,
+   "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",
+     "height" : "80px",
+     "id" : 4,
+     "links" : [
+     ],
+     "mode" : "html",
+     "repeat" : null,
+     "span" : 12,
+     "title" : "Links zu [[hostname]], Node ID [[node_id]]",
+     "type" : "text"
+    }
+   ],
+   "repeat" : null,
+   "repeatIteration" : null,
+   "repeatRowId" : null,
+   "showTitle" : false,
+   "title" : "Links zu [[hostname]], Node ID [[node_id]]",
+   "titleSize" : "h6"
+  },
+  {
    "collapse" : true,
-   "height" : "500",
+   "height" : 500,
    "panels" : [
     {
      "columns" : [
@@ -1055,6 +1088,125 @@
     "tagsQuery" : "",
     "type" : "query",
     "useTags" : false
+   },
+   {
+    "allValue" : null,
+    "current" : {
+     "text" : " - noch keine Auswahl -",
+     "value" : null
+    },
+    "datasource" : null,
+    "hide" : 0,
+    "includeAll" : false,
+    "label" : null,
+    "multi" : false,
+    "name" : "hostname",
+    "options" : [
+    ],
+    "query" : "label_values(%%PROM_INFO_PREFIX%%{hostname=~\"[[regex]]\"},hostname)",
+    "refresh" : 2,
+    "regex" : "",
+    "sort" : 1,
+    "tagValuesQuery" : "",
+    "tags" : [
+    ],
+    "tagsQuery" : "",
+    "type" : "query",
+    "useTags" : false
+   },
+   {
+    "allValue" : null,
+    "current" : {
+     "text" : null,
+     "value" : null
+    },
+    "datasource" : null,
+    "hide" : 0,
+    "includeAll" : false,
+    "label" : null,
+    "multi" : false,
+    "name" : "node_id",
+    "options" : [
+    ],
+    "query" : "label_values(%%PROM_INFO_PREFIX%%{hostname=\"[[hostname]]\"},node_id)",
+    "refresh" : 2,
+    "regex" : "",
+    "sort" : 1,
+    "tagValuesQuery" : "",
+    "tags" : [
+    ],
+    "tagsQuery" : "",
+    "type" : "query",
+    "useTags" : false
+   },
+   {
+    "allValue" : null,
+    "current" : {
+    },
+    "datasource" : null,
+    "hide" : 2,
+    "includeAll" : false,
+    "label" : null,
+    "multi" : false,
+    "name" : "link_target_id",
+    "options" : [
+    ],
+    "query" : "query_result(%%PROM_GRAPH_PREFIX%%%%PROM_SEPERATOR%%link{source=\"[[node_id]]\",target=\"[[neighbor_id]]\"} or %%PROM_GRAPH_PREFIX%%%%PROM_SEPERATOR%%link{source=\"[[neighbor_id]]\",target=\"[[node_id]]\"})",
+    "refresh" : 2,
+    "regex" : "\/.*target=\"([^\"]+)\".*\/",
+    "sort" : 0,
+    "tagValuesQuery" : "",
+    "tags" : [
+    ],
+    "tagsQuery" : "",
+    "type" : "query",
+    "useTags" : false
+   },
+   {
+    "allValue" : null,
+    "current" : {
+    },
+    "datasource" : null,
+    "hide" : 2,
+    "includeAll" : false,
+    "label" : null,
+    "multi" : false,
+    "name" : "mesh_id",
+    "options" : [
+    ],
+    "query" : "label_values(%%PROM_GRAPH_PREFIX%%%%PROM_SEPERATOR%%mesh{members=~\".*[[node_id]].*\"},node_id)",
+    "refresh" : 2,
+    "regex" : "",
+    "sort" : 0,
+    "tagValuesQuery" : "",
+    "tags" : [
+    ],
+    "tagsQuery" : "",
+    "type" : "query",
+    "useTags" : false
+   },
+   {
+    "allValue" : null,
+    "current" : {
+    },
+    "datasource" : null,
+    "hide" : 2,
+    "includeAll" : false,
+    "label" : null,
+    "multi" : false,
+    "name" : "mesh_name",
+    "options" : [
+    ],
+    "query" : "label_values(%%PROM_INFO_PREFIX%%{node_id=\"[[mesh_id]]\"},hostname)",
+    "refresh" : 2,
+    "regex" : "",
+    "sort" : 0,
+    "tagValuesQuery" : "",
+    "tags" : [
+    ],
+    "tagsQuery" : "",
+    "type" : "query",
+    "useTags" : false
    }
   ]
  },

dashboard/status-group.json.in

@@ -22,6 +22,249 @@
  "rows" : [
   {
    "collapse" : false,
+   "height" : 136,
+   "panels" : [
+    {
+     "cacheTimeout" : null,
+     "colorBackground" : false,
+     "colorValue" : false,
+     "colors" : [
+      "#299c46",
+      "rgba(237, 129, 40, 0.89)",
+      "#d44a3a"
+     ],
+     "datasource" : null,
+     "decimals" : 0,
+     "format" : "none",
+     "gauge" : {
+      "maxValue" : 100,
+      "minValue" : 0,
+      "show" : false,
+      "thresholdLabels" : false,
+      "thresholdMarkers" : true
+     },
+     "id" : 12,
+     "interval" : null,
+     "links" : [
+     ],
+     "mappingType" : 1,
+     "mappingTypes" : [
+      {
+       "name" : "value to text",
+       "value" : 1
+      },
+      {
+       "name" : "range to text",
+       "value" : 2
+      }
+     ],
+     "maxDataPoints" : 100,
+     "nullPointMode" : "connected",
+     "nullText" : null,
+     "postfix" : "",
+     "postfixFontSize" : "50%",
+     "prefix" : "",
+     "prefixFontSize" : "50%",
+     "rangeMaps" : [
+      {
+       "from" : "null",
+       "text" : "N\/A",
+       "to" : "null"
+      }
+     ],
+     "span" : 4,
+     "sparkline" : {
+      "fillColor" : "rgba(31, 118, 189, 0.18)",
+      "full" : true,
+      "lineColor" : "rgb(31, 120, 193)",
+      "show" : true
+     },
+     "tableColumn" : "",
+     "targets" : [
+      {
+       "expr" : "sum(%%PROM_STATS_PREFIX%%%%PROM_SEPERATOR%%clients{hostname=~\"([[regex]])\"})",
+       "format" : "time_series",
+       "intervalFactor" : 2,
+       "refId" : "A"
+      }
+     ],
+     "thresholds" : "",
+     "title" : "Aktuell '[[group]]': NutzerInnen",
+     "type" : "singlestat",
+     "valueFontSize" : "80%",
+     "valueMaps" : [
+      {
+       "op" : "=",
+       "text" : "N\/A",
+       "value" : "null"
+      }
+     ],
+     "valueName" : "current"
+    },
+    {
+     "cacheTimeout" : null,
+     "colorBackground" : false,
+     "colorValue" : false,
+     "colors" : [
+      "#299c46",
+      "rgba(237, 129, 40, 0.89)",
+      "#d44a3a"
+     ],
+     "datasource" : null,
+     "format" : "none",
+     "gauge" : {
+      "maxValue" : 100,
+      "minValue" : 0,
+      "show" : false,
+      "thresholdLabels" : false,
+      "thresholdMarkers" : true
+     },
+     "id" : 13,
+     "interval" : null,
+     "links" : [
+     ],
+     "mappingType" : 1,
+     "mappingTypes" : [
+      {
+       "name" : "value to text",
+       "value" : 1
+      },
+      {
+       "name" : "range to text",
+       "value" : 2
+      }
+     ],
+     "maxDataPoints" : 100,
+     "nullPointMode" : "connected",
+     "nullText" : null,
+     "postfix" : "",
+     "postfixFontSize" : "50%",
+     "prefix" : "",
+     "prefixFontSize" : "50%",
+     "rangeMaps" : [
+      {
+       "from" : "null",
+       "text" : "N\/A",
+       "to" : "null"
+      }
+     ],
+     "span" : 4,
+     "sparkline" : {
+      "fillColor" : "rgba(31, 118, 189, 0.18)",
+      "full" : true,
+      "lineColor" : "rgb(31, 120, 193)",
+      "show" : true
+     },
+     "tableColumn" : "",
+     "targets" : [
+      {
+       "expr" : "count(%%PROM_STATS_PREFIX%%%%PROM_SEPERATOR%%clients{hostname=~\"([[regex]])\"})",
+       "format" : "time_series",
+       "intervalFactor" : 2,
+       "refId" : "A"
+      }
+     ],
+     "thresholds" : "",
+     "title" : "Aktuell '[[group]]': Router",
+     "type" : "singlestat",
+     "valueFontSize" : "80%",
+     "valueMaps" : [
+      {
+       "op" : "=",
+       "text" : "N\/A",
+       "value" : "null"
+      }
+     ],
+     "valueName" : "current"
+    },
+    {
+     "cacheTimeout" : null,
+     "colorBackground" : false,
+     "colorValue" : true,
+     "colors" : [
+      "#d44a3a",
+      "rgba(237, 129, 40, 0.89)",
+      "#299c46"
+     ],
+     "datasource" : null,
+     "decimals" : 0,
+     "format" : "short",
+     "gauge" : {
+      "maxValue" : 100,
+      "minValue" : 0,
+      "show" : false,
+      "thresholdLabels" : false,
+      "thresholdMarkers" : true
+     },
+     "id" : 14,
+     "interval" : null,
+     "links" : [
+     ],
+     "mappingType" : 1,
+     "mappingTypes" : [
+      {
+       "name" : "value to text",
+       "value" : 1
+      },
+      {
+       "name" : "range to text",
+       "value" : 2
+      }
+     ],
+     "maxDataPoints" : 100,
+     "nullPointMode" : "connected",
+     "nullText" : null,
+     "postfix" : "",
+     "postfixFontSize" : "50%",
+     "prefix" : "",
+     "prefixFontSize" : "50%",
+     "rangeMaps" : [
+      {
+       "from" : "null",
+       "text" : "N\/A",
+       "to" : "null"
+      }
+     ],
+     "span" : 4,
+     "sparkline" : {
+      "fillColor" : "rgba(31, 118, 189, 0.18)",
+      "full" : false,
+      "lineColor" : "rgb(31, 120, 193)",
+      "show" : false
+     },
+     "tableColumn" : "",
+     "targets" : [
+      {
+       "expr" : "count(%%PROM_STATS_PREFIX%%%%PROM_SEPERATOR%%clients{hostname=~\"([[regex]])\"})",
+       "format" : "time_series",
+       "intervalFactor" : 2,
+       "legendFormat" : "",
+       "refId" : "A"
+      }
+     ],
+     "thresholds" : "0,1",
+     "title" : "Differenz in '[[group]]': Anzahl der Router",
+     "type" : "singlestat",
+     "valueFontSize" : "80%",
+     "valueMaps" : [
+      {
+       "op" : "=",
+       "text" : "N\/A",
+       "value" : "null"
+      }
+     ],
+     "valueName" : "diff"
+    }
+   ],
+   "repeat" : null,
+   "repeatIteration" : null,
+   "repeatRowId" : null,
+   "showTitle" : false,
+   "title" : "Dashboard Row",
+   "titleSize" : "h6"
+  },
+  {
+   "collapse" : false,
    "height" : 250,
    "panels" : [
     {
@@ -66,7 +309,7 @@
      "steppedLine" : false,
      "targets" : [
       {
-       "expr" : "count(ffdo_nodes_detail_clients{hostname=~\"([[regex]])\"})",
+       "expr" : "count(%%PROM_STATS_PREFIX%%%%PROM_SEPERATOR%%clients{hostname=~\"([[regex]])\"})",
        "format" : "time_series",
        "hide" : false,
        "instant" : false,
@@ -75,7 +318,7 @@
        "refId" : "A"
       },
       {
-       "expr" : "sum(ffdo_nodes_detail_clients{hostname=~\"([[regex]])\"})",
+       "expr" : "sum(%%PROM_STATS_PREFIX%%%%PROM_SEPERATOR%%clients{hostname=~\"([[regex]])\"})",
        "format" : "time_series",
        "intervalFactor" : 2,
        "legendFormat" : "NutzerInnen",
@@ -130,6 +373,212 @@
    "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" : 10,
+     "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" : [
+      {
+       "alias" : "Router",
+       "color" : "#1f78c1"
+      },
+      {
+       "alias" : "NutzerInnen",
+       "color" : "#EAB839"
+      }
+     ],
+     "spaceLength" : 10,
+     "span" : 6,
+     "stack" : false,
+     "steppedLine" : false,
+     "targets" : [
+      {
+       "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" : "Freifunk '[[group]]': NutzerInnen",
+     "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" : "",
+       "logBase" : 1,
+       "max" : null,
+       "min" : null,
+       "show" : false
+      }
+     ]
+    },
+    {
+     "aliasColors" : {
+      "Router" : "#1f78c1",
+      "Routeranzahl" : "#1f78c1"
+     },
+     "bars" : false,
+     "dashLength" : 10,
+     "dashes" : false,
+     "datasource" : null,
+     "decimals" : 0,
+     "fill" : 0,
+     "id" : 11,
+     "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" : [
+      {
+       "alias" : "Router",
+       "color" : "#1f78c1"
+      },
+      {
+       "alias" : "NutzerInnen",
+       "color" : "#EAB839"
+      }
+     ],
+     "spaceLength" : 10,
+     "span" : 6,
+     "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"
+      }
+     ],
+     "thresholds" : [
+     ],
+     "timeFrom" : null,
+     "timeShift" : null,
+     "title" : "Freifunk '[[group]]': 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" : "Router",
+       "logBase" : 1,
+       "max" : null,
+       "min" : "0",
+       "show" : true
+      },
+      {
+       "format" : "short",
+       "label" : "",
+       "logBase" : 1,
+       "max" : null,
+       "min" : null,
+       "show" : false
+      }
+     ]
+    }
+   ],
+   "repeat" : null,
+   "repeatIteration" : null,
+   "repeatRowId" : null,
+   "showTitle" : false,
+   "title" : "Overview '[[group]]': Clients and Nodes separate graphs",
+   "titleSize" : "h6"
+  },
+  {
    "collapse" : false,
    "height" : 278,
    "panels" : [
@@ -240,7 +689,116 @@
   },
   {
    "collapse" : false,
-   "height" : "100",
+   "height" : 250,
+   "panels" : [
+    {
+     "aliasColors" : {
+     },
+     "bars" : false,
+     "dashLength" : 10,
+     "dashes" : false,
+     "datasource" : null,
+     "fill" : 1,
+     "id" : 8,
+     "legend" : {
+      "alignAsTable" : true,
+      "avg" : true,
+      "current" : false,
+      "max" : true,
+      "min" : false,
+      "show" : true,
+      "total" : false,
+      "values" : true
+     },
+     "lines" : true,
+     "linewidth" : 1,
+     "links" : [
+     ],
+     "nullPointMode" : "null",
+     "percentage" : false,
+     "pointradius" : 5,
+     "points" : false,
+     "renderer" : "flot",
+     "seriesOverrides" : [
+      {
+       "alias" : "TX",
+       "color" : "#e24d42",
+       "transform" : "negative-Y"
+      },
+      {
+       "alias" : "RX",
+       "color" : "#7eb26d"
+      }
+     ],
+     "spaceLength" : 10,
+     "span" : 12,
+     "stack" : false,
+     "steppedLine" : false,
+     "targets" : [
+      {
+       "expr" : "sum(8*rate(%%PROM_STATS_PREFIX%%%%PROM_SEPERATOR%%rx{hostname=~\"([[regex]])\"}[20m]))",
+       "format" : "time_series",
+       "intervalFactor" : 2,
+       "legendFormat" : "RX",
+       "refId" : "B"
+      },
+      {
+       "expr" : "sum(8*rate(%%PROM_STATS_PREFIX%%%%PROM_SEPERATOR%%tx{hostname=~\"([[regex]])\"}[20m]))",
+       "format" : "time_series",
+       "intervalFactor" : 2,
+       "legendFormat" : "TX",
+       "refId" : "A"
+      }
+     ],
+     "thresholds" : [
+     ],
+     "timeFrom" : null,
+     "timeShift" : null,
+     "title" : "Router Group: '[[group]]' Data Transfer",
+     "tooltip" : {
+      "shared" : true,
+      "sort" : 0,
+      "value_type" : "individual"
+     },
+     "type" : "graph",
+     "xaxis" : {
+      "buckets" : null,
+      "mode" : "time",
+      "name" : null,
+      "show" : true,
+      "values" : [
+      ]
+     },
+     "yaxes" : [
+      {
+       "format" : "bps",
+       "label" : null,
+       "logBase" : 1,
+       "max" : null,
+       "min" : null,
+       "show" : true
+      },
+      {
+       "format" : "short",
+       "label" : null,
+       "logBase" : 1,
+       "max" : null,
+       "min" : null,
+       "show" : false
+      }
+     ]
+    }
+   ],
+   "repeat" : null,
+   "repeatIteration" : null,
+   "repeatRowId" : null,
+   "showTitle" : false,
+   "title" : "Data Transfer",
+   "titleSize" : "h6"
+  },
+  {
+   "collapse" : false,
+   "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",
@@ -264,7 +822,7 @@
   },
   {
    "collapse" : true,
-   "height" : "500",
+   "height" : 500,
    "panels" : [
     {
      "columns" : [