[context view] Use courier when querying the context #11127

weltenwort · 2017-04-10T16:29:27Z

Instead of using a separate code path for querying the anchor and
context documents, the context view actions now use a normal
SearchSource and thereby support scripted fields, source filtering and other
features of a SearchSource without duplicated code.

To facilitate this the SearchSource gained the searchAfter field,
which is turned into a search_after clause on the request.

Additionally, the FetchStrategyForSearch now honors the
timefilter.enabled flag. When this flag is enabled, the index list
will be expanded with respect to the current time interval configured in
the timefilter (previous behaviour). When this flag is disabled, the
timefilter values will be ignored when expanding the index list.

weltenwort · 2017-04-11T13:40:45Z

I hoped to gain
Without much pain.
A narrow miss -
Jenkins, test this

Bargs

This looks great! left one suggestion that you can take or leave as you see fit. I also noticed reverseQuerySort is no longer used. Not sure if you still have plans for it, or if you'd like to delete it.

Bargs · 2017-04-11T19:48:28Z

src/core_plugins/kibana/public/context/app.js

  const queryParameterActions = Private(QueryParameterActionsProvider);
  const queryActions = Private(QueryActionsProvider);

+  // this is apparently the "canonical" way to disable the time picker
+  timefilter.enabled = false;


huh... that concerning. As you say, this seems to be the way to do it at the moment though.

Bargs · 2017-04-11T19:50:23Z

src/ui/public/courier/fetch/strategy/search.js

