Support for NPM on Windows#688
Merged
albertvaka merged 4 commits intomasterfrom Mar 17, 2021
Merged
Conversation
derekwbrown
reviewed
Mar 4, 2021
| is_expected.to contain_package('Datadog Agent').with( | ||
| ensure: 'installed', | ||
| install_options: ['/norestart', { 'APIKEY' => 'notakey', 'HOSTNAME' => 'notahost', 'TAGS' => '""', 'NPM' => 'true' }], | ||
| install_options: ['/norestart', { 'APIKEY' => 'notakey', 'HOSTNAME' => 'notahost', 'TAGS' => '""', 'ADDLOCAL' => 'MainApplication,NPM' }], |
There was a problem hiding this comment.
You'll have to open up the file above, but the let statement above implies to me this is only A7.
There's no reason it won't work in A6, does there need to be another change for that?
Contributor
Author
There was a problem hiding this comment.
This is just the test. It only covers A7, but the code is the same for both Agents so I don't think we need to test both.
albertvaka
changed the title
mx-psi
approved these changes
Mar 15, 2021
cegeka-jenkins
pushed a commit
to cegeka/puppet-datadog_agent
that referenced
this pull request
Feb 5, 2026
Use MSI's standard ADDLOCAL to install optional components instead of the custom NPM=true. Allow creating the system-probe.yaml file on Windows as well. Allow setting the network_config.enabled option in system-probe.yaml.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
ADDLOCALto install optional components instead of the customNPM=true.system-probe.yamlfile on Windows as well.network_config.enabledoption insystem-probe.yaml.Motivation
Follow up to #683
The separate
$windows_npm_installoption is still needed since the class that installs the Agent and the class that configure the system-probe are separate.ADDLOCALworks even if the Agent is already installed, whileNPM=trueonly works for new installs. I haven't tested if Puppet will actually call the MSI again even if the same version is already installed, so this might have no effect, but we want to deprecatedNPM=trueanyway.