浏览代码

Update 'plugins/edirectory_monitor/libexec/agent_edirectory_monitor'

Michael Honkoop 3 月之前
父节点
当前提交
327540e5e7
共有 1 个文件被更改,包括 9 次插入5 次删除
  1. 9 5
      plugins/edirectory_monitor/libexec/agent_edirectory_monitor

+ 9 - 5
plugins/edirectory_monitor/libexec/agent_edirectory_monitor

@@ -19,7 +19,7 @@ def clean_key(key):
     return cleaned_key
 
 def clean_value(value):
-    cleaned_value = re.sub(' Bytes| KB', '', value)
+    cleaned_value = re.sub(' Bytes| KB| ms', '', value)
     #cleaned_value = re.sub(' Bytes| KB|CN=|OU=|O=', '', value)
     
     return cleaned_value
@@ -58,15 +58,19 @@ def print_sections(raw_result):
                     for item in value:
                         try:
                             decoded_value = item.decode("utf-8")
-                            lines.append(f"{key}={clean_value(decoded_value)}")
+                            if len(decoded_value) != 0:
+                                lines.append(f"{key}={clean_value(decoded_value)}")
                         except AttributeError:
-                            lines.append(f"{key}={clean_value(item)}")
+                            if len(item) != 0:
+                                lines.append(f"{key}={clean_value(item)}")
                 else:  # Handle scalar values
                     try:
                         decoded_value = value.decode("utf-8")
-                        lines.append(f"{key}={clean_value(decoded_value)}")
+                        if len(decoded_value) != 0:
+                            lines.append(f"{key}={clean_value(decoded_value)}")
                     except AttributeError:
-                        lines.append(f"{key}={clean_value(value)}")
+                        if len(item) != 0:
+                            lines.append(f"{key}={clean_value(value)}")
         else:
             process_item(each_item)