Skip to content

Commit

Permalink
Merge branch 'master' into reporting/new-platform-shim-part-ii
Browse files Browse the repository at this point in the history
  • Loading branch information
elasticmachine authored Oct 28, 2019
2 parents 05ea029 + bd265d7 commit 66fcc48
Show file tree
Hide file tree
Showing 663 changed files with 4,018 additions and 53,393 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
/src/plugins/data/ @elastic/kibana-app-arch
/src/plugins/kibana_utils/ @elastic/kibana-app-arch
/src/plugins/kibana_react/ @elastic/kibana-app-arch
/src/plugins/navigation/ @elastic/kibana-app-arch

# APM
/x-pack/legacy/plugins/apm/ @elastic/apm-ui
Expand Down
1 change: 1 addition & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
- src/plugins/data/**/*
- src/plugins/embeddable/**/*
- src/plugins/kibana_react/**/*
- src/plugins/navigation/**/*
- src/plugins/kibana_utils/**/*
- src/legacy/core_plugins/dashboard_embeddable_container/**/*
- src/legacy/core_plugins/data/**/*
Expand Down
1 change: 1 addition & 0 deletions .i18nrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"data": ["src/legacy/core_plugins/data", "src/plugins/data"],
"expressions": "src/legacy/core_plugins/expressions",
"kibana_react": "src/legacy/core_plugins/kibana_react",
"navigation": "src/legacy/core_plugins/navigation",
"server": "src/legacy/server",
"console": "src/legacy/core_plugins/console",
"core": "src/core",
Expand Down
2 changes: 1 addition & 1 deletion docs/canvas/canvas-function-reference.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -1355,7 +1355,7 @@ Formats a `number` into a formatted `string` using NumeralJS. See http://numeral
[source,js]
----
formatnumber format=”$0,0.00”
fortmatnumber “0.0a”
formatnumber “0.0a”
----

*Code example*
Expand Down
25 changes: 0 additions & 25 deletions docs/code/code-basic-nav.asciidoc

This file was deleted.

48 changes: 0 additions & 48 deletions docs/code/code-import-first-repo.asciidoc

This file was deleted.

25 changes: 0 additions & 25 deletions docs/code/code-install-lang-server.asciidoc

This file was deleted.

10 changes: 0 additions & 10 deletions docs/code/code-multiple-kibana-instances-config.asciidoc

This file was deleted.

76 changes: 0 additions & 76 deletions docs/code/code-repo-management.asciidoc

This file was deleted.

24 changes: 0 additions & 24 deletions docs/code/code-search.asciidoc

This file was deleted.

28 changes: 0 additions & 28 deletions docs/code/code-semantic-nav.asciidoc

This file was deleted.

21 changes: 0 additions & 21 deletions docs/code/index.asciidoc

This file was deleted.

2 changes: 1 addition & 1 deletion docs/getting-started/tutorial-full-experience.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ At this point, you're ready to use the Elasticsearch {ref}/docs-bulk.html[bulk]
API to load the data sets:

[source,shell]
curl -u elastic -H 'Content-Type: application/x-ndjson' -XPOST '<host>:<port>/bank/account/_bulk?pretty' --data-binary @accounts.json
curl -u elastic -H 'Content-Type: application/x-ndjson' -XPOST '<host>:<port>/bank/_bulk?pretty' --data-binary @accounts.json
curl -u elastic -H 'Content-Type: application/x-ndjson' -XPOST '<host>:<port>/shakespeare/_bulk?pretty' --data-binary @shakespeare.json
curl -u elastic -H 'Content-Type: application/x-ndjson' -XPOST '<host>:<port>/_bulk?pretty' --data-binary @logs.jsonl

Expand Down
Binary file removed docs/images/code-blame.png
Binary file not shown.
Binary file removed docs/images/code-full-text-search.png
Binary file not shown.
Binary file removed docs/images/code-history.png
Binary file not shown.
Binary file removed docs/images/code-import-repo.png
Binary file not shown.
Binary file removed docs/images/code-lang-server-status.png
Binary file not shown.
Binary file removed docs/images/code-lang-server-tab.png
Binary file not shown.
Binary file removed docs/images/code-quick-search.png
Binary file not shown.
Binary file removed docs/images/code-repo-management.png
Binary file not shown.
Binary file removed docs/images/code-search-filter.png
Binary file not shown.
Binary file removed docs/images/code-semantic-nav.png
Binary file not shown.
Binary file removed docs/images/code-starter-root.png
Binary file not shown.
Binary file removed docs/images/code-symbol-table.png
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/infrastructure/getting-started.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
To get started with the Metrics app in Kibana, you need to start collecting metrics data for your infrastructure.

Kibana provides step-by-step instructions to help you add metrics data.
The {infra-guide}[Infrastructure Monitoring Guide] is a good source for more detailed information and instructions.
The {metrics-guide}[Metrics Monitoring Guide] is a good source for more detailed information and instructions.

[role="screenshot"]
image::infrastructure/images/metrics-add-data.png[Screenshot showing Add metric data to Kibana UI]
2 changes: 1 addition & 1 deletion docs/logs/getting-started.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
To get started with the Logs app in Kibana, you need to start collecting logs data for your infrastructure.

Kibana provides step-by-step instructions to help you add logs data.
The {infra-guide}[Infrastructure Monitoring Guide] is a good source for more detailed information and instructions.
The {logs-guide}[Logs Monitoring Guide] is a good source for more detailed information and instructions.

[role="screenshot"]
image::logs/images/logs-add-data.png[Screenshot showing Add logging data in Kibana]
51 changes: 0 additions & 51 deletions docs/settings/code-settings.asciidoc

This file was deleted.

5 changes: 2 additions & 3 deletions docs/setup/settings.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,8 @@ setting specifies the port to use.

`server.rewriteBasePath:`:: *Default: deprecated* Specifies whether Kibana should
rewrite requests that are prefixed with `server.basePath` or require that they
are rewritten by your reverse proxy. In Kibana 6.3 and earlier, the default is
`false`. In Kibana 7.x, the setting is deprecated. In Kibana 8.0 and later, the
are rewritten by your reverse proxy. In Kibana 6.3 and earlier, the default is
`false`. In Kibana 7.x, the setting is deprecated. In Kibana 8.0 and later, the
default is `true`.

`server.socketTimeout:`:: *Default: "120000"* The number of milliseconds to wait before closing an
Expand Down Expand Up @@ -327,7 +327,6 @@ Rollup user interface.


include::{docdir}/settings/apm-settings.asciidoc[]
include::{docdir}/settings/code-settings.asciidoc[]
include::{docdir}/settings/dev-settings.asciidoc[]
include::{docdir}/settings/graph-settings.asciidoc[]
include::{docdir}/settings/infrastructure-ui-settings.asciidoc[]
Expand Down
Loading

0 comments on commit 66fcc48

Please sign in to comment.