Skip to content

Commit

Permalink
add changelog and config file entries
Browse files Browse the repository at this point in the history
  • Loading branch information
graphaelli committed Jan 17, 2018
1 parent 67b5002 commit 53b3a70
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
Expand Up @@ -40,6 +40,7 @@ https://github.com/elastic/apm-server/compare/71df0d96445df35afe27f38bcf734a0828
- Add Kibana sourcefilter for `sourcemap.sourcemap` {pull}454[454]
- Increase default 'ConcurrentRequests' from 20 to 40{pull}492[492]
- Add Config option for excluding stack trace frames from `grouping_key` calculation {pull}482[482]
- Expose expvar {pull}509[509]

==== Deprecated

Expand Down
8 changes: 8 additions & 0 deletions _meta/beat.reference.yml
Expand Up @@ -69,3 +69,11 @@ apm-server:
# If the default index pattern at 'outputs.elasticsearch.index' is changed,
# a matching index pattern needs to be specified here.
#index_pattern: "apm*"

# golang expvar support - https://golang.org/pkg/expvar/
#expvar:
# Set to true to Expose expvar
#enabled: false

# Url to expose expvar
#url: "/debug/vars"
8 changes: 8 additions & 0 deletions apm-server.reference.yml
Expand Up @@ -70,6 +70,14 @@ apm-server:
# a matching index pattern needs to be specified here.
#index_pattern: "apm*"

# golang expvar support - https://golang.org/pkg/expvar/
#expvar:
# Set to true to Expose expvar
#enabled: false

# Url to expose expvar
#url: "/debug/vars"

#================================ General ======================================

# The name of the shipper that publishes the network data. It can be used to group
Expand Down

0 comments on commit 53b3a70

Please sign in to comment.