Merge branch 'develop' into feature/linux-syslog

CSVD · Dec 11, 2019 · 57d74ea · 57d74ea
2 parents 62eda43 + dbb5eb1
commit 57d74ea
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 75 deletions.
diff --git a/package/etc/conf.d/log_paths/p_rfc3164-proofpoint_pps_filter.conf.tmpl b/package/etc/conf.d/log_paths/p_rfc3164-proofpoint_pps_filter.conf.tmpl
diff --git a/package/etc/context_templates/compliance_meta_by_source.conf b/package/etc/context_templates/compliance_meta_by_source.conf
@@ -1,5 +1,6 @@
 @version: 3.24
-#filter f_test_test {
-#    host("something-*" type(glob)) or
-#    netmask(192.168.100.1/24)
-#};
+filter f_test_test {
+#   host("something-*" type(glob)) or
+#   netmask(169.254.100.0/24)
+    host("cannot_ever_happen")
+};
diff --git a/package/etc/context_templates/compliance_meta_by_source.csv b/package/etc/context_templates/compliance_meta_by_source.csv
@@ -1,2 +1,2 @@
-#f_test_test,.splunk.index,"badindex"
-#f_test_test,fields.compliance,"pci"
+f_test_test,.splunk.index,"will_never_happen_index"
+f_test_test,fields.compliance,"pci"
diff --git a/package/etc/context_templates/vendor_product_by_source.conf b/package/etc/context_templates/vendor_product_by_source.conf
@@ -2,50 +2,49 @@
 
 filter f_test_test {
     host("testvp-*" type(glob)) or
-    netmask(192.168.100.1/24)
+    netmask(169.254.1.0/24)
 };
 filter f_juniper_idp {
     host("jnpidp-*" type(glob)) or
-    netmask(192.168.3.0/24)
+    netmask(169.254.2.0/24)
 };
 filter f_juniper_netscreen {
     host("jnpns-*" type(glob)) or
-    netmask(192.168.4.0/24)
+    netmask(169.254.3.0/24)
 };
 filter f_juniper_nsm {
     host("jnpnsm-*" type(glob)) or
-    netmask(192.168.1.0/24)
+    netmask(169.254.4.0/24)
 };
 filter f_juniper_nsm_idp {
     host("jnpnsmidp-*" type(glob)) or
-    netmask(192.168.2.0/24)
+    netmask(169.254.5.0/24)
 };
 filter f_cisco_meraki {
     host("testcm-*" type(glob)) or
-    netmask(192.168.4.0/24)
+    netmask(169.254.6.0/24)
 };
 filter f_cisco_nx_os {
     host("csconx-*" type(glob)) or
-    netmask(192.168.5.0/24)
+    netmask(169.254.7.0/24)
 };
 filter f_proofpoint_pps_filter {
     host("pps-*" type(glob)) or
-    netmask(192.168.7.0/24)
+    netmask(169.254.8.0/24)
 };
 filter f_proofpoint_pps_sendmail {
     host("pps-*" type(glob)) or
-    netmask(192.168.6.0/24)
+    netmask(169.254.9.0/24)
 };
 filter f_ubiquiti_unifi_fw {
-        host("usg-*" type(glob)) or
-        netmask(192.168.6.0/24)
+    host("usg-*" type(glob)) or
+    netmask(169.254.10.0/24)
 };
 filter f_tzfixhst {
-        host("tzfhst-*" type(glob)) or
-        netmask(192.168.6.0/24)
+    host("tzfhst-*" type(glob)) or
+    netmask(169.254.11.0/24)
 };
-
 filter f_tzfixny {
-        host("tzfny-*" type(glob)) or
-        netmask(192.168.6.0/24)
-};
+    host("tzfny-*" type(glob)) or
+    netmask(169.254.12.0/24)
+};