Skip to content

Commit

Permalink
Merge branch 'master' into fix_browser_date_format
Browse files Browse the repository at this point in the history
  • Loading branch information
elasticmachine authored Feb 20, 2020
2 parents 6f1faa0 + 39c835a commit cb3fbaa
Show file tree
Hide file tree
Showing 95 changed files with 2,576 additions and 2,074 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
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 cb3fbaa

Please sign in to comment.