Fixes #11232 - Add option for panel and global filters to annotations for TSVB (#11260)

* Fixes #11232 - Add option for panel and global filters

* Changing logic to use ignore instead of include

Author: simianhacker

src/core_plugins/metrics/public/components/annotations_editor.js

@@ -6,14 +6,17 @@ import ColorPicker from './color_picker';
 import FieldSelect from './aggs/field_select';
 import uuid from 'node-uuid';
 import IconSelect from './icon_select';
+import YesNo from './yes_no';
 
 function newAnnotation() {
   return {
     id: uuid.v1(),
     color: '#F00',
     index_pattern: '*',
     time_field: '@timestamp',
-    icon: 'fa-tag'
+    icon: 'fa-tag',
+    ignore_global_filters: 1,
+    ignore_panel_filters: 1
   };
 }
 
@@ -82,6 +85,22 @@ class AnnotationsEditor extends Component {
                 onChange={this.handleChange(model, 'query_string')}
                 value={model.query_string} />
             </div>
+            <div className="vis_editor__row-item-small">
+              <div className="vis_editor__label">Ignore Global Filters</div>
+              <YesNo
+                value={model.ignore_global_filters}
+                name="ignore_global_filters"
+                onChange={handleChange}/>
+
+            </div>
+            <div className="vis_editor__row-item-small">
+              <div className="vis_editor__label">Ignore Panel Filters</div>
+              <YesNo
+                value={model.ignore_panel_filters}
+                name="ignore_panel_filters"
+                onChange={handleChange}/>
+
+            </div>
           </div>
           <div className="vis_editor__row">
             <div className="vis_editor__row-item">

src/core_plugins/metrics/public/less/editor.less

@@ -416,6 +416,10 @@
       margin-bottom: 4px;
     }
   }
+  .vis_editor__row-item-small {
+    .vis_editor__row-item;
+    flex-grow: 0;
+  }
 }
 
 .vis_editor__icon_select-option {

src/core_plugins/metrics/server/lib/vis_data/request_processors/annotations/query.js

@@ -35,6 +35,20 @@ export default function query(req, panel, annotation) {
       });
     }
 
+    const globalFilters = req.payload.filters;
+    if (!annotation.ignore_global_filters) {
+      doc.query.bool.must = doc.query.bool.must.concat(globalFilters);
+    }
+
+    if (!annotation.ignore_panel_filters && panel.filter) {
+      doc.query.bool.must.push({
+        query_string: {
+          query: panel.filter,
+          analyze_wildcard: true
+        }
+      });
+    }
+
     if (annotation.fields) {
       const fields = annotation.fields.split(/[,\s]+/) || [];
       fields.forEach(field => {