Skip to content

Commit 9d682bc

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into actions/feature-usage
2 parents 91287d2 + e4b2b61 commit 9d682bc

2,112 files changed

Lines changed: 85957 additions & 31615 deletions

File tree

Some content is hidden

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

‎.ci/Jenkinsfile_coverage‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ def handleIngestion(timestamp) {
3434
kibanaCoverage.collectVcsInfo("### Collect VCS Info")
3535
kibanaCoverage.generateReports("### Merge coverage reports")
3636
kibanaCoverage.uploadCombinedReports()
37-
kibanaCoverage.ingest(env.JOB_NAME, BUILD_NUMBER, BUILD_URL, timestamp, previousSha, teamAssignmentsPath(), '### Generate Team Assignments && Ingest')
3837
kibanaCoverage.uploadCoverageStaticSite(timestamp)
38+
kibanaCoverage.ingest(env.JOB_NAME, BUILD_NUMBER, BUILD_URL, timestamp, previousSha, teamAssignmentsPath(), '### Generate Team Assignments && Ingest')
3939
}
4040

4141
def handlePreviousSha() {

‎.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: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -329,16 +329,6 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
329329
# Shared
330330
/x-pack/plugins/enterprise_search/ @elastic/enterprise-search-frontend
331331
/x-pack/test/functional_enterprise_search/ @elastic/enterprise-search-frontend
332-
# App Search
333-
/x-pack/plugins/enterprise_search/public/applications/app_search @elastic/app-search-frontend
334-
/x-pack/plugins/enterprise_search/server/routes/app_search @elastic/app-search-frontend
335-
/x-pack/plugins/enterprise_search/server/collectors/app_search @elastic/app-search-frontend
336-
/x-pack/plugins/enterprise_search/server/saved_objects/app_search @elastic/app-search-frontend
337-
# Workplace Search
338-
/x-pack/plugins/enterprise_search/public/applications/workplace_search @elastic/workplace-search-frontend
339-
/x-pack/plugins/enterprise_search/server/routes/workplace_search @elastic/workplace-search-frontend
340-
/x-pack/plugins/enterprise_search/server/collectors/workplace_search @elastic/workplace-search-frontend
341-
/x-pack/plugins/enterprise_search/server/saved_objects/workplace_search @elastic/workplace-search-frontend
342332

343333
# Elasticsearch UI
344334
/src/plugins/dev_tools/ @elastic/es-ui

‎.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
]

‎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)