whatap 0.4.79 → 0.4.81

package/lib/data/test.js

@@ -1,49 +1,49 @@
-var IntSet  = require('../util/intset') ,
-TagCountPack = require('../pack/tagcount-pack');
-const DataPackSender = require('./datapack-sender');
-
-var Test = function() {
-    this.sent = new IntSet().setMax(10);
-    this.init()
-}
-
-Test.prototype.init = function() {
-    this.sent.add(1);
-    this.sent.add(2);
-    this.sent.add(3);
-    this.sent.add(4);
-    this.sent.add(5);
-    this.sent.add(6);
-    this.sent.add(7);
-    this.sent.add(8);
-    this.sent.add(9);
-    this.sent.add(10);
-    this.sent.add(11);
-    this.sent.add(12);
-    this.sent.add(13);
-    this.sent.add(14);
-    if(this.sent.hasKey(14) == false) {
-        console.log(this.sent.getLastValue())
-        this.sent.add(15);
-    }
-    var p = new TagCountPack()
-    p.category = 'aaaa' 
-    p.pcode = 101
-    p.oid = 1
-    p.putTagString('tag1','tag1')
-    p.putTagString('tag2','tag2')
-    p.putTagString('tag3','tag3')
-    p.putTagString('tag4','tag4')
-    p.putTagString('tag5','tag5')
-    p.putTagString('tag6','tag6')
-    p.putInt('filed1' , 100)
-    p.putInt('filed2' , 200)
-    p.putInt('filed3' , 300)
-    p.putInt('filed4' , 400)
-    p.putInt('filed5' , 500)
-    p.putInt('filed6' , 600)
-    
-    DataPackSender.sendTagCounterPack(p);
-}
-
+var IntSet  = require('../util/intset') ,
+TagCountPack = require('../pack/tagcount-pack');
+const DataPackSender = require('./datapack-sender');
+
+var Test = function() {
+    this.sent = new IntSet().setMax(10);
+    this.init()
+}
+
+Test.prototype.init = function() {
+    this.sent.add(1);
+    this.sent.add(2);
+    this.sent.add(3);
+    this.sent.add(4);
+    this.sent.add(5);
+    this.sent.add(6);
+    this.sent.add(7);
+    this.sent.add(8);
+    this.sent.add(9);
+    this.sent.add(10);
+    this.sent.add(11);
+    this.sent.add(12);
+    this.sent.add(13);
+    this.sent.add(14);
+    if(this.sent.hasKey(14) == false) {
+        console.log(this.sent.getLastValue())
+        this.sent.add(15);
+    }
+    var p = new TagCountPack()
+    p.category = 'aaaa' 
+    p.pcode = 101
+    p.oid = 1
+    p.putTagString('tag1','tag1')
+    p.putTagString('tag2','tag2')
+    p.putTagString('tag3','tag3')
+    p.putTagString('tag4','tag4')
+    p.putTagString('tag5','tag5')
+    p.putTagString('tag6','tag6')
+    p.putInt('filed1' , 100)
+    p.putInt('filed2' , 200)
+    p.putInt('filed3' , 300)
+    p.putInt('filed4' , 400)
+    p.putInt('filed5' , 500)
+    p.putInt('filed6' , 600)
+    
+    DataPackSender.sendTagCounterPack(p);
+}
+
 exports.Test = new Test();

package/lib/env/constants.js

