[WIP] KQL in TSVB with full QueryBar

src/legacy/core_plugins/data/public/query_bar/query_bar_service.ts

@@ -19,6 +19,7 @@
 
 import { once } from 'lodash';
 import { QueryBar } from './components/query_bar';
+import { QueryBarInput } from './components/query_bar_input';
 import { fromUser } from './lib/from_user';
 import { toUser } from './lib/to_user';
 
@@ -40,6 +41,7 @@ export class QueryBarService {
       },
       ui: {
         QueryBar,
+        QueryBarInput,
       },
     };
   }

src/legacy/core_plugins/kibana/fixtures.js

@@ -0,0 +1,204 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+export const fixtures = {
+  doc: {
+    attributes: {
+      visState: JSON.stringify({
+        title: 'Filter Bytes Test: tsvb metric with custom interval and bytes filter',
+        type: 'metrics',
+        params: {
+          id: '61ca57f0-469d-11e7-af02-69e470af7417',
+          type: 'metric',
+          series: [
+            {
+              id: '1',
+              color: '#68BC00',
+              split_mode: 'everything',
+              metrics: [
+                {
+                  value: '',
+                  id: '61ca57f2-469d-11e7-af02-69e470af7417',
+                  type: 'sum',
+                  field: 'bytes'
+                }
+              ],
+              filter: 'Filter Bytes Test:>1000',
+            },
+            {
+              id: '2',
+              color: '#68BC00',
+              split_mode: 'everything',
+              metrics: [
+                {
+                  value: '',
+                  id: '61ca57f2-469d-11e7-af02-69e470af7417',
+                  type: 'sum',
+                  field: 'bytes'
+                }
+              ],
+              filter: {
+                query: 'Filter Bytes Test:>1000',
+                language: 'lucene'
+              },
+            },
+            {
+              id: '3',
+              color: '#68BC00',
+              split_mode: 'everything',
+              metrics: [
+                {
+                  value: '',
+                  id: '61ca57f2-469d-11e7-af02-69e470af7417',
+                  type: 'sum',
+                  field: 'bytes'
+                }
+              ]
+            }
+          ],
+          time_field: '@timestamp',
+          index_pattern: 'logstash-*',
+          interval: 'auto',
+          axis_position: 'left',
+          axis_formatter: 'number',
+          show_legend: 1,
+          show_grid: 1,
+          background_color_rules: [{ 'id': '1' }]
+        },
+        aggs: []
+      })
+    },
+  },
+  doc2: {
+    attributes: {
+      visState: JSON.stringify({
+        title: 'Arbitrary table',
+        type: 'table',
+        params: {
+          id: '61ca57f0-469d-11e7-af02-69e470af7417',
+          type: 'metric',
+          series: [
+            {
+              id: '1',
+              color: '#68BC00',
+              split_mode: 'everything',
+              metrics: [
+                {
+                  value: '',
+                  id: '61ca57f2-469d-11e7-af02-69e470af7417',
+                  type: 'sum',
+                  field: 'bytes'
+                }
+              ],
+              filter: '',
+            }
+          ],
+          time_field: '@timestamp',
+          index_pattern: 'logstash-*',
+          interval: 'auto',
+          axis_position: 'left',
+          axis_formatter: 'number',
+          show_legend: 1,
+          show_grid: 1,
+          background_color_rules: [{ 'id': '1' }]
+        },
+        aggs: []
+      })
+    },
+  },
+  doc3: {
+    id: '3',
+    type: 'visualization',
+    attributes: {
+      description: '',
+      kibanaSavedObjectMeta: {
+        searchSourceJSON: '{}'
+      },
+      title: 'Filter Bytes Test: tsvb markdown',
+      uiStateJSON: '{}',
+      version: 1,
+      visState: JSON.stringify({
+        title: 'Filter Bytes Test: tsvb markdown',
+        type: 'metrics',
+        params: {
+          id: '61ca57f0-469d-11e7-af02-69e470af7417',
+          type: 'markdown',
+          series: [
+            {
+              id: '61ca57f1-469d-11e7-af02-69e470af7417',
+              color: '#68BC00',
+              split_mode: 'filters',
+              metrics: [
+                {
+                  id: '482d6560-4194-11e8-a461-7d278185cba4',
+                  type: 'avg',
+                  field: 'bytes'
+                }
+              ],
+              seperate_axis: 0,
+              axis_position: 'right',
+              formatter: 'number',
+              chart_type: 'line',
+              line_width: 1,
+              point_size: 1,
+              fill: 0.5,
+              stacked: 'none',
+              terms_field: 'clientip',
+              filter: 'Filter Bytes Test:>1000',
+              override_index_pattern: 0,
+              series_index_pattern: 'logstash-*',
+              series_time_field: 'utc_time',
+              series_interval: '1m',
+              value_template: '',
+              split_filters: [
+                {
+                  filter: 'bytes:>1000',
+                  label: '',
+                  color: '#68BC00',
+                  id: '39a107e0-4194-11e8-a461-7d278185cba4'
+                }
+              ],
+              label: '',
+              var_name: ''
+            }
+          ],
+          time_field: '@timestamp',
+          index_pattern: 'logstash-*',
+          interval: 'auto',
+          axis_position: 'left',
+          axis_formatter: 'number',
+          show_legend: 1,
+          show_grid: 1,
+          background_color_rules: [
+            {
+              id: '06893260-4194-11e8-a461-7d278185cba4'
+            }
+          ],
+          bar_color_rules: [
+            {
+              id: '36a0e740-4194-11e8-a461-7d278185cba4'
+            }
+          ],
+          markdown: '{{bytes_1000.last.formatted}}'
+        }
+      })
+    }
+  }
+};

