update to single mount point

CSVD · Oct 6, 2019 · 928350b · 928350b
1 parent d7f0161
commit 928350b
Show file tree

Hide file tree

Showing 20 changed files with 14 additions and 191 deletions.
diff --git a/package/Dockerfile b/package/Dockerfile
@@ -86,8 +86,8 @@ RUN curl -o /usr/local/bin/gomplate -sSL https://github.com/hairyhenderson/gompl
 
 COPY etc/syslog-ng.conf /opt/syslog-ng/etc/syslog-ng.conf
 COPY etc/conf.d /opt/syslog-ng/etc/conf.d
-COPY etc/templates /opt/syslog-ng/etc/templates
-COPY etc/context-local /opt/syslog-ng/etc/context-local
+COPY etc/go_templates /opt/syslog-ng/etc/go_templates
+COPY etc/conf.d/local/context /opt/syslog-ng/etc/conf.d/local/context
 COPY sbin/entrypoint.sh /
 RUN mkdir -p /opt/syslog-ng/var/data/disk-buffer
 RUN source scl_source enable rh-python36 ;/opt/syslog-ng/sbin/syslog-ng -V

diff --git a/package/etc/conf.d/conflib/_common/compliance_meta.conf b/package/etc/conf.d/conflib/_common/compliance_meta.conf
@@ -1,7 +1,7 @@
 parser compliance_meta_by_source {
     add-contextual-data(
-        selector(filters("`syslog-ng-sysconfdir`/context-local/compliance_meta_by_source.conf")),
-        database("context-local/compliance_meta_by_source.csv")
+        selector(filters("`syslog-ng-sysconfdir`/conf.d/local/context/compliance_meta_by_source.conf")),
+        database("conf.d/local/context/compliance_meta_by_source.csv")
         ignore-case(yes)
     );
 };

diff --git a/package/etc/conf.d/conflib/_common/vendor_product_by_source_context.conf b/package/etc/conf.d/conflib/_common/vendor_product_by_source_context.conf
@@ -1,7 +1,7 @@
 block parser vendor_product_by_source() {
     add-contextual-data(
-        selector(filters("`syslog-ng-sysconfdir`/context-local/vendor_product_by_source.conf")),
-        database("context-local/vendor_product_by_source.csv")
+        selector(filters("`syslog-ng-sysconfdir`/conf.d/local/context/vendor_product_by_source.conf")),
+        database("conf.d/local/context/vendor_product_by_source.csv")
         ignore-case(yes)
         prefix("fields.")
     );

diff --git a/package/etc/conf.d/conflib/_splunk/splunk_context.conf b/package/etc/conf.d/conflib/_splunk/splunk_context.conf
@@ -1,7 +1,7 @@
 block parser p_add_context_splunk(key("syslogng-fallback")) {
     add-contextual-data(
         selector("`key`"),
-        database("context-local/splunk_index.csv"),
+        database("conf.d/local/context/splunk_index.csv"),
         prefix(".splunk.")
     );
-};
+};
diff --git a/...text-local/microfocus_arcsight_source.csv → ....d/context/microfocus_arcsight_source.csv b/...text-local/microfocus_arcsight_source.csv → ....d/context/microfocus_arcsight_source.csv
diff --git a/package/etc/conf.d/local/destinations/README.md b/package/etc/conf.d/local/destinations/README.md
diff --git a/package/etc/conf.d/local/filters/README.md b/package/etc/conf.d/local/filters/README.md
diff --git a/package/etc/conf.d/local/filters/example.conf b/package/etc/conf.d/local/filters/example.conf
diff --git a/package/etc/conf.d/local/log_paths/README.md b/package/etc/conf.d/local/log_paths/README.md
diff --git a/package/etc/conf.d/local/log_paths/example.conf.tmpl b/package/etc/conf.d/local/log_paths/example.conf.tmpl
diff --git a/package/etc/conf.d/local/sources/README.md b/package/etc/conf.d/local/sources/README.md
diff --git a/package/etc/conf.d/log_paths/p_rfc3164_microfocus_arcsight.conf.tmpl b/package/etc/conf.d/log_paths/p_rfc3164_microfocus_arcsight.conf.tmpl
@@ -22,7 +22,7 @@ parser p_microfocus_arcsight_ts_end {
 parser p_microfocus_arcsight_source {
     add-contextual-data(
         selector("${fields.cef_device_vendor}_${fields.cef_device_product}"),
-        database("context-local/microfocus_arcsight_source.csv")
+        database("conf.d/context/microfocus_arcsight_source.csv")
         ignore-case(yes)
         prefix(".splunk.")
         default-selector("unknown")

diff --git a/package/etc/context-local/compliance_meta_by_source.conf b/package/etc/context-local/compliance_meta_by_source.conf
diff --git a/package/etc/context-local/compliance_meta_by_source.csv b/package/etc/context-local/compliance_meta_by_source.csv
diff --git a/package/etc/context-local/splunk_index.csv b/package/etc/context-local/splunk_index.csv
diff --git a/package/etc/context-local/vendor_product_by_source.conf b/package/etc/context-local/vendor_product_by_source.conf
diff --git a/package/etc/context-local/vendor_product_by_source.csv b/package/etc/context-local/vendor_product_by_source.csv
diff --git a/package/etc/templates/source_network.t → package/etc/go_templates/source_network.t b/package/etc/templates/source_network.t → package/etc/go_templates/source_network.t
diff --git a/package/etc/syslog-ng.conf b/package/etc/syslog-ng.conf
@@ -62,8 +62,7 @@ options {
 @include "conf.d/destinations/*.conf"
 @include "conf.d/log_paths/*.conf"
 
-@include "conf.d/local/filters/*.conf"
-@include "conf.d/local/filters/*/*.conf"
-@include "conf.d/local/sources/*.conf"
-@include "conf.d/local/destinations/*.conf"
-@include "conf.d/local/log_paths/*.conf"
+@include "conf.d/local/config/filters/*.conf"
+@include "conf.d/local/config/sources/*.conf"
+@include "conf.d/local/config/destinations/*.conf"
+@include "conf.d/local/config/log_paths/*.conf"
diff --git a/package/sbin/entrypoint.sh b/package/sbin/entrypoint.sh
@@ -7,7 +7,7 @@ do
   echo Templating conf for $d
   gomplate \
     --input-dir=$d \
-    --template t=etc/templates/  \
+    --template t=etc/go_templates/  \
     --exclude=*.conf --exclude=*.csv --exclude=*.t --exclude=.*\
     --output-map="$d/{{ .in | strings.ReplaceAll \".conf.tmpl\" \".conf\" }}"
 done