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

dockerContainers() added started, finished time

Browse Source
This commit is contained in:
Sebastian Hildebrandt 2019-05-11 00:13:46 +02:00
parent 0dbba32ae9
commit 4c25315682
7 changed files with 72 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -30,6 +30,7 @@ For major (breaking) changes - version 3 and 2 see end of page.
| Version | Date | Comment |
| -------------- | -------------- | -------- |
| 4.4.0 | 2019-05-11 | `dockerContainers()` added started, finished time |
| 4.3.0 | 2019-05-09 | `dockerContainers()` `dockerStats()` added restartCount |
| 4.2.1 | 2019-05-09 | `networkInterfaceDefault()` time delay fix (linux) |
| 4.2.0 | 2019-05-09 | `osInfo()` extended service pack version (windows) |

2
README.md
View File

@ -82,13 +82,13 @@ si.cpu()
(last 7 major and minor version releases)
- Version 4.4.0: `dockerContainers()` added started, finished time
- Version 4.3.0: `dockerContainers()` `dockerStats()` added restartCount
- Version 4.2.0: `networkInterfaceDefault()` time delay fix (linux)
- Version 4.1.0: `versions()` added python3, pip, pip3, java
- Version 4.0.0: new version ... read the [detailed changelog][changelog-url] to see all breaking changes
- Version 3.54.0: added TypeScript type definitions
- Version 3.53.0: `versions()` added perl, python, gcc
- Version 3.52.0: `cpu()` added physical cores, processors, socket type
- ...
You can find all changes here: [detailed changelog][changelog-url]

52
docs/docker.html
View File

@ -133,7 +133,57 @@
<td>X</td>
<td>X</td>
<td>X</td>
<td>creation time</td>
<td>creation time (unix time)</td>
</tr>
<tr>
<td></td>
<td>[0].started</td>
<td>X</td>
<td>X</td>
<td>X</td>
<td>X</td>
<td>X</td>
<td>started time (unix time)</td>
</tr>
<tr>
<td></td>
<td>[0].finished</td>
<td>X</td>
<td>X</td>
<td>X</td>
<td>X</td>
<td>X</td>
<td>finished time (unix time)</td>
</tr>
<tr>
<td></td>
<td>[0].createdAt</td>
<td>X</td>
<td>X</td>
<td>X</td>
<td>X</td>
<td>X</td>
<td>creation date time string</td>
</tr>
<tr>
<td></td>
<td>[0].startedAt</td>
<td>X</td>
<td>X</td>
<td>X</td>
<td>X</td>
<td>X</td>
<td>creation date time string</td>
</tr>
<tr>
<td></td>
<td>[0].finishedAt</td>
<td>X</td>
<td>X</td>
<td>X</td>
<td>X</td>
<td>X</td>
<td>creation date time string</td>
</tr>
<tr>
<td></td>

5
docs/history.html
View File

@ -80,6 +80,11 @@
</tr>
</thead>
<tbody>
<tr>
<th scope="row">4.4.0</th>
<td>2019-05-09</td>
<td><span class="code">dockerContainers()</span> added started, finished time</td>
</tr>
<tr>
<th scope="row">4.3.0</th>
<td>2019-05-09</td>

6
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></div>
<div class="version">Current Version: <span id="version">4.3.0</span></div>
<div class="version">Current Version: <span id="version">4.4.0</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">
@ -193,7 +193,7 @@
</div>
<div class="row number-section">
<div class="col-xl-4 col-lg-4 col-md-4 col-12">
<div class="numbers">8,354</div>
<div class="numbers">8,351</div>
<div class="title">Lines of code</div>
</div>
<div class="col-xl-4 col-lg-4 col-md-4 col-12">
@ -201,7 +201,7 @@
<div class="title">Downloads last month</div>
</div>
<div class="col-xl-4 col-lg-4 col-md-4 col-12">
<div class="numbers">154</div>
<div class="numbers">157</div>
<div class="title">Dependends</div>
</div>
</div>

15
lib/docker.js
View File

@ -120,14 +120,6 @@ function dockerContainers(all, callback) {
function dockerContainerInspect(containerID, payload) {
containerID = containerID || '';
let result = {
id: containerID,
mem_usage: 0,
mem_limit: 0,
mem_percent: 0,
cpu_percent: 0,
pids: 0,
};
return new Promise((resolve) => {
process.nextTick(() => {
if (containerID) {
@ -151,6 +143,11 @@ function dockerContainerInspect(containerID, payload) {
imageID: payload.ImageID,
command: payload.Command,
created: payload.Created,
started: data.State && data.State.StartedAt ? Math.round(new Date(data.State.StartedAt).getTime() / 1000) : 0,
finished: data.State && data.State.FinishedAt && !data.State.FinishedAt.startsWith('0001-01-01') ? Math.round(new Date(data.State.FinishedAt).getTime() / 1000) : 0,
createdAt: data.Created ? data.Created : '',
startedAt: data.State && data.State.StartedAt ? data.State.StartedAt : '',
finishedAt: data.State && data.State.FinishedAt && !data.State.FinishedAt.startsWith('0001-01-01') ? data.State.FinishedAt : '',
state: payload.State,
restartCount: data.RestartCount || 0,
platform: data.Platform || '',
@ -159,7 +156,7 @@ function dockerContainerInspect(containerID, payload) {
mounts: payload.Mounts,
// hostconfig: payload.HostConfig,
// network: payload.NetworkSettings
})
});
} catch (err) {
resolve();
}

5
lib/index.d.ts vendored
View File

@ -421,6 +421,11 @@ export namespace Systeminformation {
imageID: string;
command: string;
created: number;
started: number;
finished: number;
createdAt: string;
startedAt: string;
finishedAt: string;
state: string;
restartCount: number;
platform: string;