Skip to content

Commit 2888676

Browse files
ppisljarppisljar
committed
Merge branch 'master' into persistablestate/docs
2 parents 251adae + 7b97b5c commit 2888676

File tree

1,411 files changed

+27433
-10269
lines changed

Some content is hidden

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

1,411 files changed

+27433
-10269
lines changed

‎.buildkite/scripts/bootstrap.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -euo pipefail
55
source .buildkite/scripts/common/util.sh
66

77
echo "--- yarn install and bootstrap"
8-
yarn kbn bootstrap --verbose
8+
yarn kbn bootstrap
99

1010
###
1111
### upload ts-refs-cache artifacts as quickly as possible so they are available for download

‎.buildkite/scripts/build_kibana_plugins.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ node scripts/build_kibana_platform_plugins \
1818
--scan-dir "$XPACK_DIR/test/licensing_plugin/plugins" \
1919
--scan-dir "$XPACK_DIR/test/usage_collection/plugins" \
2020
--scan-dir "$XPACK_DIR/test/security_functional/fixtures/common" \
21-
--scan-dir "$XPACK_DIR/examples" \
22-
--verbose
21+
--scan-dir "$XPACK_DIR/examples"
2322

2423
echo "--- Archive built plugins"
2524
shopt -s globstar

‎.buildkite/scripts/lifecycle/build_status.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ const { BuildkiteClient } = require('kibana-buildkite-library');
77
console.log(status.success ? 'true' : 'false');
88
process.exit(0);
99
} catch (ex) {
10+
console.error('Buildkite API Error', ex.message);
1011
if (ex.response) {
11-
console.error('HTTP Error Response Body', ex.response.data);
1212
console.error('HTTP Error Response Status', ex.response.status);
13+
console.error('HTTP Error Response Body', ex.response.data);
1314
}
14-
console.error(ex);
1515
process.exit(1);
1616
}
1717
})();

‎.buildkite/scripts/lifecycle/ci_stats_complete.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ const { CiStats } = require('kibana-buildkite-library');
44
try {
55
await CiStats.onComplete();
66
} catch (ex) {
7-
console.error(ex);
7+
console.error('CI Stats Error', ex.message);
8+
if (ex.response) {
9+
console.error('HTTP Error Response Status', ex.response.status);
10+
console.error('HTTP Error Response Body', ex.response.data);
11+
}
812
process.exit(1);
913
}
1014
})();

‎.buildkite/scripts/lifecycle/ci_stats_start.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ const { CiStats } = require('kibana-buildkite-library');
44
try {
55
await CiStats.onStart();
66
} catch (ex) {
7-
console.error(ex);
7+
console.error('CI Stats Error', ex.message);
8+
if (ex.response) {
9+
console.error('HTTP Error Response Status', ex.response.status);
10+
console.error('HTTP Error Response Body', ex.response.data);
11+
}
812
process.exit(1);
913
}
1014
})();

‎.ci/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
22
# If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
33

4-
ARG NODE_VERSION=14.17.5
4+
ARG NODE_VERSION=14.17.6
55

66
FROM node:${NODE_VERSION} AS base
77

‎.eslintrc.js‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1656,5 +1656,24 @@ module.exports = {
16561656
'@typescript-eslint/prefer-ts-expect-error': 'error',
16571657
},
16581658
},
1659+
1660+
/**
1661+
* Disallow `export *` syntax in plugin/core public/server/common index files and instead
1662+
* require that plugins/core explicitly export the APIs that should be accessible outside the plugin.
1663+
*
1664+
* To add your plugin to this list just update the relevant glob with the name of your plugin
1665+
*/
1666+
{
1667+
files: [
1668+
'src/core/{server,public,common}/index.ts',
1669+
'src/plugins/*/{server,public,common}/index.ts',
1670+
'src/plugins/*/*/{server,public,common}/index.ts',
1671+
'x-pack/plugins/*/{server,public,common}/index.ts',
1672+
'x-pack/plugins/*/*/{server,public,common}/index.ts',
1673+
],
1674+
rules: {
1675+
'@kbn/eslint/no_export_all': 'error',
1676+
},
1677+
},
16591678
],
16601679
};

