Add the 'auditd-system' message_type choice to the logging resource m…

…odule (#459) * add new type to 'message_type' * add changelog * make changes based on PR comments
ansible-collections · Nov 20, 2024 · d439ba9 · d439ba9
1 parent bf69b1a
commit d439ba9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/changelogs/fragments/459-add-new-message-type.yaml b/changelogs/fragments/459-add-new-message-type.yaml
@@ -0,0 +1,2 @@
+minor_changes:
+  - sonic-logging - Add new 'auditd_system' choice to the 'message_type' choices for the logging resource module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/459).
diff --git a/plugins/module_utils/network/sonic/argspec/logging/logging.py b/plugins/module_utils/network/sonic/argspec/logging/logging.py
@@ -45,7 +45,7 @@ def __init__(self, **kwargs):
                     'options': {
                         'host': {'required': True,
                                  'type': 'str'},
-                        'message_type': {'choices': ['log', 'event', 'audit'],
+                        'message_type': {'choices': ['log', 'event', 'audit', 'auditd-system'],
                                          'type': 'str'},
                         'severity': {'choices': ['debug', 'info', 'notice', 'warning', 'error', 'critical', 'alert', 'emergency'],
                                      'type': 'str'},

diff --git a/plugins/modules/sonic_logging.py b/plugins/modules/sonic_logging.py
@@ -76,6 +76,7 @@
               - log
               - event
               - audit
+              - auditd-system
           severity:
             version_added: 3.1.0
             type: str
@@ -212,7 +213,7 @@
           remote_port: 622
           protocol: TCP
           source_interface: Ethernet24
-          message_type: audit
+          message_type: auditd-system
     state: overridden
 #
 # After state:
@@ -222,7 +223,7 @@
 #--------------------------------------------------------------------------------------
 #HOST            PORT      SOURCE-INTERFACE    VRF            MESSAGE-TYPE    PROTOCOL
 #--------------------------------------------------------------------------------------
-#10.11.1.2       622       Ethernet24          -              audit            tcp
+#10.11.1.2       622       Ethernet24          -              auditd-system      tcp
 #
 # Using replaced
 #

diff --git a/tests/regression/roles/sonic_logging/defaults/main.yml b/tests/regression/roles/sonic_logging/defaults/main.yml
@@ -44,7 +44,7 @@ tests:
           source_interface: "{{ vlan1 }}"
           remote_port: 818
           protocol: TCP
-          message_type: event
+          message_type: auditd-system
           vrf: Vrf_logging_2
         - host: "{{ logging_ip_server_7 }}"
           severity: debug
@@ -100,7 +100,7 @@ tests:
           source_interface: "{{ interface5 }}"
           remote_port: 818
           protocol: TLS
-          message_type: event
+          message_type: auditd-system
 
   - name: test_case_05
     description: Overridden logging remote servers
@@ -134,7 +134,7 @@ tests:
           source_interface: "{{ vlan1 }}"
           remote_port: 313
           protocol: UDP
-          message_type: audit
+          message_type: auditd-system
           vrf: Vrf_logging_2
         - host: "{{ logging_host_server }}"
           severity: warning
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		minor_changes:
		- sonic-logging - Add new 'auditd_system' choice to the 'message_type' choices for the logging resource module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/459).