src/legacy/core_plugins/kibana/migrations.js

@@ -134,6 +134,98 @@ const migrateDateHistogramAggregation = doc => {
   return doc;
 };
 
+// Migrate filters (string -> { query: string, language: lucene })
+/*
+  Enabling KQL in TSVB causes problems with savedObject visualizations when these are saved with filters.
+  In a visualisation type of saved object, if the visState param is of type metric, the filter is saved as a string that is not interpretted correctly as a lucene query in the visualization itself.
+  We need to transform the filter string into an object containing the original string as a query and specify the query language as lucene.
+  For Metrics visualizations (param.type === "metric"), filters can be applied to each series object in the series array within the SavedObject.visState.params object.
+  Path to the series array is thus:
+  attributes.visState.
+*/
+function transformFilterStringToQueryObject(doc) {
+  // Migrate filters
+  // If any filters exist and they are a string, we assume it to be lucene and transform the filter into an object accordingly
+  const newDoc = cloneDeep(doc);
+  const visStateJSON = get(doc, 'attributes.visState');
+  if (visStateJSON) {
+    let visState;
+    try {
+      visState = JSON.parse(visStateJSON);
+    } catch (e) {
+      // let it go, the data is invalid and we'll leave it as is
+    }
+    if (visState) {
+      const visType = get(visState, 'params.type');
+      const tsvbTypes = ['metric', 'markdown', 'top_n', 'gauge', 'table', 'timeseries'];
+      if (tsvbTypes.indexOf(visType) === -1) {
+        // skip
+        return doc;
+      }
+      // migrate the params fitler
+      const params = get(visState, 'params');
+      if (params.filter && typeof params.filter === 'string') {
+        const paramsFilterObject = {
+          query: params.filter,
+          language: 'lucene',
+        };
+        params.filter = paramsFilterObject;
+      }
+
+      // migrate the annotations query string:
+      const annotations = get(visState, 'params.annotations') || [];
+      annotations.forEach((item) => {
+        if (!item.query_string) {
+          // we don't need to transform anything if there isn't a filter at all
+          return;
+        }
+        if (typeof item.query_string === 'string') {
+          const itemQueryStringObject = {
+            query: item.query_string,
+            language: 'lucene',
+          };
+          item.query_string = itemQueryStringObject;
+        }
+      });
+      // migrate the series filters
+      const series = get(visState, 'params.series') || [];
+      series.forEach((item) => {
+        if (!item.filter) {
+          // we don't need to transform anything if there isn't a filter at all
+          return;
+        }
+        // series item filter
+        if (typeof item.filter === 'string') {
+          const itemfilterObject = {
+            query: item.filter,
+            language: 'lucene',
+          };
+          item.filter = itemfilterObject;
+        }
+        // series item split filters filter
+        if (item.split_filters) {
+          const splitFilters = get(item, 'split_filters') || [];
+          splitFilters.forEach((filter) => {
+            if (!filter.filter) {
+              // we don't need to transform anything if there isn't a filter at all
+              return;
+            }
+            if (typeof filter.filter === 'string') {
+              const filterfilterObject = {
+                query: filter.filter,
+                language: 'lucene',
+              };
+              filter.filter = filterfilterObject;
+            }
+          });
+        }
+      });
+      newDoc.attributes.visState = JSON.stringify(visState);
+    }
+  }
+  return newDoc;
+}
+
 const executeMigrations710 = flow(migratePercentileRankAggregation, migrateDateHistogramAggregation);
 
 function removeDateHistogramTimeZones(doc) {
@@ -264,7 +356,8 @@ export const migrations = {
       }
     },
     '7.0.1': removeDateHistogramTimeZones,
-    '7.1.0': doc => executeMigrations710(doc)
+    '7.1.0': doc => executeMigrations710(doc),
+    '7.2.0': transformFilterStringToQueryObject
   },
   dashboard: {
     '7.0.0': (doc) => {