added log_model call for journal plugin + updated journaldata

Author: alexandraBara

nodescraper/plugins/inband/journal/journal_collector.py

@@ -23,6 +23,9 @@
 # SOFTWARE.
 #
 ###############################################################################
+import io
+import json
+
 from nodescraper.base import InBandDataCollector
 from nodescraper.enums import EventCategory, EventPriority, ExecutionStatus, OSFamily
 from nodescraper.models import TaskResult
@@ -42,12 +45,10 @@ def _read_with_journalctl(self):
         Returns:
             str|None: system journal read
         """
-        cmd = "journalctl --no-pager --system --all -o short-iso --output=json"
+        cmd = "journalctl --no-pager --system --all --output=json"
         res = self._run_sut_cmd(cmd, sudo=True, log_artifact=False, strip=False)
 
-        if res.exit_code == 0:
-            return res.stdout
-        else:
+        if res.exit_code != 0:
             self._log_event(
                 category=EventCategory.OS,
                 description="Error reading journalctl",
@@ -57,8 +58,20 @@ def _read_with_journalctl(self):
             )
             self.result.message = "Could not read journalctl data"
             self.result.status = ExecutionStatus.ERROR
+            return None
+
+        raw = res.stdout
+        text = (
+            raw.decode("utf-8", errors="surrogateescape")
+            if isinstance(raw, (bytes, bytearray))
+            else raw
+        )
+
+        lines = [ln for ln in (line.strip() for line in text.splitlines()) if ln.startswith("{")]
+        array_like = "[" + ",".join(lines) + "]"
+        entries: list[dict] = json.load(io.StringIO(array_like))
 
-        return None
+        return entries
 
     def collect_data(self, args=None) -> tuple[TaskResult, JournalData | None]:
         """Collect journal lofs

nodescraper/plugins/inband/journal/journaldata.py

@@ -23,10 +23,25 @@
 # SOFTWARE.
 #
 ###############################################################################
+import json
+import os
+
 from nodescraper.models import DataModel
 
 
 class JournalData(DataModel):
     """Data model for journal logs"""
 
-    journal_log: str
+    journal_log: list[dict]
+
+    def log_model(self, log_path: str):
+        """Log data model to a file
+
+        Args:
+            log_path (str): log path
+        """
+        log_name = os.path.join(log_path, "journal.log")
+        with open(log_name, "w", encoding="utf-8") as log_filename:
+            for e in self.journal_log:
+                log_filename.write(json.dumps(e, ensure_ascii=False, separators=(",", ":")))
+                log_filename.write("\n")

test/unit/plugin/test_journal_collector.py

@@ -68,4 +68,4 @@ def run_map(cmd, **kwargs):
     result, data = c.collect_data()
     assert isinstance(data, JournalData)
 
-    assert data.journal_log == '{"MESSAGE":"hello"}\n'
+    assert data.journal_log == [{"MESSAGE": "hello"}]