@@ -1,21 +1,21 @@
-/**
- * Copyright 2016 the WHATAP project authors. All rights reserved.
- * Use of this source code is governed by a license that
- * can be found in the LICENSE file.
- */
-
-var numType = {
-	INT8_MIN : -128,
-	INT8_MAX : 127,
-	INT16_MIN : -32768,
-	INT16_MAX : 32767,
-	INT24_MIN : -8388608,
-	INT24_MAX : 8388607,
-	INT32_MIN : -2147483648,
-	INT32_MAX : 2147483647,
-	INT40_MIN : -549755813888,
-	INT40_MAX : 549755813887,
-	INT64_MIN : -4503599627370496,
-	INT64_MAX : 4503599627370495
-};
+/**
+ * Copyright 2016 the WHATAP project authors. All rights reserved.
+ * Use of this source code is governed by a license that
+ * can be found in the LICENSE file.
+ */
+
+var numType = {
+	INT8_MIN : -128,
+	INT8_MAX : 127,
+	INT16_MIN : -32768,
+	INT16_MAX : 32767,
+	INT24_MIN : -8388608,
+	INT24_MAX : 8388607,
+	INT32_MIN : -2147483648,
+	INT32_MAX : 2147483647,
+	INT40_MIN : -549755813888,
+	INT40_MAX : 549755813887,
+	INT64_MIN : -4503599627370496,
+	INT64_MAX : 4503599627370495
+};
 module.exports.numType = numType;

package/lib/kube/kube-client.js

