(SIMP-10410) Reduce journal noise (#13)

- Set the journald LogLevelMax to warning for instances to reduce unnecessary
  log noise

SIMP-10410 #close

Author: trevor-vaughan

.fixtures.yml

@@ -14,6 +14,7 @@ fixtures:
       repo: https://github.com/simp/pupmod-voxpupuli-selinux.git
       branch: simp-master
     selinux: https://github.com/simp/pupmod-simp-selinux.git
+    systemd: https://github.com/simp/puppet-systemd.git
 
 # Testing
     auditd: https://github.com/simp/pupmod-simp-auditd.git

CHANGELOG

@@ -1,6 +1,8 @@
 * Tue Aug 03 2021 Trevor Vaughan <tvaughan@onyxoint.com> - 0.1.1
 - Fixed
   - Ensure that dirsrv.target is enabled so that all 389ds instances start at boot
+  - Set the journald LogLevelMax to warning for instances to reduce unnecessary
+    log noise
 
 * Tue Jun 15 2021 Trevor Vaughan <tvaughan@onyxpoint.com> - 0.1.0
 - Initial release

manifests/instance/service.pp

@@ -6,19 +6,28 @@
   Enum['stopped','running'] $ensure     = simplib::dlookup('ds389::instance::service', 'ensure', $name, { 'default_value' => 'running'}),
   Boolean                   $enable     = simplib::dlookup('ds389::instance::service', 'enable', $name, { 'default_value' => true}),
   Boolean                   $hasrestart = simplib::dlookup('ds389::instance::service', 'hasrestart', $name, { 'default_value' => true})
-) {
+){
   assert_private()
 
   $_instance_name = split($title, /^(dirsrv@)?slapd-/)[-1]
 
   # Ensure that services start at boot time
   ensure_resource('service', 'dirsrv.target', { enable => true })
 
-  ensure_resource('service', "dirsrv@${_instance_name}",
-    {
-      ensure     => $ensure,
-      enable     => $enable,
-      hasrestart => $hasrestart
-    }
-  )
+  $_loglevel_override = @(OVERRIDE)
+    [Service]
+    LogLevelMax=warning
+    | OVERRIDE
+
+  ensure_resource('systemd::dropin_file', "00_dirsrv_${_instance_name}_loglevel.conf", {
+    unit    => "dirsrv@${_instance_name}.service",
+    content => $_loglevel_override
+  })
+
+  ensure_resource('service', "dirsrv@${_instance_name}", {
+    ensure     => $ensure,
+    enable     => $enable,
+    hasrestart => $hasrestart,
+    require    => Systemd::Dropin_file["00_dirsrv_${_instance_name}_loglevel.conf"]
+  })
 }

metadata.json

@@ -8,6 +8,10 @@
   "project_page": "https://github.com/simp/pupmod-simp-ds389",
   "issues_url": "https://simp-project.atlassian.net",
   "dependencies": [
+    {
+      "name": "camptocamp/systemd",
+      "version_requirement": ">= 2.7.0 < 3.0.0"
+    },
     {
       "name": "simp/simplib",
       "version_requirement": ">= 4.4.1 < 5.0.0"

spec/acceptance/nodesets/default.yml

@@ -33,3 +33,15 @@ CONFIG:
 <% if ENV['BEAKER_PUPPET_ENVIRONMENT'] -%>
   puppet_environment: <%= ENV['BEAKER_PUPPET_ENVIRONMENT'] %>
 <% end -%>
+  ssh:
+    keepalive: true
+    keepalive_interval: 10
+    keepalive_maxcount: 120
+    host_key:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:host_key].join("\n#{' '*6}- ") %>
+    kex:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:kex].join("\n#{' '*6}- ") %>
+    encryption:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:encryption].join("\n#{' '*6}- ") %>
+    hmac:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:hmac].join("\n#{' '*6}- ") %>

spec/acceptance/nodesets/docker.yml

@@ -26,3 +26,14 @@ CONFIG:
     password: root
     auth_methods:
       - password
+    keepalive: true
+    keepalive_interval: 10
+    keepalive_maxcount: 120
+    host_key:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:host_key].join("\n#{' '*6}- ") %>
+    kex:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:kex].join("\n#{' '*6}- ") %>
+    encryption:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:encryption].join("\n#{' '*6}- ") %>
+    hmac:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:hmac].join("\n#{' '*6}- ") %>

spec/acceptance/nodesets/oel.yml

@@ -34,3 +34,15 @@ CONFIG:
 <% if ENV['BEAKER_PUPPET_ENVIRONMENT'] -%>
   puppet_environment: <%= ENV['BEAKER_PUPPET_ENVIRONMENT'] %>
 <% end -%>
+  ssh:
+    keepalive: true
+    keepalive_interval: 10
+    keepalive_maxcount: 120
+    host_key:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:host_key].join("\n#{' '*6}- ") %>
+    kex:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:kex].join("\n#{' '*6}- ") %>
+    encryption:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:encryption].join("\n#{' '*6}- ") %>
+    hmac:
+      - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:hmac].join("\n#{' '*6}- ") %>