Issue #57: Code review changes

Code review changes
sentrysoftware · Apr 24, 2024 · 45cb57f · 45cb57f
1 parent 5d73c88
commit 45cb57f
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/main/connector/system/Linux/Linux.yaml b/src/main/connector/system/Linux/Linux.yaml
@@ -21,7 +21,7 @@ connector:
     - linux
     criteria:
     - type: osCommand
-      commandLine: (/usr/bin/uname -o) || (/bin/uname -o )
+      commandLine: /usr/bin/uname -o || /bin/uname -o
       expectedResult: GNU/Linux
       errorMessage: Not a valid Linux host.
     tags: [ system ]
@@ -67,7 +67,8 @@ monitors:
           computes:
           - type: awk
             script: |
-             /procs_/ {s = s ";" $2} END {print s}
+             /procs_/ {s = s ";" $2}
+             END {print s}
       mapping:
         source: ${source::procrb}
         attributes:
@@ -82,11 +83,12 @@ monitors:
         memorySys:
           # memSystem
           type: osCommand  
-          commandLine: (/usr/bin/lsmem -b) || (free -b | awk '/Mem/ {print "Total online memory " $2}')
+          commandLine: /usr/bin/lsmem -b || /usr/bin/free -b
           computes:
           - type: awk
             script: |
-              /Total online memory/ { print $4 }
+              /^Mem:/ { print $2 }
+              /^Total online memory:/ { print $4 }
         memoryInfo:
           # memTotal;memFree;memUsed;memBuffers;memCached;memFreeUtilization;memUsedUtilization;memBuffersUtilization;memCachedUtilization
           type: osCommand