Stop requiring net-tools for Splunk 8.x and newer

Also make sure to not install net-tools on splunk enterprise, this was just added to the splunk forwarder, not for splunk enterprise in #335
voxpupuli · Mar 17, 2024 · 6f4cb20 · 6f4cb20
1 parent 1054ac0
commit 6f4cb20
Show file tree

Hide file tree

Showing 3 changed files with 354 additions and 344 deletions.
diff --git a/manifests/enterprise/install/nix.pp b/manifests/enterprise/install/nix.pp
@@ -30,8 +30,13 @@
     }
   }
 
-  # Required for splunk 7.2.4.2
-  if $splunk::params::manage_net_tools and versioncmp($splunk::enterprise::version, '7.2.4.2') >= 0 {
+  # Required for splunk from 7.2.4.2 until 8.0.0
+  if (
+    $splunk::params::manage_net_tools and
+    $facts['kernel'] == 'Linux' and
+    versioncmp($splunk::enterprise::version, '7.2.4.2') >= 0 and
+    versioncmp($splunk::enterprise::version, '8.0.0') == -1
+  ) {
     stdlib::ensure_packages(['net-tools'], {
         'ensure' => 'present',
     })

diff --git a/manifests/forwarder/install.pp b/manifests/forwarder/install.pp
@@ -61,8 +61,13 @@
     }
   }
 
-  # Required for splunk 7.2.4.2
-  if $splunk::params::manage_net_tools and $facts['kernel'] == 'Linux' and (versioncmp($splunk::forwarder::version, '7.2.4.2') >= 0) {
+  # Required for splunk from 7.2.4.2 until 8.0.0
+  if (
+    $splunk::params::manage_net_tools and
+    $facts['kernel'] == 'Linux' and
+    versioncmp($splunk::forwarder::version, '7.2.4.2') >= 0 and
+    versioncmp($splunk::forwarder::version, '8.0.0') == -1
+  ) {
     stdlib::ensure_packages(['net-tools'], {
         'ensure' => 'present',
     })