Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into kbn-xxx-SO-create…
Browse files Browse the repository at this point in the history
…-initialNamespaces
  • Loading branch information
pgayvallet committed Sep 2, 2021
2 parents ae809a2 + 00305db commit 4d1b75e
Show file tree
Hide file tree
Showing 224 changed files with 2,907 additions and 2,382 deletions.
Binary file modified docs/discover/images/add-field-to-pattern.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/discover/images/customer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/discover/images/discover-from-visualize.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/discover/images/discover-search-for-relevance.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/discover/images/document-table-expanded.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/discover/images/document-table.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/discover/images/double-arrow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/discover/images/downward-arrow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/discover/images/hello-field.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 6 additions & 9 deletions docs/discover/search-for-relevance.asciidoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[[discover-search-for-relevance]]
== Search for relevance
Sometimes you might be unsure which documents best match your search.
{es} assigns a relevancy, or score to each document, so you can
can narrow your search to the documents with the most relevant results.
The higher the score, the better it matches your query.
Expand All @@ -12,25 +11,23 @@ the <<gs-get-data-into-kibana, sample flights data set>>, or you can use your ow
. In *Discover*, open the index pattern dropdown, and select that data you want to work with.
+
For the sample flights data, set the index pattern to *kibana_sample_data_flights*.
. In the query bar, click *KQL*, and then turn it off.
+
You're now using the <<lucene-query, Lucene query syntax>>.

. Run your search. For the sample data, try:
+
```ts
Warsaw OR Venice OR Clear
```
. If you don't see any results, expand the <<set-time-filter,time range>>, for example to *Last 7 days*.
. From the list of *Available fields*, add `_score` and any other fields you want to the document table.
. To sort the `_score` column in descending order, hover over its header, and then click twice on
the arrow icon
image:images/double-arrow.png[Double arrow icon to indicate sorting] so it changes to
. To sort the `_score` column in descending order, hover over its header, and set
the sort icon to
image:images/downward-arrow.png[Downward pointing arrow to indicate descending sorting].
+
At this point, you're doing a multi-column sort: first by `Time`, and then by `_score`.
. To turn off sorting for the `Time` field, hover over its header, and then click the down arrow.
. To turn off sorting for the `Time` field, hover over its header, and set the sort icon to
image:images/double-arrow.png[Arrow on both ends of the icon indicates sorting is off].
+
Your table now sorts documents from most to least relevant.
+
[role="screenshot"]
image::images/discover-search-for-relevance.png["Example of a search for relevance"]
image::images/discover-search-for-relevance.png["Documents are sorted from most relevant to least relevant."]
8 changes: 3 additions & 5 deletions docs/user/discover.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ If you are using the sample data, this value was set when you added the data.
If you are using your own data, and it does not have a time field, the range selection is not available.

. To view the count of documents for a given time in the specified range,
click and drag the mouse over the histogram.
click and drag the mouse over the chart.

[float]
[[explore-fields-in-your-data]]
Expand Down Expand Up @@ -108,7 +108,7 @@ them to your document table. Your table should look similar to this:
image:images/document-table.png[Document table with fields for manufacturer, customer_first_name, and customer_last_name]

. To rearrange the table columns, hover the mouse over a
column header, and then use the move controls.
column header, and then use the move control.

. To view more of the document table, click *Hide chart*.

Expand Down Expand Up @@ -275,7 +275,7 @@ image:images/discover-maps.png[Map containing documents]
[[share-your-findings]]
=== Share your findings

To share your findings with a larger audience, click *Share* in the toolbar. For detailed information about the sharing options, refer to <<reporting-getting-started,Reporting>>.
To share your findings with a larger audience, click *Share* in the *Discover* toolbar. For detailed information about the sharing options, refer to <<reporting-getting-started,Reporting>>.


[float]
Expand All @@ -285,8 +285,6 @@ To share your findings with a larger audience, click *Share* in the toolbar. For

* <<discover-search-for-relevance, Search for relevance>>.

