Skip to content

Commit

Permalink
Merge branch 'master' into security/telemetry-privilege
Browse files Browse the repository at this point in the history
  • Loading branch information
kibanamachine committed Apr 22, 2021
2 parents 5b7bd25 + fecdd45 commit de9ee3a
Show file tree
Hide file tree
Showing 1,909 changed files with 175,239 additions and 42,681 deletions.
3 changes: 2 additions & 1 deletion .backportrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"targetBranchChoices": [
{ "name": "master", "checked": true },
{ "name": "7.x", "checked": true },
"7.13",
"7.12",
"7.11",
"7.10",
Expand Down Expand Up @@ -30,7 +31,7 @@
"targetPRLabels": ["backport"],
"branchLabelMapping": {
"^v8.0.0$": "master",
"^v7.13.0$": "7.x",
"^v7.14.0$": "7.x",
"^v(\\d+).(\\d+).\\d+$": "$1.$2"
},
"autoMerge": true,
Expand Down
1 change: 0 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
**/*.js.snap
**/graphql/types.ts
/.es
/.chromium
/build
Expand Down
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@
/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/ @elastic/kibana-alerting-services
/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/ @elastic/kibana-alerting-services
/docs/user/alerting/ @elastic/kibana-alerting-services
/docs/management/alerting/ @elastic/kibana-alerting-services
/docs/management/connectors/ @elastic/kibana-alerting-services
#CC# /x-pack/plugins/stack_alerts @elastic/kibana-alerting-services

# Enterprise Search
Expand Down
4 changes: 3 additions & 1 deletion .telemetryrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
{
"output": "src/plugins/telemetry/schema/oss_plugins.json",
"root": "src/plugins/",
"exclude": []
"exclude": [
"src/plugins/kibana_usage_collection/server/collectors/config_usage/register_config_usage_collector.ts"
]
}
]
2 changes: 1 addition & 1 deletion docs/apm/agent-configuration.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Go Agent:: {apm-go-ref}/configuration.html[Configuration reference]
Java Agent:: {apm-java-ref}/configuration.html[Configuration reference]
.NET Agent:: {apm-dotnet-ref}/configuration.html[Configuration reference]
Node.js Agent:: {apm-node-ref}/configuration.html[Configuration reference]
PHP Agent:: _Not yet supported_
PHP Agent:: {apm-php-ref}/configuration.html[Configuration reference]
Python Agent:: {apm-py-ref}/configuration.html[Configuration reference]
Ruby Agent:: {apm-ruby-ref}/configuration.html[Configuration reference]
Real User Monitoring (RUM) Agent:: {apm-rum-ref}/configuration.html[Configuration reference]
Binary file modified docs/concepts/images/add-filter-popup.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/concepts/images/refresh-every.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/concepts/images/save-icon.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 added docs/concepts/images/saved-query-popup.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 added docs/concepts/images/saved-query.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 added docs/concepts/images/time-filter-icon.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 added docs/concepts/images/time-filter.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 added docs/concepts/images/time-relative.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[[index-patterns]]
== Create an index pattern
=== Create an index pattern