@@ -1,144 +1,144 @@
-var net             = require('net'),
-    conf            = require('../conf/configure'),
-    MapValue        = require('../value/map-value'),
-    KubeUtil        = require('../util/kube-util'),
-    StopWatch       = require('../util/stop-watch'),
-    DataOutputX     = require('../io/data-outputx'),
-    DataInputX      = require('../io/data-inputx'),
-    IPUtil          = require('../util/iputil'),
-    TcpRequestClientProxy = require('./../net/tcpreq-client-proxy'),
-    Logger          = require('../logger'),
-    SecurityMaster  = require('./../net/security-master');
-    
-const SLEEP_TIME = 15000;
-
-var KubeClient = {
-    intervalId: undefined,
-    run: function(){
-        var self = this;
-        if(this.intervalId){
-            clearInterval(this.intervalId); this.intervalId = undefined;
-        }
-        this.intervalId = setInterval(function(){
-            self.process(conf.pod_name);
-        },SLEEP_TIME);
-    },
-
-    process: function(podName){
-        var self = this;
-        var p = new MapValue();
-
-        var localAddr = (IPUtil.getIp());
-
-        SecurityMaster.IP = IPUtil.stringToInt(localAddr);
-
-		p.putString("cmd", "regist");
-		p.putLong("pcode", SecurityMaster.PCODE);
-		p.putLong("oid", SecurityMaster.OID);
-        p.putString("oname", SecurityMaster.ONAME);
-        
-		p.putString("ip", IPUtil.intToString(SecurityMaster.IP));
-		p.putString("hostname", require('os').hostname());
-        p.putBoolean("kube.micro", true);
-
-        if (podName != null) {
-			p.putString("pod_name", podName);
-		}
-		if (conf.OKIND != 0) {
-			p.putLong("okind", conf.OKIND);
-			p.putString("okind_name", conf.OKIND_NAME);
-		}
-		if (conf.ONODE != 0) {
-			p.putLong("onode", conf.ONODE);
-			p.putString("onode_name", conf.ONODE_NAME);
-		}
-		if (KubeUtil.container_id != null) {
-			p.putString("container_id", KubeUtil.container_id);
-        }
-    
-        this.sendToMaster(p, function(){
-            self.sendToNode(p);
-        });
-    },
-
-    sendToNode: function(p){
-        var self = this;
-
-        try{
-            var client = new TcpRequestClientProxy("Node " + self.node_agent_ip+ ":"+self.node_agent_port);
-            client.open( self.node_agent_ip , self.node_agent_port, function(err, data){
-                client.send(new DataOutputX().writeValue(p));
-            }, function(err, data){
-                if(err || !data){
-                    return console.log("#### errordata" , err, data);
-                }
-                var m = new DataInputX(data).readValue();
-
-                self.cpu = m.getFloat("cpu");
-                self.cpu_sys = m.getFloat("cpu_sys");
-                self.cpu_user = m.getFloat("cpu_user");
-                self.throttled_periods = m.getFloat("throttled_periods");
-                self.throttled_time = m.getFloat("throttled_time");
-
-                self.memory = m.getLong("memory");
-                self.failcnt = m.getLong("failcnt");
-                self.limit = m.getLong("limit");
-                self.maxUsage = m.getLong("maxUsage");
-
-                self.node_recv_time = Date.now();
-                self.metering = m.getFloat("metering");
-            });
-        }catch(e){
-            return Logger.printError("WHATAP-128", 'Failed to connect to kubernetes Node!')
-        }
-    },
-
-    sendToMaster: function(p, cb){
-        var self = this;
-        if (conf.master_agent_host == null) {
-            return Logger.printError("WHATAP-129", 'master_agent_host=null', e)
-		}
-
-        var connectOptions = {
-            host: 
-            conf.master_agent_host
-            // 'localhost'
-            , port: conf.master_agent_port, agent: false
-        };
-
-        try{
-            self.auto_oname_reset = conf.auto_oname_reset;
-
-            var client = new TcpRequestClientProxy("Master " + connectOptions.host+ ":"+connectOptions.port);
-            client.open( connectOptions.host , connectOptions.port, function(err, data){
-                client.send(new DataOutputX().writeValue(p));
-            }, function(err, data){
-                if(data === undefined){
-                    return Logger.printError('WHATAP-802', 'Are You Sure Kubernetes Container ??? (current whatap_micro_enabled=true)', new Error('No Master Whatap'), true);
-                }
-                
-                var m = new DataInputX(data).readValue();
-                self.node_agent_ip = m.getText("node.agent.ip");
-                self.node_agent_port = m.getInt("node.agent.port");
-                if(cb) cb();
-            } );
-        }catch(e){
-            return Logger.printError("WHATAP-128", 'Failed to connect to kubernetes Master!', e)
-        }
-    },
-
-    recvNodeAddr: function(m){
-        var host = m['node.agent.ip'];
-        var port = m['node.agent.port'];
-
-        if(!host){
-            this.node_agent_host = host;
-        }
-
-        if(!port && port !== 0){
-            this.node_agent_port = port;
-        }
-    }
-}
-
+var net             = require('net'),
+    conf            = require('../conf/configure'),
+    MapValue        = require('../value/map-value'),
+    KubeUtil        = require('../util/kube-util'),
+    StopWatch       = require('../util/stop-watch'),
+    DataOutputX     = require('../io/data-outputx'),
+    DataInputX      = require('../io/data-inputx'),
+    IPUtil          = require('../util/iputil'),
+    TcpRequestClientProxy = require('./../net/tcpreq-client-proxy'),
+    Logger          = require('../logger'),
+    SecurityMaster  = require('./../net/security-master');
+    
+const SLEEP_TIME = 15000;
+
+var KubeClient = {
+    intervalId: undefined,
+    run: function(){
+        var self = this;
+        if(this.intervalId){
+            clearInterval(this.intervalId); this.intervalId = undefined;
+        }
+        this.intervalId = setInterval(function(){
+            self.process(conf.pod_name);
+        },SLEEP_TIME);
+    },
+
+    process: function(podName){
+        var self = this;
+        var p = new MapValue();
+
+        var localAddr = (IPUtil.getIp());
+
+        SecurityMaster.IP = IPUtil.stringToInt(localAddr);
+
+		p.putString("cmd", "regist");
+		p.putLong("pcode", SecurityMaster.PCODE);
+		p.putLong("oid", SecurityMaster.OID);
+        p.putString("oname", SecurityMaster.ONAME);
+        
+		p.putString("ip", IPUtil.intToString(SecurityMaster.IP));
+		p.putString("hostname", require('os').hostname());
+        p.putBoolean("kube.micro", true);
+
+        if (podName != null) {
+			p.putString("pod_name", podName);
+		}
+		if (conf.OKIND != 0) {
+			p.putLong("okind", conf.OKIND);
+			p.putString("okind_name", conf.OKIND_NAME);
+		}
+		if (conf.ONODE != 0) {
+			p.putLong("onode", conf.ONODE);
+			p.putString("onode_name", conf.ONODE_NAME);
+		}
+		if (KubeUtil.container_id != null) {
+			p.putString("container_id", KubeUtil.container_id);
+        }
+    
+        this.sendToMaster(p, function(){
+            self.sendToNode(p);
+        });
+    },
+
+    sendToNode: function(p){
+        var self = this;
+
+        try{
+            var client = new TcpRequestClientProxy("Node " + self.node_agent_ip+ ":"+self.node_agent_port);
+            client.open( self.node_agent_ip , self.node_agent_port, function(err, data){
+                client.send(new DataOutputX().writeValue(p));
+            }, function(err, data){
+                if(err || !data){
+                    return console.log("#### errordata" , err, data);
+                }
+                var m = new DataInputX(data).readValue();
+
+                self.cpu = m.getFloat("cpu");
+                self.cpu_sys = m.getFloat("cpu_sys");
+                self.cpu_user = m.getFloat("cpu_user");
+                self.throttled_periods = m.getFloat("throttled_periods");
+                self.throttled_time = m.getFloat("throttled_time");
+
+                self.memory = m.getLong("memory");
+                self.failcnt = m.getLong("failcnt");
+                self.limit = m.getLong("limit");
+                self.maxUsage = m.getLong("maxUsage");
+
+                self.node_recv_time = Date.now();
+                self.metering = m.getFloat("metering");
+            });
+        }catch(e){
+            return Logger.printError("WHATAP-128", 'Failed to connect to kubernetes Node!')
+        }
+    },
+
+    sendToMaster: function(p, cb){
+        var self = this;
+        if (conf.master_agent_host == null) {
+            return Logger.printError("WHATAP-129", 'master_agent_host=null', e)
+		}
+
+        var connectOptions = {
+            host: 
+            conf.master_agent_host
+            // 'localhost'
+            , port: conf.master_agent_port, agent: false
+        };
+
+        try{
+            self.auto_oname_reset = conf.auto_oname_reset;
+
+            var client = new TcpRequestClientProxy("Master " + connectOptions.host+ ":"+connectOptions.port);
+            client.open( connectOptions.host , connectOptions.port, function(err, data){
+                client.send(new DataOutputX().writeValue(p));
+            }, function(err, data){
+                if(data === undefined){
+                    return Logger.printError('WHATAP-802', 'Are You Sure Kubernetes Container ??? (current whatap_micro_enabled=true)', new Error('No Master Whatap'), true);
+                }
+                
+                var m = new DataInputX(data).readValue();
+                self.node_agent_ip = m.getText("node.agent.ip");
+                self.node_agent_port = m.getInt("node.agent.port");
+                if(cb) cb();
+            } );
+        }catch(e){
+            return Logger.printError("WHATAP-128", 'Failed to connect to kubernetes Master!', e)
+        }
+    },
+
+    recvNodeAddr: function(m){
+        var host = m['node.agent.ip'];
+        var port = m['node.agent.port'];
+
+        if(!host){
+            this.node_agent_host = host;
+        }
+
+        if(!port && port !== 0){
+            this.node_agent_port = port;
+        }
+    }
+}
+
 module.exports = KubeClient;

