[merge] Merge master into feature/setup-refactor

2026-02-06 15:24:11 +01:00 · 2020-04-28 01:15:02 -04:00
parent 5c5a97ca75
commit 3bfaa6f8de
254 changed files with 26274 additions and 112 deletions
--- a/pillar/data/addtotab.sh
+++ b/pillar/data/addtotab.sh
--- a/pillar/firewall/addfirewall.sh
+++ b/pillar/firewall/addfirewall.sh
--- a/pillar/masters/example.sls
+++ b/pillar/masters/example.sls
@@ -0,0 +1,10 @@
+# Example Pillar file for a master
+master:
+  esaccessip: 127.0.0.1
+  esheap: CHANGEME
+  esclustername: {{ grains.host }}
+  freq: 0
+  domainstats: 0
+  lsheap: 1500m
+  lsaccessip: 127.0.0.1
+  elastalert: 1
--- a/pillar/nodes/example.sls
+++ b/pillar/nodes/example.sls
@@ -0,0 +1,5 @@
+# Example Pillar file for a sensor
+node:
+  ls_heapsize: CHANGEME
+  es_heapsize: CHANGEME
+  node_type: CHANGEME
--- a/pillar/sensors/example.sls
+++ b/pillar/sensors/example.sls
@@ -0,0 +1,14 @@
+# Example Pillar file for a sensor
+sensor:
+  interface: CHANGEME
+  bro_pins:
+    - 1
+    - 2
+    - 3
+    - 4
+  brobpf:
+  pcapbpf:
+  nidsbpf:
+  s3bucket:
+  s3key:
+