diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml index 2463e4d23..fceb3f380 100644 --- a/salt/grafana/defaults.yaml +++ b/salt/grafana/defaults.yaml @@ -34,34 +34,47 @@ grafana: - monint - cpucount panels: - row_docker_details: + row_overview: gridPos: x: 0 y: 0 h: 1 w: 24 - cpu_docker_combined_current: + system_uptime: gridPos: x: 0 y: 1 + h: 4 + w: 4 + + row_docker_details: + gridPos: + x: 0 + y: 5 + h: 1 + w: 24 + cpu_docker_combined_current: + gridPos: + x: 0 + y: 6 h: 10 w: 24 cpu_docker_combined_trend: gridPos: x: 0 - y: 11 + y: 16 h: 10 w: 24 memory_used_docker_combined_current: gridPos: x: 0 - y: 21 + y: 26 h: 10 w: 24 memory_used_docker_combined_trend: gridPos: x: 0 - y: 31 + y: 36 h: 10 w: 24 # cpu_usage_idle: diff --git a/salt/grafana/panels/row_overview.json.jinja b/salt/grafana/panels/row_overview.json.jinja new file mode 100644 index 000000000..bbffcc7dc --- /dev/null +++ b/salt/grafana/panels/row_overview.json.jinja @@ -0,0 +1,15 @@ +{ + "collapsed": false, + "datasource": null, + "gridPos": { + "x": {{ PANELS.overview.gridPos.x }}, + "y": {{ PANELS.overview.gridPos.y }}, + "w": {{ PANELS.overview.gridPos.w }}, + "h": {{ PANELS.overview.gridPos.h }} + }, + "id": 1, + "panels": [], + "repeat": null, + "title": "Overview", + "type": "row" + }