Fix json endpoint

docker-compose.yml

@@ -93,8 +93,6 @@ services:
     volumes: 
       - ./stats/:/opt/stats/
  
- 
- 
   mysql:
     restart: always
     environment:
@@ -147,7 +145,7 @@ services:
 
   grafana:
     restart: always
-    image: grafana/grafana
+    image: grafana/grafana:master
     links:
      - jsonendpoint:endpoint
      - mysql_jsonendpoint:endpoint
@@ -176,6 +174,9 @@ services:
       - 9003:8000
     build: 
       context: ./statsd/endpoint/json
+    links:
+        - mysql_jsonendpoint:mysql_jsonendpoint
+        - mongodb_jsonendpoint:mongodb_jsonendpoint
     volumes:
       - ./statsd/endpoint/json:/opt/datasource
     environment:

statsd/endpoint/mongodb/package.json

@@ -10,7 +10,8 @@
     "mongodb": "^2.2.29",
     "morgan": "^1.8.1",
     "mysql": "^2.13.0",
-    "nodemon": "^1.11.0"
+    "nodemon": "^1.11.0",
+    "async": "2.5.0"
   },
   "devDependencies": {},
   "scripts": {

statsd/endpoint/mysql/index.js

@@ -91,12 +91,14 @@ function query(table, req, res)
         }
         
         var result = [];
-        for (var i = 0; i < rows.length; i++) {
-            if (rows[i].name !== undefined) {
-                if (result.indexOf(rows[i].name) === -1) {
-                    result[rows[i].name] = new Array();   
+        var results = rows[1];
+        for (var i = 0; i < results.length; i++) {
+            var name = results[i].name;
+            if (name !== undefined) {
+                if (result[name] === undefined) {
+                    result[name] = [];
                 }
-                (result[rows[i].name]).push([rows[i].value, 1000 * rows[i].timestamp]);
+                result[name].push([results[i].value, 1000 * results[i].timestamp]);
             }
         }
         var keys = _.keys(result);