whatap - npm Package Compare versions

Comparing version 0.4.46 to 0.4.47

lib/counter/task/res/systemKubeTask.js

@@ -44,11 +44,4 @@ /**
     var now = Date.now();
-
-    if (now < KubeClient.node_recv_time + 10000) {
-        //  몽땅 만들어야 함.
-        p.cpu = KubeClient.cpu * ConfSysMon.correction_factor_cpu;
-        p.mem = KubeClient.memory * ConfSysMon.correction_factor_pcpu;
-        // p.metering = KubeClient.metering == 0 ? p.cpu_cores : KubeClient.metering;
-        p.metering = 1;
-    }
-
+    p.cpu = 0;
+    p.mem = 0;
     if (p.metering != 0) {
@@ -55,0 +48,0 @@ this.last_metering = p.metering;

lib/counter/task/systemperf.js

@@ -9,2 +9,3 @@ /**
     ResourceProfile = require('./../../util/resourceprofile'),
+    KubeUtil            = require('./../../util/kube-util'),
     SecurityMaster  = require('../../net/security-master');
@@ -29,8 +30,16 @@
     p.disk = ResourceProfile.getDisk().usage;
-    p.mem = ResourceProfile.getMemory().usage;
+
+    if(p.version <= 1) p.mem = ResourceProfile.getMemory().usage;
+    else p.mem = ResourceProfile.getMemoryV2().usage;
+
     p.cpu_cores = cpu.core;
     p.host_ip = SecurityMaster.IP;
     p.pid=process.pid;
+    
+    if (KubeUtil.container_id != null) {
+        p.mem = 0;
+        p.cpu = 0;
+    }
 };
 
 module.exports = SystemPerf;

lib/util/kube-util.js

@@ -21,3 +21,3 @@ var fs = require('fs');
                     this.container_id = line.substr(line.lastIndexOf('/')+1) || '';
-                    this.container_id = this.container_id.replace(/^(docker-)+|(\\.scope)+$/ig, "");
+                    this.container_id = this.container_id.replace(/^(docker-)+|(containerd-)+|(crio-)+|(\\.scope)+$/ig, "");
                     if(this.container_id.length > 5){
@@ -29,2 +29,3 @@ this.container_key = HashUtil.hash(this.container_id);
             }
+            Logger.print('WHATAP-800' , 'id:' + this.container_id + ' // key:' + this.container_key  , false)
         }catch(e){
@@ -31,0 +32,0 @@ Logger.printError('WHATAP-800', 'KubeUtil(loadContainerId) ', e)

package.json

 {
   "name": "whatap",
   "homepage": "http://www.whatap.io",
-  "version": "0.4.46",
-  "releaseDate": "20220523",
+  "version": "0.4.47",
+  "releaseDate": "20220602",
   "description": "Monitoring and Profiling Service",
@@ -7,0 +7,0 @@ "main": "index.js",

No alert changes

Improved metrics

Total package byte prevSize

910497

increased by0.01%

Lines of code

19162

increased by0.01%

No dependency changes