Skip to content

Commit

Permalink
Merge branch 'master' into 57207-fix-log-settings-dnd
Browse files Browse the repository at this point in the history
  • Loading branch information
elasticmachine committed Feb 20, 2020
2 parents a4eb08d + 5cfc5ef commit 25fc73a
Show file tree
Hide file tree
Showing 144 changed files with 2,652 additions and 7,722 deletions.
6 changes: 1 addition & 5 deletions .ci/Jenkinsfile_coverage
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,7 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
]) {
parallel([
'kibana-intake-agent': {
withEnv([
'NODE_ENV=test' // Needed for jest tests only
]) {
kibanaPipeline.intakeWorker('kibana-intake', './test/scripts/jenkins_unit.sh')()
}
kibanaPipeline.intakeWorker('kibana-intake', './test/scripts/jenkins_unit.sh')()
},
'x-pack-intake-agent': {
withEnv([
Expand Down
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
/x-pack/plugins/ingest_manager/ @elastic/ingest
/x-pack/legacy/plugins/ingest_manager/ @elastic/ingest
/x-pack/plugins/observability/ @elastic/logs-metrics-ui @elastic/apm-ui @elastic/uptime @elastic/ingest
/x-pack/legacy/plugins/monitoring/ @elastic/stack-monitoring-ui

# Machine Learning
/x-pack/legacy/plugins/ml/ @elastic/ml-ui
Expand Down
3 changes: 0 additions & 3 deletions docs/management/advanced-options.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,6 @@ into the document when displaying it.
`metrics:max_buckets`:: The maximum numbers of buckets that a single
data source can return. This might arise when the user selects a
short interval (for example, 1s) for a long time period (1 year).
`pageNavigation`:: The style of navigation menu for Kibana.
Choices are Individual, the legacy style where every plugin is represented in the nav,
and Grouped, a new format that bundles related plugins together in nested navigation.
`query:allowLeadingWildcards`:: Allows a wildcard (*) as the first character
in a query clause. Only applies when experimental query features are
enabled in the query bar. To disallow leading wildcards in Lucene queries,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
server:
autoListen: false
port: 8274
logging:
json: true
optimize:
enabled: false
plugins:
initialize: false
migrations:
skip: true
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
server:
autoListen: false
port: 8274
logging:
loggers:
- context: root
appenders:
- console
level: debug
appenders:
console:
kind: console
layout:
kind: json
root:
level: debug
optimize:
enabled: false
plugins:
initialize: false
migrations:
skip: true
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
server:
autoListen: false
port: 8274
logging:
loggers:
- context: root
appenders:
- file
level: debug
appenders:
file:
kind: file
layout:
kind: pattern
root:
level: debug
optimize:
enabled: false
plugins:
initialize: false
migrations:
skip: true
224 changes: 0 additions & 224 deletions src/cli/serve/integration_tests/reload_logging_config.test.js

This file was deleted.

Loading

0 comments on commit 25fc73a

Please sign in to comment.