2.3 merge

* New: Add ability to do multi-host deployment of sensor + data tiers (#339, [[email protected]](mailto:[email protected])) * New: Integrate Docket into Kibana by default ([[email protected]](mailto:[email protected])) * New: Improvements and additional Kibana dashboards (spartan782) * Fixes: issue with Bro failing when monitor interface is down (#343, [[email protected]](mailto:[email protected])) * Fixes: issue with services starting that shouldn’t (#346, [[email protected]](mailto:[email protected])) * Fixes: race condition on loading dashboards into Kibana (#356, [[email protected]](mailto:[email protected])) * Fixes: configuration for Docket allowing serving from non-root URI (#361, [[email protected]](mailto:[email protected])) * Change: bro log retention value to one week rather than forever (#345, [[email protected]](mailto:[email protected])) * Change: Greatly improve documentation (#338, [[email protected]](mailto:[email protected])) * Change: Reorganize README (#308, [[email protected]](mailto:[email protected])) * Change: Move ECS to rock-dashboards repo (#305, [[email protected]](mailto:[email protected])) * Change: Move RockNSM install paths to filesystem heirarchy standard locations (#344, [[email protected]](mailto:[email protected]))
rocknsm · Feb 22, 2019 · f3ba006 · f3ba006
2 parents 3370a6f + 8f2a28f
commit f3ba006
Show file tree

Hide file tree

Showing 199 changed files with 1,894 additions and 6,041 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -24,7 +24,7 @@ Vagrant.configure(2) do |config|
     echo "tsflags=nodocs" | tee -a /etc/yum.conf
     yum -y install epel-release
     #sed -i 's/^mirrorlist/#mirrorlist/; s/^#baseurl/baseurl/' /etc/yum.repos.d/{CentOS-Base.repo,epel.repo}
-    yum -y install https://packagecloud.io/rocknsm/2_2/packages/el/7/rock-release-2.2.0-2.noarch.rpm/download.rpm
+    yum -y install https://packagecloud.io/rocknsm/2_3/packages/el/7/rock-release-2.3-1.noarch.rpm/download.rpm
     yum -y update
     yum -y install ansible vim git tmux tito
     # Create virtual interface

diff --git a/ansible.cfg b/ansible.cfg
diff --git a/bin/deploy_rock.sh b/bin/deploy_rock.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 SCRIPT_PATH=$(dirname $(readlink -f $0))
-TOPLEVEL=$(dirname ${SCRIPT_PATH})
+ROCK_HOME=/usr/share/rock
 VERBOSE_FLAGS=
 if [ "x${DEBUG}" != "x" ]; then
   VERBOSE_FLAGS="-vvv"
 fi
 
-cd ${TOPLEVEL}/playbooks
-ansible-playbook "${TOPLEVEL}/playbooks/site.yml" ${VERBOSE_FLAGS}
+cd ${ROCK_HOME}/playbooks
+ansible-playbook "${ROCK_HOME}/playbooks/site.yml" ${VERBOSE_FLAGS}
 
 if [ $? -eq 0 ]; then
   cat << 'EOF'

diff --git a/bin/generate_defaults.sh b/bin/generate_defaults.sh
@@ -1,22 +1,22 @@
 #!/bin/bash
 
 SCRIPT_PATH=$(dirname $(readlink -f $0))
-TOPLEVEL=$(dirname ${SCRIPT_PATH})
+ROCK_HOME=/usr/share/rock
 
-cd ${TOPLEVEL}/playbooks
+cd ${ROCK_HOME}/playbooks
 
 # Check for /srv/rocknsm/repodata/repomd.xml.asc and set GPG checking bool:
 if [[ -f /srv/rocknsm/repodata/repomd.xml.asc ]]; then
   echo "Signing data for local repo found. Enabling GPG checking."
-  sed -i 's|rock_offline_gpgcheck: .*|rock_offline_gpgcheck: 1|' ${TOPLEVEL}/playbooks/group_vars/all.yml
+  sed -i 's|rock_offline_gpgcheck: .*|rock_offline_gpgcheck: 1|' ${ROCK_HOME}/playbooks/group_vars/all.yml
   sed -i 's|rock_offline_gpgcheck: .*|rock_offline_gpgcheck: 1|' /etc/rocknsm/config.yml
 else
   echo "No signing data for local repo found. Disabling GPG checking."
-  sed -i 's|rock_offline_gpgcheck: .*|rock_offline_gpgcheck: 0|' ${TOPLEVEL}/playbooks/group_vars/all.yml
+  sed -i 's|rock_offline_gpgcheck: .*|rock_offline_gpgcheck: 0|' ${ROCK_HOME}/playbooks/group_vars/all.yml
   sed -i 's|rock_offline_gpgcheck: .*|rock_offline_gpgcheck: 0|' /etc/rocknsm/config.yml
 fi
 
-ansible-playbook "${TOPLEVEL}/playbooks/generate-defaults.yml"
+ansible-playbook "${ROCK_HOME}/playbooks/generate-defaults.yml"
 retVal=$?
 if [ $retVal -ne 0 ]; then
   echo "Dumping default variables failed! Verify you can run sudo without a password." 1>&2

diff --git a/bin/reset_data.sh b/bin/reset_data.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_PATH=$(dirname $(readlink -f $0))
-TOPLEVEL=$(dirname ${SCRIPT_PATH})
+ROCK_HOME=/usr/share/rock
 VERBOSE_FLAGS=
 if [ "x${DEBUG}" != "x" ]; then
   VERBOSE_FLAGS="-vvv"
@@ -15,9 +15,9 @@ then
 echo "Stopping Rock Services"
 
 
-cd ${TOPLEVEL}/playbooks
-ansible-playbook "${TOPLEVEL}/playbooks/delete-data.yml" ${VERBOSE_FLAGS}
-ansible-playbook "${TOPLEVEL}/playbooks/deploy-rock.yml" ${VERBOSE_FLAGS}
+cd ${ROCK_HOME}/playbooks
+ansible-playbook "${ROCK_HOME}/playbooks/delete-data.yml" ${VERBOSE_FLAGS}
+ansible-playbook "${ROCK_HOME}/playbooks/deploy-rock.yml" ${VERBOSE_FLAGS}
 
-/sbin/rock_start
-fi
+/usr/local/bin/rockctl start
+fi
diff --git a/book.json b/book.json
diff --git a/docs/ascii_logo.monopic b/docs/ascii_logo.monopic
diff --git a/docs/guide/README.adoc b/docs/guide/README.adoc
diff --git a/docs/guide/SUMMARY.adoc b/docs/guide/SUMMARY.adoc