‎.github/CODEOWNERS‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,23 @@
1616
/src/plugins/discover/ @elastic/kibana-data-discovery
1717
/x-pack/plugins/discover_enhanced/ @elastic/kibana-data-discovery
1818
/test/functional/apps/discover/ @elastic/kibana-data-discovery
19+
/x-pack/plugins/graph/ @elastic/kibana-data-discovery
20+
/x-pack/test/functional/apps/graph @elastic/kibana-data-discovery
1921

2022
# Vis Editors
2123
/x-pack/plugins/lens/ @elastic/kibana-vis-editors
22-
/x-pack/plugins/graph/ @elastic/kibana-vis-editors
2324
/src/plugins/advanced_settings/ @elastic/kibana-vis-editors
2425
/src/plugins/charts/ @elastic/kibana-vis-editors
2526
/src/plugins/management/ @elastic/kibana-vis-editors
2627
/src/plugins/kibana_legacy/ @elastic/kibana-vis-editors
2728
/src/plugins/timelion/ @elastic/kibana-vis-editors
2829
/src/plugins/vis_default_editor/ @elastic/kibana-vis-editors
29-
/src/plugins/vis_type_metric/ @elastic/kibana-vis-editors
30+
/src/plugins/vis_types/metric/ @elastic/kibana-vis-editors
3031
/src/plugins/vis_type_table/ @elastic/kibana-vis-editors
31-
/src/plugins/vis_type_tagcloud/ @elastic/kibana-vis-editors
32+
/src/plugins/vis_types/tagcloud/ @elastic/kibana-vis-editors
3233
/src/plugins/vis_type_timelion/ @elastic/kibana-vis-editors
3334
/src/plugins/vis_type_timeseries/ @elastic/kibana-vis-editors
34-
/src/plugins/vis_type_vega/ @elastic/kibana-vis-editors
35+
/src/plugins/vis_types/vega/ @elastic/kibana-vis-editors
3536
/src/plugins/vis_types/vislib/ @elastic/kibana-vis-editors
3637
/src/plugins/vis_types/xy/ @elastic/kibana-vis-editors
3738
/src/plugins/vis_types/pie/ @elastic/kibana-vis-editors

‎.github/workflows/sync-main-branch.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Synchronize all pushes to 'master' branch with 'main' branch to facilitate migration
2+
name: "Sync main branch"
3+
on:
4+
push:
5+
branches:
6+
- master
7+
8+
jobs:
9+
sync_latest_from_upstream:
10+
runs-on: ubuntu-latest
11+
name: Sync latest commits from master branch
12+
if: github.repository == 'elastic/kibana'
13+
14+
steps:
15+
- name: Checkout target repo
16+
uses: actions/checkout@v2
17+
with:
18+
ref: main
19+
20+
- name: Sync upstream changes
21+
id: sync
22+
uses: aormsby/Fork-Sync-With-Upstream-action@v3.0
23+
with:
24+
target_sync_branch: main
25+
target_repo_token: ${{ secrets.KIBANAMACHINE_TOKEN }}
26+
upstream_sync_branch: master
27+
upstream_sync_repo: elastic/kibana

‎.i18nrc.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"paths": {
33
"alerts": "packages/kbn-alerts/src",
44
"autocomplete": "packages/kbn-securitysolution-autocomplete/src",
5+
"kbnConfig": "packages/kbn-config/src",
56
"console": "src/plugins/console",
67
"core": "src/core",
78
"discover": "src/plugins/discover",
@@ -59,11 +60,11 @@
5960
"uiActions": "src/plugins/ui_actions",
6061
"visDefaultEditor": "src/plugins/vis_default_editor",
6162
"visTypeMarkdown": "src/plugins/vis_type_markdown",
62-
"visTypeMetric": "src/plugins/vis_type_metric",
63+
"visTypeMetric": "src/plugins/vis_types/metric",
6364
"visTypeTable": "src/plugins/vis_type_table",
64-
"visTypeTagCloud": "src/plugins/vis_type_tagcloud",
65+
"visTypeTagCloud": "src/plugins/vis_types/tagcloud",
6566
"visTypeTimeseries": "src/plugins/vis_type_timeseries",
66-
"visTypeVega": "src/plugins/vis_type_vega",
67+
"visTypeVega": "src/plugins/vis_types/vega",
6768
"visTypeVislib": "src/plugins/vis_types/vislib",
6869
"visTypeXy": "src/plugins/vis_types/xy",
6970
"visTypePie": "src/plugins/vis_types/pie",

0 commit comments

Comments
 (0)