more db to bucket

grafana · Dec 19, 2018 · 075c831 · 075c831
1 parent 1ca0267
commit 075c831
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 25 deletions.
diff --git a/specs/datasource.jest.ts b/specs/datasource.jest.ts
@@ -6,9 +6,9 @@ import Datasource from '../src/datasource';
 
 describe('InfluxDB (Flux)', () => {
   const templateSrv = new TemplateSrv();
-  const ds = new Datasource({ url: '' }, {}, templateSrv);
+  const ds = new Datasource({url: ''}, {}, templateSrv);
   const DEFAULT_OPTIONS = {
-    rangeRaw: { to: 'now', from: 'now - 3h' },
+    rangeRaw: {to: 'now', from: 'now - 3h'},
     scopedVars: {},
     targets: [],
   };
@@ -18,23 +18,28 @@ describe('InfluxDB (Flux)', () => {
     let target: any;
 
     it.skip('replaces $range variable', () => {
-      target = ds.prepareQueryTarget({ query: 'from(db: "test") |> range($range)' }, DEFAULT_OPTIONS);
-      expect(target.query).toBe('from(db: "test") |> range(start: -3h)');
+      target = ds.prepareQueryTarget(
+        {query: 'from(bucket: "test") |> range($range)'},
+        DEFAULT_OPTIONS
+      );
+      expect(target.query).toBe('from(bucket: "test") |> range(start: -3h)');
     });
 
     it.skip('replaces $range variable with custom dates', () => {
       const to = moment();
       const from = moment().subtract(1, 'hours');
       target = ds.prepareQueryTarget(
-        { query: 'from(db: "test") |> range($range)' },
+        {query: 'from(bucket: "test") |> range($range)'},
         {
           ...DEFAULT_OPTIONS,
-          rangeRaw: { to, from },
+          rangeRaw: {to, from},
         }
       );
       const start = from.toISOString();
       const stop = to.toISOString();
-      expect(target.query).toBe(`from(db: "test") |> range(start: ${start}, stop: ${stop})`);
+      expect(target.query).toBe(
+        `from(bucket: "test") |> range(start: ${start}, stop: ${stop})`
+      );
     });
   });
 });
diff --git a/specs/metric_find_query.jest.ts b/specs/metric_find_query.jest.ts
@@ -3,7 +3,7 @@ import expandMacros from '../src/metric_find_query';
 describe('metric find query', () => {
   describe('expandMacros()', () => {
     it('returns a non-macro query unadulterated', () => {
-      const query = 'from(db:"telegraf") |> last()';
+      const query = 'from(bucket:"telegraf") |> last()';
       const result = expandMacros(query);
       expect(result).toBe(query);
     });
@@ -12,31 +12,33 @@ describe('metric find query', () => {
       const query = ' measurements(mydb) ';
       const result = expandMacros(query).replace(/\s/g, '');
       expect(result).toBe(
-        'from(db:"mydb")|>range($range)|>group(by:["_measurement"])|>distinct(column:"_measurement")|>group(none:true)'
+        'from(bucket:"mydb")|>range($range)|>group(by:["_measurement"])|>distinct(column:"_measurement")|>group(none:true)'
       );
     });
 
     it('returns a tags query for tags()', () => {
       const query = ' tags(mydb , mymetric) ';
       const result = expandMacros(query).replace(/\s/g, '');
-      expect(result).toBe('from(db:"mydb")|>range($range)|>filter(fn:(r)=>r._measurement=="mymetric")|>keys()');
+      expect(result).toBe(
+        'from(bucket:"mydb")|>range($range)|>filter(fn:(r)=>r._measurement=="mymetric")|>keys()'
+      );
     });
 
     it('returns a tag values query for tag_values()', () => {
       const query = ' tag_values(mydb , mymetric, mytag) ';
       const result = expandMacros(query).replace(/\s/g, '');
       expect(result).toBe(
-        'from(db:"mydb")|>range($range)|>filter(fn:(r)=>r._measurement=="mymetric")' +
-        '|>group(by:["mytag"])|>distinct(column:"mytag")|>group(none:true)'
+        'from(bucket:"mydb")|>range($range)|>filter(fn:(r)=>r._measurement=="mymetric")' +
+          '|>group(by:["mytag"])|>distinct(column:"mytag")|>group(none:true)'
       );
     });
 
     it('returns a field keys query for field_keys()', () => {
       const query = ' field_keys(mydb , mymetric) ';
       const result = expandMacros(query).replace(/\s/g, '');
       expect(result).toBe(
-        'from(db:"mydb")|>range($range)|>filter(fn:(r)=>r._measurement=="mymetric")' +
-        '|>group(by:["_field"])|>distinct(column:"_field")|>group(none:true)'
+        'from(bucket:"mydb")|>range($range)|>filter(fn:(r)=>r._measurement=="mymetric")' +
+          '|>group(by:["_field"])|>distinct(column:"_field")|>group(none:true)'
       );
     });
   });

diff --git a/src/editor/FluxQueryField.tsx b/src/editor/FluxQueryField.tsx
@@ -26,14 +26,14 @@ const wrapText = text => ({ text });
 const RATE_RANGES = ['1m', '5m', '10m', '30m', '1h'];
 const DEFAULT_DATABASE = 'telegraf';
 
-function expandQuery(database, measurement, field) {
+function expandQuery(bucket, measurement, field) {
   if (field) {
     return (
-      `from(db: "${database}")\n` +
+      `from(bucket: "${bucket}")\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: "${bucket}")\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,

diff --git a/src/editor/flux.ts b/src/editor/flux.ts
@@ -37,8 +37,8 @@ export const FUNCTIONS = [
   },
   {
     text: 'from',
-    display: 'from(db: "database)',
-    hint: 'Starting point of a query, produces a table from the given "db".',
+    display: 'from(bucket: "database/policy")',
+    hint: 'Starting point of a query, produces a table from the given bucket.',
   },
   {
     text: 'group',

diff --git a/src/metric_find_query.ts b/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"])

diff --git a/src/partials/annotations.editor.html b/src/partials/annotations.editor.html
@@ -1,6 +1,6 @@
 <div class="gf-form-group">
 	<div class="gf-form">
-		<input type="text" class="gf-form-input" ng-model='ctrl.annotation.query' placeholder='from(db:"telegraf") |> range($range)'></input>
+		<input type="text" class="gf-form-input" ng-model='ctrl.annotation.query' placeholder='from(bucket:"telegraf/autogen") |> range($range)'></input>
 	</div>
 </div>