From b34814ffa211b3927e26c82ba55531602bc8babd Mon Sep 17 00:00:00 2001 From: Ben Bartlett Date: Wed, 9 May 2018 14:42:38 -0700 Subject: [PATCH] Update dashboard --- assets/Grafana Dashboards/Overmind.json | 449 +++++++++++------------- 1 file changed, 214 insertions(+), 235 deletions(-) diff --git a/assets/Grafana Dashboards/Overmind.json b/assets/Grafana Dashboards/Overmind.json index b28628f93..da77128af 100644 --- a/assets/Grafana Dashboards/Overmind.json +++ b/assets/Grafana Dashboards/Overmind.json @@ -17,7 +17,7 @@ "gnetId": null, "graphTooltip": 1, "id": 2135, - "iteration": 1524863066020, + "iteration": 1525902105260, "links": [], "panels": [ { @@ -55,7 +55,7 @@ "thresholdMarkers": true }, "gridPos": { - "h": 7, + "h": 8, "w": 6, "x": 0, "y": 1 @@ -123,6 +123,86 @@ ], "valueName": "current" }, + { + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "datasource": "ScreepsPlus-Graphite", + "editable": true, + "error": false, + "format": "none", + "gauge": { + "maxValue": 10000, + "minValue": 0, + "show": true, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "h": 4, + "w": 3, + "x": 6, + "y": 1 + }, + "id": 25, + "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" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true + }, + "tableColumn": "", + "targets": [ + { + "refId": "A", + "target": "screeps.$User.cpu.bucket" + } + ], + "thresholds": "1500,3000", + "title": "Bucket", + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current" + }, { "aliasColors": {}, "bars": false, @@ -134,9 +214,9 @@ "fill": 0, "grid": {}, "gridPos": { - "h": 12, - "w": 18, - "x": 6, + "h": 8, + "w": 15, + "x": 9, "y": 1 }, "height": "", @@ -243,86 +323,6 @@ } ] }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "datasource": "ScreepsPlus-Graphite", - "editable": true, - "error": false, - "format": "none", - "gauge": { - "maxValue": 10000, - "minValue": 0, - "show": true, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "h": 5, - "w": 3, - "x": 0, - "y": 8 - }, - "id": 25, - "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" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": true - }, - "tableColumn": "", - "targets": [ - { - "refId": "A", - "target": "screeps.$User.cpu.bucket" - } - ], - "thresholds": "1500,3000", - "title": "Bucket", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "avg" - }, { "cacheTimeout": null, "colorBackground": false, @@ -344,10 +344,10 @@ "thresholdMarkers": true }, "gridPos": { - "h": 5, + "h": 4, "w": 3, - "x": 3, - "y": 8 + "x": 6, + "y": 5 }, "id": 84, "interval": null, @@ -411,7 +411,7 @@ "h": 1, "w": 24, "x": 0, - "y": 13 + "y": 9 }, "id": 82, "panels": [], @@ -441,10 +441,10 @@ "thresholdMarkers": true }, "gridPos": { - "h": 9, + "h": 8, "w": 6, "x": 0, - "y": 14 + "y": 10 }, "height": "", "id": 59, @@ -536,7 +536,7 @@ "h": 4, "w": 4, "x": 6, - "y": 14 + "y": 10 }, "id": 92, "interval": null, @@ -575,7 +575,6 @@ "tableColumn": "", "targets": [ { - "$$hashKey": "object:603", "refId": "A", "target": "screeps.$User.leaderboard.rank" } @@ -604,10 +603,10 @@ "fill": 1, "grid": {}, "gridPos": { - "h": 9, + "h": 8, "w": 14, "x": 10, - "y": 14 + "y": 10 }, "id": 50, "legend": { @@ -648,7 +647,6 @@ "steppedLine": false, "targets": [ { - "$$hashKey": "object:3717", "hide": false, "refCount": 0, "refId": "A", @@ -656,7 +654,6 @@ "textEditor": false }, { - "$$hashKey": "object:3718", "hide": true, "refCount": 0, "refId": "B", @@ -664,7 +661,6 @@ "textEditor": false }, { - "$$hashKey": "object:3719", "refCount": 0, "refId": "C", "target": "alias(scale(movingAverage(perSecond(keepLastValue(screeps.$User.gcl.progress, 100)), 500), 86400), 'GCL / 24hr (avg)')", @@ -730,10 +726,10 @@ "thresholdMarkers": true }, "gridPos": { - "h": 5, + "h": 4, "w": 4, "x": 6, - "y": 18 + "y": 14 }, "id": 60, "interval": null, @@ -820,7 +816,7 @@ "h": 1, "w": 24, "x": 0, - "y": 23 + "y": 18 }, "id": 83, "panels": [], @@ -841,10 +837,10 @@ "fontSize": "70%", "format": "short", "gridPos": { - "h": 10, + "h": 9, "w": 6, "x": 0, - "y": 24 + "y": 19 }, "id": 63, "interval": null, @@ -862,7 +858,6 @@ "strokeWidth": 1, "targets": [ { - "$$hashKey": "object:163", "refId": "A", "target": "aliasByNode(sortByTotal(scale(movingAverage(perSecond(keepLastValue(screeps.$User.colonies.$colonies.rcl.progress, 100)), 3600), 86400)), 3)", "textEditor": false @@ -881,10 +876,10 @@ "datasource": "ScreepsPlus-Graphite", "fill": 1, "gridPos": { - "h": 10, + "h": 9, "w": 18, "x": 6, - "y": 24 + "y": 19 }, "id": 61, "legend": { @@ -914,7 +909,6 @@ "steppedLine": false, "targets": [ { - "$$hashKey": "object:975", "refId": "A", "target": "aliasByNode(scale(movingAverage(perSecond(keepLastValue(screeps.$User.colonies.$colonies.rcl.progress)), 200), 86400), 3)", "textEditor": false @@ -943,7 +937,7 @@ "label": null, "logBase": 1, "max": null, - "min": null, + "min": "0", "show": true }, { @@ -951,7 +945,7 @@ "label": null, "logBase": 1, "max": null, - "min": null, + "min": "0", "show": true } ] @@ -964,10 +958,10 @@ "datasource": "ScreepsPlus-Graphite", "fill": 0, "gridPos": { - "h": 10, + "h": 7, "w": 12, "x": 0, - "y": 34 + "y": 28 }, "id": 64, "legend": { @@ -979,7 +973,7 @@ "max": false, "min": false, "rightSide": true, - "show": true, + "show": false, "total": false, "values": false }, @@ -997,7 +991,6 @@ "steppedLine": false, "targets": [ { - "$$hashKey": "object:451", "refId": "A", "target": "aliasByNode(keepLastValue(screeps.$User.colonies.$colonies.hatchery.uptime), 3)", "textEditor": false @@ -1048,10 +1041,10 @@ "datasource": "ScreepsPlus-Graphite", "fill": 0, "gridPos": { - "h": 10, + "h": 7, "w": 12, "x": 12, - "y": 34 + "y": 28 }, "id": 62, "legend": { @@ -1063,7 +1056,7 @@ "max": false, "min": false, "rightSide": true, - "show": true, + "show": false, "total": false, "values": false }, @@ -1129,7 +1122,7 @@ "h": 1, "w": 24, "x": 0, - "y": 44 + "y": 35 }, "id": 88, "panels": [], @@ -1155,10 +1148,10 @@ "thresholdMarkers": true }, "gridPos": { - "h": 6, + "h": 8, "w": 6, "x": 0, - "y": 45 + "y": 36 }, "id": 98, "interval": null, @@ -1166,12 +1159,10 @@ "mappingType": 1, "mappingTypes": [ { - "$$hashKey": "object:2583", "name": "value to text", "value": 1 }, { - "$$hashKey": "object:2584", "name": "range to text", "value": 2 } @@ -1199,9 +1190,8 @@ "tableColumn": "", "targets": [ { - "$$hashKey": "object:2503", "refId": "A", - "target": "movingAverage(scaleToSeconds(perSecond(keepLastValue(sumSeries(screeps.$User.persistent.terminalNetwork.transfers.energy.*.*))), 86400), 200)", + "target": "movingAverage(scaleToSeconds(perSecond(keepLastValue(sumSeries(screeps.$User.persistent.terminalNetwork.transfers.energy.*.*))), 86400), 500)", "textEditor": true } ], @@ -1211,7 +1201,6 @@ "valueFontSize": "200%", "valueMaps": [ { - "$$hashKey": "object:2586", "op": "=", "text": "N/A", "value": "null" @@ -1231,10 +1220,10 @@ "fontSize": "80%", "format": "short", "gridPos": { - "h": 14, - "w": 9, + "h": 8, + "w": 5, "x": 6, - "y": 45 + "y": 36 }, "id": 102, "interval": null, @@ -1251,7 +1240,6 @@ "strokeWidth": 1, "targets": [ { - "$$hashKey": "object:3082", "refId": "A", "target": "aliasByNode(sortByTotal(scaleToSeconds(movingAverage(perSecond(keepLastValue(groupByNode(screeps.$User.persistent.terminalNetwork.transfers.energy.*.*, 7, 'sumSeries'))), 500), 86000)), 0)", "textEditor": true @@ -1263,46 +1251,82 @@ }, { "aliasColors": {}, - "breakPoint": "50%", - "cacheTimeout": null, - "combine": { - "label": "Others", - "threshold": 0 - }, + "bars": false, + "dashLength": 10, + "dashes": false, "datasource": null, - "fontSize": "80%", - "format": "short", + "fill": 1, "gridPos": { - "h": 14, - "w": 9, - "x": 15, - "y": 45 + "h": 8, + "w": 13, + "x": 11, + "y": 36 }, - "id": 100, - "interval": null, + "id": 90, "legend": { - "show": true, - "sort": "current", - "sortDesc": false, - "values": true + "avg": false, + "current": false, + "max": false, + "min": false, + "show": false, + "total": false, + "values": false }, - "legendType": "On graph", + "lines": true, + "linewidth": 1, "links": [], - "maxDataPoints": 3, - "nullPointMode": "connected", - "pieType": "pie", - "strokeWidth": 1, + "nullPointMode": "null", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": true, + "steppedLine": false, "targets": [ { - "$$hashKey": "object:2944", "refId": "A", - "target": "aliasByNode(sortByTotal(scaleToSeconds(movingAverage(perSecond(keepLastValue(groupByNode(screeps.$User.persistent.terminalNetwork.transfers.energy.*.*, 6, 'sumSeries'))), 500), 86000)), 0)", + "target": "aliasByNode(scaleToSeconds(movingAverage(perSecond(keepLastValue(groupByNode(screeps.$User.persistent.terminalNetwork.transfers.energy.*.*, 7, 'sumSeries'))), 500), 86000), 0)", "textEditor": true } ], - "title": "Outgoing Energy Rate", - "type": "grafana-piechart-panel", - "valueName": "current" + "thresholds": [], + "timeFrom": null, + "timeShift": null, + "title": "Incoming Energy per 24h", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": "0", + "show": true + }, + { + "decimals": null, + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": "0", + "show": true + } + ] }, { "cacheTimeout": null, @@ -1326,7 +1350,7 @@ "h": 8, "w": 6, "x": 0, - "y": 51 + "y": 44 }, "id": 94, "interval": null, @@ -1365,7 +1389,6 @@ "tableColumn": "", "targets": [ { - "$$hashKey": "object:1809", "hide": true, "refCount": -1, "refId": "A", @@ -1373,7 +1396,6 @@ "textEditor": true }, { - "$$hashKey": "object:2234", "hide": true, "refCount": -1, "refId": "B", @@ -1381,7 +1403,6 @@ "textEditor": true }, { - "$$hashKey": "object:2251", "refCount": 0, "refId": "C", "target": "divideSeries(#A, #B)", @@ -1404,84 +1425,45 @@ }, { "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, + "breakPoint": "50%", + "cacheTimeout": null, + "combine": { + "label": "Others", + "threshold": 0 + }, "datasource": null, - "fill": 1, + "fontSize": "80%", + "format": "short", "gridPos": { - "h": 14, - "w": 12, - "x": 0, - "y": 59 + "h": 8, + "w": 5, + "x": 6, + "y": 44 }, - "id": 90, + "id": 100, + "interval": null, "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, "show": true, - "total": false, - "values": false + "sort": "current", + "sortDesc": false, + "values": true }, - "lines": true, - "linewidth": 1, + "legendType": "On graph", "links": [], - "nullPointMode": "null", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": true, - "steppedLine": false, + "maxDataPoints": 3, + "nullPointMode": "connected", + "pieType": "pie", + "strokeWidth": 1, "targets": [ { - "$$hashKey": "object:535", "refId": "A", - "target": "aliasByNode(scaleToSeconds(movingAverage(perSecond(keepLastValue(groupByNode(screeps.$User.persistent.terminalNetwork.transfers.energy.*.*, 7, 'sumSeries'))), 200), 86000), 0)", + "target": "aliasByNode(sortByTotal(scaleToSeconds(movingAverage(perSecond(keepLastValue(groupByNode(screeps.$User.persistent.terminalNetwork.transfers.energy.*.*, 6, 'sumSeries'))), 500), 86000)), 0)", "textEditor": true } ], - "thresholds": [], - "timeFrom": null, - "timeShift": null, - "title": "Incoming Energy per 24h", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:1106", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "$$hashKey": "object:1107", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ] + "title": "Outgoing Energy Rate", + "type": "grafana-piechart-panel", + "valueName": "current" }, { "aliasColors": {}, @@ -1491,10 +1473,10 @@ "datasource": null, "fill": 1, "gridPos": { - "h": 14, - "w": 12, - "x": 12, - "y": 59 + "h": 8, + "w": 13, + "x": 11, + "y": 44 }, "id": 103, "legend": { @@ -1502,7 +1484,7 @@ "current": false, "max": false, "min": false, - "show": true, + "show": false, "total": false, "values": false }, @@ -1520,9 +1502,8 @@ "steppedLine": false, "targets": [ { - "$$hashKey": "object:535", "refId": "A", - "target": "aliasByNode(scaleToSeconds(movingAverage(perSecond(keepLastValue(groupByNode(screeps.$User.persistent.terminalNetwork.transfers.energy.*.*, 6, 'sumSeries'))), 200), 86000), 0)", + "target": "aliasByNode(scaleToSeconds(movingAverage(perSecond(keepLastValue(groupByNode(screeps.$User.persistent.terminalNetwork.transfers.energy.*.*, 6, 'sumSeries'))), 500), 86000), 0)", "textEditor": true } ], @@ -1545,7 +1526,6 @@ }, "yaxes": [ { - "$$hashKey": "object:1106", "format": "short", "label": null, "logBase": 1, @@ -1554,7 +1534,6 @@ "show": true }, { - "$$hashKey": "object:1107", "format": "short", "label": null, "logBase": 1, @@ -1661,5 +1640,5 @@ "timezone": "browser", "title": "Overmind", "uid": "000002135", - "version": 31 + "version": 39 } \ No newline at end of file