v1.0.1 release .

Author: lsongdev

README.md

@@ -1,15 +1,27 @@
-## open-falcon ![NPM version](https://img.shields.io/npm/v/open-falcon.svg?style=flat)
+## open-falcon ![NPM version](https://img.shields.io/npm/v/node-open-falcon.svg?style=flat)
 
-open-falcon
+open-falcon for nodejs.
 
 ### Installation
 ```bash
-$ npm install open-falcon
+$ npm install node-open-falcon --save
 ```
 
 ### Example
 ```js
-var Falcon = require('open-falcon');
+var os     = require('os');
+var Falcon = require('node-open-falcon');
+
+var falcon = new Falcon({
+  endpoint: os.hostname()
+});
+//
+var usage = process.memoryUsage();
+for(var key in usage){
+  falcon.metric('memory.' + key, usage[key]).end();
+}
+
+falcon.send();
 ```
 
 ### API
@@ -47,5 +59,3 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 ---
-![docor]()
-built upon love by [docor](git+https://github.com/turingou/docor.git) v0.3.0

index.js

@@ -1,5 +1,3 @@
-var os      = require('os');
-var _       = require('lodash');
 var request = require('superagent');
 var debug   = require('debug')('open-falcon');
 
@@ -12,10 +10,25 @@ function Falcon(options){
       api: options
     };
   }
-
-  this.options  = options;
-  this.data     = {};
-  this.queue    = [];
+  var self = this, defaults = {
+    tags        : ''          ,
+    step        : 60          ,
+    value       : 0           ,
+    endpoint    : 'localhost' ,
+    counterType : 'GAUGE'     ,
+    api         : 'http://127.0.0.1:1988/v1/push',
+    timestamp   : function(){
+      return Math.floor(+new Date() / 1000);
+    },
+  };
+  //
+  for(var key in options){
+    defaults[ key ] = options[ key ];
+  }
+  //
+  this.data    = {};
+  this.queue   = [];
+  this.options = defaults;
   return this;
 }
 
@@ -24,7 +37,6 @@ Falcon.COUNTER_TYPE = {
   COUNTER: 'COUNTER'
 };
 
-
 Falcon.prototype.use = function(middleware){
   middleware.apply(this, [ this ]);
   return this;
@@ -35,8 +47,13 @@ Falcon.prototype.set = function(key, value){
   return this;
 };
 
-Falcon.prototype.metric = function(value){
-  this.set.apply(this, [ 'metric', value ]);
+Falcon.prototype.metric = function(name, value){
+  if(name){
+    this.set('metric', name);
+  }
+  if(value){
+    this.set('value', value);
+  }
   return this;
 };
 /**
@@ -76,7 +93,7 @@ Falcon.prototype.step = function(value){
  * @return {[type]} [description]
  */
 Falcon.prototype.type = function(value){
-  this.set.apply(this, [ 'counterType', value ]);
+  this.set.apply(this, [ 'counterType', value.toUpperCase() ]);
   return this;
 };
 /**
@@ -92,25 +109,28 @@ Falcon.prototype.tags = function(tags){
   return this;
 };
 
-Falcon.prototype.defaults = function(name){
-  switch(name){
-    case 'endpoint':
-      return os.hostname();
-    case 'timestamp':
-      return +new Date();
-    case 'counterType':
-      return 'COUNTER';
-    case 'step':
-      return 60;
-  }
-}
-
 Falcon.prototype.end = function(){
   var self = this;
-  [ 'endpoint', 'timestamp', 'metric', 'value', 'step', 'counterType', 'tags' ].map(function(key){
-    self.data[ key ] = self.data[ key ] || self.defaults(key);
-    if(typeof self.data[ key ] == 'undefined'){
-      throw new Error( `'${key}' is required .`)
+  ([
+    'step'        ,
+    'tags'        ,
+    'value'       ,
+    'metric'      ,
+    'endpoint'    ,
+    'timestamp'   ,
+    'counterType'
+  ]).map(function(key){
+    if(
+      typeof self.data[ key ]  == 'undefined' &&
+      typeof self.options[key] == 'undefined'
+    ) throw new Error( `'${key}' is required .`);
+    //
+    if(typeof self.data[key] == 'undefined'){
+      if(typeof self.options[key] == 'function'){
+        self.data[ key ] = self.options[key](self);
+      }else if(typeof self.options[key] != 'undefined'){
+        self.data[ key ] = self.options[key];
+      }
     }
   });
   this.queue.push(this.data);
@@ -134,40 +154,4 @@ Falcon.prototype.send = function(callback){
   return this;
 };
 
-
-Falcon.memory = function(name){
-  return function(f){
-    var usage = process.memoryUsage();
-
-    f
-      .metric(`${name}.rss`)
-      .value(usage.rss)
-      .type(Falcon.COUNTER_TYPE.GAUGE)
-      .tags()
-      .end()
-
-    f
-      .metric(`${name}.heapTotal`)
-      .value(usage.heapTotal)
-      .type(Falcon.COUNTER_TYPE.GAUGE)
-      .tags()
-      .end()
-
-    f
-      .metric(`${name}.heapUsed`)
-      .value(usage.heapUsed)
-      .type(Falcon.COUNTER_TYPE.GAUGE)
-      .tags()
-      .end()
-
-  };
-};
-
-Falcon.cpu = function(name){
-  return function(f){
-    f.metric(name);
-  };
-};
-
-
 module.exports = Falcon;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-open-falcon",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "open-falcon",
   "main": "index.js",
   "scripts": {
@@ -21,8 +21,7 @@
   },
   "homepage": "https://github.com/song940/node-open-falcon#readme",
   "dependencies": {
-    "debug": "^2.2.0",
-    "lodash": "^3.10.1",
-    "superagent": "^1.4.0"
+    "debug": "latest",
+    "superagent": "latest"
   }
 }

test/test.js

@@ -1,41 +1,13 @@
+var os     = require('os');
 var Falcon = require('../');
 
-var falcon = new Falcon(
-  'http://127.0.0.1:1988/v1/push'
-);
+var falcon = new Falcon({
+  endpoint: os.hostname()
+});
 //
-// falcon
-//   .metric('cpu.idle')
-//   .endpoint()
-//   .timestamp()
-//   .value(1)
-//   .step(20)
-//   .type(Falcon.COUNTER_TYPE.COUNTER)
-//   .tags({name: 'aa', 'bb':1})
-//   .end()
-//   // .send()
-//   .use(function(f){
-//     f.metric('test')
-//     f.value('aa');
-//     f.step(60);
-//     f.type('s');
-//     f.tags({a:1});
-//   })
-//   .use(function(f){
-//     f.metric('a')
-//     f.value('aa');
-//     f.step(60);
-//     f.type('s');
-//     f.tags({a:2});
-//   })
-//   .send(function(err, res){
-//     console.log(res);
-//   })
+var usage = process.memoryUsage();
+for(var key in usage){
+  falcon.metric('memory.' + key, usage[key]).end();
+}
 
-setInterval(function(){
-
-  falcon
-    .use(Falcon.memory('memory'))
-    .send()
-
-}, 1000);
+falcon.send();