Ver código fonte

-5- 20171019 dashboard (neu: status-group.json.in und ...group-render...)

Altlast 7 anos atrás
pai
commit
fbfde0e0bb

+ 16 - 2
dashboard/Makefile.in

@@ -1,6 +1,6 @@
 all:	dashboard
 
-dashboard: %%DASHBOARD_PREFIX%%status.json %%DASHBOARD_PREFIX%%status-render.json
+dashboard: %%DASHBOARD_PREFIX%%status.json %%DASHBOARD_PREFIX%%status-render.json %%DASHBOARD_PREFIX%%status-group.json %%DASHBOARD_PREFIX%%status-group-render.json
 
 %%DASHBOARD_PREFIX%%status.json: status.json.in
 	../conf/substitute.sh $> $@
@@ -8,7 +8,13 @@ dashboard: %%DASHBOARD_PREFIX%%status.json %%DASHBOARD_PREFIX%%status-render.jso
 %%DASHBOARD_PREFIX%%status-render.json: status-render.json.in
 	../conf/substitute.sh $> $@
 
-install: %%DASHBOARD_DIR%%/%%DASHBOARD_PREFIX%%status.json %%DASHBOARD_DIR%%/%%DASHBOARD_PREFIX%%status-render.json
+%%DASHBOARD_PREFIX%%status-group.json: status-group.json.in
+	../conf/substitute.sh $> $@
+
+%%DASHBOARD_PREFIX%%status-group-render.json: status-group-render.json.in
+	../conf/substitute.sh $> $@
+
+install: %%DASHBOARD_DIR%%/%%DASHBOARD_PREFIX%%status.json %%DASHBOARD_DIR%%/%%DASHBOARD_PREFIX%%status-render.json %%DASHBOARD_DIR%%/%%DASHBOARD_PREFIX%%status-group.json %%DASHBOARD_DIR%%/%%DASHBOARD_PREFIX%%status-group-render.json
 
 %%DASHBOARD_DIR%%/%%DASHBOARD_PREFIX%%status.json: %%DASHBOARD_PREFIX%%status.json
 	%%INSTALL_DATA_CMD%% $> $@
@@ -16,6 +22,14 @@ install: %%DASHBOARD_DIR%%/%%DASHBOARD_PREFIX%%status.json %%DASHBOARD_DIR%%/%%D
 %%DASHBOARD_DIR%%/%%DASHBOARD_PREFIX%%status-render.json: %%DASHBOARD_PREFIX%%status-render.json
 	%%INSTALL_DATA_CMD%% $> $@
 
+%%DASHBOARD_DIR%%/%%DASHBOARD_PREFIX%%status-group.json: %%DASHBOARD_PREFIX%%status-group.json
+	%%INSTALL_DATA_CMD%% $> $@
+
+%%DASHBOARD_DIR%%/%%DASHBOARD_PREFIX%%status-group-render.json: %%DASHBOARD_PREFIX%%status-group-render.json
+	%%INSTALL_DATA_CMD%% $> $@
+
 clean:
 	rm -f %%DASHBOARD_PREFIX%%status.json
 	rm -f %%DASHBOARD_PREFIX%%status-render.json
+	rm -f %%DASHBOARD_PREFIX%%status-group.json
+	rm -f %%DASHBOARD_PREFIX%%status-group-render.json

+ 314 - 0
dashboard/status-group-render.json.in

