groonga/grafana-datasource-plugin-groonga at e71f6b7 [master] Support other time column name such as "date" (Groonga-commit) - Groonga - fulltext search engine.

Masafumi Yokoyama	2016-02-28 01:43:35 +0900 (Sun, 28 Feb 2016)

  New Revision: e71f6b778574a83055a4d33c42936b5feadf9a01
  https://github.com/groonga/grafana-datasource-plugin-groonga/commit/e71f6b778574a83055a4d33c42936b5feadf9a01

  Message:
    Support other time column name such as "date"

  Modified files:
    datasource.js
    query_ctrl.js

  Modified: datasource.js (+8 -2)
===================================================================

--- datasource.js    2016-02-28 00:37:47 +0900 (d7c4098)
+++ datasource.js    2016-02-28 01:43:35 +0900 (90fb171)
@@ -35,10 +35,16 @@ function (angular) {
     GroongaDatasource.prototype.query = function(options) {
       var target = options.targets[0];
       var column = target.column;
+      var timeColumn;
+      if (target.timeColumns.indexOf('timestamp') >= 0) {
+        timeColumn = 'timestamp';
+      } else {
+        timeColumn = target.timeColumns[0];
+      }
       var selectOptions = {
         table: target.table,
-        output_columns: 'timestamp, ' + target.column,
-        filter: 'between(timestamp, ' +
+        output_columns: timeColumn + ', ' + target.column,
+        filter: 'between(' + timeColumn + ', ' +
                          options.range.from.unix() + ', "include", ' +
                          options.range.to.unix() + ', "include")',
         limit: -1

  Modified: query_ctrl.js (+7 -1)
===================================================================
--- query_ctrl.js    2016-02-28 00:37:47 +0900 (dd6da1a)
+++ query_ctrl.js    2016-02-28 01:43:35 +0900 (ab28d0e)
@@ -20,8 +20,12 @@ function (angular) {
           var columnName;
           for (columnName in table.columns) {
             if (table.columns[columnName].value_type.name === 'Time') {
+
               hasTimeColumn = true;
-              break;
+              if (!angular.isDefined($scope.timeColumns[tableName])) {
+                $scope.timeColumns[tableName] = [];
+              }
+              $scope.timeColumns[tableName].push(columnName);
             }
           }
           if (hasTimeColumn) {
@@ -33,6 +37,7 @@ function (angular) {
 
     $scope.updateTable = function () {
       $scope.target.table = $scope.table;
+      $scope.target.timeColumns = $scope.timeColumns[$scope.table];
       var columns = $scope.schema.tables[$scope.table].columns;
       angular.forEach(columns, function(column, columnName) {
         switch (column.value_type.name) {
@@ -58,6 +63,7 @@ function (angular) {
 
     $scope.availableTables = [];
     $scope.availableColumns = [];
+    $scope.timeColumns = {};
     $scope.init();
 
   });
-------------- next part --------------
HTML����������������������������...
Download 


Groonga - fulltext search engine.

[Groonga-commit] groonga/grafana-datasource-plugin-groonga at e71f6b7 [master] Support other time column name such as "date"