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

Jump to bottom

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

merged 3 commits into from
Sep 25, 2019

Conversation

iashwash
Copy link
Contributor

I ran into a local port collision as well.
This is just the commit from #577 with the merge conflict resolved.

I tested agent5 and agent6 deployments to verify no issues with bringing up datadog agent after cooking.

@iashwash
Copy link
Contributor Author

iashwash commented Jul 9, 2019

Build failure unrelated to this PR:

Err:1 https://packages.chef.io/repos/apt/stable precise/main amd64 chefdk amd64 2.3.1-1
  Operation too slow. Less than 10 bytes/sec transferred the last 10 seconds
E: Failed to fetch https://packages.chef.io/repos/apt/stable/ubuntu/12.04/chefdk_2.3.1-1_amd64.deb  Operation too slow. Less than 10 bytes/sec transferred the last 10 seconds

remeh
remeh requested changes Jul 10, 2019
View reviewed changes
Copy link
Contributor

@remeh remeh left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Hey @iashwash , thank you for your contribution! I've left a comment on a change that is not needed in my opinion, please let me know.

attributes/default.rb Outdated
# 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.

@remeh
Copy link
Contributor

remeh commented Sep 25, 2019

Hey @iashwash I made a slight change to remove the unneeded agent6 prefix (they don't conflict with any agent5 field).
I'll merge this and it'll be part of the next release! 📦
Thanks again.

@remeh remeh merged commit fd45239 into DataDog:master Sep 25, 2019
@remeh remeh mentioned this pull request Sep 25, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@remeh remeh remeh requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@iashwash @remeh @mkrabsbp