Merge branch 'master' of https://github.com/toosmooth/securityonion-saltstack

pillar/data/evaltab.sls

@@ -0,0 +1 @@
+evaltab:

salt/common/init.sls

@@ -343,6 +343,26 @@ dashboard-{{ SN }}:
 {% endfor %}
 {% endif %}
 
+{% if salt['pillar.get']('evaltab', False) %}
+{%- for SN, SNDATA in salt['pillar.get']('evaltab', {}).iteritems() %}
+dashboard-{{ SN }}:
+  file.managed:
+    - name: /opt/so/conf/grafana/grafana_dashboards/storage_nodes/{{ SN }}-Node.json
+    - user: 939
+    - group: 939
+    - template: jinja
+    - source: salt://common/grafana/grafana_dashboards/eval/eval.json
+    - defaults:
+      SERVERNAME: {{ SN }}
+      MANINT: {{ SNDATA.manint }}
+      MONINT: {{ SNDATA.manint }}
+      CPUS: {{ SNDATA.totalcpus }}
+      UID: {{ SNDATA.guid }}
+      ROOTFS: {{ SNDATA.rootfs }}
+      NSMFS: {{ SNDATA.nsmfs }}
+
+{% endfor %}
+{% endif %}
 
 # Install the docker. This needs to be behind nginx at some point
 so-grafana:

so-setup-network.sh

@@ -877,8 +877,8 @@ whiptail_bro_pins() {
 
 whiptail_bro_version() {
 
-  BROVERSION=$(whiptail --title "Security Onion Setup" --radiolist "What tool would you like to use to generate meta data?" 20 78 4 "COMMUNITY" "Install Community NSM" ON \
+  BROVERSION=$(whiptail --title "Security Onion Setup" --radiolist "What tool would you like to use to generate meta data?" 20 78 4 "ZEEK" "Install Zeek (aka Bro)"  ON \
-   "ZEEK" "Install Zeek" OFF "SURICATA" "SUPER EXPERIMENTAL" OFF 3>&1 1>&2 2>&3)
+  "COMMUNITY" "Install Community NSM" OFF "SURICATA" "SUPER EXPERIMENTAL" OFF 3>&1 1>&2 2>&3)
 
   local exitstatus=$?
   whiptail_check_exitstatus $exitstatus
@@ -1497,7 +1497,7 @@ if (whiptail_you_sure); then
     RULESETUP=ETOPEN
     NSMSETUP=BASIC
     NIDS=Suricata
-    BROVERSION=COMMUNITY
+    BROVERSION=ZEEK
     whiptail_make_changes
     clear_master
     mkdir -p /nsm