Skip to content

Commit 48ba40e

Browse files
committed
Merge remote-tracking branch upstream/master into rename-triggers_actions_ui
2 parents 3726d9c + de130ab commit 48ba40e

File tree

4,330 files changed

+184033
-90215
lines changed

Some content is hidden

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

4,330 files changed

+184033
-90215
lines changed

.ci/Jenkinsfile_coverage

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,12 @@ kibanaPipeline(timeoutMinutes: 240) {
1212
]) {
1313
workers.base(name: 'coverage-worker', size: 'l', ramDisk: false, bootstrapped: false) {
1414
catchError {
15+
16+
kibanaPipeline.bash("""
17+
echo '${TIME_STAMP}'
18+
""", "### Print Canonical Time Stamp")
19+
1520
kibanaCoverage.runTests()
16-
kibanaTeamAssign.load('team_assignment', "### Upload Team Assignment JSON")
1721
handleIngestion(TIME_STAMP)
1822
}
1923
handleFail()
@@ -30,8 +34,8 @@ def handleIngestion(timestamp) {
3034
kibanaCoverage.collectVcsInfo("### Collect VCS Info")
3135
kibanaCoverage.generateReports("### Merge coverage reports")
3236
kibanaCoverage.uploadCombinedReports()
33-
kibanaCoverage.ingest(env.JOB_NAME, BUILD_NUMBER, BUILD_URL, timestamp, previousSha, '### Ingest && Upload')
3437
kibanaCoverage.uploadCoverageStaticSite(timestamp)
38+
kibanaCoverage.ingest(env.JOB_NAME, BUILD_NUMBER, BUILD_URL, timestamp, previousSha, teamAssignmentsPath(), '### Generate Team Assignments && Ingest')
3539
}
3640

3741
def handlePreviousSha() {
@@ -42,11 +46,15 @@ def handlePreviousSha() {
4246

4347
def handleFail() {
4448
def buildStatus = buildUtils.getBuildStatus()
45-
if(params.NOTIFY_ON_FAILURE && buildStatus != 'SUCCESS' && buildStatus != 'ABORTED' && buildStatus != 'UNSTABLE') {
49+
if (params.NOTIFY_ON_FAILURE && buildStatus != 'SUCCESS' && buildStatus != 'ABORTED' && buildStatus != 'UNSTABLE') {
4650
slackNotifications.sendFailedBuild(
4751
channel: '#kibana-qa',
4852
username: 'Kibana QA'
4953
)
5054
}
5155
}
5256

57+
def teamAssignmentsPath() {
58+
return 'src/dev/code_coverage/ingest_coverage/team_assignment/team_assignments.txt'
59+
}
60+

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,7 @@ module.exports = {
388388
*/
389389
{
390390
files: [
391+
'**/*.stories.tsx',
391392
'x-pack/test/apm_api_integration/**/*.ts',
392393
'x-pack/test/functional/apps/**/*.js',
393394
'x-pack/plugins/apm/**/*.js',

.github/CODEOWNERS

Lines changed: 124 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
# Identify which groups will be pinged by changes to different parts of the codebase.
33
# For more info, see https://help.github.com/articles/about-codeowners/
44

5+
# The #CC# prefix delineates Code Coverage,
6+
# used for the 'team' designator within Kibana Stats
7+
58
# App
69
/x-pack/plugins/dashboard_enhanced/ @elastic/kibana-app
710
/x-pack/plugins/discover_enhanced/ @elastic/kibana-app
@@ -14,6 +17,7 @@
1417
/src/plugins/input_control_vis/ @elastic/kibana-app
1518
/src/plugins/management/ @elastic/kibana-app
1619
/src/plugins/kibana_legacy/ @elastic/kibana-app
20+
/src/plugins/timelion/ @elastic/kibana-app
1721
/src/plugins/vis_default_editor/ @elastic/kibana-app
1822
/src/plugins/vis_type_markdown/ @elastic/kibana-app
1923
/src/plugins/vis_type_metric/ @elastic/kibana-app
@@ -26,6 +30,24 @@
2630
/src/plugins/vis_type_xy/ @elastic/kibana-app
2731
/src/plugins/visualize/ @elastic/kibana-app
2832
/src/plugins/visualizations/ @elastic/kibana-app
33+
#CC# /src/legacy/core_plugins/kibana/public/local_application_service/ @elastic/kibana-app
34+
#CC# /src/legacy/core_plugins/kibana/ @elastic/kibana-app
35+
#CC# /src/legacy/core_plugins/kibana/common/utils @elastic/kibana-app
36+
#CC# /src/legacy/core_plugins/kibana/migrations @elastic/kibana-app
37+
#CC# /src/legacy/core_plugins/kibana/public @elastic/kibana-app
38+
#CC# /src/legacy/core_plugins/kibana/public/dashboard/ @elastic/kibana-app
39+
#CC# /src/legacy/core_plugins/kibana/public/discover/ @elastic/kibana-app
40+
#CC# /src/legacy/core_plugins/kibana/public/local_application_service/ @elastic/kibana-app
41+
#CC# /src/legacy/core_plugins/input_control_vis @elastic/kibana-app
42+
#CC# /src/legacy/core_plugins/timelion @elastic/kibana-app
43+
#CC# /src/legacy/core_plugins/vis_type_tagcloud @elastic/kibana-app
44+
#CC# /src/legacy/core_plugins/vis_type_vega @elastic/kibana-app
45+
#CC# /src/legacy/core_plugins/vis_type_vislib/ @elastic/kibana-app
46+
#CC# /src/legacy/server/url_shortening/ @elastic/kibana-app
47+
#CC# /src/legacy/ui/public/state_management @elastic/kibana-app
48+
#CC# /src/plugins/index_pattern_management/public @elastic/kibana-app
49+
#CC# /x-pack/legacy/plugins/dashboard_mode/ @elastic/kibana-app
50+
#CC# /x-pack/plugins/dashboard_mode @elastic/kibana-app
2951

3052
# App Architecture
3153
/examples/bfetch_explorer/ @elastic/kibana-app-arch
@@ -56,12 +78,37 @@
5678
/x-pack/plugins/data_enhanced/ @elastic/kibana-app-arch
5779
/x-pack/plugins/embeddable_enhanced/ @elastic/kibana-app-arch
5880
/x-pack/plugins/ui_actions_enhanced/ @elastic/kibana-app-arch
81+
#CC# /src/legacy/core_plugins/kibana/public/management/ @elastic/kibana-app-arch
82+
#CC# /src/legacy/core_plugins/kibana/server/routes/api/management/ @elastic/kibana-app-arch
83+
#CC# /src/legacy/core_plugins/embeddable_api/ @elastic/kibana-app-arch
84+
#CC# /src/legacy/core_plugins/interpreter/ @elastic/kibana-app-arch
85+
#CC# /src/legacy/core_plugins/kibana_react/ @elastic/kibana-app-arch
86+
#CC# /src/legacy/core_plugins/status_page/public @elastic/kibana-app-arch
87+
#CC# /src/legacy/server/index_patterns/ @elastic/kibana-app-arch
88+
#CC# /src/legacy/ui/public/field_editor @elastic/kibana-app-arch
89+
#CC# /src/legacy/ui/public/management @elastic/kibana-app-arch
90+
#CC# /src/plugins/advanced_settings/ @elastic/kibana-app-arch
91+
#CC# /src/plugins/bfetch/ @elastic/kibana-app-arch
92+
#CC# /src/plugins/charts/ @elastic/kibana-app-arch
93+
#CC# /src/plugins/index_pattern_management/public/service @elastic/kibana-app-arch
94+
#CC# /src/plugins/inspector/ @elastic/kibana-app-arch
95+
#CC# /src/plugins/saved_objects/ @elastic/kibana-app-arch
96+
#CC# /src/plugins/share/ @elastic/kibana-app-arch
97+
#CC# /src/plugins/vis_default_editor @elastic/kibana-app-arch
98+
#CC# /x-pack/plugins/advanced_ui_actions/ @elastic/kibana-app-arch
99+
#CC# /x-pack/plugins/drilldowns/ @elastic/kibana-app-arch
100+
#CC# /packages/kbn-interpreter/ @elastic/kibana-app-arch
59101

60102
# APM
61103
/x-pack/plugins/apm/ @elastic/apm-ui
62104
/x-pack/test/functional/apps/apm/ @elastic/apm-ui
63105
/src/plugins/apm_oss/ @elastic/apm-ui
64106
/src/apm.js @watson @vigneshshanmugam
107+
#CC# /src/plugins/apm_oss/ @elastic/apm-ui
108+
#CC# /src/legacy/core_plugins/apm_oss/ @elastic/apm-ui
109+
#CC# /src/legacy/ui/public/apm @elastic/apm-ui
110+
#CC# /x-pack/legacy/plugins/apm/ @elastic/apm-ui
111+
#CC# /x-pack/plugins/observability/ @elastic/apm-ui
65112

66113
# Client Side Monitoring (lives in APM directories but owned by Uptime)
67114
/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm @elastic/uptime
@@ -71,20 +118,33 @@
71118
/x-pack/plugins/apm/server/lib/rum_client @elastic/uptime
72119
/x-pack/plugins/apm/server/routes/rum_client.ts @elastic/uptime
73120
/x-pack/plugins/apm/server/projections/rum_page_load_transactions.ts @elastic/uptime
121+
/x-pack/plugins/apm/server/projections/rum_overview.ts @elastic/uptime
122+
#CC# /x-pack/legacy/plugins/uptime @elastic/uptime
74123

75124
# Beats
76125
/x-pack/plugins/beats_management/ @elastic/beats
126+
/x-pack/legacy/plugins/beats_management/ @elastic/beats
127+
#CC# /x-pack/plugins/beats_management/ @elastic/beats
77128

78129
# Canvas
79130
/x-pack/plugins/canvas/ @elastic/kibana-canvas
80131
/x-pack/test/functional/apps/canvas/ @elastic/kibana-canvas
132+
#CC# /src/plugins/kibana_react/public/code_editor/ @elastic/kibana-canvas
133+
#CC# /x-pack/legacy/plugins/canvas/ @elastic/kibana-canvas
81134

82135
# Core UI
83136
# Exclude tutorials folder for now because they are not owned by Kibana app and most will move out soon
84137
/src/plugins/home/public @elastic/kibana-core-ui
85138
/src/plugins/home/server/*.ts @elastic/kibana-core-ui
86139
/src/plugins/home/server/services/ @elastic/kibana-core-ui
87140
/x-pack/plugins/global_search_bar/ @elastic/kibana-core-ui
141+
#CC# /src/legacy/core_plugins/newsfeed @elastic/kibana-core-ui
142+
#CC# /src/legacy/server/sample_data/ @elastic/kibana-core-ui
143+
#CC# /src/plugins/newsfeed @elastic/kibana-core-ui
144+
#CC# /src/plugins/home/public @elastic/kibana-core-ui
145+
#CC# /src/plugins/home/server/services/ @elastic/kibana-core-ui
146+
#CC# /src/plugins/home/ @elastic/kibana-core-ui
147+
#CC# /x-pack/plugins/global_search_providers/ @elastic/kibana-core-ui
88148

89149
# Observability UIs
90150
/x-pack/plugins/infra/ @elastic/logs-metrics-ui
@@ -110,6 +170,14 @@
110170
/x-pack/test/functional/apps/maps/ @elastic/kibana-gis
111171
/x-pack/test/functional/es_archives/maps/ @elastic/kibana-gis
112172
/x-pack/test/visual_regression/tests/maps/index.js @elastic/kibana-gis
173+
#CC# /src/legacy/core_plugins/region_map @elastic/kibana-gis
174+
#CC# /src/legacy/core_plugins/tile_map @elastic/kibana-gis
175+
#CC# /src/plugins/maps_legacy/ @elastic/kibana-gis
176+
#CC# /x-pack/plugins/file_upload @elastic/kibana-gis
177+
#CC# /x-pack/plugins/maps_legacy_licensing @elastic/kibana-gis
178+
#CC# /src/plugins/home/server/tutorials @elastic/kibana-gis
179+
#CC# /src/plugins/tile_map/ @elastic/kibana-gis
180+
#CC# /src/plugins/region_map/ @elastic/kibana-gis
113181

114182
# Operations
115183
/src/dev/ @elastic/kibana-operations
@@ -132,6 +200,7 @@
132200
/src/legacy/server/warnings/ @elastic/kibana-operations
133201
/.ci/es-snapshots/ @elastic/kibana-operations
134202
/vars/ @elastic/kibana-operations
203+
#CC# /packages/kbn-expect/ @elastic/kibana-operations
135204

136205
# Quality Assurance
137206
/src/dev/code_coverage @elastic/kibana-qa
@@ -158,6 +227,31 @@
158227
/src/plugins/status_page/ @elastic/kibana-platform
159228
/src/plugins/saved_objects_management/ @elastic/kibana-platform
160229
/src/dev/run_check_published_api_changes.ts @elastic/kibana-platform
230+
#CC# /src/core/server/csp/ @elastic/kibana-platform
231+
#CC# /src/legacy/core_plugins/kibana/server/lib @elastic/kibana-platform
232+
#CC# /src/legacy/core_plugins/kibana/server/lib/management/saved_objects @elastic/kibana-platform
233+
#CC# /src/legacy/core_plugins/kibana/server/routes/api/import/ @elastic/kibana-platform
234+
#CC# /src/legacy/core_plugins/kibana/server/routes/api/export/ @elastic/kibana-platform
235+
#CC# /src/legacy/core_plugins/elasticsearch @elastic/kibana-platform
236+
#CC# /src/legacy/core_plugins/testbed @elastic/kibana-platform
237+
#CC# /src/legacy/server/config/ @elastic/kibana-platform
238+
#CC# /src/legacy/server/http/ @elastic/kibana-platform
239+
#CC# /src/legacy/server/status/ @elastic/kibana-platform
240+
#CC# /src/legacy/ui/public/new_platform @elastic/kibana-platform
241+
#CC# /src/legacy/ui/public/plugin_discovery @elastic/kibana-platform
242+
#CC# /src/legacy/ui/public/chrome @elastic/kibana-platform
243+
#CC# /src/legacy/ui/public/notify @elastic/kibana-platform
244+
#CC# /src/legacy/ui/public/documentation_links @elastic/kibana-platform
245+
#CC# /src/legacy/ui/public/autoload @elastic/kibana-platform
246+
#CC# /src/plugins/legacy_export/ @elastic/kibana-platform
247+
#CC# /src/plugins/status_page/ @elastic/kibana-platform
248+
#CC# /src/plugins/testbed/server/ @elastic/kibana-platform
249+
#CC# /x-pack/legacy/plugins/xpack_main/server/ @elastic/kibana-platform
250+
#CC# /x-pack/legacy/server/lib/ @elastic/kibana-platform
251+
#CC# /x-pack/plugins/cloud/ @elastic/kibana-platform
252+
#CC# /x-pack/plugins/features/ @elastic/kibana-platform
253+
#CC# /x-pack/plugins/global_search/ @elastic/kibana-platform
254+
#CC# /src/legacy/plugin_discovery/ @elastic/kibana-platform
161255

162256
# Security
163257
/src/core/server/csp/ @elastic/kibana-security @elastic/kibana-platform
@@ -177,12 +271,19 @@
177271
/x-pack/test/security_functional/ @elastic/kibana-security
178272
/x-pack/test/spaces_api_integration/ @elastic/kibana-security
179273
/x-pack/test/token_api_integration/ @elastic/kibana-security
274+
#CC# /src/legacy/ui/public/capabilities @elastic/kibana-security
275+
#CC# /x-pack/legacy/plugins/encrypted_saved_objects/ @elastic/kibana-security
276+
#CC# /x-pack/plugins/security_solution/ @elastic/kibana-security
277+
#CC# /x-pack/plugins/security/ @elastic/kibana-security
278+
#CC# /x-pack/plugins/audit_trail/ @elastic/kibana-security
180279

181280
# Kibana Localization
182281
/src/dev/i18n/ @elastic/kibana-localization
183282
/src/legacy/server/i18n/ @elastic/kibana-localization
184283
/src/core/public/i18n/ @elastic/kibana-localization
185284
/packages/kbn-i18n/ @elastic/kibana-localization
285+
#CC# /src/legacy/server/i18n/ @elastic/kibana-localization
286+
#CC# /x-pack/plugins/translations/ @elastic/kibana-localization
186287

187288
# Kibana Telemetry
188289
/packages/kbn-analytics/ @elastic/kibana-telemetry
@@ -211,21 +312,16 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
211312
/x-pack/plugins/triggers_actions_ui/ @elastic/kibana-alerting-services
212313
/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/ @elastic/kibana-alerting-services
213314
/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/ @elastic/kibana-alerting-services
315+
#CC# /x-pack/legacy/plugins/actions/ @elastic/kibana-alerting-services
316+
#CC# /x-pack/legacy/plugins/alerting/ @elastic/kibana-alerting-services
317+
#CC# /x-pack/legacy/plugins/task_manager @elastic/kibana-alerting-services
318+
#CC# /x-pack/legacy/plugins/triggers_actions_ui/ @elastic/kibana-alerting-services
319+
#CC# /x-pack/plugins/alerting_builtins @elastic/kibana-alerting-services
214320

215321
# Enterprise Search
216322
# Shared
217323
/x-pack/plugins/enterprise_search/ @elastic/enterprise-search-frontend
218324
/x-pack/test/functional_enterprise_search/ @elastic/enterprise-search-frontend
219-
# App Search
220-
/x-pack/plugins/enterprise_search/public/applications/app_search @elastic/app-search-frontend
221-
/x-pack/plugins/enterprise_search/server/routes/app_search @elastic/app-search-frontend
222-
/x-pack/plugins/enterprise_search/server/collectors/app_search @elastic/app-search-frontend
223-
/x-pack/plugins/enterprise_search/server/saved_objects/app_search @elastic/app-search-frontend
224-
# Workplace Search
225-
/x-pack/plugins/enterprise_search/public/applications/workplace_search @elastic/workplace-search-frontend
226-
/x-pack/plugins/enterprise_search/server/routes/workplace_search @elastic/workplace-search-frontend
227-
/x-pack/plugins/enterprise_search/server/collectors/workplace_search @elastic/workplace-search-frontend
228-
/x-pack/plugins/enterprise_search/server/saved_objects/workplace_search @elastic/workplace-search-frontend
229325

230326
# Elasticsearch UI
231327
/src/plugins/dev_tools/ @elastic/es-ui
@@ -248,6 +344,14 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
248344
/x-pack/plugins/ingest_pipelines/ @elastic/es-ui
249345
/packages/kbn-ace/ @elastic/es-ui
250346
/packages/kbn-monaco/ @elastic/es-ui
347+
#CC# /src/legacy/core_plugins/kibana/public/dev_tools/ @elastic/es-ui
348+
#CC# /src/legacy/core_plugins/console_legacy @elastic/es-ui
349+
#CC# /x-pack/legacy/plugins/rollup/ @elastic/es-ui
350+
#CC# /x-pack/legacy/server/lib/create_router/ @elastic/es-ui
351+
#CC# /x-pack/legacy/server/lib/check_license/ @elastic/es-ui
352+
#CC# /x-pack/plugins/console_extensions/ @elastic/es-ui
353+
#CC# /x-pack/plugins/cross_cluster_replication/ @elastic/es-ui
354+
#CC# /x-pack/plugins/es_ui_shared/ @elastic/es-u
251355

252356
# Endpoint
253357
/x-pack/plugins/endpoint/ @elastic/endpoint-app-team @elastic/siem
@@ -257,6 +361,9 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
257361
/x-pack/test/functional/es_archives/endpoint/ @elastic/endpoint-app-team @elastic/siem
258362
/x-pack/test/plugin_functional/plugins/resolver_test/ @elastic/endpoint-app-team @elastic/siem
259363
/x-pack/test/plugin_functional/test_suites/resolver/ @elastic/endpoint-app-team @elastic/siem
364+
#CC# /x-pack/legacy/plugins/siem/ @elastic/siem
365+
#CC# /x-pack/plugins/siem/ @elastic/siem
366+
#CC# /x-pack/plugins/security_solution/ @elastic/siem
260367

261368
# Security Solution
262369
/x-pack/plugins/security_solution/ @elastic/siem @elastic/endpoint-app-team
@@ -271,6 +378,7 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
271378

272379
# Design (at the bottom for specificity of SASS files)
273380
**/*.scss @elastic/kibana-design
381+
#CC# /packages/kbn-ui-framework/ @elastic/kibana-design
274382

275383
# Core design
276384
/src/plugins/dashboard/**/*.scss @elastic/kibana-core-ui-designers
@@ -292,3 +400,9 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
292400
/x-pack/plugins/endpoint/**/*.scss @elastic/security-design
293401
/x-pack/plugins/security_solution/**/*.scss @elastic/security-design
294402

403+
# Logstash
404+
#CC# /x-pack/plugins/logstash/ @elastic/logstash
405+
406+
# Reporting
407+
#CC# /x-pack/plugins/reporting/ @elastic/kibana-reporting-services
408+

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ Delete any items that are not applicable to this PR.
99
- [ ] Any text added follows [EUI's writing guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses sentence case text and includes [i18n support](https://github.com/elastic/kibana/blob/master/packages/kbn-i18n/README.md)
1010
- [ ] [Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html) was added for features that require explanation or tutorials
1111
- [ ] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios
12-
- [ ] This was checked for [keyboard-only and screenreader accessibility](https://developer.mozilla.org/en-US/docs/Learn/Tools_and_testing/Cross_browser_testing/Accessibility#Accessibility_testing_checklist)
13-
- [ ] This renders correctly on smaller devices using a responsive layout. (You can test this [in your browser](https://www.browserstack.com/guide/responsive-testing-on-local-server)
12+
- [ ] Any UI touched in this PR is usable by keyboard only (learn more about [keyboard accessibility](https://webaim.org/techniques/keyboard/))
13+
- [ ] Any UI touched in this PR does not create any new axe failures (run axe in browser: [FF](https://addons.mozilla.org/en-US/firefox/addon/axe-devtools/), [Chrome](https://chrome.google.com/webstore/detail/axe-web-accessibility-tes/lhdoppojpmngadmnindnejefpokejbdd?hl=en-US))
14+
- [ ] This renders correctly on smaller devices using a responsive layout. (You can test this [in your browser](https://www.browserstack.com/guide/responsive-testing-on-local-server))
1415
- [ ] This was checked for [cross-browser compatibility](https://www.elastic.co/support/matrix#matrix_browsers)
1516

1617
### For maintainers

.telemetryrc.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
"exclude": [
66
"src/plugins/kibana_react/",
77
"src/plugins/testbed/",
8-
"src/plugins/kibana_utils/",
9-
"src/plugins/kibana_usage_collection/server/collectors/ui_metric/telemetry_ui_metric_collector.ts"
8+
"src/plugins/kibana_utils/"
109
]
1110
}
1211
]

NOTICE.txt

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,30 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
208208
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
209209
SOFTWARE.
210210

211+
---
212+
MIT License
213+
214+
Copyright (c) 2014-present Sebastian McKenzie and other contributors
215+
216+
Permission is hereby granted, free of charge, to any person obtaining
217+
a copy of this software and associated documentation files (the
218+
"Software"), to deal in the Software without restriction, including
219+
without limitation the rights to use, copy, modify, merge, publish,
220+
distribute, sublicense, and/or sell copies of the Software, and to
221+
permit persons to whom the Software is furnished to do so, subject to
222+
the following conditions:
223+
224+
The above copyright notice and this permission notice shall be
225+
included in all copies or substantial portions of the Software.
226+
227+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
228+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
229+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
230+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
231+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
232+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
233+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
234+
211235
---
212236
This product bundles bootstrap@3.3.6 which is available under a
213237
"MIT" license.

config/kibana.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@
2727
# The URLs of the Elasticsearch instances to use for all your queries.
2828
#elasticsearch.hosts: ["http://localhost:9200"]
2929

30-
# When this setting's value is true Kibana uses the hostname specified in the server.host
31-
# setting. When the value of this setting is false, Kibana uses the hostname of the host
32-
# that connects to this Kibana instance.
33-
#elasticsearch.preserveHost: true
34-
3530
# Kibana uses an index in Elasticsearch to store saved searches, visualizations and
3631
# dashboards. Kibana creates a new index if the index doesn't already exist.
3732
#kibana.index: ".kibana"
@@ -81,9 +76,6 @@
8176
# Time in milliseconds for Elasticsearch to wait for responses from shards. Set to 0 to disable.
8277
#elasticsearch.shardTimeout: 30000
8378

84-
# Time in milliseconds to wait for Elasticsearch at Kibana startup before retrying.
85-
#elasticsearch.startupTimeout: 5000
86-
8779
# Logs queries sent to Elasticsearch. Requires logging.verbose set to true.
8880
#elasticsearch.logQueries: false
8981

0 commit comments

Comments
 (0)