Updated db: to bucket: to support new changes in Flux

Author: mattttt

src/editor/FluxQueryField.tsx

@@ -29,11 +29,11 @@ const DEFAULT_DATABASE = 'telegraf';
 function expandQuery(database, measurement, field) {
   if (field) {
     return (
-      `from(db: "${database}")\n` +
+      `from(bucket: "${database}")\n` +
       `  |> filter(fn: (r) => r["_measurement"] == "${measurement}" AND r["_field"] == "${field}")\n  |> range($range)\n  |> limit(n: 1000)`
     );
   }
-  return `from(db: "${database}")\n  |> filter(fn: (r) => r["_measurement"] == "${measurement}")\n  |> range($range)\n  |> limit(n: 1000)`;
+  return `from(bucket: "${database}")\n  |> filter(fn: (r) => r["_measurement"] == "${measurement}")\n  |> range($range)\n  |> limit(n: 1000)`;
 }
 
 export default class FluxQueryField extends QueryField {
@@ -154,7 +154,7 @@ export default class FluxQueryField extends QueryField {
         suggestionGroups.push({
           prefixMatch: true,
           label: 'Templates',
-          items: [`from(db: "${database}") |> range($range) `].map(wrapText),
+          items: [`from(bucket: "${database}") |> range($range) `].map(wrapText),
         });
         suggestionGroups.push({
           prefixMatch: true,

src/editor/flux.ts

@@ -37,7 +37,7 @@ export const FUNCTIONS = [
   },
   {
     text: 'from',
-    display: 'from(db: "database)',
+    display: 'from(bucket: "database)',
     hint: 'Starting point of a query, produces a table from the given "db".',
   },
   {

src/metric_find_query.ts

@@ -16,7 +16,7 @@ export default function expandMacros(query) {
   const measurementsQuery = query.match(MEASUREMENTS_REGEXP);
   if (measurementsQuery) {
     const database = measurementsQuery[1];
-    return `from(db:"${database}")
+    return `from(bucket:"${database}")
     |> range($range)
     |> group(by:["_measurement"])
     |> distinct(column:"_measurement")
@@ -27,7 +27,7 @@ export default function expandMacros(query) {
   if (tagsQuery) {
     const database = tagsQuery[1];
     const measurement = tagsQuery[2];
-    return `from(db:"${database}")
+    return `from(bucket:"${database}")
     |> range($range)
     |> filter(fn:(r) => r._measurement == "${measurement}")
     |> keys()`;
@@ -38,7 +38,7 @@ export default function expandMacros(query) {
     const database = tagValuesQuery[1];
     const measurement = tagValuesQuery[2];
     const tag = tagValuesQuery[3];
-    return `from(db:"${database}")
+    return `from(bucket:"${database}")
     |> range($range)
     |> filter(fn:(r) => r._measurement == "${measurement}")
     |> group(by:["${tag}"])
@@ -50,7 +50,7 @@ export default function expandMacros(query) {
   if (fieldKeysQuery) {
     const database = fieldKeysQuery[1];
     const measurement = fieldKeysQuery[2];
-    return `from(db:"${database}")
+    return `from(bucket:"${database}")
     |> range($range)
     |> filter(fn:(r) => r._measurement == "${measurement}")
     |> group(by:["_field"])

src/query_ctrl.ts

@@ -1,10 +1,10 @@
 import appEvents from 'grafana/app/core/app_events';
-import { QueryCtrl } from 'grafana/app/plugins/sdk';
+import {QueryCtrl} from 'grafana/app/plugins/sdk';
 
 import './editor/editor_component';
 
 function makeDefaultQuery(database) {
-  return `from(db: "${database}")
+  return `from(bucket: "${database}")
   |> range($range)
   |> limit(n:1000)
 `;
@@ -30,7 +30,10 @@ export class InfluxFluxQueryCtrl extends QueryCtrl {
     }
 
     this.defaultDatabase = this.datasource.database;
-    this.resultFormats = [{ text: 'Time series', value: 'time_series' }, { text: 'Table', value: 'table' }];
+    this.resultFormats = [
+      {text: 'Time series', value: 'time_series'},
+      {text: 'Table', value: 'table'},
+    ];
 
     appEvents.on('ds-request-response', this.onResponseReceived, $scope);
     this.panelCtrl.events.on('refresh', this.onRefresh, $scope);
@@ -39,7 +42,8 @@ export class InfluxFluxQueryCtrl extends QueryCtrl {
 
   onDataReceived = dataList => {
     this.resultRecordCount = dataList.reduce((count, model) => {
-      const records = model.type === 'table' ? model.rows.length : model.datapoints.length;
+      const records =
+        model.type === 'table' ? model.rows.length : model.datapoints.length;
       return count + records;
     }, 0);
     this.resultTableCount = dataList.length;