Skip to content

Commit

Permalink
Stop overriding logging.{ecs,json} defaults (#6613)
Browse files Browse the repository at this point in the history
Co-authored-by: stuart nelson <[email protected]>
  • Loading branch information
axw and stuartnelson3 authored Nov 15, 2021
1 parent 642aaee commit edca170
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 29 deletions.
7 changes: 0 additions & 7 deletions _meta/beat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1002,13 +1002,6 @@ output.elasticsearch:
# Unix epoch. Defaults to disabled.
#interval: 0

# Set to true to log messages in json format.
#logging.json: true

# Set to true, to log messages with minimal required Elastic Common Schema (ECS)
# information. Recommended to use in combination with `logging.json=true`.
#logging.ecs: true

#=============================== HTTP Endpoint ===============================

# apm-server can expose internal metrics through a HTTP endpoint. For security
Expand Down
7 changes: 0 additions & 7 deletions apm-server.docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1002,13 +1002,6 @@ output.elasticsearch:
# Unix epoch. Defaults to disabled.
#interval: 0

# Set to true to log messages in json format.
#logging.json: true

# Set to true, to log messages with minimal required Elastic Common Schema (ECS)
# information. Recommended to use in combination with `logging.json=true`.
#logging.ecs: true

#=============================== HTTP Endpoint ===============================

# apm-server can expose internal metrics through a HTTP endpoint. For security
Expand Down
7 changes: 0 additions & 7 deletions apm-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1002,13 +1002,6 @@ output.elasticsearch:
# Unix epoch. Defaults to disabled.
#interval: 0

# Set to true to log messages in json format.
#logging.json: true

# Set to true, to log messages with minimal required Elastic Common Schema (ECS)
# information. Recommended to use in combination with `logging.json=true`.
#logging.ecs: true

#=============================== HTTP Endpoint ===============================

# apm-server can expose internal metrics through a HTTP endpoint. For security
Expand Down
1 change: 1 addition & 0 deletions changelogs/head.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ https://github.com/elastic/apm-server/compare/7.15\...master[View commits]
- Onboarding documents are no longer indexed {pull}6431[6431]
- Removed `apm-server.register.ingest.pipeline` and `output.elasticsearch.pipeline` configuration options {pull}6575[6575]
- Removed unused `span.start.us` field, and deprecated `span.http.*` fields {pull}6602[6602]
- Removed `logging.ecs` and `logging.json` config {pull}6613[6613]

[float]
==== Bug fixes
Expand Down
2 changes: 0 additions & 2 deletions cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ var libbeatConfigOverrides = func() []cfgfile.ConditionalOverride {
"metrics": map[string]interface{}{
"enabled": false,
},
"ecs": true,
"json": true,
},
}),
},
Expand Down
2 changes: 0 additions & 2 deletions systemtest/apmservertest/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,6 @@ func (s *Server) start(tls bool) error {
extra := map[string]interface{}{
// These are config attributes that we always specify,
// as the testing framework relies on them being set.
"logging.ecs": true,
"logging.json": true,
"logging.level": "debug",
"logging.to_stderr": true,
"apm-server.expvar.enabled": true,
Expand Down
4 changes: 0 additions & 4 deletions systemtest/export_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ func TestExportConfigDefaults(t *testing.T) {

expectedConfig := strings.ReplaceAll(`
logging:
ecs: true
json: true
metrics:
enabled: false
path:
Expand All @@ -71,8 +69,6 @@ func TestExportConfigOverrideDefaults(t *testing.T) {

expectedConfig := strings.ReplaceAll(`
logging:
ecs: true
json: true
metrics:
enabled: true
path:
Expand Down

0 comments on commit edca170

Please sign in to comment.