summaryrefslogtreecommitdiffstats
path: root/web/gui/dashboard_info.js
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2019-02-21 19:34:01 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2019-02-21 19:34:01 +0000
commit66564c2324abc58b24327b763e1113ff781156a2 (patch)
tree2480212cd47149a3fda5225b57689d0126546e23 /web/gui/dashboard_info.js
parentAdding upstream version 1.12.0. (diff)
downloadnetdata-66564c2324abc58b24327b763e1113ff781156a2.tar.xz
netdata-66564c2324abc58b24327b763e1113ff781156a2.zip
Adding upstream version 1.12.1.upstream/1.12.1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'web/gui/dashboard_info.js')
-rw-r--r--web/gui/dashboard_info.js64
1 files changed, 61 insertions, 3 deletions
diff --git a/web/gui/dashboard_info.js b/web/gui/dashboard_info.js
index 00cac6317..4de6081ec 100644
--- a/web/gui/dashboard_info.js
+++ b/web/gui/dashboard_info.js
@@ -618,6 +618,10 @@ netdataDashboard.submenu = {
// colors: the dimension colors of the chart (the default colors are appended)
// height: the ratio of the chart height relative to the default
//
+
+var cgroupCPULimitIsSet = 0;
+var cgroupMemLimitIsSet = 0;
+
netdataDashboard.context = {
'system.cpu': {
info: function (os) {
@@ -1416,11 +1420,15 @@ netdataDashboard.context = {
// ------------------------------------------------------------------------
// containers
- 'cgroup.cpu': {
+ 'cgroup.cpu_limit': {
+ valueRange: "[0, null]",
mainheads: [
function (os, id) {
void(os);
+ cgroupCPULimitIsSet = 1;
return '<div data-netdata="' + id + '"'
+ + ' data-dimensions="used"'
+ + ' data-gauge-max-value="100"'
+ ' data-chart-library="gauge"'
+ ' data-title="CPU"'
+ ' data-units="%"'
@@ -1435,14 +1443,41 @@ netdataDashboard.context = {
]
},
- 'cgroup.mem_usage': {
+ 'cgroup.cpu': {
+ mainheads: [
+ function (os, id) {
+ void(os);
+ if (cgroupCPULimitIsSet === 0) {
+ 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[4] + '"'
+ + ' role="application"></div>';
+ }
+ else
+ return '';
+ }
+ ]
+ },
+
+ 'cgroup.mem_usage_limit': {
mainheads: [
function (os, id) {
void(os);
+ cgroupMemLimitIsSet = 1;
return '<div data-netdata="' + id + '"'
+ + ' data-dimensions="used"'
+ + ' data-append-options="percentage"'
+ + ' data-gauge-max-value="100"'
+ ' data-chart-library="gauge"'
+ ' data-title="Memory"'
- + ' data-units="MB"'
+ + ' data-units="%"'
+ ' data-gauge-adjust="width"'
+ ' data-width="12%"'
+ ' data-before="0"'
@@ -1454,6 +1489,29 @@ netdataDashboard.context = {
]
},
+ 'cgroup.mem_usage': {
+ mainheads: [
+ function (os, id) {
+ void(os);
+ if (cgroupMemLimitIsSet === 0) {
+ 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>';
+ }
+ else
+ return '';
+ }
+ ]
+ },
+
'cgroup.throttle_io': {
mainheads: [
function (os, id) {