Container: T7473: Fix show/monitor container log failed when log-driver is journald

Author: opswill

op-mode-definitions/container.xml.in

@@ -89,7 +89,7 @@
                 <path>container name</path>
               </completionHelp>
             </properties>
-            <command>sudo podman logs --follow --names "$4"</command>
+            <command>sudo ${vyos_op_scripts_dir}/container.py show_log --follow --name "$4"</command>
           </tagNode>
         </children>
       </node>
@@ -133,7 +133,7 @@
               </completionHelp>
             </properties>
             <!-- no admin check -->
-            <command>sudo podman logs --names "$4"</command>
+            <command>sudo ${vyos_op_scripts_dir}/container.py show_log --name "$4"</command>
           </tagNode>
           <node name="network">
             <properties>
@@ -162,7 +162,7 @@
                 <path>container name</path>
               </completionHelp>
             </properties>
-            <command>sudo podman logs --names "$4"</command>
+            <command>sudo ${vyos_op_scripts_dir}/container.py show_log --name "$4"</command>
           </tagNode>
         </children>
       </node>

src/op_mode/container.py

@@ -16,6 +16,7 @@
 
 import json
 import sys
+import subprocess
 
 from vyos.utils.process import cmd
 from vyos.utils.process import rc_cmd
@@ -32,6 +33,26 @@ def _get_raw_data(command: str) -> list:
     data = json.loads(json_data)
     return data
 
+def _get_container_log_type(name: str) -> str:
+    """
+    Determines the log type for a given container name by inspecting it.
+    Returns the log type string.
+    """
+    try:
+        container_info_list = _get_raw_data(f'podman container inspect {name}')
+        if not container_info_list:
+             raise vyos.opmode.Error(f"Container '{name}' not found.")
+    except Exception as e:
+        raise vyos.opmode.Error(f"Container '{name}' not found.") from e
+
+    container_info = container_info_list[0]
+    log_config = container_info.get('HostConfig', {}).get('LogConfig', {})
+    log_type = log_config.get('Type')
+
+    if not log_type:
+        raise vyos.opmode.InternalError(f"Could not determine log type for container '{name}'")
+    return log_type
+
 def add_image(name: str):
     """ Pull image from container registry. If registry authentication
     is defined within VyOS CLI, credentials are used to login befroe pull """
@@ -109,6 +130,39 @@ def restart(name: str):
     print(f'Container "{name}" restarted!')
     return output
 
+def show_log(name: str, follow: bool = False, **kwargs):
+    """
+    Show or monitor logs for a specific container.
+    Use --follow to continuously stream logs.
+    """
+    log_type = _get_container_log_type(name)
+    if log_type == 'k8s-file':
+        if follow:
+            log_command_list = ['sudo', 'podman', 'logs', '--follow', '--names', name]
+        else:
+            log_command_list = ['sudo', 'podman', 'logs', '--names', name]
+    if log_type == 'journald':
+        if follow:
+            log_command_list = ['journalctl', '--follow', '--unit', f'vyos-container-{name}.service']
+        else:
+            log_command_list = ['journalctl', '-e', '--no-pager', '--unit', f'vyos-container-{name}.service']
+
+    process = None
+    try:
+        process = subprocess.Popen(log_command_list,
+                                   stdout=sys.stdout,
+                                   stderr=sys.stderr)
+        process.wait()
+    except KeyboardInterrupt:
+        if process:
+            process.terminate()
+            process.wait()
+        return None
+    except Exception as e:
+        raise vyos.opmode.InternalError(f"Error starting logging command: {e} ")
+    return None
+
+
 if __name__ == '__main__':
     try:
         res = vyos.opmode.run(sys.modules[__name__])