-
Notifications
You must be signed in to change notification settings - Fork 260
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.
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
Support NPM installation switch #784
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, but I think we can improve the user experience:
NPM only runs if system-probe.yaml
contains a section like this:
network_config:
enabled: true
Although it's technically possible to use Windows NPM with the current PR, you need to do three things:
- Setting
windows_npm_install = true
to install the driver - Setting
system_probe.enabled = true
to create the system-probe.yaml file - Setting
system_probe.extra_config: {"network_config": { "enabled": true } }
to write the above section in the file.
We can simplify this to a great extent with the addition of a new chef property:
default['datadog']['system_probe']['network_enabled'] = true
This property could have the three effects mentioned: installing the driver, enabling the system-probe.yaml creation and writing the above section to the file. We can maintain the existing properties (eg: windows_npm_install
) for users who want full control, but for most cases being able to set a single property will simplify the user experience.
a227af4
to
7fcd0c2
Compare
Found and fixed some issues:
Tested via local changes below: |
The comment has been addressed in the latest commit.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Left one comment but otherwise LGTM.
Co-authored-by: Albert Vaca Cintora <albert.vaca@datadoghq.com>
Tested via local change:
default['datadog']['windows_agent_url'] = 'https://s3.amazonaws.com/dd-agent-mstesting/builds/tagged/'
default['datadog']['windows_npm_install'] = true
default['datadog']['system_probe']['enabled'] = true
dd_agent_installer = "datadog-agent-7.27.0-rc.4-1-x86_64.msi"
and running command:
kitchen converge dd-agent-windows-2012r2-13113
Observed the VM provisioned properly, NPM installed and "C:/ProgramData/Datadog/system-probe.yaml" is created.