Notify services on system probe file updates

manifests/params.pp

@@ -21,6 +21,7 @@
   $container_collect_all          = false
   $sysprobe_service_name          = 'datadog-agent-sysprobe'
   $securityagent_service_name     = 'datadog-agent-security'
+  $win_npm_service_name           = 'ddnpm'
   $module_metadata                = load_module_metadata($module_name)
 
   case $::operatingsystem {
@@ -64,6 +65,7 @@
       $permissions_file           = '0664' # otherwise puppet itself won't be able to access the file. Reported
       $permissions_protected_file = '0660' # as bug in: https://tickets.puppetlabs.com/browse/PA-2877
       $agent_binary               = 'C:/Program Files/Datadog/Datadog Agent/embedded/agent.exe'
+      $sysprobe_service_name      = 'datadog-system-probe'
     }
     default: { fail("Class[datadog_agent]: Unsupported operatingsystem: ${::operatingsystem}") }
   }

manifests/system_probe.pp

@@ -2,7 +2,7 @@
 #
 # This class contains the Datadog agent system probe (NPM) configuration.
 # On Windows, install the NPM driver by setting 'windows_npm_install' 
-# to 'true on the datadog_agent class.
+# to 'true on both the datadog_agent class and the system_probe class.
 #
 
 class datadog_agent::system_probe(
@@ -14,6 +14,7 @@
   Optional[Hash] $runtime_security_config = undef,
 
   Boolean $service_enable = true,
+  Boolean $windows_npm_install = false,
   String $service_ensure = 'running',
   Optional[String] $service_provider = undef,
 ) inherits datadog_agent::params {
@@ -33,15 +34,21 @@
   }
 
   if $::operatingsystem == 'Windows' {
+    service { $datadog_agent::params::sysprobe_service_name:
+      ensure    => $service_ensure,
+      enable    => $service_enable,
+      hasstatus => false,
+      require   => Package[$datadog_agent::params::package_name],
+    }
 
     file { 'C:/ProgramData/Datadog/system-probe.yaml':
       owner   => $datadog_agent::params::dd_user,
       group   => $datadog_agent::params::dd_group,
       mode    => '0640',
       content => template('datadog_agent/system_probe.yaml.erb'),
       require => File['C:/ProgramData/Datadog'],
+      notify  => Service[$datadog_agent::params::sysprobe_service_name],
     }
-
   } else {
 
     if $service_provider {

manifests/windows.pp

@@ -77,6 +77,16 @@
       install_options => ['/norestart', {'APIKEY' => $api_key, 'TAGS' => $tags_quote_wrap} + $npm_install_option + $hostname_option]
     }
 
+    if $npm_install {
+      service { $datadog_agent::params::win_npm_service_name:
+        ensure    => $service_ensure,
+        enable    => $service_enable,
+        hasstatus => false,
+        require   => Package[$datadog_agent::params::package_name],
+        subscribe => File['C:/ProgramData/Datadog/system-probe.yaml'],
+      }
+    }
+
   } else {
     exec { 'datadog_6_14_fix':
       command  => "((New-Object System.Net.WebClient).DownloadFile('https://s3.amazonaws.com/ddagent-windows-stable/scripts/fix_6_14.ps1', \$env:temp + '\\fix_6_14.ps1')); &\$env:temp\\fix_6_14.ps1",