@@ -0,0 +1,314 @@
+{
+ "annotations" : {
+  "list" : [
+
+   ]
+  },
+ "editable" : true,
+ "gnetId" : null,
+ "graphTooltip" : 0,
+ "hideControls" : false,
+ "id" : null,
+ "links" : [
+
+  ],
+ "rows" : [
+  {
+   "collapse" : false,
+   "height" : 278,
+   "panels" : [
+    {
+     "aliasColors" : {
+      },
+     "bars" : false,
+     "dashLength" : 10,
+     "dashes" : false,
+     "datasource" : null,
+     "fill" : 0,
+     "id" : 3,
+     "legend" : {
+      "alignAsTable" : true,
+      "avg" : true,
+      "current" : true,
+      "hideEmpty" : true,
+      "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" : "%%PROM_STATS_PREFIX%%%%PROM_SEPERATOR%%clients{hostname=~\"([[select]])\"}",
+       "format" : "time_series",
+       "hide" : false,
+       "interval" : "",
+       "intervalFactor" : 2,
+       "legendFormat" : "{{hostname}}",
+       "refId" : "A",
+       "step" : 120
+       },
+      {
+       "expr" : "sum(%%PROM_STATS_PREFIX%%%%PROM_SEPERATOR%%clients{hostname=~\"([[select]])\"})",
+       "format" : "time_series",
+       "hide" : false,
+       "interval" : "",
+       "intervalFactor" : 2,
+       "legendFormat" : "Summe",
+       "refId" : "B",
+       "step" : 120
+       }
+      ],
+     "thresholds" : [
+
+      ],
+     "timeFrom" : null,
+     "timeShift" : null,
+     "title" : "[[title]] (clients)",
+     "tooltip" : {
+      "shared" : true,
+      "sort" : 1,
+      "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" : null,
+       "show" : true
+       },
+      {
+       "format" : "short",
+       "label" : null,
+       "logBase" : 1,
+       "max" : null,
+       "min" : null,
+       "show" : true
+       }
+      ]
+     }
+    ],
+   "repeat" : null,
+   "repeatIteration" : null,
+   "repeatRowId" : null,
+   "showTitle" : false,
+   "title" : "Dashboard Row",
+   "titleSize" : "h6"
+   },
+  {
+   "collapse" : false,
+   "height" : "100",
+   "panels" : [
+    {
+     "content" : "<p>Links zu Router [[hostname]], Node ID [[node_id]]: <a href=\"/dashboard/file/%%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" : "Dashboard Row",
+   "titleSize" : "h6"
+   }
+  ],
+ "schemaVersion" : 14,
+ "style" : "dark",
+ "tags" : [
+
+  ],
+ "templating" : {
+  "list" : [
+   {
+    "allValue" : null,
+    "current" : {
+     "tags" : [
+
+      ],
+     "text" : "FF-DO-LA.*|FF-DO-BB-LA.*",
+     "value" : "FF-DO-LA.*|FF-DO-BB-LA.*"
+     },
+    "hide" : 0,
+    "includeAll" : false,
+    "label" : null,
+    "multi" : false,
+    "name" : "select",
+    "options" : [
+     {
+      "selected" : false,
+      "text" : "FF-DO-LA.*|FF-DO-BB-LA.*",
+      "value" : "FF-DO-LA.*|FF-DO-BB-LA.*"
+      },
+     {
+      "selected" : false,
+      "text" : "FF-DO-Braunschweiger31-.*|FF-DO-BB-Braunschweiger31-.*",
+      "value" : "FF-DO-Braunschweiger31-.*|FF-DO-BB-Braunschweiger31-.*"
+      },
+     {
+      "selected" : false,
+      "text" : "FF-DO-CafeAufbruch.*",
+      "value" : "FF-DO-CafeAufbruch.*"
+      }
+     ],
+    "query" : "FF-DO-LA.*|FF-DO-BB-LA.*, FF-DO-Braunschweiger31-.*|FF-DO-BB-Braunschweiger31-.*,FF-DO-CafeAufbruch.*",
+    "type" : "custom"
+    },
+   {
+    "allValue" : null,
+    "current" : {
+     "tags" : [
+
+      ],
+     "text" : "Langer August",
+     "value" : "Langer August"
+     },
+    "hide" : 0,
+    "includeAll" : false,
+    "label" : null,
+    "multi" : false,
+    "name" : "title",
+    "options" : [
+     {
+      "selected" : true,
+      "text" : "Langer August",
+      "value" : "Langer August"
+      },
+     {
+      "selected" : false,
+      "text" : "Braunschweiger Str. 31-33",
+      "value" : "Braunschweiger Str. 31-33"
+      },
+     {
+      "selected" : false,
+      "text" : "CaféAufbruch",
+      "value" : "CaféAufbruch"
+      }
+     ],
+    "query" : "Langer August,Braunschweiger Str. 31-33,CaféAufbruch",
+    "type" : "custom"
+    },
+   {
+    "allValue" : null,
+    "current" : {
+     },
+    "datasource" : null,
+    "hide" : 0,
+    "includeAll" : false,
+    "label" : null,
+    "multi" : false,
+    "name" : "hostname",
+    "options" : [
+
+     ],
+    "query" : "label_values(%%PROM_INFO_PREFIX%%{hostname=~\"([[select]])\"},hostname)",
+    "refresh" : 2,
+    "regex" : "",
+    "sort" : 1,
+    "tagValuesQuery" : "",
+    "tags" : [
+
+     ],
+    "tagsQuery" : "",
+    "type" : "query",
+    "useTags" : false
+    },
+   {
+    "allValue" : null,
+    "current" : {
+     },
+    "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
+    }
+   ]
+  },
+ "time" : {
+  "from" : "now-24h",
+  "to" : "now"
+  },
+ "timepicker" : {
+  "refresh_intervals" : [
+   "5s",
+   "10s",
+   "30s",
+   "1m",
+   "5m",
+   "15m",
+   "30m",
+   "1h",
+   "2h",
+   "1d"
+   ],
+  "time_options" : [
+   "5m",
+   "15m",
+   "1h",
+   "6h",
+   "12h",
+   "24h",
+   "2d",
+   "7d",
+   "30d"
+   ]
+  },
+ "timezone" : "",
+ "title" : "%%DASHBOARD_PREFIX%%status-group",
+ "version" : 8
+ }

