Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Optional cmd_port & GUI_port on agentv6 due to port conflicts #632

Merged
merged 3 commits into from
Sep 25, 2019
Merged

Optional cmd_port & GUI_port on agentv6 due to port conflicts #632

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4409b1
Optional cmd_port & GUI_port on agentv6 due to port conflicts
mkrabsbp Dec 10, 2018
80479ce
per PR feedback, remove attribute change
iashwash Sep 3, 2019
39ec447
Remove unneeded agent6 prefix.
remeh Sep 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions attributes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,21 @@
# Defaults to 'datadoghq.com', set to 'datadoghq.eu' to send data to the EU site.
default['datadog']['site'] = nil

# The port on which the IPC api listens
# cmd_port: 5001
default['datadog']['agent6_cmd_port'] = nil

# The port for the browser GUI to be served
# Setting 'GUI_port: -1' turns off the GUI completely
# Default is '5002' on Windows and macOS ; turned off on Linux
# GUI_port: -1
default['datadog']['agent6_gui_port'] = nil

# Set a key to true to make the agent6 use the v2 api on that endpoint, false otherwise.
# Leave key value to nil to use agent6 default for that endpoint.
# Supported keys: "series", "events", "service checks"
default['datadog']['use_v2_api'] = {}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the change on this attribute is not needed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @remeh - apologies for the delay on this, I may have missed the comment notification on vacation.


### End of Agent6-only attributes ###
########################################################################

Expand Down
2 changes: 2 additions & 0 deletions templates/default/datadog.yaml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ agent_config = @extra_config.merge({
use_dogstatsd: node['datadog']['dogstatsd'],
statsd_metric_namespace: node['datadog']['statsd_metric_namespace'],
log_level: node['datadog']['log_level'],
cmd_port: node['datadog']['agent6_cmd_port'],
GUI_port: node['datadog']['agent6_gui_port'],

# log agent options
logs_enabled: node['datadog']['enable_logs_agent'],
Expand Down