Skip to content

Add support for multiple network configuration options#732

Merged
bkabrda merged 3 commits intoDataDog:mainfrom
ryan-dyer-sp:add-network-options
Jun 2, 2022
Merged

Add support for multiple network configuration options#732
bkabrda merged 3 commits intoDataDog:mainfrom
ryan-dyer-sp:add-network-options

Conversation

@ryan-dyer-sp
Copy link
Copy Markdown
Contributor

What does this PR do?

Updates the network integration to support the current set of options available.

Motivation

need support for ENA metrics in the network integration via puppet

Additional Notes

Describe your test plan

Just manual testing using the module and updating various variables to ensure they rendered conf.yaml contained the correct data.

@ryan-dyer-sp ryan-dyer-sp requested a review from a team as a code owner May 13, 2022 20:14
Copy link
Copy Markdown

@bkabrda bkabrda left a comment

Choose a reason for hiding this comment

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

Hi 👋. Thanks a lot for submitting this PR. Overall it looks good, but I requested some minor changes (see the comments inline) to make it consistent with the actual defaults. Once these get fixed, I can merge.

Comment thread manifests/integrations/network.pp Outdated
Comment thread manifests/integrations/network.pp Outdated
Comment thread manifests/integrations/network.pp Outdated
Comment thread templates/agent-conf.d/network.yaml.erb
@ryan-dyer-sp
Copy link
Copy Markdown
Contributor Author

@bkabrda comments addressed except for the service one. If you're wanting me to add service to init_config along with that which is in instance, lmk.

@bkabrda
Copy link
Copy Markdown

bkabrda commented Jun 1, 2022

@ryan-dyer-sp thanks for doing the changes. Could you possibly rebase on top of latest main branch? This should fix the CI - once that is green, I can merge the PR. Thanks!

Signed-off-by: Ryan Dyer <ryan-dyer-sp@users.noreply.github.com>
@ryan-dyer-sp ryan-dyer-sp force-pushed the add-network-options branch from d18598e to 80e1d62 Compare June 1, 2022 13:46
@ryan-dyer-sp
Copy link
Copy Markdown
Contributor Author

@bkabrda rebased and CI now passing

Copy link
Copy Markdown

@bkabrda bkabrda left a comment

Choose a reason for hiding this comment

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

LGTM now. Thanks for the PR!

@bkabrda bkabrda merged commit 7e63d59 into DataDog:main Jun 2, 2022
cegeka-jenkins pushed a commit to cegeka/puppet-datadog_agent that referenced this pull request Feb 5, 2026
Signed-off-by: Ryan Dyer <ryan-dyer-sp@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants