diff --git a/salt/grafana/panels/memory_usage_graph.json.jinja b/salt/grafana/panels/memory_usage_graph.json.jinja index f80ad3112..4c19bdb05 100644 --- a/salt/grafana/panels/memory_usage_graph.json.jinja +++ b/salt/grafana/panels/memory_usage_graph.json.jinja @@ -1,146 +1,135 @@ { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fill": 1, - "fillGradient": 0, - "grid": {}, - "gridPos": { - "x": {{ PANELS.memory_usage_graph.gridPos.x }}, - "y": {{ PANELS.memory_usage_graph.gridPos.y }}, - "w": {{ PANELS.memory_usage_graph.gridPos.w }}, - "h": {{ PANELS.memory_usage_graph.gridPos.h }} - }, - "height": "400", - "id": 12054, - "interval": "$inter", - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "max": true, - "min": true, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "connected", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [ - { - "alias": "/total/", - "color": "#BF1B00", - "fill": 0, - "linewidth": 2 - } - ], - "spaceLength": 10, - "stack": false, - "steppedLine": false, + "type": "graph", + "title": "Memory Usage", + "gridPos": { + "x": {{ PANELS.row_memory.gridPos.x }}, + "y": {{ PANELS.row_memory.gridPos.y }}, + "w": {{ PANELS.row_memory.gridPos.w }}, + "h": {{ PANELS.row_memory.gridPos.h }} + }, + "id": 61873, "targets": [ { - "alias": "$tag_host: $col", - "dsType": "influxdb", - "function": "mean", + "refId": "A", + "queryType": "randomWalk", + "policy": "default", + "resultFormat": "time_series", + "orderByTime": "ASC", + "tags": [], "groupBy": [ { - "interval": "auto", + "type": "time", "params": [ - "auto" - ], - "type": "time" + "$__interval" + ] }, { - "key": "host", + "type": "fill", "params": [ - "tag" - ], - "type": "tag" + "null" + ] } ], - "measurement": "mem_inactive", - "policy": "default", - "query": "SELECT mean(total) as total, mean(used) as used, mean(cached) as cached, mean(free) as free, mean(buffered) as buffered FROM \"mem\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($interval), host ORDER BY asc", - "rawQuery": true, - "refId": "A", - "resultFormat": "time_series", "select": [ [ { + "type": "field", "params": [ "value" - ], - "type": "field" + ] }, { - "params": [], - "type": "mean" + "type": "mean", + "params": [] } ] ], - "tags": [] + "query": "SELECT mean(total) as total, mean(used) as used, mean(cached) as cached, mean(free) as free, mean(buffered) as buffered FROM \"mem\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($interval), host ORDER BY asc", + "rawQuery": true, + "alias": "$tag_host: $col" } ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Memory Usage", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 0, - "value_type": "cumulative" + "options": { + "alertThreshold": true }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] + "datasource": "InfluxDB", + "fieldConfig": { + "defaults": {}, + "overrides": [] }, + "pluginVersion": "7.5.4", + "renderer": "flot", "yaxes": [ { - "format": "bytes", + "label": null, + "show": true, "logBase": 1, + "min": "0", "max": null, - "min": 0, - "show": true + "format": "bytes", + "$$hashKey": "object:235" }, { - "format": "short", + "label": null, + "show": true, "logBase": 1, - "max": null, "min": null, - "show": true + "max": null, + "format": "short", + "$$hashKey": "object:236" } ], + "xaxis": { + "show": true, + "mode": "time", + "name": null, + "values": [], + "buckets": null + }, "yaxis": { "align": false, "alignLevel": null }, - "fieldConfig": { - "defaults": { - "links": [] - }, - "overrides": [] + "lines": true, + "fill": 1, + "linewidth": 1, + "dashLength": 10, + "spaceLength": 10, + "pointradius": 2, + "legend": { + "show": true, + "values": true, + "min": true, + "max": true, + "current": true, + "total": false, + "avg": true, + "alignAsTable": true }, - "pluginVersion": "7.5.4", - "hiddenSeries": false + "nullPointMode": "connected", + "tooltip": { + "value_type": "individual", + "shared": true, + "sort": 0 + }, + "aliasColors": {}, + "seriesOverrides": [ + { + "$$hashKey": "object:295", + "alias": "/total/", + "fill": 0, + "color": "#C4162A" + } + ], + "thresholds": [], + "timeRegions": [], + "fillGradient": 0, + "dashes": false, + "hiddenSeries": false, + "points": false, + "bars": false, + "stack": false, + "percentage": false, + "steppedLine": false, + "description": "" }