Skip to content

Commit

Permalink
Merge branch 'develop' into feature/cisco-notimesync
Browse files Browse the repository at this point in the history
  • Loading branch information
Ryan Faircloth authored and GitHub committed Jun 9, 2020
2 parents a784099 + 7cc1201 commit 348ea46
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
8 changes: 6 additions & 2 deletions package/etc/conf.d/filters/VMware/vsphere.conf
Original file line number Diff line number Diff line change
@@ -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))
Expand All @@ -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))
Expand Down Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion tests/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
context: ../package
hostname: sc4s
#When this is enabled test_common will fail
command: -det
command: -dvt
ports:
- "514"
- "601"
Expand Down

0 comments on commit 348ea46

Please sign in to comment.