forked from cisagov/Malcolm
-
Notifications
You must be signed in to change notification settings - Fork 61
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
update elasticsearch to 7.6.2; also, fix issue #119
- Loading branch information
Showing
80 changed files
with
195 additions
and
165 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM docker.elastic.co/beats/filebeat-oss:7.6.1 | ||
FROM docker.elastic.co/beats/filebeat-oss:7.6.2 | ||
|
||
# Copyright (c) 2020 Battelle Energy Alliance, LLC. All rights reserved. | ||
LABEL maintainer="[email protected]" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM docker.elastic.co/kibana/kibana-oss:7.6.1 | ||
FROM docker.elastic.co/kibana/kibana-oss:7.6.2 | ||
|
||
# Copyright (c) 2020 Battelle Energy Alliance, LLC. All rights reserved. | ||
LABEL maintainer="[email protected]" | ||
|
@@ -49,11 +49,11 @@ ADD kibana/dashboards /opt/kibana/dashboards | |
ADD kibana/maps /opt/maps | ||
ADD https://github.com/gwintzer/kibana-comments-app-plugin/releases/download/7.4.0/kibana-comments-app-plugin-7.4.0-latest.zip /tmp/kibana-comments.zip | ||
ADD https://github.com/prelert/kibana-swimlane-vis/releases/download/v7.6.0/prelert_swimlane_vis-7.6.0.zip /tmp/kibana-swimlane.zip | ||
ADD https://github.com/bitsensor/elastalert-kibana-plugin/releases/download/1.1.0/elastalert-kibana-plugin-1.1.0-7.5.0.zip /tmp/elastalert-kibana-plugin.zip | ||
ADD kibana/elastalert-kibana-plugin/server/routes/elastalert.js /tmp/elastalert-server-routes.js | ||
|
||
# todo: these extra plugins are kind of gutted right now with 7.5.x, need to fix | ||
|
||
# ADD https://github.com/bitsensor/elastalert-kibana-plugin/releases/download/1.1.0/elastalert-kibana-plugin-1.1.0-7.5.0.zip /tmp/elastalert-kibana-plugin.zip | ||
|
||
# see https://github.com/walterra/kibana-milestones-vis/issues/9 | ||
# ADD https://github.com/walterra/kibana-milestones-vis/releases/download/v7.1.1/kibana-milestones-vis-7.1.1.zip /tmp/kibana-milestones.zip | ||
|
||
|
@@ -73,26 +73,28 @@ RUN chmod 755 /data/*.sh /data/*.py && \ | |
chmod 400 /opt/maps/* && \ | ||
mkdir -p /var/log/supervisor && \ | ||
(echo -e "*/2 * * * * su -c /data/kibana-create-moloch-sessions-index.sh kibana >/dev/null 2>&1\n0 * * * * su -c /data/kibana_index_refresh.py kibana >/dev/null 2>&1\n" | crontab -) && \ | ||
# cd /tmp && \ | ||
# echo "Installing ElastAlert plugin..." && \ | ||
# unzip elastalert-kibana-plugin.zip kibana/elastalert-kibana-plugin/package.json && \ | ||
# sed -i "s/7\.5\.0/7\.6\.1/g" kibana/elastalert-kibana-plugin/package.json && \ | ||
# zip elastalert-kibana-plugin.zip kibana/elastalert-kibana-plugin/package.json && \ | ||
# cd /usr/share/kibana/plugins && \ | ||
# /usr/share/kibana/bin/kibana-plugin install file:///tmp/elastalert-kibana-plugin.zip --allow-root && \ | ||
# rm -rf /tmp/elastalert-kibana-plugin.zip /tmp/kibana && \ | ||
cd /tmp && \ | ||
echo "Installing ElastAlert plugin..." && \ | ||
unzip elastalert-kibana-plugin.zip kibana/elastalert-kibana-plugin/package.json && \ | ||
sed -i "s/7\.5\.0/7\.6\.2/g" kibana/elastalert-kibana-plugin/package.json && \ | ||
mkdir -p kibana/elastalert-kibana-plugin/server/routes/ && \ | ||
cp /tmp/elastalert-server-routes.js kibana/elastalert-kibana-plugin/server/routes/elastalert.js && \ | ||
zip elastalert-kibana-plugin.zip kibana/elastalert-kibana-plugin/package.json kibana/elastalert-kibana-plugin/server/routes/elastalert.js && \ | ||
cd /usr/share/kibana/plugins && \ | ||
/usr/share/kibana/bin/kibana-plugin install file:///tmp/elastalert-kibana-plugin.zip --allow-root && \ | ||
rm -rf /tmp/elastalert-kibana-plugin.zip /tmp/elastalert.js /tmp/kibana && \ | ||
cd /tmp && \ | ||
echo "Installing Comments visualization..." && \ | ||
unzip kibana-comments.zip kibana/kibana-comments-app-plugin/package.json && \ | ||
sed -i "s/7\.4\.0/7\.6\.1/g" kibana/kibana-comments-app-plugin/package.json && \ | ||
sed -i "s/7\.4\.0/7\.6\.2/g" kibana/kibana-comments-app-plugin/package.json && \ | ||
zip kibana-comments.zip kibana/kibana-comments-app-plugin/package.json && \ | ||
cd /usr/share/kibana/plugins && \ | ||
/usr/share/kibana/bin/kibana-plugin install file:///tmp/kibana-comments.zip --allow-root && \ | ||
rm -rf /tmp/kibana-comments.zip /tmp/kibana && \ | ||
cd /tmp && \ | ||
echo "Installing Swimlanes visualization..." && \ | ||
unzip kibana-swimlane.zip kibana/prelert_swimlane_vis/package.json && \ | ||
sed -i "s/7\.6\.0/7\.6\.1/g" kibana/prelert_swimlane_vis/package.json && \ | ||
sed -i "s/7\.6\.0/7\.6\.2/g" kibana/prelert_swimlane_vis/package.json && \ | ||
zip kibana-swimlane.zip kibana/prelert_swimlane_vis/package.json && \ | ||
cd /usr/share/kibana/plugins && \ | ||
/usr/share/kibana/bin/kibana-plugin install file:///tmp/kibana-swimlane.zip --allow-root && \ | ||
|
@@ -101,7 +103,7 @@ RUN chmod 755 /data/*.sh /data/*.py && \ | |
# cd /tmp && \ | ||
# echo "Installing Milestones visualization..." && \ | ||
# unzip kibana-milestones.zip kibana/kibana-milestones-vis/package.json && \ | ||
# sed -i "s/7\.1\.1/7\.6\.1/g" kibana/kibana-milestones-vis/package.json && \ | ||
# sed -i "s/7\.1\.1/7\.6\.2/g" kibana/kibana-milestones-vis/package.json && \ | ||
# zip kibana-milestones.zip kibana/kibana-milestones-vis/package.json && \ | ||
# cd /usr/share/kibana/plugins && \ | ||
# /usr/share/kibana/bin/kibana-plugin install file:///tmp/kibana-milestones.zip --allow-root && \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.