CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

[fix] Resolve merge commits

Browse Source
This commit is contained in:
William Wernert
2020-07-20 14:22:55 -04:00
parent 9ff3ffc401
commit 9be4756a90
2 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
salt/common/tools/sbin/so-elastic-clear
View File

@@ -13,11 +13,7 @@
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
<<<<<<< HEAD
# along with this program. If not, see <http://www.gnu.org/licenses/>.
=======
# along with this program. If not, see <http://www.gnu.org/licenses/>.. /usr/sbin/so-common # along with this program. If not, see <http://www.gnu.org/licenses/>.. /usr/sbin/so-common
>>>>>>> 08220e33... Issue #885: so-elastic-clear not removing so-* indices
{%- set MASTERIP = salt['pillar.get']('static:masterip', '') -%} {%- set MASTERIP = salt['pillar.get']('static:masterip', '') -%}
. /usr/sbin/so-common . /usr/sbin/so-common
@@ -67,10 +63,6 @@ if [ $SKIP -ne 1 ]; then
if [ "$INPUT" != "AGREE" ] ; then exit 0; fi if [ "$INPUT" != "AGREE" ] ; then exit 0; fi
fi fi
<<<<<<< HEAD
/usr/sbin/so-filebeat-stop
/usr/sbin/so-logstash-stop
=======
# Check to see if Logstash/Filebeat are running # Check to see if Logstash/Filebeat are running
LS_ENABLED=$(so-status | grep logstash) LS_ENABLED=$(so-status | grep logstash)
FB_ENABLED=$(so-status | grep filebeat) FB_ENABLED=$(so-status | grep filebeat)
@@ -93,7 +85,6 @@ if [ ! -z "$EA_ENABLED" ]; then
/usr/sbin/so-elastalert-stop /usr/sbin/so-elastalert-stop
fi fi
>>>>>>> 08220e33... Issue #885: so-elastic-clear not removing so-* indices
# Delete data # Delete data
echo "Deleting data..." echo "Deleting data..."
@@ -104,10 +95,6 @@ do
curl -XDELETE "{{ MASTERIP }}:9200/${INDX}" > /dev/null 2>&1 curl -XDELETE "{{ MASTERIP }}:9200/${INDX}" > /dev/null 2>&1
done done
<<<<<<< HEAD
/usr/sbin/so-logstash-start
/usr/sbin/so-filebeat-start
=======
#Start Logstash/Filebeat #Start Logstash/Filebeat
if [ ! -z "$FB_ENABLED" ]; then if [ ! -z "$FB_ENABLED" ]; then
@@ -126,5 +113,4 @@ if [ ! -z "$EA_ENABLED" ]; then
/usr/sbin/so-elastalert-start /usr/sbin/so-elastalert-start
fi fi
>>>>>>> 08220e33... Issue #885: so-elastic-clear not removing so-* indices

0
test.test
View File