{kib} requires an index pattern to access the {es} data that you want to explore.
An index pattern selects the data to use and allows you to define properties of the fields.
Expand Down Expand Up @@ -126,7 +126,7 @@ pattern:
```

You can use exclusions to exclude indices that might contain mapping errors.
To match indices starting with `logstash-`, and exclude those starting with `logstash-old` from
To match indices starting with `logstash-`, and exclude those starting with `logstash-old` from
all clusters having a name starting with `cluster_`, you can use `cluster_*:logstash-*,cluster*:logstash-old*`.
To exclude a cluster, use `cluster_*:logstash-*,cluster_one:-*`.

Expand All @@ -152,7 +152,7 @@ move between {kib} apps.
image:management/index-patterns/images/new-index-pattern.png["Create index pattern"]

[float]
==== Format the display of common field types
=== Format the display of common field types

Whenever possible, {kib} uses the same field type for display as
{es}. However, some field types that {es} supports are not available
Expand Down
16 changes: 14 additions & 2 deletions docs/concepts/index.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[[kibana-concepts-analysts]]
== {kib} concepts for analysts
== {kib} concepts
**_Learn the shared concepts for analyzing and visualizing your data_**

As an analyst, you will use a combination of {kib} apps to analyze and
Expand Down Expand Up @@ -65,7 +65,7 @@ Each app in {kib} provides a time filter, and most apps also include semi-struct
image:concepts/images/top-bar.png["Time filter, semi-structured search, and filters in a {kib} app"]

If you frequently use any of the search options, you can click the
save icon
save query icon
image:concepts/images/save-icon.png["save icon"] next to the
semi-structured search to save or load a previously saved query.
The saved query will always contain the semi-structured search query,
Expand Down Expand Up @@ -127,6 +127,7 @@ filters is combined with AND logic on the rest of the query.
[role="screenshot"]
image:concepts/images/add-filter-popup.png["Add filter popup"]


[float]
=== Saving objects
{kib} lets you save objects for your own future use or for sharing with others.
Expand All @@ -147,3 +148,14 @@ Use the global search to quickly open a saved object.

* Try the {kib} <<get-started,Quick start>>, which shows you how to put these concepts into action.
* Go to <<discover, Discover>> for instructions on searching your data.


include::index-patterns.asciidoc[]

include::set-time-filter.asciidoc[]

include::kuery.asciidoc[]

include::lucene.asciidoc[]

include::save-query.asciidoc[]
File renamed without changes.
51 changes: 51 additions & 0 deletions docs/concepts/lucene.asciidoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
[[lucene-query]]
=== Lucene query syntax
Lucene query syntax is available to {kib} users who opt out of the <<kuery-query>>.
Full documentation for this syntax is available as part of {es}
{ref}/query-dsl-query-string-query.html#query-string-syntax[query string syntax].

The main reason to use the Lucene query syntax in {kib} is for advanced
Lucene features, such as regular expressions or fuzzy term matching. However,
Lucene syntax is not able to search nested objects or scripted fields.

To perform a free text search, simply enter a text string. For example, if
you're searching web server logs, you could enter `safari` to search all
fields:

[source,yaml]
-------------------
safari
-------------------

To search for a value in a specific field, prefix the value with the name
of the field:

[source,yaml]
-------------------
status:200
-------------------

To search for a range of values, use the bracketed range syntax,
`[START_VALUE TO END_VALUE]`. For example, to find entries that have 4xx
status codes, you could enter `status:[400 TO 499]`.

[source,yaml]
-------------------
status:[400 TO 499]
-------------------

For an open range, use a wildcard:

[source,yaml]
-------------------
status:[400 TO *]
-------------------

To specify more complex search criteria, use the boolean operators
`AND`, `OR`, and `NOT`. For example, to find entries that have 4xx status
codes and have an extension of `php` or `html`:

[source,yaml]
-------------------
status:[400 TO 499] AND (extension:php OR extension:html)
-------------------
58 changes: 32 additions & 26 deletions docs/concepts/save-query.asciidoc
Original file line number Diff line number Diff line change
@@ -1,39 +1,45 @@
[[save-load-delete-query]]
== Save a query
A saved query is a collection of query text and filters that you can
reuse in any app with a query bar, like <<discover, *Discover*>> and <<dashboard, *Dashboard*>>. Save a query when you want to:
=== Save a query

* Retrieve results from the same query at a later time without having to reenter the query text, add the filters or set the time filter
* View the results of the same query in multiple apps
* Share your query
Have you ever built a query that you wanted to reuse?
With saved queries, you can save your query text, filters, and time range for
reuse anywhere a query bar is present.

Saved queries don't include information specific to *Discover*,
such as the currently selected columns in the document table, the sort order, and the index pattern.
To save your current view of *Discover* for later retrieval and reuse,
create a <<save-open-search, saved search>> instead.
For example, suppose you're in *Discover*, and you've put time into building
a query that includes query input text, multiple filters, and a specific time range.
Save this query, and you can embed the search results in dashboards,
use them as a foundation for building a visualization,
and share them in a link or CVS form.

[role="screenshot"]
image:concepts/images/saved-query.png["Example of the saved query management popover with a list of saved queries"]

NOTE::

If you have insufficient privileges to save queries, the *Save current query*
button isn't visible in the saved query management popover.
Saved queries are different than <<save-open-search,saved searches>>,
which include the *Discover* configuration&mdash;selected columns in the document table, sort order, and
index pattern&mdash;in addition to the query.
Saved searches are primarily used for adding search results to a dashboard.

[role="xpack"]
==== Read-only access
If you have insufficient privileges to save queries,
the *Save* button isn't visible in the saved query management popover.
For more information, see <<xpack-security-authorization, Granting access to Kibana>>

. Click *#* in the query bar.
==== Save a query

. Once you’ve built a query worth saving, click the save query icon image:concepts/images/save-icon.png["save query icon"].
. In the popover, click *Save current query*.
+
[role="screenshot"]
image::discover/images/saved-query-management-component-all-privileges.png["Example of the saved query management popover with a list of saved queries with write access",width="80%"]
+
. Enter a name, a description, and then select the filter options.
. Enter a unique name to identify the query and an optional description that will appear in a tooltip in the saved query popover.
. Choose whether to include or exclude filters and a time range.
By default, filters are automatically included, but the time filter is not.
+
[role="screenshot"]
image::discover/images/saved-query-save-form-default-filters.png["Example of the saved query management save form with the filters option included and the time filter option excluded",width="80%"]
image:concepts/images/saved-query-popup.png["Example of the saved query management popover with a list of saved queries"]

. Click *Save*.
. To load a saved query into *Discover* or *Dashboard*, open the *Saved search* popover, and select the query.
. To manage your saved queries, use these actions in the popover:
. To load a saved query, select it in the *Saved query* popover.
+
* Save as new: Save changes to the current query.
* Clear. Clear a query that is currently loaded in an app.
* Delete. You can’t recover a deleted query.
. To import and export saved queries, go to <<managing-saved-objects, Saved Objects in Management>>.
The query text, filters, and time range are updated and your data refreshed.
If you’re loading a saved query that did not include the filters or time range, those components remain as-is.
. To clear, modify, and delete saved queries, use the *Saved query* popover.
31 changes: 31 additions & 0 deletions docs/concepts/set-time-filter.asciidoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
[[set-time-filter]]
=== Set the time range
Display data within a
specified time range when your index contains time-based events, and a time-field is configured for the
selected <<index-patterns, index pattern>>.
The default time range is 15 minutes, but you can customize
it in <<advanced-options,Advanced Settings>>.

. Click image:concepts/images/time-filter-icon.png[clock icon].

. Choose one of the following:

* *Quick select* to use a recent time range, then use the back and forward
arrows to move through the time ranges.

* *Commonly used* to use a time range from options such as *Last 15 minutes*,
*Today*, and *Week to date*.

* *Recently used date ranges* to use a previously selected data range.

* *Refresh every* to specify an automatic refresh rate.
+
[role="screenshot"]
image::concepts/images/time-filter.png[Time filter menu]

. To set start and end times, click the bar next to the time filter.
In the popup, select *Absolute*, *Relative* or *Now*, then specify the required
options.
+
[role="screenshot"]
image::concepts/images/time-relative.png[Time filter showing relative time]
15 changes: 15 additions & 0 deletions docs/developer/getting-started/index.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,21 @@

Get started building your own plugins, or contributing directly to the {kib} repo.

[discrete]
[[developing-on-windows]]
=== Developing on Windows

In order to support Windows development we currently require you to use one of the following:

- https://git-scm.com/download/win[Git bash] (other bash emulators like https://cmder.net/[Cmder] could work but we did not test them)
- https://docs.microsoft.com/en-us/windows/wsl/about[WSL]

As well as installing https://www.microsoft.com/en-us/download/details.aspx?id=48145[Visual C++ Redistributable for Visual Studio 2015].

Before running the steps listed below, please make sure you have installed everything
that we require and listed above and that you are running the mentioned commands
through Git bash or WSL.

[discrete]
[[get-kibana-code]]
=== Get the code
Expand Down
1 change: 1 addition & 0 deletions docs/developer/getting-started/monorepo-packages.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ yarn kbn watch-bazel
- @kbn/apm-utils
- @kbn/babel-preset
- @kbn/config-schema
- @kbn/std
- @kbn/tinymath
- @kbn/utility-types

6 changes: 5 additions & 1 deletion docs/developer/plugin-list.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ Failure to have auth enabled in Kibana will make for a broken UI. UI-based error
|{kib-repo}blob/{branch}/x-pack/plugins/data_enhanced/README.md[dataEnhanced]
|The data_enhanced plugin is the x-pack counterpart to the OSS data plugin.
|The data_enhanced plugin is the x-pack counterpart to the src/plguins/data plugin.
|{kib-repo}blob/{branch}/x-pack/plugins/discover_enhanced/README.md[discoverEnhanced]
Expand Down Expand Up @@ -392,6 +392,10 @@ actitivies.
|The features plugin enhance Kibana with a per-feature privilege system.
|{kib-repo}blob/{branch}/x-pack/plugins/file_data_visualizer[fileDataVisualizer]
|WARNING: Missing README.
|{kib-repo}blob/{branch}/x-pack/plugins/file_upload[fileUpload]
|WARNING: Missing README.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@

```typescript
readonly links: {
readonly canvas: {
readonly guide: string;
};
readonly dashboard: {
readonly guide: string;
readonly drilldowns: string;
Expand Down
Loading

0 comments on commit de9ee3a

Please sign in to comment.