Merge remote-tracking branch 'remotes/upstream/master'

Merging duplicate fixes for the same issue nvmlabs/statsd-influxdb-backend@1c7effa cce20b6

Conflicts:
	lib/influxdb.js

Author: gnjack

CHANGELOG.md

@@ -1,12 +1,16 @@
 StatsD InfluxDB backend - CHANGELOG
 -----------------------------------
 
+## v0.4.1 (2015-02-23)
+
+* Use prefixStats setting instead of hardcoding prefix. (#6)
+
 ## v0.4.0 (2015-02-22)
 
-* Add configuration option to enable sending internal statsd metrics.
-* Add SET support.
-* Fix problem with histograms breaking data flushes.
-* Add SSL support.
+* Add configuration option to enable sending internal statsd metrics. (#6)
+* Add SET support. (#7)
+* Fix problem with histograms breaking data flushes. (#8)
+* Add SSL support. (#3)
 * Improve configuration example in README.
 
 ## v0.3.0 (2014-08-24)

lib/influxdb.js

@@ -49,7 +49,6 @@ function InfluxdbBackend(startupTime, config, events) {
   self.defaultProxyEnable = false;
   self.defaultProxySuffix = 'raw';
   self.defaultProxyFlushInterval = 1000;
-  self.prefixStats = config.prefixStats !== undefined ? config.prefixStats : "statsd";
 
   self.host = self.defaultHost;
   self.port = self.defaultPort;
@@ -61,6 +60,9 @@ function InfluxdbBackend(startupTime, config, events) {
   self.includeStatsdMetrics = false;
   self.includeInfluxdbMetrics = false;
 
+  /* XXX Hardcoding default prefix here because it is not accessible otherwise. */
+  self.prefixStats = config.prefixStats !== undefined ? config.prefixStats : 'statsd';
+
   if (config.influxdb) {
     self.host = config.influxdb.host || self.defaultHost;
     self.port = config.influxdb.port || self.defaultPort;
@@ -154,7 +156,6 @@ InfluxdbBackend.prototype.processFlush = function (timestamp, metrics) {
       gauges = metrics.gauges,
       timerData = metrics.timer_data,
       statsdMetrics = metrics.statsd_metrics,
-      statsdMetricsRegExp = new RegExp('^'+self.prefixStats),
       points = [],
       sets  = function (vals) {
         var ret = {};
@@ -164,14 +165,15 @@ InfluxdbBackend.prototype.processFlush = function (timestamp, metrics) {
         return ret;
       }(metrics.sets),
       startTime = process.hrtime(),
-      key, timerKey;
+      key, timerKey,
+      statsPrefixRegexp = new RegExp('^' + self.prefixStats + '\\.');
 
   /* Convert timestamp from seconds to milliseconds. */
   timestamp = (timestamp * 1000);
 
   for (key in counters) {
     /* Do not include statsd counters. */
-    if (!self.includeStatsdMetrics && key.match(statsdMetricsRegExp)) { continue; }
+    if (!self.includeStatsdMetrics && key.match(statsPrefixRegexp)) { continue; }
 
     var value = counters[key],
         k = key + '.counter';
@@ -383,7 +385,7 @@ InfluxdbBackend.prototype.httpPOST = function (points) {
   if (!points.length) { return; }
 
   var self = this,
-      query = {u: self.user, p: self.pass, time_precision: 'm'},
+      query = {u: self.user, p: self.pass, time_precision: 'ms'},
       protocolName = self.protocol == http ? 'HTTP' : 'HTTPS',
       startTime;
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "statsd-influxdb-backend",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "InfluxDB backend for StatsD",
   "main": "lib/influxdb.js",
   "dependencies": {