+ 314 - 0
dashboard/status-group.json.in

@@ -0,0 +1,314 @@
+{
+ "annotations" : {
+  "list" : [
+
+   ]
+  },
+ "editable" : true,
+ "gnetId" : null,
+ "graphTooltip" : 0,
+ "hideControls" : false,
+ "id" : null,
+ "links" : [
+
+  ],
+ "rows" : [
+  {
+   "collapse" : false,
+   "height" : 278,
+   "panels" : [
+    {
+     "aliasColors" : {
+      },
+     "bars" : false,
+     "dashLength" : 10,
+     "dashes" : false,
+     "datasource" : null,
+     "fill" : 0,
+     "id" : 3,
+     "legend" : {
+      "alignAsTable" : true,
+      "avg" : true,
+      "current" : true,
+      "hideEmpty" : true,
+      "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" : "%%PROM_STATS_PREFIX%%%%PROM_SEPERATOR%%clients{hostname=~\"([[select]])\"}",
+       "format" : "time_series",
+       "hide" : false,
+       "interval" : "",
+       "intervalFactor" : 2,
+       "legendFormat" : "{{hostname}}",
+       "refId" : "A",
+       "step" : 120
+       },
+      {
+       "expr" : "sum(%%PROM_STATS_PREFIX%%%%PROM_SEPERATOR%%clients{hostname=~\"([[select]])\"})",
+       "format" : "time_series",
+       "hide" : false,
+       "interval" : "",
+       "intervalFactor" : 2,
+       "legendFormat" : "Summe",
+       "refId" : "B",
+       "step" : 120
+       }
+      ],
+     "thresholds" : [
+
+      ],
+     "timeFrom" : null,
+     "timeShift" : null,
+     "title" : "[[title]] (clients)",
+     "tooltip" : {
+      "shared" : true,
+      "sort" : 1,
+      "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" : null,
+       "show" : true
+       },
+      {
+       "format" : "short",
+       "label" : null,
+       "logBase" : 1,
+       "max" : null,
+       "min" : null,
+       "show" : true
+       }
+      ]
+     }
+    ],
+   "repeat" : null,
+   "repeatIteration" : null,
+   "repeatRowId" : null,
+   "showTitle" : false,
+   "title" : "Dashboard Row",
+   "titleSize" : "h6"
+   },
+  {
+   "collapse" : false,
+   "height" : "100",
+   "panels" : [
+    {
+     "content" : "<p>Links zu Router [[hostname]], Node ID [[node_id]]: <a href=\"/dashboard/file/%%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" : "Dashboard Row",
+   "titleSize" : "h6"
+   }
+  ],
+ "schemaVersion" : 14,
+ "style" : "dark",
+ "tags" : [
+
+  ],
+ "templating" : {
+  "list" : [
+   {
+    "allValue" : null,
+    "current" : {
+     "tags" : [
+
+      ],
+     "text" : "FF-DO-LA.*|FF-DO-BB-LA.*",
+     "value" : "FF-DO-LA.*|FF-DO-BB-LA.*"
+     },
+    "hide" : 0,
+    "includeAll" : false,
+    "label" : null,
+    "multi" : false,
+    "name" : "select",
+    "options" : [
+     {
+      "selected" : false,
+      "text" : "FF-DO-LA.*|FF-DO-BB-LA.*",
+      "value" : "FF-DO-LA.*|FF-DO-BB-LA.*"
+      },
+     {
+      "selected" : false,
+      "text" : "FF-DO-Braunschweiger31-.*|FF-DO-BB-Braunschweiger31-.*",
+      "value" : "FF-DO-Braunschweiger31-.*|FF-DO-BB-Braunschweiger31-.*"
+      },
+     {
+      "selected" : false,
+      "text" : "FF-DO-CafeAufbruch.*",
+      "value" : "FF-DO-CafeAufbruch.*"
+      }
+     ],
+    "query" : "FF-DO-LA.*|FF-DO-BB-LA.*, FF-DO-Braunschweiger31-.*|FF-DO-BB-Braunschweiger31-.*,FF-DO-CafeAufbruch.*",
+    "type" : "custom"
+    },
+   {
+    "allValue" : null,
+    "current" : {
+     "tags" : [
+
+      ],
+     "text" : "Langer August",
+     "value" : "Langer August"
+     },
+    "hide" : 0,
+    "includeAll" : false,
+    "label" : null,
+    "multi" : false,
+    "name" : "title",
+    "options" : [
+     {
+      "selected" : true,
+      "text" : "Langer August",
+      "value" : "Langer August"
+      },
+     {
+      "selected" : false,
+      "text" : "Braunschweiger Str. 31-33",
+      "value" : "Braunschweiger Str. 31-33"
+      },
+     {
+      "selected" : false,
+      "text" : "CaféAufbruch",
+      "value" : "CaféAufbruch"
+      }
+     ],
+    "query" : "Langer August,Braunschweiger Str. 31-33,CaféAufbruch",
+    "type" : "custom"
+    },
+   {
+    "allValue" : null,
+    "current" : {
+     },
+    "datasource" : null,
+    "hide" : 0,
+    "includeAll" : false,
+    "label" : null,
+    "multi" : false,
+    "name" : "hostname",
+    "options" : [
+
+     ],
+    "query" : "label_values(%%PROM_INFO_PREFIX%%{hostname=~\"([[select]])\"},hostname)",
+    "refresh" : 2,
+    "regex" : "",
+    "sort" : 1,
+    "tagValuesQuery" : "",
+    "tags" : [
+
+     ],
+    "tagsQuery" : "",
+    "type" : "query",
+    "useTags" : false
+    },
+   {
+    "allValue" : null,
+    "current" : {
+     },
+    "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
+    }
+   ]
+  },
+ "time" : {
+  "from" : "now-24h",
+  "to" : "now"
+  },
+ "timepicker" : {
+  "refresh_intervals" : [
+   "5s",
+   "10s",
+   "30s",
+   "1m",
+   "5m",
+   "15m",
+   "30m",
+   "1h",
+   "2h",
+   "1d"
+   ],
+  "time_options" : [
+   "5m",
+   "15m",
+   "1h",
+   "6h",
+   "12h",
+   "24h",
+   "2d",
+   "7d",
+   "30d"
+   ]
+  },
+ "timezone" : "",
+ "title" : "%%DASHBOARD_PREFIX%%status-group",
+ "version" : 8
+ }