@@ -16,6 +16,7 @@ export default function FetchStrategyForSearch(Private, Promise, timefilter, kbn
     */
    reqsFetchParamsToBody: function (reqsFetchParams) {
      const indexToListMapping = {};
+      const timeBounds = timefilter.enabled ? timefilter.getBounds() : null;


It looks like there's a getActiveBounds method you could use on the timefilter.

lukasolson · 2017-04-11T20:36:46Z

src/core_plugins/kibana/public/context/api/anchor.js

+
+  return async function fetchAnchor(indexPattern, uid, sort) {
+    const searchSource = new SearchSource()
+      .inherits(false)


I'm trying to figure out what exactly this line accomplishes... Does the SearchSource inherit something else by default?

Yes, it takes a while to trace the effect. Ultimately it disables the default inheritance from the rootSearchSource:

kibana/src/ui/public/courier/data_source/search_source.js

Lines 151 to 156 in 9043476

SearchSource.prototype.getParent = function (onlyHardLinked) {

const self = this;

if (self._parent === false) return;

if (self._parent) return self._parent;

return onlyHardLinked ? undefined : Private(rootSearchSource).get();

};

This is how the the timefilter values get mixed into the request, which I needed to disable for the context query.

lukasolson

LGTM! Great improvement.

weltenwort · 2017-04-13T17:08:11Z

A clojure trace
Blocks my ways
To easter weekend bliss!
Please, jenkins, test this!

scampi · 2017-04-13T21:05:55Z

@weltenwort looks like jenkins had no ear for your nice poem ;)

spalger · 2017-04-14T00:16:15Z

jenkins, listen to felix and test this

Instead of using a separate code path for querying the anchor and context documents, the context view actions now use a normal `SearchSource` and thereby scripted fields, source filtering and other features of a `SearchSource` without duplicated code. To facilitate this the `SearchSource` gained the `searchAfter` field, which is turned into a `search_after` clause on the request. Additionally, the `FetchStrategyForSearch` now honors the `timefilter.enabled` flag. When this flag is enabled, the index list will be expanded with respect to the current time interval configured in the `timefilter` (previous behaviour). When this flag is disabled, the `timefilter` values will be ignored when expanding the index list.

…1127) Instead of using a separate code path for querying the anchor and context documents, the context view actions now use a normal `SearchSource` and thereby scripted fields, source filtering and other features of a `SearchSource` without duplicated code. To facilitate this the `SearchSource` gained the `searchAfter` field, which is turned into a `search_after` clause on the request. Additionally, the `FetchStrategyForSearch` now honors the `timefilter.enabled` flag. When this flag is enabled, the index list will be expanded with respect to the current time interval configured in the `timefilter` (previous behaviour). When this flag is disabled, the `timefilter` values will be ignored when expanding the index list.

Backports PR #11127 with adaptions to 5.x (see below) * [5.x] [context view] Use courier when querying the context (#11127) Instead of using a separate code path for querying the anchor and context documents, the context view actions now use a normal `SearchSource` and thereby scripted fields, source filtering and other features of a `SearchSource` without duplicated code. To facilitate this the `SearchSource` gained the `searchAfter` field, which is turned into a `search_after` clause on the request. Additionally, the `FetchStrategyForSearch` now honors the `timefilter.enabled` flag. When this flag is enabled, the index list will be expanded with respect to the current time interval configured in the `timefilter` (previous behaviour). When this flag is disabled, the `timefilter` values will be ignored when expanding the index list. * Undo named exports fix until rollout has been backported

weltenwort added :Discovery WIP Work in progress labels Apr 10, 2017

weltenwort self-assigned this Apr 10, 2017

weltenwort added review and removed WIP Work in progress labels Apr 11, 2017

weltenwort changed the title ~~(WIP) Refactoring/context courier query~~ [context view] Use courier when querying the context Apr 11, 2017

weltenwort requested review from lukasolson and Bargs April 11, 2017 15:31

lukasolson self-assigned this Apr 11, 2017

Bargs approved these changes Apr 11, 2017

View reviewed changes

lukasolson reviewed Apr 11, 2017

View reviewed changes

lukasolson approved these changes Apr 11, 2017

View reviewed changes

weltenwort force-pushed the refactoring/context-courier-query branch from ccc60f5 to 69e2a8a Compare April 13, 2017 16:31

weltenwort added v6.0.0 v5.5.0 and removed review labels Apr 18, 2017

weltenwort added 5 commits April 18, 2017 11:20

Adapt tests

5635616

Remove code for deprecated query code path

eaa2d0f

Remove unused utility function

7d38d05

Use timefilter.getActiveBounds()

bf8ddb5

weltenwort force-pushed the refactoring/context-courier-query branch from 69e2a8a to bf8ddb5 Compare April 18, 2017 09:20

Fix usages of default exports

a03bf50

weltenwort merged commit 0be7acc into elastic:master Apr 18, 2017

weltenwort mentioned this pull request Apr 18, 2017

[5.x] [context view] Use courier when querying the context #11301

Merged

weltenwort mentioned this pull request Apr 27, 2017

[context view] Apply filters to the context query #11466

Merged

4 tasks

weltenwort added release_note:enhancement and removed release_note:enhancement labels May 12, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[context view] Use courier when querying the context #11127

[context view] Use courier when querying the context #11127

weltenwort commented Apr 10, 2017 •

edited

Loading

weltenwort commented Apr 11, 2017

Bargs left a comment

Bargs Apr 11, 2017

Bargs Apr 11, 2017

lukasolson Apr 11, 2017

weltenwort Apr 11, 2017

lukasolson left a comment

weltenwort commented Apr 13, 2017 •

edited

Loading

scampi commented Apr 13, 2017

spalger commented Apr 14, 2017

	SearchSource.prototype.getParent = function (onlyHardLinked) {
	const self = this;
	if (self._parent === false) return;
	if (self._parent) return self._parent;
	return onlyHardLinked ? undefined : Private(rootSearchSource).get();
	};

[context view] Use courier when querying the context #11127

[context view] Use courier when querying the context #11127

Conversation

weltenwort commented Apr 10, 2017 • edited Loading

weltenwort commented Apr 11, 2017

Bargs left a comment

Choose a reason for hiding this comment

Bargs Apr 11, 2017

Choose a reason for hiding this comment

Bargs Apr 11, 2017

Choose a reason for hiding this comment

lukasolson Apr 11, 2017

Choose a reason for hiding this comment

weltenwort Apr 11, 2017

Choose a reason for hiding this comment

lukasolson left a comment

Choose a reason for hiding this comment

weltenwort commented Apr 13, 2017 • edited Loading

scampi commented Apr 13, 2017

spalger commented Apr 14, 2017

weltenwort commented Apr 10, 2017 •

edited

Loading

weltenwort commented Apr 13, 2017 •

edited

Loading