diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml index e8343131c..8f2e83013 100644 --- a/salt/grafana/defaults.yaml +++ b/salt/grafana/defaults.yaml @@ -33,18 +33,19 @@ grafana: - monint - cpucount panels: - cpu_usage_idle: - enabled: true - trend: true - gridPos: - h: 10 - w: 20 - x: 0 - y: 0 - cpu_usage_tasks: {} - disk_io: {} - disk_used_root: {} - disk_used_nsm: {} - elasticsearch_cpu_usage: {} - elasticsearch_documents_count: {} - elasticsearch_field_data_cache_size: {} + cpu_docker_combined: {} +# cpu_usage_idle: +# enabled: true +# trend: true +# gridPos: +# h: 10 +# w: 20 +# x: 0 +# y: 0 +# cpu_usage_tasks: {} +# disk_io: {} +# disk_used_root: {} +# disk_used_nsm: {} +# elasticsearch_cpu_usage: {} +# elasticsearch_documents_count: {} +# elasticsearch_field_data_cache_size: {} diff --git a/salt/grafana/panels/cpu_docker_combined.json.jinja b/salt/grafana/panels/cpu_docker_combined.json.jinja index e066f56b1..751f999d7 100644 --- a/salt/grafana/panels/cpu_docker_combined.json.jinja +++ b/salt/grafana/panels/cpu_docker_combined.json.jinja @@ -4,8 +4,8 @@ "gridPos": { "x": 0, "y": 0, - "w": 24, - "h": 14 + "w": 30, + "h": 15 }, "id": 78, "targets": [