dockly 3.23.6 → 3.24.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/widgets/containers/containerUtilization.widget.js +4 -9
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dockly",
3
- "version": "3.23.6",
3
+ "version": "3.24.0",
4
4
  "description": "Immersive terminal interface for managing docker containers and services",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/widgets/containers/containerUtilization.widget.js CHANGED
@@ -50,8 +50,7 @@ class myWidget extends baseWidget() {
50
50
  if (!data.cpu_stats || !data.precpu_stats || !data.cpu_stats.cpu_usage ||
51
51
  !data.precpu_stats.cpu_usage || !data.cpu_stats.cpu_usage.total_usage ||
52
52
  !data.precpu_stats.cpu_usage.total_usage ||
53
- !data.cpu_stats.system_cpu_usage || !data.precpu_stats.system_cpu_usage ||
54
- !data.cpu_stats.cpu_usage.percpu_usage) {
53
+ !data.cpu_stats.system_cpu_usage || !data.precpu_stats.system_cpu_usage) {
55
54
  return this.widget.setData({
56
55
  titles: ['CPU', 'Memory'],
57
56
  data: [
@@ -64,15 +63,11 @@ class myWidget extends baseWidget() {
64
63
  // Calculate CPU usage based on delta from previous measurement
65
64
  let cpuUsageDelta = data.cpu_stats.cpu_usage.total_usage - data.precpu_stats.cpu_usage.total_usage
66
65
  let systemUsageDelta = data.cpu_stats.system_cpu_usage - data.precpu_stats.system_cpu_usage
67
- let cpuCoresAvail = data.cpu_stats.cpu_usage.percpu_usage ? data.cpu_stats.cpu_usage.percpu_usage.length : 0
66
+ let cpuCoresAvail = data.cpu_stats.online_cpus ? data.cpu_stats.online_cpus : 1
68
67
 
69
68
  let cpuUsagePercent = 0
70
- if (systemUsageDelta !== 0 || cpuCoresAvail !== 0) {
71
- let totalUsage = systemUsageDelta * cpuCoresAvail * 100
72
- cpuUsagePercent = 0
73
- if (totalUsage && totalUsage !== 0) {
74
- cpuUsagePercent = cpuUsageDelta / totalUsage
75
- }
69
+ if (systemUsageDelta > 0) {
70
+ cpuUsagePercent = (cpuUsageDelta / systemUsageDelta) * cpuCoresAvail * 100
76
71
  }
77
72
 
78
73
  // Calculate Memory usage