remove whitespace between CPU% and (val)

Signed-off-by: [email protected] <[email protected]>
hyperledger-caliper · Jan 30, 2020 · 5e0d6c1 · 5e0d6c1
1 parent 082f108
commit 5e0d6c1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/packages/caliper-core/lib/master/monitors/monitor-docker.js b/packages/caliper-core/lib/master/monitors/monitor-docker.js
@@ -359,8 +359,8 @@ class MonitorDocker extends MonitorInterface {
                     watchItemStat.set('Name', container.name);
                     watchItemStat.set('Memory(max)', mem_stat.max);
                     watchItemStat.set('Memory(avg)', mem_stat.avg);
-                    watchItemStat.set('CPU% (max)', cpu_stat.max.toFixed(2));
-                    watchItemStat.set('CPU% (avg)', cpu_stat.avg.toFixed(2));
+                    watchItemStat.set('CPU%(max)', cpu_stat.max.toFixed(2));
+                    watchItemStat.set('CPU%(avg)', cpu_stat.avg.toFixed(2));
                     watchItemStat.set('Traffic In', (net.in[net.in.length - 1] - net.in[0]));
                     watchItemStat.set('Traffic Out', (net.out[net.out.length - 1] - net.out[0]));
                     watchItemStat.set('Disc Write', (disc.write[disc.write.length - 1] - disc.write[0]));

diff --git a/packages/caliper-core/lib/master/monitors/monitor-process.js b/packages/caliper-core/lib/master/monitors/monitor-process.js
@@ -288,15 +288,15 @@ class MonitorProcess extends MonitorInterface {
                 watchItemStat.set('Name', key);
                 watchItemStat.set('Memory(max)', MonitorUtilities.byteNormalize(mem_stat.max));
                 watchItemStat.set('Memory(avg)', MonitorUtilities.byteNormalize(mem_stat.avg));
-                watchItemStat.set('CPU% (max)', cpu_stat.max.toFixed(2));
-                watchItemStat.set('CPU% (avg)', cpu_stat.avg.toFixed(2));
+                watchItemStat.set('CPU%(max)', cpu_stat.max.toFixed(2));
+                watchItemStat.set('CPU%(avg)', cpu_stat.avg.toFixed(2));
 
                 // append return array
                 resourceStats.push(watchItemStat);
             }
 
             // Normalize the resource stats to a single unit
-            const normalizeStats = ['Memory(max)', 'Memory(avg)', 'CPU% (max)', 'CPU% (avg)'];
+            const normalizeStats = ['Memory(max)', 'Memory(avg)'];
             for (const stat of normalizeStats) {
                 MonitorUtilities.normalizeStats(stat, resourceStats);
             }