* <<reporting-getting-started, Present your findings in a report>>.

* <<kibana-discover-settings, Configure Discover>> to better meet your needs.
Go to **Advanced Settings** to configure the number of documents to show,
the table columns that display by default, and more.
Expand Down
37 changes: 37 additions & 0 deletions src/core/server/saved_objects/service/lib/repository.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -566,6 +566,25 @@ describe('SavedObjectsRepository', () => {
await test(namespace);
});

it(`normalizes initialNamespaces from 'default' to undefined`, async () => {
const test = async (namespace) => {
const objects = [{ ...obj1, type: 'dashboard', initialNamespaces: ['default'] }];
await bulkCreateSuccess(objects, { namespace, overwrite: true });
const body = [
{ index: expect.objectContaining({ _id: `dashboard:${obj1.id}` }) },
expect.not.objectContaining({ namespace: 'default' }),
];
expect(client.bulk).toHaveBeenCalledWith(
expect.objectContaining({ body }),
expect.anything()
);
client.bulk.mockClear();
client.mget.mockClear();
};
await test(undefined);
await test(namespace);
});

it(`doesn't add namespaces to request body for any types that are not multi-namespace`, async () => {
const test = async (namespace) => {
const objects = [obj1, { ...obj2, type: NAMESPACE_AGNOSTIC_TYPE }];
Expand Down Expand Up @@ -2131,6 +2150,24 @@ describe('SavedObjectsRepository', () => {
);
});

it(`normalizes initialNamespaces from 'default' to undefined`, async () => {
await savedObjectsRepository.create('dashboard', attributes, {
id,
namespace,
initialNamespaces: ['default'],
});

expect(client.create).toHaveBeenCalledTimes(1);
expect(client.create).toHaveBeenNthCalledWith(
1,
expect.objectContaining({
id: `dashboard:${id}`,
body: expect.not.objectContaining({ namespace: 'default' }),
}),
expect.anything()
);
});

it(`doesn't prepend namespace to the id or add namespace or namespaces fields when using namespace-agnostic type`, async () => {
await createSuccess(NAMESPACE_AGNOSTIC_TYPE, attributes, { id, namespace });
expect(client.create).toHaveBeenCalledWith(
Expand Down
8 changes: 6 additions & 2 deletions src/core/server/saved_objects/service/lib/repository.ts
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,9 @@ export class SavedObjectsRepository {
let savedObjectNamespaces: string[] | undefined;

if (this._registry.isSingleNamespace(type)) {
savedObjectNamespace = initialNamespaces ? initialNamespaces[0] : namespace;
savedObjectNamespace = initialNamespaces
? normalizeNamespace(initialNamespaces[0])
: namespace;
} else if (this._registry.isMultiNamespace(type)) {
if (id && overwrite) {
// we will overwrite a multi-namespace saved object if it exists; if that happens, ensure we preserve its included namespaces
Expand Down Expand Up @@ -486,7 +488,9 @@ export class SavedObjectsRepository {
versionProperties = getExpectedVersionProperties(version, actualResult);
} else {
if (this._registry.isSingleNamespace(object.type)) {
savedObjectNamespace = initialNamespaces ? initialNamespaces[0] : namespace;
savedObjectNamespace = initialNamespaces
? normalizeNamespace(initialNamespaces[0])
: namespace;
} else if (this._registry.isMultiNamespace(object.type)) {
savedObjectNamespaces = initialNamespaces || getSavedObjectNamespaces(namespace);
}
Expand Down
2 changes: 0 additions & 2 deletions src/plugins/discover/public/application/angular/_index.scss

This file was deleted.

95 changes: 0 additions & 95 deletions src/plugins/discover/public/application/angular/context/NOTES.md

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

39 changes: 0 additions & 39 deletions src/plugins/discover/public/application/angular/discover.js

This file was deleted.

This file was deleted.

Loading

0 comments on commit 4d1b75e

Please sign in to comment.