Skip to content

Commit 0778186

Browse files
committed
merge master and fix conflicts
2 parents 204134e + 0da5578 commit 0778186

File tree

381 files changed

+9349
-5367
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

381 files changed

+9349
-5367
lines changed

.bazelrc.common

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@
1010
build --experimental_guard_against_concurrent_changes
1111
run --experimental_guard_against_concurrent_changes
1212
test --experimental_guard_against_concurrent_changes
13+
query --experimental_guard_against_concurrent_changes
1314

1415
## Cache action outputs on disk so they persist across output_base and bazel shutdown (eg. changing branches)
15-
build --disk_cache=~/.bazel-cache/disk-cache
16+
common --disk_cache=~/.bazel-cache/disk-cache
1617

1718
## Bazel repo cache settings
18-
build --repository_cache=~/.bazel-cache/repository-cache
19+
common --repository_cache=~/.bazel-cache/repository-cache
1920

2021
# Bazel will create symlinks from the workspace directory to output artifacts.
2122
# Build results will be placed in a directory called "bazel-bin"
@@ -35,13 +36,16 @@ build --experimental_inprocess_symlink_creation
3536
# Incompatible flags to run with
3637
build --incompatible_no_implicit_file_export
3738
build --incompatible_restrict_string_escapes
39+
query --incompatible_no_implicit_file_export
40+
query --incompatible_restrict_string_escapes
3841

3942
# Log configs
4043
## different from default
4144
common --color=yes
42-
build --show_task_finish
43-
build --noshow_progress
45+
common --noshow_progress
46+
common --show_task_finish
4447
build --noshow_loading_progress
48+
query --noshow_loading_progress
4549
build --show_result=0
4650

4751
# Specifies desired output mode for running tests.
@@ -82,7 +86,7 @@ test:debug --test_output=streamed --test_strategy=exclusive --test_timeout=9999
8286
run:debug --define=VERBOSE_LOGS=1 -- --node_options=--inspect-brk
8387
# The following option will change the build output of certain rules such as terser and may not be desirable in all cases
8488
# It will also output both the repo cache and action cache to a folder inside the repo
85-
build:debug --compilation_mode=dbg --show_result=1
89+
build:debug --compilation_mode=dbg --show_result=0 --noshow_loading_progress --noshow_progress --show_task_finish
8690

8791
# Turn off legacy external runfiles
8892
# This prevents accidentally depending on this feature, which Bazel will remove.