package/lib/lang/text-types.js

@@ -1,58 +1,58 @@
-/**
- * Copyright 2016 the WHATAP project authors. All rights reserved.
- * Use of this source code is governed by a license that
- * can be found in the LICENSE file.
- */
-
-exports.SERVICE = 1;
-exports.SQL = 2;
-exports.DB_URL = 3;
-exports.HTTPC_URL = 4;
-exports.ERROR = 5;
-exports.METHOD = 6;
-exports.STACK_ELEMENTS = 7;
-exports.REFERER = 8;
-exports.USER_AGENT = 9;
-exports.HTTPC_HOST = 10;
-exports.MESSAGE = 11;
-exports.CRUD = 12;
-exports.ONAME = 13;
-exports.COMMAND = 14;
-exports.USER_AGENT_OS = 15;
-exports.USER_AGENT_BROWSER = 16;
-exports.CITY = 17;
-exports.LOGIN = 18;
-exports.SQLPARAM = 19;
-exports.HTTP_DOMAIN = 20;
-
-exports.SYS_DEVICE_ID = 21;
-exports.SYS_MOUNT_POINT = 22;
-exports.SYS_FILE_SYSTEM = 23;
-exports.SYS_NET_DESC = 24;
-exports.SYS_PROC_CMD1 = 26;
-exports.SYS_PROC_CMD2 = 27;
-exports.SYS_PROC_USER = 28;
-exports.SYS_PROC_STATE = 29;
-exports.SYS_PROC_FILENAME = 30;
-exports.SM_LOG_FILE = 31;
-exports.EXT_META = 32;
-
-exports.DB_COUNTER_NAME = 41;
-exports.DB_COUNTER_UNIT = 42;
-
-exports.CW_AGENT_IP = 51;
-exports.CW_MXID = 52;
-
-exports.MTRACE_SPEC = 53;
-
-exports.MTRACE_CALLER_URL = 54;
-exports.OKIND_NAME = 57;
-exports.KUBE_COUNT_NAME = 59;
-
-exports.CONTAINER_ID= 60;
-exports.PODNAME= 61;
-exports.CONTAINER_IMAGE =62;
-exports.ONODE_NAME = 63;
-exports.CONTAINER_COMMAND=64;
-exports.REPLICASETNAME = 65;
-exports.NAMESPACE = 66;
+/**
+ * Copyright 2016 the WHATAP project authors. All rights reserved.
+ * Use of this source code is governed by a license that
+ * can be found in the LICENSE file.
+ */
+
+exports.SERVICE = 1;
+exports.SQL = 2;
+exports.DB_URL = 3;
+exports.HTTPC_URL = 4;
+exports.ERROR = 5;
+exports.METHOD = 6;
+exports.STACK_ELEMENTS = 7;
+exports.REFERER = 8;
+exports.USER_AGENT = 9;
+exports.HTTPC_HOST = 10;
+exports.MESSAGE = 11;
+exports.CRUD = 12;
+exports.ONAME = 13;
+exports.COMMAND = 14;
+exports.USER_AGENT_OS = 15;
+exports.USER_AGENT_BROWSER = 16;
+exports.CITY = 17;
+exports.LOGIN = 18;
+exports.SQLPARAM = 19;
+exports.HTTP_DOMAIN = 20;
+
+exports.SYS_DEVICE_ID = 21;
+exports.SYS_MOUNT_POINT = 22;
+exports.SYS_FILE_SYSTEM = 23;
+exports.SYS_NET_DESC = 24;
+exports.SYS_PROC_CMD1 = 26;
+exports.SYS_PROC_CMD2 = 27;
+exports.SYS_PROC_USER = 28;
+exports.SYS_PROC_STATE = 29;
+exports.SYS_PROC_FILENAME = 30;
+exports.SM_LOG_FILE = 31;
+exports.EXT_META = 32;
+
+exports.DB_COUNTER_NAME = 41;
+exports.DB_COUNTER_UNIT = 42;
+
+exports.CW_AGENT_IP = 51;
+exports.CW_MXID = 52;
+
+exports.MTRACE_SPEC = 53;
+
+exports.MTRACE_CALLER_URL = 54;
+exports.OKIND_NAME = 57;
+exports.KUBE_COUNT_NAME = 59;
+
+exports.CONTAINER_ID= 60;
+exports.PODNAME= 61;
+exports.CONTAINER_IMAGE =62;
+exports.ONODE_NAME = 63;
+exports.CONTAINER_COMMAND=64;
+exports.REPLICASETNAME = 65;
+exports.NAMESPACE = 66;