Manage journald service and configuration

data/common.yaml

@@ -20,3 +20,5 @@ systemd::ntp_server: ~
 systemd::fallback_ntp_server: ~
 systemd::manage_accounting: false
 systemd::accounting: {}
+systemd::manage_journald: false
+systemd::journald_config: {}

manifests/init.pp

@@ -68,6 +68,13 @@
 #   A space-separated list of NTP server host names or IP addresses to be used
 #   as the fallback NTP servers. Any per-interface NTP servers obtained from
 #   systemd-networkd take precedence over this setting. requires puppetlabs-inifile
+#
+# @param manage_journald
+#   Managed the systemd journald daemon and config
+#
+# @param journald_config
+#   Config Hash that is used to configure settings in journald.conf
+#
 class systemd (
   Hash[String,Hash[String, Any]]                         $service_limits,
   Boolean                                                $manage_resolved,
@@ -90,6 +97,8 @@
   Optional[Variant[Array,String]]                        $fallback_ntp_server,
   Boolean                                                $manage_accounting,
   Hash[String,String]                                    $accounting,
+  Boolean                                                $manage_journald,
+  Hash[String, String]                                   $journald_config,
 ){
 
   contain systemd::systemctl::daemon_reload
@@ -111,4 +120,8 @@
   if $manage_accounting {
     contain systemd::system
   }
+
+  if $manage_journald {
+    contain systemd::journald
+  }
 }

manifests/journald.pp

@@ -0,0 +1,23 @@
+# **NOTE: THIS IS A [PRIVATE](https://github.com/puppetlabs/puppetlabs-stdlib#assert_private) CLASS**
+#
+# This class provides a solution to managed journald
+#
+class systemd::journald {
+
+  assert_private()
+
+  $systemd::journald_config.each |$option, $value| {
+    ini_setting{ $option:
+      ensure  => 'present',
+      path    => '/etc/systemd/journald.conf',
+      section => 'Journal',
+      setting => $option,
+      value   => $value,
+      notify  => Service['systemd-journald'],
+    }
+  }
+
+  service { 'systemd-journald':
+    ensure => 'running',
+  }
+}

spec/classes/init_spec.rb

@@ -12,6 +12,7 @@
         it { is_expected.to_not create_service('systemd-resolved') }
         it { is_expected.to_not create_service('systemd-networkd') }
         it { is_expected.to_not create_service('systemd-timesyncd') }
+        it { is_expected.to_not create_service('systemd-journald') }
 
         context 'when enabling resolved and networkd' do
           let(:params) {{
@@ -158,6 +159,45 @@
           end
           it { is_expected.to compile.with_all_deps }
         end
+
+        context 'when managing journald' do
+          let :params do
+            {
+              manage_journald: true,
+            }
+          end
+
+          it { is_expected.to contain_class('systemd::journald') }
+          it { is_expected.to contain_service('systemd-journald').with_ensure('running') }
+          it { is_expected.to have_ini_setting_resource_count(0) }
+
+          context 'with journald_config defined' do
+            let :params do
+              {
+                manage_journald: true,
+                journald_config: { 'RateLimitInterval' => '30s', 'RateLimitBurst' => '1000' }
+              }
+            end
+
+            it { is_expected.to contain_ini_setting('RateLimitInterval').with(
+              ensure: 'present',
+              path: '/etc/systemd/journald.conf',
+              section: 'Journal',
+              setting: 'RateLimitInterval',
+              value: '30s',
+              notify: 'Service[systemd-journald]'
+            )}
+
+            it { is_expected.to contain_ini_setting('RateLimitBurst').with(
+              ensure: 'present',
+              path: '/etc/systemd/journald.conf',
+              section: 'Journal',
+              setting: 'RateLimitBurst',
+              value: '1000',
+              notify: 'Service[systemd-journald]'
+            )}
+          end
+        end
       end
     end
   end