Skip to content

Commit

Permalink
Merge branch 'master' of github.com:elastic/kibana into docss/gs-update
Browse files Browse the repository at this point in the history
  • Loading branch information
gchaps committed Jul 24, 2019
2 parents a280563 + 5e47011 commit 622fb1a
Show file tree
Hide file tree
Showing 983 changed files with 23,711 additions and 13,394 deletions.
13 changes: 12 additions & 1 deletion .ci/packer_cache.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,16 @@ mkdir -p .chromedriver
curl "https://chromedriver.storage.googleapis.com/$chromedriverDistVersion/chromedriver_linux64.zip" > .chromedriver/chromedriver.zip
echo "$chromedriverPkgVersion" > .chromedriver/pkgVersion

# cache the geckodriver archive
geckodriverPkgVersion="$(node -e "console.log(require('./package.json').devDependencies.geckodriver)")"
if [ -z "$geckodriverPkgVersion" ]; then
echo "UNABLE TO DETERMINE geckodriver VERSIONS"
exit 1
fi
mkdir -p ".geckodriver"
cp "node_modules/geckodriver/geckodriver.tar.gz" .geckodriver/geckodriver.tar.gz
echo "$geckodriverPkgVersion" > .geckodriver/pkgVersion

# archive cacheable directories
mkdir -p "$HOME/.kibana/bootstrap_cache"
tar -cf "$HOME/.kibana/bootstrap_cache/$branch.tar" \
Expand All @@ -35,7 +45,8 @@ tar -cf "$HOME/.kibana/bootstrap_cache/$branch.tar" \
x-pack/legacy/plugins/reporting/.chromium \
test/plugin_functional/plugins/*/node_modules \
.es \
.chromedriver;
.chromedriver \
.geckodriver;

echo "created $HOME/.kibana/bootstrap_cache/$branch.tar"

Expand Down
3 changes: 3 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,11 @@
/x-pack/legacy/plugins/spaces/ @elastic/kibana-security
/x-pack/legacy/plugins/encrypted_saved_objects/ @elastic/kibana-security
/src/legacy/server/csp/ @elastic/kibana-security
/x-pack/plugins/security/ @elastic/kibana-security

# Kibana Stack Services
/packages/kbn-analytics/ @elastic/kibana-stack-services
/src/legacy/core_plugins/ui_metric/ @elastic/kibana-stack-services
/x-pack/legacy/plugins/telemetry @elastic/kibana-stack-services
/x-pack/legacy/plugins/alerting @elastic/kibana-stack-services
/x-pack/legacy/plugins/actions @elastic/kibana-stack-services
Expand Down
44 changes: 4 additions & 40 deletions .i18nrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"paths": {
"common.ui": "src/legacy/ui",
"data": "src/legacy/core_plugins/data",
"kibana_react": "src/legacy/core_plugins/kibana_react",
"server": "src/legacy/server",
"console": "src/legacy/core_plugins/console",
"core": "src/core",
Expand All @@ -15,53 +16,16 @@
"kbnVislibVisTypes": "src/legacy/core_plugins/kbn_vislib_vis_types",
"visTypeMarkdown": "src/legacy/core_plugins/vis_type_markdown",
"metricVis": "src/legacy/core_plugins/metric_vis",
"vega": "src/legacy/core_plugins/vega",
"visTypeVega": "src/legacy/core_plugins/vis_type_vega",
"tableVis": "src/legacy/core_plugins/table_vis",
"regionMap": "src/legacy/core_plugins/region_map",
"statusPage": "src/legacy/core_plugins/status_page",
"tileMap": "src/legacy/core_plugins/tile_map",
"timelion": "src/legacy/core_plugins/timelion",
"tagCloud": "src/legacy/core_plugins/tagcloud",
"tsvb": "src/legacy/core_plugins/metrics",
"kbnESQuery": "packages/kbn-es-query",
"xpack.actions": "x-pack/legacy/plugins/actions",
"xpack.alerting": "x-pack/legacy/plugins/alerting",
"xpack.apm": "x-pack/legacy/plugins/apm",
"xpack.beatsManagement": "x-pack/legacy/plugins/beats_management",
"xpack.canvas": "x-pack/legacy/plugins/canvas",
"xpack.code": "x-pack/legacy/plugins/code",
"xpack.crossClusterReplication": "x-pack/legacy/plugins/cross_cluster_replication",
"xpack.dashboardMode": "x-pack/legacy/plugins/dashboard_mode",
"xpack.fileUpload": "x-pack/legacy/plugins/file_upload",
"xpack.graph": "x-pack/legacy/plugins/graph",
"xpack.grokDebugger": "x-pack/legacy/plugins/grokdebugger",
"xpack.idxMgmt": "x-pack/legacy/plugins/index_management",
"xpack.indexLifecycleMgmt": "x-pack/legacy/plugins/index_lifecycle_management",
"xpack.infra": "x-pack/legacy/plugins/infra",
"xpack.kueryAutocomplete": "x-pack/legacy/plugins/kuery_autocomplete",
"xpack.licenseMgmt": "x-pack/legacy/plugins/license_management",
"xpack.maps": "x-pack/legacy/plugins/maps",
"xpack.ml": "x-pack/legacy/plugins/ml",
"xpack.logstash": "x-pack/legacy/plugins/logstash",
"xpack.main": "x-pack/legacy/plugins/xpack_main",
"xpack.telemetry": "x-pack/legacy/plugins/telemetry",
"xpack.monitoring": "x-pack/legacy/plugins/monitoring",
"xpack.remoteClusters": "x-pack/legacy/plugins/remote_clusters",
"xpack.reporting": "x-pack/legacy/plugins/reporting",
"xpack.rollupJobs": "x-pack/legacy/plugins/rollup",
"xpack.searchProfiler": "x-pack/legacy/plugins/searchprofiler",
"xpack.siem": "x-pack/legacy/plugins/siem",
"xpack.security": "x-pack/legacy/plugins/security",
"xpack.server": "x-pack/legacy/server",
"xpack.snapshotRestore": "x-pack/legacy/plugins/snapshot_restore",
"xpack.spaces": "x-pack/legacy/plugins/spaces",
"xpack.upgradeAssistant": "x-pack/legacy/plugins/upgrade_assistant",
"xpack.uptime": "x-pack/legacy/plugins/uptime",
"xpack.watcher": "x-pack/legacy/plugins/watcher"
"kbnESQuery": "packages/kbn-es-query"
},
"exclude": ["src/legacy/ui/ui_render/ui_render_mixin.js"],
"translations": [
"x-pack/plugins/translations/translations/zh-CN.json",
"x-pack/plugins/translations/translations/ja-JP.json"
]
"translations": []
}
2 changes: 1 addition & 1 deletion config/kibana.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,5 +111,5 @@
#ops.interval: 5000

# Specifies locale to be used for all localizable strings, dates and number formats.
# Supported languages are the following: English - en , by default , Chinese - zh-CN .
# Supported languages are the following: English - en , by default , Chinese - zh-CN .
#i18n.locale: "en"
2 changes: 1 addition & 1 deletion docs/apm/transactions.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ This graph is an easy way to visualize where your application is spending most o
For example, is your app spending time in external calls, database processing, or application code execution?

The time a transaction took to complete is also recorded and displayed on the chart under the "app" label.
"App" indicates that something was happening within the application, but we're not sure exactly what.
"app" indicates that something was happening within the application, but we're not sure exactly what.
This could be a sign that the agent does not have auto-instrumentation for whatever was happening during that time.

It's important to note that if you have asynchronous spans, the sum of all span times may exceed the duration of the transaction.
Expand Down
26 changes: 13 additions & 13 deletions docs/canvas/canvas-function-reference.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@ Default: `"-_index:.kibana"`
|`number`
|The number of documents to retrieve. For better performance, use a smaller data set.

Default: `100`
Default: `1000`

|`fields`
|`string`
Expand Down Expand Up @@ -1161,7 +1161,7 @@ Default: `""`
|`style`
|The CSS font properties for the content. For example, `font-family` or `font-weight`.

Default: `{<<font_fn>>}`
Default: `{font}`
|===

*Returns:* `render`
Expand Down Expand Up @@ -1213,13 +1213,13 @@ Default: `""`
|`style`
|The CSS font properties for the metric. For example, `font-family` or `font-weight`.

Default: `{<<font_fn>> size=48 family="'Open Sans', Helvetica, Arial, sans-serif" color="#000000" align=center lHeight=48}`.
Default: `{font size=48 family="'Open Sans', Helvetica, Arial, sans-serif" color="#000000" align=center lHeight=48}`.

|`labelFont`
|`style`
|The CSS font properties for the label. For example, `font-family` or `font-weight`.

Default: `{<<font_fn>> size=14 family="'Open Sans', Helvetica, Arial, sans-serif" color="#000000" align=center}`.
Default: `{font size=14 family="'Open Sans', Helvetica, Arial, sans-serif" color="#000000" align=center}`.
|===

*Returns:* `render`
Expand Down Expand Up @@ -1305,7 +1305,7 @@ Configures a pie chart element.
|`style`
|The CSS font properties for the labels. For example, `font-family` or `font-weight`.

Default: `{<<font_fn>>}`
Default: `{font}`

|`hole`
|`number`
Expand Down Expand Up @@ -1335,7 +1335,7 @@ Default: `false`
|`palette`
|A `palette` object for describing the colors to use in this pie chart

Default: `{<<palette_fn>>}`
Default: `{palette}`

|`radius`
|`string`, `number`
Expand Down Expand Up @@ -1373,13 +1373,13 @@ Configures a plot element.
|`seriesStyle`
|The default style to use for every series.

Default: `{<<seriesStyle_fn>> points=5}`
Default: `{seriesStyle points=5}`

|`font`
|`style`
|The CSS font properties for the labels. For example, `font-family` or `font-weight`.

Default: `{<<font_fn>>}`
Default: `{font}`

|`legend`
|`string`, `boolean`
Expand All @@ -1391,7 +1391,7 @@ Default: `"ne"`
|`palette`
|A `palette` object for describing the colors to use in this chart

Default: `{<<palette_fn>>}`
Default: `{palette}`

|`seriesStyle` †
|`seriesStyle`
Expand Down Expand Up @@ -1512,7 +1512,7 @@ Default: `20`
|`style`
|The CSS font properties for the label. For example, `font-family` or `font-weight`.

Default: `{<<font_fn>> size=24 family="'Open Sans', Helvetica, Arial, sans-serif" color="#000000" align=center}`
Default: `{font size=24 family="'Open Sans', Helvetica, Arial, sans-serif" color="#000000" align=center}`

|`label`
|`boolean`, `string`
Expand Down Expand Up @@ -1572,7 +1572,7 @@ Default: `".canvasRenderEl{\n\n}"`
|`containerStyle`
|The style for the container, including background, border, and opacity.

Default: `{<<containerStyle_fn>>}`
Default: `{containerStyle}`
|===

*Returns:* `render`
Expand Down Expand Up @@ -1726,7 +1726,7 @@ Alias: `format`
[[rowCount_fn]]
=== `rowCount`

Returns the number of rows. Pairs with `<<ply_fn>>` to get the count of unique column values, or combinations of unique column values.
Returns the number of rows. Pairs with <<ply_fn>> to get the count of unique column values, or combinations of unique column values.

*Accepts:* `datatable`

Expand Down Expand Up @@ -1964,7 +1964,7 @@ Configures a table element.
|`style`
|The CSS font properties for the contents of the table. For example, `font-family` or `font-weight`.

Default: `{<<font_fn>>}`
Default: `{font}`

|`paginate`
|`boolean`
Expand Down
20 changes: 0 additions & 20 deletions docs/dev-tools/console/auto-formatting.asciidoc

This file was deleted.

26 changes: 0 additions & 26 deletions docs/dev-tools/console/configuring-console.asciidoc

This file was deleted.

Loading

0 comments on commit 622fb1a

Please sign in to comment.