diff --git a/.gitignore b/.gitignore
index 701b6bbbc11..383cfb4e5c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ node_modules
 dist
 web.config
 config.js
-*.sublime-workspace
\ No newline at end of file
+*.sublime-workspace
+*.swp
diff --git a/src/app/partials/influxdb/editor.html b/src/app/partials/influxdb/editor.html
index 07f6ad52b7b..bbf4cbd5df4 100644
--- a/src/app/partials/influxdb/editor.html
+++ b/src/app/partials/influxdb/editor.html
@@ -76,7 +76,7 @@
             <input type="text"
                    class="input-small grafana-target-segment-input"
                    ng-model="target.column"
-                   placeholder="value column"
+                   placeholder="value"
                    spellcheck='false'
                    bs-typeahead="listColumns"
                    data-min-length=0
@@ -137,6 +137,24 @@
                    spellcheck='false'
                    ng-model-onblur ng-change="get_data()" >
           </li>
+          <li>
+            <a class="grafana-target-segment"
+               ng-click="target.groupby_field_add = !target.groupby_field_add; get_data();"
+               role="menuitem">
+              <i class="icon-plus"></i>
+            </a>
+          </li>
+
+          <li ng-show="target.groupby_field_add">
+            <input type="text"
+                   class="input-small grafana-target-segment-input"
+                   ng-model="target.groupby_field"
+                   placeholder="column"
+                   spellcheck="false"
+                   bs-typeahead="listColumns"
+                   data-min-length=0
+                   ng-blur="get_data()">
+          </li>
 
           <li class="grafana-target-segment">
             alias as
diff --git a/src/app/services/influxdb/influxdbDatasource.js b/src/app/services/influxdb/influxdbDatasource.js
index 45ea716d68b..4e72e93b586 100644
--- a/src/app/services/influxdb/influxdbDatasource.js
+++ b/src/app/services/influxdb/influxdbDatasource.js
@@ -73,14 +73,14 @@ function (angular, _, kbn) {
           query = queryElements.join(" ");
         }
         else {
-          var template = "select [[func]]([[column]]) as [[column]]_[[func]] from [[series]] " +
+          var template = "select [[group]][[group_add]] [[func]]([[column]]) as [[column]]_[[func]] from [[series]] " +
                          "where  [[timeFilter]] [[condition_add]] [[condition_key]] [[condition_op]] [[condition_value]] " +
-                         "group by time([[interval]]) order asc";
+                         "group by time([[interval]])[[group_add]] [[group]] order asc";
 
           if (target.column.indexOf('-') !== -1 || target.column.indexOf('.') !== -1) {
-            template = "select [[func]](\"[[column]]\") as \"[[column]]_[[func]]\" from [[series]] " +
+            template = "select [[group]][[group_add]] [[func]](\"[[column]]\") as \"[[column]]_[[func]]\" from [[series]] " +
                          "where  [[timeFilter]] [[condition_add]] [[condition_key]] [[condition_op]] [[condition_value]] " +
-                         "group by time([[interval]]) order asc";
+                         "group by time([[interval]])[[group_add]] [[group]] order asc";
           }
 
           var templateData = {
@@ -92,9 +92,14 @@ function (angular, _, kbn) {
             condition_add: target.condiction_filter ? target.condition_add : '',
             condition_key: target.condiction_filter ? target.condition_key : '',
             condition_op: target.condiction_filter ? target.condition_op : '',
-            condition_value: target.condiction_filter ? target.condition_value: ''
+            condition_value: target.condiction_filter ? target.condition_value : '',
+            group_add: target.groupby_field_add && target.groupby_field ? ',' : '',
+            group: target.groupby_field_add ? target.groupby_field : '',
           };
 
+          if (target.groupby_field_add) {
+            additionalGroups.push(target.groupby_field);
+          }
           query = _.template(template, templateData, this.templateSettings);
           target.query = query;
         }