remove file exclusion from ixdiagnose on enterprise systems (#219)

ixdiagnose/plugins/metrics/command.py

@@ -42,6 +42,7 @@ def execute_impl(self) -> Tuple[List, str]:
         cmd_context = []
         metric_report = []
         for cmd in self.cmds:
+            cmd.execution_context = self.execution_context
             start_time = time.time()
             cp = cmd.execute()
             report = {

ixdiagnose/plugins/system_state.py

@@ -53,20 +53,30 @@ def get_root_ds(client: None, resource_type: str) -> dict:
     return report
 
 
-def usr_postprocess(lines: str) -> str:
-    result = []
-    for line in lines.splitlines():
-        try:
-            filename = line.split(maxsplit=1)[1].strip()
-        except IndexError:
-            pass
-        else:
-            if can_be_modified(filename):
-                continue
+class UsrPostprocess:
+    def __init__(self):
+        self.is_enterprise = None
 
-        result.append(line)
+    def __call__(self, execution_context, lines: str) -> str:
+        if self.is_enterprise is None:
+            self.is_enterprise = execution_context['middleware_client'].call('system.is_enterprise')
 
-    return "\n".join(result)
+        if self.is_enterprise:
+            return lines
+
+        result = []
+        for line in lines.splitlines():
+            try:
+                filename = line.split(maxsplit=1)[1].strip()
+            except IndexError:
+                pass
+            else:
+                if can_be_modified(filename):
+                    continue
+
+            result.append(line)
+
+        return "\n".join(result)
 
 
 def can_be_modified(filename: str) -> bool:
@@ -155,8 +165,9 @@ class SystemState(Plugin):
         CommandMetric(f'{ds.split("/")[-1]}_dataset_diff', [
             Command(
                 ['zfs', 'diff', f'{ds}@pristine'],
-                f'changes of {ds} dataset', serializable=False,
-                postprocess=usr_postprocess if ds.split('/')[-1] == 'usr' else None
+                f'changes of {ds} dataset',
+                serializable=False,
+                postprocess=UsrPostprocess() if ds.split('/')[-1] == 'usr' else None,
             )],
         )
         for ds in get_ds_list()

ixdiagnose/utils/command.py

@@ -1,6 +1,6 @@
 from collections.abc import Callable
 import subprocess
-from typing import Optional, Union
+from typing import Any, Optional, Union
 
 from .run import run
 
@@ -10,7 +10,7 @@ class Command:
     def __init__(
         self, command: Union[str, list], description: str, serializable: bool = True,
         safe_returncodes: list = None, env: Optional[dict] = None, max_lines: Optional[int] = None,
-        postprocess: Optional[Callable[[str], str]] = None,
+        postprocess: Optional[Callable[[Any, str], str]] = None,
     ):
         self.command: Union[str, list] = command
         self.description: str = description
@@ -19,12 +19,13 @@ def __init__(
         self.serializable: bool = serializable
         self.safe_returncodes: list = safe_returncodes or [0]
         self.postprocess = postprocess
+        self.execution_context: Any = None
 
     def execute(self) -> subprocess.CompletedProcess:
         cp = run(self.command, check=False, env=self.env)
         if cp.returncode in self.safe_returncodes:
             if self.postprocess:
-                cp.stdout = self.postprocess(cp.stdout)
+                cp.stdout = self.postprocess(self.execution_context, cp.stdout)
             if self.max_lines:
                 cp.stdout = "\n".join(cp.stdout.splitlines()[:self.max_lines])
         return cp