mike/systeminformation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dockerContainerStats() fixed parameter *

Browse Source
This commit is contained in:
Sebastian Hildebrandt 2021-02-23 22:49:28 +01:00
parent 0dedf36936
commit 79f1511242
9 changed files with 74 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -72,6 +72,7 @@ For major (breaking) changes - **version 4, 3 and 2** - see end of page.
| Version | Date | Comment |
| -------------- | -------------- | -------- |
| 5.3.5 | 2020-02-23 | `dockerContainerStats()` fixed parameter * |
| 5.3.4 | 2020-02-20 | `sanitizeShellString()` optimized strict sanitation |
| 5.3.3 | 2020-02-15 | `dockerContainerStats()` fixed ID splitting |
| 5.3.2 | 2020-02-15 | `inetLatency()` `ineChecksite()` fixed possible security issue (file://) |

30
docs/docker.html
View File

@ -728,7 +728,7 @@
</tr>
<tr>
<td></td>
<td>id</td>
<td>[0].id</td>
<td>X</td>
<td>X</td>
<td>X</td>
@ -738,7 +738,7 @@
</tr>
<tr>
<td></td>
<td>memUsage</td>
<td>[0].memUsage</td>
<td>X</td>
<td>X</td>
<td>X</td>
@ -748,7 +748,7 @@
</tr>
<tr>
<td></td>
<td>memLimit</td>
<td>[0].memLimit</td>
<td>X</td>
<td>X</td>
<td>X</td>
@ -758,7 +758,7 @@
</tr>
<tr>
<td></td>
<td>memPercent</td>
<td>[0].memPercent</td>
<td>X</td>
<td>X</td>
<td>X</td>
@ -768,7 +768,7 @@
</tr>
<tr>
<td></td>
<td>cpuPercent</td>
<td>[0].cpuPercent</td>
<td>X</td>
<td>X</td>
<td>X</td>
@ -778,7 +778,7 @@
</tr>
<tr>
<td></td>
<td>pids</td>
<td>[0].pids</td>
<td>X</td>
<td>X</td>
<td>X</td>
@ -788,7 +788,7 @@
</tr>
<tr>
<td></td>
<td>netIO.rx</td>
<td>[0].netIO.rx</td>
<td>X</td>
<td>X</td>
<td>X</td>
@ -798,7 +798,7 @@
</tr>
<tr>
<td></td>
<td>netIO.wx</td>
<td>[0].netIO.wx</td>
<td>X</td>
<td>X</td>
<td>X</td>
@ -808,7 +808,7 @@
</tr>
<tr>
<td></td>
<td>blockIO.r</td>
<td>[0].blockIO.r</td>
<td>X</td>
<td>X</td>
<td>X</td>
@ -818,7 +818,7 @@
</tr>
<tr>
<td></td>
<td>blockIO.w</td>
<td>[0].blockIO.w</td>
<td>X</td>
<td>X</td>
<td>X</td>
@ -828,7 +828,7 @@
</tr>
<tr>
<td></td>
<td>restartCount</td>
<td>[0].restartCount</td>
<td>X</td>
<td>X</td>
<td>X</td>
@ -838,7 +838,7 @@
</tr>
<tr>
<td></td>
<td>cpuStats</td>
<td>[0].cpuStats</td>
<td>X</td>
<td>X</td>
<td>X</td>
@ -848,7 +848,7 @@
</tr>
<tr>
<td></td>
<td>precpuStats</td>
<td>[0].precpuStats</td>
<td>X</td>
<td>X</td>
<td>X</td>
@ -858,7 +858,7 @@
</tr>
<tr>
<td></td>
<td>memoryStats</td>
<td>[0].memoryStats</td>
<td>X</td>
<td>X</td>
<td>X</td>
@ -868,7 +868,7 @@
</tr>
<tr>
<td></td>
<td>networks</td>
<td>[0].networks</td>
<td>X</td>
<td>X</td>
<td>X</td>

5
docs/history.html
View File

@ -56,6 +56,11 @@
</tr>
</thead>
<tbody>
<tr>
<th scope="row">5.3.5</th>
<td>2020-02-23</td>
<td><span class="code">dockerContainerStats()</span> fixed issue parameter *</td>
</tr>
<tr>
<th scope="row">5.3.4</th>
<td>2020-02-20</td>

2
docs/index.html
View File

@ -170,7 +170,7 @@
<img class="logo" src="assets/logo.png">
<div class="title">systeminformation</div>
<div class="subtitle"><span id="typed"></span>&nbsp;</div>
<div class="version">New Version: <span id="version">5.3.4</span></div>
<div class="version">New Version: <span id="version">5.3.5</span></div>
<button class="btn btn-light" onclick="location.href='https://github.com/sebhildebrandt/systeminformation'">View on Github <i class=" fab fa-github"></i></button>
</div>
<div class="down">

30
docs/v4/docker.html
View File

@ -727,7 +727,7 @@
</tr>
<tr>
<td></td>
<td>id</td>
<td>[0].id</td>
<td>X</td>
<td>X</td>
<td>X</td>
@ -737,7 +737,7 @@
</tr>
<tr>
<td></td>
<td>mem_usage</td>
<td>[0].mem_usage</td>
<td>X</td>
<td>X</td>
<td>X</td>
@ -747,7 +747,7 @@
</tr>
<tr>
<td></td>
<td>mem_limit</td>
<td>[0].mem_limit</td>
<td>X</td>
<td>X</td>
<td>X</td>
@ -757,7 +757,7 @@
</tr>
<tr>
<td></td>
<td>mem_percent</td>
<td>[0].mem_percent</td>
<td>X</td>
<td>X</td>
<td>X</td>
@ -767,7 +767,7 @@
</tr>
<tr>
<td></td>
<td>cpu_percent</td>
<td>[0].cpu_percent</td>
<td>X</td>
<td>X</td>
<td>X</td>
@ -777,7 +777,7 @@
</tr>
<tr>
<td></td>
<td>pids</td>
<td>[0].pids</td>
<td>X</td>
<td>X</td>
<td>X</td>
@ -787,7 +787,7 @@
</tr>
<tr>
<td></td>
<td>netIO.rx</td>
<td>[0].netIO.rx</td>
<td>X</td>
<td>X</td>
<td>X</td>
@ -797,7 +797,7 @@
</tr>
<tr>
<td></td>
<td>netIO.wx</td>
<td>[0].netIO.wx</td>
<td>X</td>
<td>X</td>
<td>X</td>
@ -807,7 +807,7 @@
</tr>
<tr>
<td></td>
<td>blockIO.r</td>
<td>[0].blockIO.r</td>
<td>X</td>
<td>X</td>
<td>X</td>
@ -817,7 +817,7 @@
</tr>
<tr>
<td></td>
<td>blockIO.w</td>
<td>[0].blockIO.w</td>
<td>X</td>
<td>X</td>
<td>X</td>
@ -827,7 +827,7 @@
</tr>
<tr>
<td></td>
<td>restartCount</td>
<td>[0].restartCount</td>
<td>X</td>
<td>X</td>
<td>X</td>
@ -837,7 +837,7 @@
</tr>
<tr>
<td></td>
<td>cpu_stats</td>
<td>[0].cpu_stats</td>
<td>X</td>
<td>X</td>
<td>X</td>
@ -847,7 +847,7 @@
</tr>
<tr>
<td></td>
<td>percpu_stats</td>
<td>[0].percpu_stats</td>
<td>X</td>
<td>X</td>
<td>X</td>
@ -857,7 +857,7 @@
</tr>
<tr>
<td></td>
<td>memory_stats</td>
<td>[0].memory_stats</td>
<td>X</td>
<td>X</td>
<td>X</td>
@ -867,7 +867,7 @@
</tr>
<tr>
<td></td>
<td>networks</td>
<td>[0].networks</td>
<td>X</td>
<td>X</td>
<td>X</td>

15
docs/v4/history.html
View File

@ -83,6 +83,21 @@
</tr>
</thead>
<tbody>
<tr>
<th scope="row">4.34.15</th>
<td>2020-02-23</td>
<td><span class="code">dockerContainerStats()</span> fixed issue parameter *</td>
</tr>
<tr>
<th scope="row">4.34.14</th>
<td>2020-02-20</td>
<td><span class="code">sanitizeShellString()</span> optimized strict sanitation</td>
</tr>
<tr>
<th scope="row">4.34.13</th>
<td>2020-02-15</td>
<td><span class="code">dockerContainerStats()</span> fix correct ID splitting</td>
</tr>
<tr>
<th scope="row">4.34.12</th>
<td>2020-02-15</td>

2
docs/v4/index.html
View File

@ -170,7 +170,7 @@
<div class="title">systeminformation </div>
<div class="subtitle"><span id="typed"></span>&nbsp;</div>
<div class="version larger">Version 4 documentation</div>
<div class="version">Current Version: <span id="version">4.34.12</span></div>
<div class="version">Current Version: <span id="version">4.34.15</span></div>
<button class="btn btn-light" onclick="location.href='https://github.com/sebhildebrandt/systeminformation'">View on Github <i class=" fab fa-github"></i></button>
</div>
<div class="down">

28
lib/docker.js
View File

@ -350,13 +350,18 @@ function dockerContainerStats(containerIDs, callback) {
containerIDsSanitized.__proto__.replace = util.stringReplace;
containerIDsSanitized.__proto__.trim = util.stringTrim;
const s = (util.isPrototypePolluted() ? '' : util.sanitizeShellString(containerIDs, true)).trim();
for (let i = 0; i <= 2000; i++) {
if (!(s[i] === undefined)) {
s[i].__proto__.toLowerCase = util.stringToLower;
const sl = s[i].toLowerCase();
if (sl && sl[0] && !sl[1]) {
containerIDsSanitized = containerIDsSanitized + sl[0];
containerIDsSanitized = containerIDs;
containerIDsSanitized = containerIDsSanitized.trim();
if (containerIDsSanitized !== '*') {
containerIDsSanitized = '';
const s = (util.isPrototypePolluted() ? '' : util.sanitizeShellString(containerIDs, true)).trim();
for (let i = 0; i <= 2000; i++) {
if (!(s[i] === undefined)) {
s[i].__proto__.toLowerCase = util.stringToLower;
const sl = s[i].toLowerCase();
if (sl && sl[0] && !sl[1]) {
containerIDsSanitized = containerIDsSanitized + sl[0];
}
}
}
}
@ -374,10 +379,15 @@ function dockerContainerStats(containerIDs, callback) {
for (let container of allContainers) {
containerArray.push(container.id);
}
dockerContainerStats(containerArray.join(',')).then(result => {
if (containerArray.length) {
dockerContainerStats(containerArray.join(',')).then(result => {
if (callback) { callback(result); }
resolve(result);
});
} else {
if (callback) { callback(result); }
resolve(result);
});
}
});
} else {
for (let containerID of containerArray) {

4
test/si.js
View File

@ -50,8 +50,8 @@ function test(f) {
else if (f === '5') { si.networkConnections().then(data => { if (data !== null) { resolve({ data, title: 'NET Connections' }); } else { resolve('not_supported'); } }); }
else if (f === '6') { si.dockerInfo().then(data => { if (data !== null) { resolve({ data, title: 'Docker Info' }); } else { resolve('not_supported'); } }); }
else if (f === '7') { si.dockerContainers(true).then(data => { if (data !== null) { resolve({ data, title: 'Docker Containers' }); } else { resolve('not_supported'); } }); }
else if (f === '8') { si.dockerContainerStats('1').then(data => { if (data !== null) { resolve({ data, title: 'Docker Cont Stats' }); } else { resolve('not_supported'); } }); }
else if (f === '9') { si.dockerContainerProcesses('1').then(data => { if (data !== null) { resolve({ data, title: 'Docker Cont Processes' }); } else { resolve('not_supported'); } }); }
else if (f === '8') { si.dockerContainerStats('*').then(data => { if (data !== null) { resolve({ data, title: 'Docker Cont Stats' }); } else { resolve('not_supported'); } }); }
else if (f === '9') { si.dockerContainerProcesses('*').then(data => { if (data !== null) { resolve({ data, title: 'Docker Cont Processes' }); } else { resolve('not_supported'); } }); }
else if (f === '0') { si.dockerAll().then(data => { if (data !== null) { resolve({ data, title: 'Docker All' }); } else { resolve('not_supported'); } }); }
else if (f === ',') { si.getStaticData().then(data => { if (data !== null) { resolve({ data, title: 'All Static Data' }); } else { resolve('not_supported'); } }); }
else if (f === '.') { si.getDynamicData('apache2, postgres, wsearch').then(data => { if (data !== null) { resolve({ data, title: 'All Dynamic Data' }); } else { resolve('not_supported'); } }); }