Add EL9 support (#146)

* Add EL9 support
* Also avoid legacy `operatingsystemmajrelease` fact in tests

CHANGELOG

@@ -1,3 +1,6 @@
+* Mon Oct 23 2023 Steven Pritchard <[email protected]> - 8.6.0
+- Add EL9 support
+
 * Wed Oct 11 2023 Steven Pritchard <[email protected]> - 8.5.0
 - [puppetsync] Updates for Puppet 8
   - These updates may include the following:

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "simp-rsyslog",
-  "version": "8.5.0",
+  "version": "8.6.0",
   "author": "SIMP Team",
   "summary": "A puppet module to support RSyslog version 8.",
   "license": "Apache-2.0",
@@ -52,33 +52,38 @@
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
         "7",
-        "8"
+        "8",
+        "9"
       ]
     },
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "7",
-        "8"
+        "8",
+        "9"
       ]
     },
     {
       "operatingsystem": "OracleLinux",
       "operatingsystemrelease": [
         "7",
-        "8"
+        "8",
+        "9"
       ]
     },
     {
       "operatingsystem": "Rocky",
       "operatingsystemrelease": [
-        "8"
+        "8",
+        "9"
       ]
     },
     {
       "operatingsystem": "AlmaLinux",
       "operatingsystemrelease": [
-        "8"
+        "8",
+        "9"
       ]
     }
   ],

spec/acceptance/suites/compliance/01_simp_profile_inspec_spec.rb

@@ -14,7 +14,7 @@
           profile_path = File.join(
                 fixtures_path,
                 'inspec_profiles',
-                "#{fact_on(host, 'operatingsystem')}-#{fact_on(host, 'operatingsystemmajrelease')}-#{profile}"
+                "#{fact_on(host, 'operatingsystem')}-#{fact_on(host, 'os.release.major')}-#{profile}"
               )
 
           unless File.exist?(profile_path)

spec/classes/init_spec.rb

@@ -87,7 +87,7 @@
   on_supported_os.each do |os, os_facts|
     context "on #{os}" do
       let(:facts) do
-        if os_facts[:operatingsystemmajrelease] < '8'
+        if os_facts[:os][:release][:major].to_i < 8
           version = '8.24.0'   # CentOS 7: 7.4 and later
         else
           version = '8.1911.0' # CentOS 8: 8.2 and later
@@ -115,7 +115,7 @@
         it { is_expected.to contain_file(global_conf_file).with_content(global_expected) }
 
 
-        if os_facts[:operatingsystemmajrelease] < '8'
+        if os_facts[:os][:release][:major].to_i < 8
           it do
             expected = <<~EOM
               # This file is managed by Puppet.

spec/defines/rule/expected/el9/remote_defaults.txt

@@ -0,0 +1,34 @@
+ruleset(
+  name="ruleset_test_name"
+  queue.filename="test_name_disk_queue"
+  queue.syncqueuefiles="off"
+  queue.type="LinkedList"
+  queue.saveonshutdown="on"
+) {
+  action(
+    type="omfwd"
+    protocol="tcp"
+    target="1.2.3.4"
+    port="514"
+    TCP_Framing="traditional"
+    ZipLevel="0"
+    maxErrorMessages="5"
+    compression.mode="none"
+    compression.stream.flushOnTXEnd="on"
+    ResendLastMSGOnReconnect="on"
+  )
+  action(
+    type="omfwd"
+    protocol="tcp"
+    target="5.6.7.8"
+    port="5678"
+    TCP_Framing="traditional"
+    ZipLevel="0"
+    maxErrorMessages="5"
+    compression.mode="none"
+    compression.stream.flushOnTXEnd="on"
+    ResendLastMSGOnReconnect="on"
+  )
+}
+
+if (test_rule) then call ruleset_test_name

spec/defines/rule/expected/el9/remote_tls_with_peers_undef_hostname_for_logserver.txt

@@ -0,0 +1,40 @@
+ruleset(
+  name="ruleset_test_name"
+  queue.filename="test_name_disk_queue"
+  queue.syncqueuefiles="off"
+  queue.type="LinkedList"
+  queue.saveonshutdown="on"
+) {
+  action(
+    type="omfwd"
+    protocol="tcp"
+    target="logserver.my.domain"
+    port="6514"
+    TCP_Framing="traditional"
+    ZipLevel="0"
+    maxErrorMessages="5"
+    compression.mode="none"
+    compression.stream.flushOnTXEnd="on"
+    StreamDriverMode="1"
+    StreamDriverAuthMode="x509/name"
+    StreamDriverPermittedPeers="logserver.my.domain"
+    ResendLastMSGOnReconnect="on"
+  )
+  action(
+    type="omfwd"
+    protocol="tcp"
+    target="logserver2.other.place"
+    port="4444"
+    TCP_Framing="traditional"
+    ZipLevel="0"
+    maxErrorMessages="5"
+    compression.mode="none"
+    compression.stream.flushOnTXEnd="on"
+    StreamDriverMode="1"
+    StreamDriverAuthMode="x509/name"
+    StreamDriverPermittedPeers="logserver2.other.place"
+    ResendLastMSGOnReconnect="on"
+  )
+}
+
+if (test_rule) then call ruleset_test_name

spec/defines/rule/expected/el9/remote_tls_with_peers_undef_hostname_for_remotes.txt

