Skip to content

Commit

Permalink
Merge branch 'main' into 119217_turn_off_alerts_granular
Browse files Browse the repository at this point in the history
  • Loading branch information
kibanamachine authored Nov 30, 2021
2 parents 5aa1d17 + e52610f commit b406c61
Show file tree
Hide file tree
Showing 2,806 changed files with 18,641 additions and 9,992 deletions.
8 changes: 7 additions & 1 deletion .buildkite/scripts/build_kibana.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,19 @@ else
fi

if [[ "${GITHUB_PR_LABELS:-}" == *"ci:deploy-cloud"* ]]; then
echo "--- Build Kibana Cloud Distribution"
echo "--- Build and push Kibana Cloud Distribution"

echo "$KIBANA_DOCKER_PASSWORD" | docker login -u "$KIBANA_DOCKER_USERNAME" --password-stdin docker.elastic.co
trap 'docker logout docker.elastic.co' EXIT

node scripts/build \
--skip-initialize \
--skip-generic-folders \
--skip-platform-folders \
--skip-archives \
--docker-images \
--docker-tag-qualifier="$GIT_COMMIT" \
--docker-push \
--skip-docker-ubi \
--skip-docker-centos \
--skip-docker-contexts
Expand Down
6 changes: 6 additions & 0 deletions .buildkite/scripts/lifecycle/pre_command.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,12 @@ export GITHUB_TOKEN
KIBANA_CI_REPORTER_KEY=$(retry 5 5 vault read -field=value secret/kibana-issues/dev/kibanamachine-reporter)
export KIBANA_CI_REPORTER_KEY

KIBANA_DOCKER_USERNAME="$(retry 5 5 vault read -field=username secret/kibana-issues/dev/container-registry)"
export KIBANA_DOCKER_USERNAME

KIBANA_DOCKER_PASSWORD="$(retry 5 5 vault read -field=password secret/kibana-issues/dev/container-registry)"
export KIBANA_DOCKER_PASSWORD

# Setup Failed Test Reporter Elasticsearch credentials
{
TEST_FAILURES_ES_CLOUD_ID=$(retry 5 5 vault read -field=cloud_id secret/kibana-issues/dev/failed_tests_reporter_es)
Expand Down
2 changes: 1 addition & 1 deletion docs/CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ Use spaces, cross-cluster replication, or cross-cluster search. To migrate to <<
The logging configuration and log output format has changed. For more information, refer to {kibana-pull}112305[#112305].
*Impact* +
Use the new <<logging-configuration-migration,logging system>>.
Use the new <<logging-configuration, logging system configuration>>.
====

[float]
Expand Down
12 changes: 7 additions & 5 deletions docs/api/saved-objects/import.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@ Saved objects can only be imported into the same version, a newer minor on the s

|=======
| Exporting version | Importing version | Compatible?
| 6.7.0 | 6.8.1 | Yes
| 6.8.1 | 7.3.0 | Yes
| 7.3.0 | 7.11.1 | Yes
| 7.11.1 | 7.6.0 | No
| 6.8.1 | 8.0.0 | No
| 6.7.x | 6.8.x | Yes
| 6.x.x | 7.x.x | Yes
| 7.x.x | 8.x.x | Yes
| 7.1.x | 7.15.x | Yes
| 7.x.x | 6.x.x | No
| 7.15.x | 7.1.x | No
| 6.x.x | 8.x.x | No
|=======

[[saved-objects-api-import-request]]
Expand Down
8 changes: 4 additions & 4 deletions docs/concepts/data-views.asciidoc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[[data-views]]
=== Create a data view

{kib} requires a data view to access the {es} data that you want to explore.
{kib} requires a data view to access the {es} data that you want to explore.
A data view selects the data to use and allows you to define properties of the fields.

A data view can point to one or more indices, {ref}/data-streams.html[data stream], or {ref}/alias.html[index aliases].
Expand Down Expand Up @@ -37,7 +37,7 @@ If you loaded your own data, follow these steps to create a data view.
. Click *Create data view*.

[role="screenshot"]
image:management/index-patterns/images/create-index-pattern.png["Create data view"]
image:management/index-patterns/images/create-data-view.png["Create data view"]

. Start typing in the *name* field, and {kib} looks for the names of
indices, data streams, and aliases that match your input.
Expand Down Expand Up @@ -87,11 +87,11 @@ For an example, refer to <<rollup-data-tutorial,Create and visualize rolled up d
==== Create a data view that searches across clusters

If your {es} clusters are configured for {ref}/modules-cross-cluster-search.html[{ccs}],
you can create an index pattern to search across the clusters of your choosing. Use the
you can create a {data-source} to search across the clusters of your choosing. Use the
same syntax that you use in a raw {ccs} request in {es}:

```ts
<cluster-names>:<pattern>
<cluster-names>:<data-view>
```

To query {ls} indices across two {es} clusters
Expand Down
5 changes: 1 addition & 4 deletions docs/concepts/index.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ image:concepts/images/global-search.png["Global search showing matches to apps a
{kib} requires a data view to tell it which {es} data you want to access,
and whether the data is time-based. A data view can point to one or more {es}
data streams, indices, or index aliases by name.
For example, `logs-elasticsearch-prod-*` is an index pattern,
and it is time-based with a time field of `@timestamp`. The time field is not editable.

Data views are typically created by an administrator when sending data to {es}.
You can <<data-views,create or update data views>> in *Stack Management*, or by using a script
Expand Down Expand Up @@ -129,8 +127,7 @@ Previously, {kib} used the {ref}/search-aggregations-bucket-terms-aggregation.ht
Structured filters are a more interactive way to create {es} queries,
and are commonly used when building dashboards that are shared by multiple analysts.
Each filter can be disabled, inverted, or pinned across all apps.
The structured filters are the only way to use the {es} Query DSL in JSON form,
or to target a specific index pattern for filtering. Each of the structured
Each of the structured
filters is combined with AND logic on the rest of the query.

[role="screenshot"]
Expand Down
2 changes: 1 addition & 1 deletion docs/concepts/save-query.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ image:concepts/images/saved-query.png["Example of the saved query management pop

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.
{data-source}&mdash;in addition to the query.
Saved searches are primarily used for adding search results to a dashboard.

[role="xpack"]
Expand Down
2 changes: 1 addition & 1 deletion docs/concepts/set-time-filter.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
=== 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 <<data-views, data view>>.
selected <<data-views, {data-source}>>.
The default time range is 15 minutes, but you can customize
it in <<advanced-options,Advanced Settings>>.

Expand Down

This file was deleted.

Loading

0 comments on commit b406c61

Please sign in to comment.