Skip to content

Commit

Permalink
remove agent_config sample configuration (#5366) (#5367)
Browse files Browse the repository at this point in the history
Since this is predominantly existing for use by
elastic-agent/fleet, exposing this as manual
configuration in the .yml file is not necessary.

(cherry picked from commit 39b703c)

Co-authored-by: stuart nelson <[email protected]>
  • Loading branch information
mergify[bot] and stuartnelson3 authored May 28, 2021
1 parent 7db7063 commit a729b54
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 66 deletions.
22 changes: 0 additions & 22 deletions _meta/beat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -273,28 +273,6 @@ apm-server:
#index_pattern: "apm-*-sourcemap*"

#---------------------------- APM Server - Agent Configuration ----------------------------
# Directly specify agent configuration. If `agent_config` is set, agent
# configuration under `kibana` will be ignored.
# An agent's incoming configuration request will be matched to an
# agent_config with the following precedence:
# - service.name and service.environment match an agent_config
# - service.name matches an agent_config, service.environment == ""
# - service.environment matches an agent_config, service.name == ""
# - an agent_config without a name or environment set
# An empty result is is returned if no matching result is found.
# agent_config:
# - service.name: ten_percent
# service.environment: production
# config:
# capture_body: off
# capture_body: true
# log_level: info
# recording: true
# transaction_sample_rate: 0.1
# - service.name: frontend
# agent.name: rum-js
# config:
# transaction_sample_rate: 0.1

# When using APM agent configuration, information fetched from Kibana will be cached in memory for some time.
# Specify cache key expiration via this setting. Default is 30 seconds.
Expand Down
22 changes: 0 additions & 22 deletions apm-server.docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -273,28 +273,6 @@ apm-server:
#index_pattern: "apm-*-sourcemap*"

#---------------------------- APM Server - Agent Configuration ----------------------------
# Directly specify agent configuration. If `agent_config` is set, agent
# configuration under `kibana` will be ignored.
# An agent's incoming configuration request will be matched to an
# agent_config with the following precedence:
# - service.name and service.environment match an agent_config
# - service.name matches an agent_config, service.environment == ""
# - service.environment matches an agent_config, service.name == ""
# - an agent_config without a name or environment set
# An empty result is is returned if no matching result is found.
# agent_config:
# - service.name: ten_percent
# service.environment: production
# config:
# capture_body: off
# capture_body: true
# log_level: info
# recording: true
# transaction_sample_rate: 0.1
# - service.name: frontend
# agent.name: rum-js
# config:
# transaction_sample_rate: 0.1

# When using APM agent configuration, information fetched from Kibana will be cached in memory for some time.
# Specify cache key expiration via this setting. Default is 30 seconds.
Expand Down
22 changes: 0 additions & 22 deletions apm-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -273,28 +273,6 @@ apm-server:
#index_pattern: "apm-*-sourcemap*"

#---------------------------- APM Server - Agent Configuration ----------------------------
# Directly specify agent configuration. If `agent_config` is set, agent
# configuration under `kibana` will be ignored.
# An agent's incoming configuration request will be matched to an
# agent_config with the following precedence:
# - service.name and service.environment match an agent_config
# - service.name matches an agent_config, service.environment == ""
# - service.environment matches an agent_config, service.name == ""
# - an agent_config without a name or environment set
# An empty result is is returned if no matching result is found.
# agent_config:
# - service.name: ten_percent
# service.environment: production
# config:
# capture_body: off
# capture_body: true
# log_level: info
# recording: true
# transaction_sample_rate: 0.1
# - service.name: frontend
# agent.name: rum-js
# config:
# transaction_sample_rate: 0.1

# When using APM agent configuration, information fetched from Kibana will be cached in memory for some time.
# Specify cache key expiration via this setting. Default is 30 seconds.
Expand Down

0 comments on commit a729b54

Please sign in to comment.