fix: Add new programs to vmware map

CSVD · Jun 4, 2020 · 84f77d1 · 84f77d1
1 parent 4d3a9a6
commit 84f77d1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/package/etc/conf.d/filters/VMware/vsphere.conf b/package/etc/conf.d/filters/VMware/vsphere.conf
@@ -1,6 +1,7 @@
 filter f_vmware_all {
     #begin base vmware
-    program("cimslp", flags(ignore-case))
+    program("applmgmt-audit", flags(ignore-case))
+    or program("cimslp", flags(ignore-case))    
     or program("Fdm", flags(ignore-case))
     or program("Hostd", flags(ignore-case))
     or program("hostd-probe", flags(ignore-case))
@@ -12,6 +13,7 @@ filter f_vmware_all {
     or program("sdrsInjector", flags(ignore-case))
     or program("sfcb-.*", flags(ignore-case))
     or program("storageRM", flags(ignore-case))
+    or program("updatemgr", flags(ignore-case))    
     or program("vmafdd", flags(ignore-case))
     or program("vmcad", flags(ignore-case))
     or program("vmdird", flags(ignore-case))
@@ -63,7 +65,9 @@ filter f_vmware_nsx {
     program("nsx-.*", flags(ignore-case))
 };
 filter f_vmware_vcenter {
-    program("vmafdd", flags(ignore-case))
+    program("applmgmt-audit", flags(ignore-case))    
+    or program("updatemgr", flags(ignore-case))    
+    or program("vmafdd", flags(ignore-case))
     or program("vmcad", flags(ignore-case))
     or program("vmdird", flags(ignore-case))
     or program("vmon", flags(ignore-case))

diff --git a/package/etc/conf.d/log_paths/lp-sc4s_internal.conf.tmpl b/package/etc/conf.d/log_paths/lp-sc4s_internal.conf.tmpl
@@ -21,7 +21,7 @@ log {
         {{- end}}
 
         {{- if eq (getenv "SC4S_DEBUG_STDOUT" "yes") "no"}}
-        destination(d_stdout);
+        #destination(d_stdout);
         {{- end}}
 
         {{- if (print (getenv "SC4S_DEST_GLOBAL_ALTERNATES")) }}
@@ -56,7 +56,7 @@ log {
             };
 
         {{- if eq (getenv "SC4S_DEBUG_STDOUT" "no") "yes"}}
-        destination(d_stdout);
+        #destination(d_stdout);
         {{- end}}
     };
     flags(flow-control,final);

diff --git a/package/etc/syslog-ng.conf.tmpl b/package/etc/syslog-ng.conf.tmpl
@@ -31,6 +31,7 @@ options {
         normalize-hostnames(yes);
         on-error(fallback-to-string);
         frac-digits(3);
+        use-rcptid(yes);
 };
 
 

diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
@@ -14,7 +14,7 @@ services:
       context: ../package
     hostname: sc4s
     #When this is enabled test_common will fail
-    command: -det
+    command: -dvt
     ports:
       - "514"
       - "601"