Support 'table' as well as 'timeserie'

JamesOsgood · JamesOsgood · commit 4713b300f47f · 2018-08-06T15:58:01.000+01:00
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,15 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Launch Program",
+            "program": "${workspaceFolder}/server/mongodb-proxy.js",
+            "cwd" : "${workspaceFolder}/server"
+        }
+    ]
+}
diff --git a/dist/server/mongodb-proxy.js b/dist/server/mongodb-proxy.js
@@ -127,8 +127,9 @@ app.all('/query', function(req, res, next)
 
     for ( var queryId = 0; queryId < req.body.targets.length && !error; queryId++)
     {
-      tg = req.body.targets[queryId].target
-      queryArgs = parseQuery(tg, substitutions)
+      tg = req.body.targets[queryId]
+      queryArgs = parseQuery(tg.target, substitutions)
+      queryArgs.type = tg.type
       if (queryArgs.err != null)
       {
         queryError(requestId, queryArgs.err, next)
@@ -299,22 +300,13 @@ function runAggregateQuery( requestId, queryId, body, queryArgs, res, next )
             try
             {
               var results = {}
-              for ( var i = 0; i < docs.length; i++)
+              if ( queryArgs.type == 'timeserie' )
               {
-                var doc = docs[i]
-                var tg = doc.name
-                var dp = null
-                if (tg in results)
-                {
-                  dp = results[tg]
-                }
-                else
-                {
-                  dp = { 'target' : tg, 'datapoints' : [] }
-                  results[tg] = dp
-                }
-                
-                results[tg].datapoints.push([doc['value'], doc['ts'].getTime()])
+                results = getTimeseriesResults(docs)
+              }
+              else
+              {
+                results = getTableResults(docs)
               }
       
               client.close();
@@ -333,6 +325,83 @@ function runAggregateQuery( requestId, queryId, body, queryArgs, res, next )
     })
 }
 
+function getTableResults(docs)
+{
+  var columns = {}
+  
+  // Build superset of columns
+  for ( var i = 0; i < docs.length; i++)
+  {
+    var doc = docs[i]
+    // Go through all properties
+    for (var propName in doc )
+    {
+      // See if we need to add a new column
+      if ( !(propName in columns) )
+      {
+        columns[propName] = 
+        {
+          text : propName,
+          type : "text"
+        }
+      }
+    }
+  }
+  
+  // Build return rows
+  rows = []
+  for ( var i = 0; i < docs.length; i++)
+  {
+    var doc = docs[i]
+    row = []
+    // All cols
+    for ( var colName in columns )
+    {
+      var col = columns[colName]
+      if ( col.text in doc )
+      {
+        row.push(doc[col.text])
+      }
+      else
+      {
+        row.push(null)
+      }
+    }
+    rows.push(row)
+  }
+  
+  var results = {}
+  results["table"] = {
+    columns :  Object.values(columns),
+    rows : rows,
+    type : "table"
+  }
+  return results
+}
+
+function getTimeseriesResults(docs)
+{
+  var results = {}
+  for ( var i = 0; i < docs.length; i++)
+  {
+    var doc = docs[i]
+    var tg = doc.name
+    var dp = null
+    if (tg in results)
+    {
+      dp = results[tg]
+    }
+    else
+    {
+      dp = { 'target' : tg, 'datapoints' : [] }
+      results[tg] = dp
+    }
+    
+    results[tg].datapoints.push([doc['value'], doc['ts'].getTime()])
+  }
+  return results
+}
+
 // Runs a query to support templates. Must returns documents of the form
 // { _id : <id> }
 function doTemplateQuery(requestId, queryArgs, db, res, next)
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "grafana-mongodb",
   "private": true,
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "",
   "main": "server/mongodb-proxy.js",
   "scripts": {
diff --git a/server/mongodb-proxy.js b/server/mongodb-proxy.js
@@ -127,8 +127,9 @@ app.all('/query', function(req, res, next)
 
     for ( var queryId = 0; queryId < req.body.targets.length && !error; queryId++)
     {
-      tg = req.body.targets[queryId].target
-      queryArgs = parseQuery(tg, substitutions)
+      tg = req.body.targets[queryId]
+      queryArgs = parseQuery(tg.target, substitutions)
+      queryArgs.type = tg.type
       if (queryArgs.err != null)
       {
         queryError(requestId, queryArgs.err, next)
@@ -299,22 +300,13 @@ function runAggregateQuery( requestId, queryId, body, queryArgs, res, next )
             try
             {
               var results = {}
-              for ( var i = 0; i < docs.length; i++)
+              if ( queryArgs.type == 'timeserie' )
               {
-                var doc = docs[i]
-                var tg = doc.name
-                var dp = null
-                if (tg in results)
-                {
-                  dp = results[tg]
-                }
-                else
-                {
-                  dp = { 'target' : tg, 'datapoints' : [] }
-                  results[tg] = dp
-                }
-                
-                results[tg].datapoints.push([doc['value'], doc['ts'].getTime()])
+                results = getTimeseriesResults(docs)
+              }
+              else
+              {
+                results = getTableResults(docs)
               }
       
               client.close();
@@ -333,6 +325,83 @@ function runAggregateQuery( requestId, queryId, body, queryArgs, res, next )
     })
 }
 
+function getTableResults(docs)
+{
+  var columns = {}
+  
+  // Build superset of columns
+  for ( var i = 0; i < docs.length; i++)
+  {
+    var doc = docs[i]
+    // Go through all properties
+    for (var propName in doc )
+    {
+      // See if we need to add a new column
+      if ( !(propName in columns) )
+      {
+        columns[propName] = 
+        {
+          text : propName,
+          type : "text"
+        }
+      }
+    }
+  }
+  
+  // Build return rows
+  rows = []
+  for ( var i = 0; i < docs.length; i++)
+  {
+    var doc = docs[i]
+    row = []
+    // All cols
+    for ( var colName in columns )
+    {
+      var col = columns[colName]
+      if ( col.text in doc )
+      {
+        row.push(doc[col.text])
+      }
+      else
+      {
+        row.push(null)
+      }
+    }
+    rows.push(row)
+  }
+  
+  var results = {}
+  results["table"] = {
+    columns :  Object.values(columns),
+    rows : rows,
+    type : "table"
+  }
+  return results
+}
+
+function getTimeseriesResults(docs)
+{
+  var results = {}
+  for ( var i = 0; i < docs.length; i++)
+  {
+    var doc = docs[i]
+    var tg = doc.name
+    var dp = null
+    if (tg in results)
+    {
+      dp = results[tg]
+    }
+    else
+    {
+      dp = { 'target' : tg, 'datapoints' : [] }
+      results[tg] = dp
+    }
+    
+    results[tg].datapoints.push([doc['value'], doc['ts'].getTime()])
+  }
+  return results
+}
+
 // Runs a query to support templates. Must returns documents of the form
 // { _id : <id> }
 function doTemplateQuery(requestId, queryArgs, db, res, next)

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "grafana-mongodb",`
`3`	`3`	`"private": true,`
`4`		`- "version": "0.7.0",`
	`4`	`+ "version": "0.8.0",`
`5`	`5`	`"description": "",`
`6`	`6`	`"main": "server/mongodb-proxy.js",`
`7`	`7`	`"scripts": {`