Merge pull request #1 from statful/fix-multiple-namespaces-ingestion

fix(NA): fix on multiple namespaces ingestion. fix on dimensions filtering.
statful · Oct 6, 2016 · 8e2e2dc · 8e2e2dc
2 parents 7cef26d + 2f1e846
commit 8e2e2dc
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "statful-collector-aws",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "AWS Cloudwatch collector for Statful",
   "engines": {
     "node": ">=4.0.0",

diff --git a/src/collector.js b/src/collector.js
@@ -133,6 +133,10 @@ class Collector {
         if (!this.isStopping) {
             let now = new Date();
             let nowMinusPastPeriod = new Date(new Date(now).setSeconds(now.getSeconds() - (this[_config].statfulCollectorAws.period - 1)));
+
+            now.setMinutes(now.getMinutes() - 5);
+            nowMinusPastPeriod.setMinutes(nowMinusPastPeriod.getMinutes() - 5);
+
             let startTime = nowMinusPastPeriod.toISOString();
             let endTime = now.toISOString();
 

diff --git a/src/metrics-list.js b/src/metrics-list.js
@@ -178,7 +178,11 @@ class MetricsList {
             if (validDimensions[i].length !== dimension.length) {
                 break;
             }
-            valid = this[_dimensionsElementContainsAnother](validDimensions[i], dimension);
+
+            if (this[_dimensionsElementContainsAnother](validDimensions[i], dimension)) {
+                valid = true;
+                break;
+            }
         }
         return valid;
     }
@@ -196,14 +200,19 @@ class MetricsList {
         // Process dimensions information
         each(requestData.data,
             (metric, eachMetricCallback) => {
-                if (!this[_dimensionsValidatorPerRegionAndMetric][metricRegion][metric.MetricName]) {
-                    this[_dimensionsValidatorPerRegionAndMetric][metricRegion][metric.MetricName] = [];
+                if (!this[_dimensionsValidatorPerRegionAndMetric][metricRegion].hasOwnProperty(metric.Namespace)) {
+                    this[_dimensionsValidatorPerRegionAndMetric][metricRegion][metric.Namespace] = {};
                 }
 
-                let validMetricDimensions = this[_dimensionsValidatorPerRegionAndMetric][metricRegion][metric.MetricName];
+                if (!this[_dimensionsValidatorPerRegionAndMetric][metricRegion][metric.Namespace][metric.MetricName]) {
+                    this[_dimensionsValidatorPerRegionAndMetric][metricRegion][metric.Namespace][metric.MetricName] = [];
+                }
+
+                let validMetricDimensions = this[_dimensionsValidatorPerRegionAndMetric][metricRegion][metric.Namespace][metric.MetricName];
                 let dimensionsToInsert = this[_getDimensionsNames](metric.Dimensions);
 
-                this[_dimensionsValidatorPerRegionAndMetric][metricRegion][metric.MetricName] =
+
+                this[_dimensionsValidatorPerRegionAndMetric][metricRegion][metric.Namespace][metric.MetricName] =
                     this[_addDimensionsElement](dimensionsToInsert, validMetricDimensions);
 
                 eachMetricCallback(null);
@@ -230,7 +239,7 @@ class MetricsList {
                     // Validate dimensions to use with generated dimensions information
                     each(requestData.data,
                         (metric, eachMetricCallback) => {
-                            let validDimensions = this[_dimensionsValidatorPerRegionAndMetric][metricRegion][metric.MetricName];
+                            let validDimensions = this[_dimensionsValidatorPerRegionAndMetric][metricRegion][metric.Namespace][metric.MetricName];
                             let dimensionsToVerify = this[_getDimensionsNames](metric.Dimensions);
 
                             if (this[_isAValidDimension](validDimensions, dimensionsToVerify)) {