@@ -0,0 +1,81 @@
+ruleset(
+  name="ruleset_test_name"
+  queue.filename="test_name_disk_queue"
+  queue.syncqueuefiles="off"
+  queue.type="LinkedList"
+  queue.saveonshutdown="on"
+) {
+  action(
+    type="omfwd"
+    protocol="tcp"
+    target="logserver.my.domain"
+    port="6514"
+    TCP_Framing="traditional"
+    ZipLevel="0"
+    maxErrorMessages="5"
+    compression.mode="none"
+    compression.stream.flushOnTXEnd="on"
+    StreamDriverMode="1"
+    StreamDriverAuthMode="x509/name"
+    StreamDriverPermittedPeers="logserver.my.domain"
+    ResendLastMSGOnReconnect="on"
+  )
+  action(
+    type="omfwd"
+    protocol="tcp"
+    target="logserver2.other.place"
+    port="4444"
+    TCP_Framing="traditional"
+    ZipLevel="0"
+    maxErrorMessages="5"
+    compression.mode="none"
+    compression.stream.flushOnTXEnd="on"
+    StreamDriverMode="1"
+    StreamDriverAuthMode="x509/name"
+    StreamDriverPermittedPeers="logserver2.other.place"
+    ResendLastMSGOnReconnect="on"
+  )
+
+  action(
+    type="omfwd"
+    protocol="tcp"
+    target="failover.my.domain"
+    port="6514"
+    TCP_Framing="traditional"
+    ZipLevel="0"
+    maxErrorMessages="5"
+    compression.mode="none"
+    compression.stream.flushOnTXEnd="on"
+    StreamDriverMode="1"
+    StreamDriverAuthMode="x509/name"
+    StreamDriverPermittedPeers="failover.my.domain"
+    ResendLastMSGOnReconnect="on"
+    action.resumeRetryCount="-1"
+    action.execOnlyWhenPreviousIsSuspended="on"
+  )
+
+  action(
+    type="omfwd"
+    protocol="tcp"
+    target="failover.other.place"
+    port="4444"
+# NOTE: This must exist for the last failover host so that we can queue logs to disk when needed.
+    queue.filename="test_name_disk_queue_action"
+    queue.syncqueuefiles="off"
+    queue.type="LinkedList"
+    queue.saveonshutdown="on"
+    TCP_Framing="traditional"
+    ZipLevel="0"
+    maxErrorMessages="5"
+    compression.mode="none"
+    compression.stream.flushOnTXEnd="on"
+    StreamDriverMode="1"
+    StreamDriverAuthMode="x509/name"
+    StreamDriverPermittedPeers="failover.other.place"
+    ResendLastMSGOnReconnect="on"
+    action.resumeRetryCount="-1"
+    action.execOnlyWhenPreviousIsSuspended="on"
+  )
+}
+
+if (test_rule) then call ruleset_test_name

spec/defines/rule/expected/el9/remote_tls_with_peers_undef_ip_for_failover.txt

@@ -0,0 +1,48 @@
+ruleset(
+  name="ruleset_test_name"
+  queue.filename="test_name_disk_queue"
+  queue.syncqueuefiles="off"
+  queue.type="LinkedList"
+  queue.saveonshutdown="on"
+) {
+  action(
+    type="omfwd"
+    protocol="tcp"
+    target="logserver1.my.domain"
+    port="6514"
+    TCP_Framing="traditional"
+    ZipLevel="0"
+    maxErrorMessages="5"
+    compression.mode="none"
+    compression.stream.flushOnTXEnd="on"
+    StreamDriverMode="1"
+    StreamDriverAuthMode="x509/name"
+    StreamDriverPermittedPeers="*.example.com"
+    ResendLastMSGOnReconnect="on"
+  )
+
+  action(
+    type="omfwd"
+    protocol="tcp"
+    target="1.2.3.4"
+    port="6514"
+# NOTE: This must exist for the last failover host so that we can queue logs to disk when needed.
+    queue.filename="test_name_disk_queue_action"
+    queue.syncqueuefiles="off"
+    queue.type="LinkedList"
+    queue.saveonshutdown="on"
+    TCP_Framing="traditional"
+    ZipLevel="0"
+    maxErrorMessages="5"
+    compression.mode="none"
+    compression.stream.flushOnTXEnd="on"
+    StreamDriverMode="1"
+    StreamDriverAuthMode="x509/name"
+    StreamDriverPermittedPeers="*.example.com"
+    ResendLastMSGOnReconnect="on"
+    action.resumeRetryCount="-1"
+    action.execOnlyWhenPreviousIsSuspended="on"
+  )
+}
+
+if (test_rule) then call ruleset_test_name

spec/defines/rule/expected/el9/remote_tls_with_peers_undef_ip_for_logserver.txt

@@ -0,0 +1,25 @@
+ruleset(
+  name="ruleset_test_name"
+  queue.filename="test_name_disk_queue"
+  queue.syncqueuefiles="off"
+  queue.type="LinkedList"
+  queue.saveonshutdown="on"
+) {
+  action(
+    type="omfwd"
+    protocol="tcp"
+    target="1.2.3.4"
+    port="6514"
+    TCP_Framing="traditional"
+    ZipLevel="0"
+    maxErrorMessages="5"
+    compression.mode="none"
+    compression.stream.flushOnTXEnd="on"
+    StreamDriverMode="1"
+    StreamDriverAuthMode="x509/name"
+    StreamDriverPermittedPeers="*.example.com"
+    ResendLastMSGOnReconnect="on"
+  )
+}
+
+if (test_rule) then call ruleset_test_name