update

Author: alexandraBara

nodescraper/pluginexecutor.py

@@ -240,6 +240,8 @@ def apply_global_args_to_plugin(
         for key in global_args:
             if key in ["collection_args", "analysis_args"] and isinstance(plugin_inst, DataPlugin):
                 continue
+            if key == "skip_sudo" and (global_args[key] or global_args[key] == 1):
+                global_args["collection_args"]["skip_sudo"] = 1
             else:
                 run_args[key] = global_args[key]
 

nodescraper/plugins/inband/dimm/dimm_collector.py

@@ -40,6 +40,10 @@ def collect_data(
         args=None,
     ) -> tuple[TaskResult, DimmDataModel | None]:
         """Collect data on installed DIMMs"""
+        if args and "skip_sudo" in args.keys() and args["skip_sudo"]:
+            self.resultmessage = "Skipping sudo plugin"
+            self.result.status = ExecutionStatus.NOT_RAN
+            return self.result, None
         dimm_str = None
         if self.system_info.os_family == OSFamily.WINDOWS:
             res = self._run_sut_cmd("wmic memorychip get Capacity")

nodescraper/plugins/inband/dmesg/dmesg_collector.py

@@ -24,7 +24,7 @@
 #
 ###############################################################################
 from nodescraper.base import InBandDataCollector
-from nodescraper.enums import EventCategory, EventPriority, OSFamily
+from nodescraper.enums import EventCategory, EventPriority, ExecutionStatus, OSFamily
 from nodescraper.models import TaskResult
 
 from .dmesgdata import DmesgData
@@ -67,6 +67,10 @@ def collect_data(
         Returns:
             tuple[TaskResult, DmesgData | None]: tuple containing the result of the task and the dmesg data if available
         """
+        if args and "skip_sudo" in args.keys() and args["skip_sudo"]:
+            self.resultmessage = "Skipping sudo plugin"
+            self.result.status = ExecutionStatus.NOT_RAN
+            return self.result, None
         dmesg_content = self._get_dmesg_content()
 
         if dmesg_content:

nodescraper/plugins/inband/kernel/kernel_collector.py

@@ -53,7 +53,7 @@ def collect_data(
                     "="
                 )[1]
         else:
-            res = self._run_sut_cmd("sh -c 'uname -r'", sudo=True)
+            res = self._run_sut_cmd("sh -c 'uname -r'")
             if res.exit_code == 0:
                 kernel = res.stdout
 

nodescraper/plugins/inband/os/os_collector.py

@@ -84,8 +84,7 @@ def collect_data(self, args=None) -> tuple[TaskResult, OsDataModel | None]:
         else:
             PRETTY_STR = "PRETTY_NAME"  # noqa: N806
             res = self._run_sut_cmd(
-                f"sh -c '( lsb_release -ds || (cat /etc/*release | grep {PRETTY_STR}) || uname -om ) 2>/dev/null | head -n1'",
-                sudo=False,
+                f"sh -c '( lsb_release -ds || (cat /etc/*release | grep {PRETTY_STR}) || uname -om ) 2>/dev/null | head -n1'"
             )
             # search for PRETTY_NAME in res
             if res.exit_code == 0:

nodescraper/plugins/inband/storage/storage_collector.py

@@ -39,6 +39,10 @@ class StorageCollector(InBandDataCollector[StorageDataModel, None]):
 
     def collect_data(self, args: None = None) -> tuple[TaskResult, StorageDataModel | None]:
         """read storage usage data"""
+        if args and "skip_sudo" in args.keys() and args["skip_sudo"]:
+            self.resultmessage = "Skipping sudo plugin"
+            self.result.status = ExecutionStatus.NOT_RAN
+            return self.result, None
         storage_data = {}
         if self.system_info.os_family == OSFamily.WINDOWS:
             res = self._run_sut_cmd(