WORKSPACE.bazel

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@ node_repositories(
5252
# NOTE: FORCE_COLOR env var forces colors on non tty mode
5353
yarn_install(
5454
name = "npm",
55-
environment = {
56-
"FORCE_COLOR": "True",
57-
},
5855
package_json = "//:package.json",
5956
yarn_lock = "//:yarn.lock",
6057
data = [

docs/developer/getting-started/index.asciidoc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ yarn kbn bootstrap --force-install
6666

6767
(You can also run `yarn kbn` to see the other available commands. For
6868
more info about this tool, see
69-
{kib-repo}tree/{branch}/packages/kbn-pm[{kib-repo}tree/{branch}/packages/kbn-pm].)
69+
{kib-repo}tree/{branch}/packages/kbn-pm[{kib-repo}tree/{branch}/packages/kbn-pm]. If you want more
70+
information about how to actively develop over packages please read <<monorepo-packages>>)
7071

7172
When switching branches which use different versions of npm packages you
7273
may need to run:
@@ -169,3 +170,5 @@ include::debugging.asciidoc[leveloffset=+1]
169170
include::building-kibana.asciidoc[leveloffset=+1]
170171

171172
include::development-plugin-resources.asciidoc[leveloffset=+1]
173+
174+
include::monorepo-packages.asciidoc[leveloffset=+1]
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
[[monorepo-packages]]
2+
== {kib} Monorepo Packages
3+
4+
Currently {kib} works as a monorepo composed by a core, plugins and packages.
5+
The latest are located in a folder called `packages` and are pieces of software that
6+
composes a set of features that can be isolated and reused across the entire repository.
7+
They are also supposed to be able to imported just like any other `node_module`.
8+
9+
Previously we relied solely on `@kbn/pm` to manage the development tools of those packages, but we are
10+
now in the middle of migrating those responsibilities into Bazel. Every package already migrated
11+
will contain in its root folder a `BUILD.bazel` file and other `build` and `watching` strategies should be used.
12+
13+
Remember that any time you need to make sure the monorepo is ready to be used just run:
14+
15+
[source,bash]
16+
----
17+
yarn kbn bootstrap
18+
----
19+
20+
[discrete]
21+
=== Building Non Bazel Packages
22+
23+
Non Bazel packages can be built independently with
24+
25+
[source,bash]
26+
----
27+
yarn kbn run build -i PACKAGE_NAME
28+
----
29+
30+
[discrete]
31+
=== Watching Non Bazel Packages
32+
33+
Non Bazel packages can be watched independently with
34+
35+
[source,bash]
36+
----
37+
yarn kbn watch -i PACKAGE_NAME
38+
----
39+
40+
[discrete]
41+
=== Building Bazel Packages
42+
43+
Bazel packages are built as a whole for now. You can use:
44+
45+
[source,bash]
46+
----
47+
yarn kbn build-bazel
48+
----
49+
50+
[discrete]
51+
=== Watching Bazel Packages
52+
53+
Bazel packages are watched as a whole for now. You can use:
54+
55+
[source,bash]
56+
----
57+
yarn kbn watch-bazel
58+
----
59+
60+
61+
[discrete]
62+
=== List of Already Migrated Packages to Bazel
63+
64+
- @elastic/datemath
65+
66+
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-plugins-embeddable-server](./kibana-plugin-plugins-embeddable-server.md) &gt; [EmbeddableStart](./kibana-plugin-plugins-embeddable-server.embeddablestart.md)
4+
5+
## EmbeddableStart type
6+
7+
<b>Signature:</b>
8+
9+
```typescript
10+
export declare type EmbeddableStart = PersistableStateService<EmbeddableStateWithType>;
11+
```

docs/development/plugins/embeddable/server/kibana-plugin-plugins-embeddable-server.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,9 @@
1818
| --- | --- |
1919
| [plugin](./kibana-plugin-plugins-embeddable-server.plugin.md) | |
2020

21+
## Type Aliases
22+
23+
| Type Alias | Description |
24+
| --- | --- |
25+
| [EmbeddableStart](./kibana-plugin-plugins-embeddable-server.embeddablestart.md) | |
26+

docs/management/index-patterns.asciidoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,11 @@ pattern:
125125
*:logstash-*
126126
```
127127

128+
You can use exclusions to exclude indices that might contain mapping errors.
129+
To match indices starting with `logstash-`, and exclude those starting with `logstash-old` from
130+
all clusters having a name starting with `cluster_`, you can use `cluster_*:logstash-*,cluster*:logstash-old*`.
131+
To exclude a cluster, use `cluster_*:logstash-*,cluster_one:-*`.
132+
128133
Once an index pattern is configured using the {ccs} syntax, all searches and
129134
aggregations using that index pattern in {kib} take advantage of {ccs}.
130135

docs/settings/dev-settings.asciidoc

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,14 @@ They are enabled by default.
2929
| Set to `true` to enable the <<xpack-profiler,{searchprofiler}>>. Defaults to `true`.
3030

3131
|===
32+
33+
[float]
34+
[[painless_lab-settings]]
35+
==== Painless Lab settings
36+
37+
[cols="2*<"]
38+
|===
39+
| `xpack.painless_lab.enabled`
40+
| When set to `true`, enables the <<painlesslab, Painless Lab>>. Defaults to `true`.
41+
42+
|===

docs/settings/search-sessions-settings.asciidoc

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,33 @@ Configure the search session settings in your `kibana.yml` configuration file.
1111
[cols="2*<"]
1212
|===
1313
a| `xpack.data_enhanced.`
14-
`search.sessions.enabled`
14+
`search.sessions.enabled` {ess-icon}
1515
| Set to `true` (default) to enable search sessions.
1616

1717
a| `xpack.data_enhanced.`
18-
`search.sessions.trackingInterval`
19-
| The frequency for updating the state of a search session. The default is 10s.
18+
`search.sessions.trackingInterval` {ess-icon}
19+
| The frequency for updating the state of a search session. The default is `10s`.
2020

2121
a| `xpack.data_enhanced.`
22-
`search.sessions.defaultExpiration`
22+
`search.sessions.pageSize` {ess-icon}
23+
| How many search sessions {kib} processes at once while monitoring
24+
session progress. The default is `100`.
25+
26+
a| `xpack.data_enhanced.`
27+
`search.sessions.notTouchedTimeout` {ess-icon}
28+
| How long {kib} stores search results from unsaved sessions,
29+
after the last search in the session completes. The default is `5m`.
30+
31+
a| `xpack.data_enhanced.`
32+
`search.sessions.notTouchedInProgressTimeout` {ess-icon}
33+
| How long a search session can run after a user navigates away without saving a session. The default is `1m`.
34+
35+
a| `xpack.data_enhanced.`
36+
`search.sessions.maxUpdateRetries` {ess-icon}
37+
| How many retries {kib} can perform while attempting to save a search session. The default is `3`.
38+
39+
a| `xpack.data_enhanced.`
40+
`search.sessions.defaultExpiration` {ess-icon}
2341
| How long search session results are stored before they are deleted.
24-
Extending a search session resets the expiration by the same value. The default is 7d.
42+
Extending a search session resets the expiration by the same value. The default is `7d`.
2543
|===

docs/user/alerting/defining-rules.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ Name:: The name of the rule. While this name does not have to be unique, th
2828
Tags:: A list of tag names that can be applied to a rule. Tags can help you organize and find rules, because tags appear in the rule listing in the management UI which is searchable by tag.
2929
Check every:: This value determines how frequently the rule conditions below are checked. Note that the timing of background rule checks are not guaranteed, particularly for intervals of less than 10 seconds. See <<alerting-production-considerations, Alerting production considerations>> for more information.
3030
Notify:: This value limits how often actions are repeated when an alert remains active across rule checks. See <<alerting-concepts-suppressing-duplicate-notifications>> for more information. +
31-
- **Only on status change**: Actions are not repeated when an alert remains active across checks. Actions run only when the rule status changes.
32-
- **Every time rule is active**: Actions are repeated when an alert remains active across checks.
31+
- **Only on status change**: Actions are not repeated when an alert remains active across checks. Actions run only when the alert status changes.
32+
- **Every time alert is active**: Actions are repeated when an alert remains active across checks.
3333
- **On a custom action interval**: Actions are suppressed for the throttle interval, but repeat when an alert remains active across checks for a duration longer than the throttle interval.
3434

3535

0 commit comments

Comments
 (0)