diff options
| -rw-r--r-- | web/dashboard.css | 1 | ||||
| -rw-r--r-- | web/dashboard.js | 4 | ||||
| -rw-r--r-- | web/dashboard.slate.css | 1 | ||||
| -rw-r--r-- | web/dashboard_info.js | 77 | ||||
| -rw-r--r-- | web/index.html | 4 |
5 files changed, 83 insertions, 4 deletions
diff --git a/web/dashboard.css b/web/dashboard.css index 2147c6038d..42ffa3ddb1 100644 --- a/web/dashboard.css +++ b/web/dashboard.css @@ -37,6 +37,7 @@ body { justify-content: center; -webkit-justify-content: center; -moz-justify-content: center; + padding-top: 10px; } .netdata-container { diff --git a/web/dashboard.js b/web/dashboard.js index f218dccbd2..f1a2337cfe 100644 --- a/web/dashboard.js +++ b/web/dashboard.js @@ -144,7 +144,7 @@ var NETDATA = window.NETDATA || {}; NETDATA.themes = { white: { bootstrap_css: NETDATA.serverDefault + 'css/bootstrap-3.3.7.css', - dashboard_css: NETDATA.serverDefault + 'dashboard.css?v20170605-2', + dashboard_css: NETDATA.serverDefault + 'dashboard.css?v20170725-1', background: '#FFFFFF', foreground: '#000000', grid: '#F0F0F0', @@ -161,7 +161,7 @@ var NETDATA = window.NETDATA || {}; }, slate: { bootstrap_css: NETDATA.serverDefault + 'css/bootstrap-slate-flat-3.3.7.css?v20161229-1', - dashboard_css: NETDATA.serverDefault + 'dashboard.slate.css?v20170605-2', + dashboard_css: NETDATA.serverDefault + 'dashboard.slate.css?v20170725-1', background: '#272b30', foreground: '#C8C8C8', grid: '#283236', diff --git a/web/dashboard.slate.css b/web/dashboard.slate.css index f12a6aab99..7445d532c7 100644 --- a/web/dashboard.slate.css +++ b/web/dashboard.slate.css @@ -51,6 +51,7 @@ code { justify-content: center; -moz--webkit-justify-content: center; -moz-justify-content: center; + padding-top: 10px; } .netdata-container { diff --git a/web/dashboard_info.js b/web/dashboard_info.js index 91e007a1df..ffc3062d90 100644 --- a/web/dashboard_info.js +++ b/web/dashboard_info.js @@ -1020,6 +1020,83 @@ netdataDashboard.context = { height: 0.5 }, + + // ------------------------------------------------------------------------ + // containers + + 'cgroup.cpu': { + mainheads: [ + function(os, id) { + void(os); + return '<div data-netdata="' + id + '"' + + ' data-chart-library="gauge"' + + ' data-title="CPU"' + + ' data-units="%"' + + ' data-gauge-adjust="width"' + + ' data-width="12%"' + + ' data-before="0"' + + ' data-after="-CHART_DURATION"' + + ' data-points="CHART_DURATION"' + + ' data-colors="' + NETDATA.colors[0] + '"' + + ' role="application"></div>'; + } + ] + }, + + 'cgroup.mem_usage': { + mainheads: [ + function(os, id) { + void(os); + return '<div data-netdata="' + id + '"' + + ' data-chart-library="gauge"' + + ' data-title="Memory"' + + ' data-units="MB"' + + ' data-gauge-adjust="width"' + + ' data-width="12%"' + + ' data-before="0"' + + ' data-after="-CHART_DURATION"' + + ' data-points="CHART_DURATION"' + + ' data-colors="' + NETDATA.colors[1] + '"' + + ' role="application"></div>'; + } + ] + }, + + 'cgroup.throttle_io': { + mainheads: [ + function(os, id) { + void(os); + return '<div data-netdata="' + id + '"' + + ' data-dimensions="read"' + + ' data-chart-library="gauge"' + + ' data-title="Read Disk I/O"' + + ' data-units="KB/s"' + + ' data-gauge-adjust="width"' + + ' data-width="12%"' + + ' data-before="0"' + + ' data-after="-CHART_DURATION"' + + ' data-points="CHART_DURATION"' + + ' data-colors="' + NETDATA.colors[2] + '"' + + ' role="application"></div>'; + }, + function(os, id) { + void(os); + return '<div data-netdata="' + id + '"' + + ' data-dimensions="write"' + + ' data-chart-library="gauge"' + + ' data-title="Write Disk I/O"' + + ' data-units="KB/s"' + + ' data-gauge-adjust="width"' + + ' data-width="12%"' + + ' data-before="0"' + + ' data-after="-CHART_DURATION"' + + ' data-points="CHART_DURATION"' + + ' data-colors="' + NETDATA.colors[3] + '"' + + ' role="application"></div>'; + } + ] + }, + // ------------------------------------------------------------------------ // web_log diff --git a/web/index.html b/web/index.html index 0bb8b505d0..b742401480 100644 --- a/web/index.html +++ b/web/index.html @@ -2961,7 +2961,7 @@ }); NETDATA.requiredJs.push({ - url: NETDATA.serverDefault + 'dashboard_info.js?v20170530-1', + url: NETDATA.serverDefault + 'dashboard_info.js?v20170725-1', async: false, isAlreadyLoaded: function() { return false; } }); @@ -3589,4 +3589,4 @@ </div> </body> </html> -<script type="text/javascript" src="dashboard.js?v20170724-1"></script> +<script type="text/javascript" src="dashboard.js?v20170725-1"></script> |