-
Notifications
You must be signed in to change notification settings - Fork 326
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #287 from cisagov/v23.10.0_merge_cisagov
Malcolm v23.10.0 development
- Loading branch information
Showing
225 changed files
with
2,231 additions
and
1,178 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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM docker.elastic.co/beats/filebeat-oss:8.10.0 | ||
FROM docker.elastic.co/beats/filebeat-oss:8.10.4 | ||
|
||
# Copyright (c) 2023 Battelle Energy Alliance, LLC. All rights reserved. | ||
LABEL maintainer="[email protected]" | ||
|
@@ -45,7 +45,7 @@ ARG LOG_CLEANUP_MINUTES=0 | |
ARG ZIP_CLEANUP_MINUTES=0 | ||
ARG NGINX_LOG_ACCESS_AND_ERRORS=false | ||
ARG OPENSEARCH_URL="http://opensearch:9200" | ||
ARG OPENSEARCH_LOCAL=true | ||
ARG OPENSEARCH_PRIMARY="opensearch-local" | ||
ARG FILEBEAT_TCP_LISTEN=false | ||
ARG FILEBEAT_TCP_PORT=5045 | ||
ARG FILEBEAT_TCP_LOG_FORMAT="raw" | ||
|
@@ -61,10 +61,10 @@ ARG FILEBEAT_TCP_PARSE_TARGET_FIELD="" | |
ARG FILEBEAT_TCP_PARSE_DROP_FIELD="" | ||
ARG FILEBEAT_TCP_TAG="_malcolm_beats" | ||
|
||
ENV SUPERCRONIC_VERSION "0.2.26" | ||
ENV SUPERCRONIC_VERSION "0.2.27" | ||
ENV SUPERCRONIC_URL "https://github.com/aptible/supercronic/releases/download/v$SUPERCRONIC_VERSION/supercronic-linux-amd64" | ||
ENV SUPERCRONIC "supercronic-linux-amd64" | ||
ENV SUPERCRONIC_SHA1SUM "7a79496cf8ad899b99a719355d4db27422396735" | ||
ENV SUPERCRONIC_SHA1SUM "7dadd4ac827e7bd60b386414dfefc898ae5b6c63" | ||
ENV SUPERCRONIC_CRONTAB "/etc/crontab" | ||
|
||
ENV TINI_VERSION v0.19.0 | ||
|
@@ -146,7 +146,7 @@ ENV FILEBEAT_SURICATA_LOG_PATH $FILEBEAT_SURICATA_LOG_PATH | |
ENV FILEBEAT_NGINX_LOG_PATH $FILEBEAT_NGINX_LOG_PATH | ||
ENV NGINX_LOG_ACCESS_AND_ERRORS $NGINX_LOG_ACCESS_AND_ERRORS | ||
ENV OPENSEARCH_URL $OPENSEARCH_URL | ||
ENV OPENSEARCH_LOCAL $OPENSEARCH_LOCAL | ||
ENV OPENSEARCH_PRIMARY $OPENSEARCH_PRIMARY | ||
ENV FILEBEAT_TCP_LISTEN $FILEBEAT_TCP_LISTEN | ||
ENV FILEBEAT_TCP_PORT $FILEBEAT_TCP_PORT | ||
ENV FILEBEAT_TCP_LOG_FORMAT $FILEBEAT_TCP_LOG_FORMAT | ||
|
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/logstash/logstash-oss:8.10.0 | ||
FROM docker.elastic.co/logstash/logstash-oss:8.10.4 | ||
|
||
LABEL maintainer="[email protected]" | ||
LABEL org.opencontainers.image.authors='[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 netboxcommunity/netbox:v3.6.1 | ||
FROM netboxcommunity/netbox:v3.6.4 | ||
|
||
# Copyright (c) 2023 Battelle Energy Alliance, LLC. All rights reserved. | ||
LABEL maintainer="[email protected]" | ||
|
@@ -24,10 +24,10 @@ ENV PUSER "ubuntu" | |
ENV PGROUP "ubuntu" | ||
ENV PUSER_PRIV_DROP true | ||
|
||
ENV SUPERCRONIC_VERSION "0.2.26" | ||
ENV SUPERCRONIC_VERSION "0.2.27" | ||
ENV SUPERCRONIC_URL "https://github.com/aptible/supercronic/releases/download/v$SUPERCRONIC_VERSION/supercronic-linux-amd64" | ||
ENV SUPERCRONIC "supercronic-linux-amd64" | ||
ENV SUPERCRONIC_SHA1SUM "7a79496cf8ad899b99a719355d4db27422396735" | ||
ENV SUPERCRONIC_SHA1SUM "7dadd4ac827e7bd60b386414dfefc898ae5b6c63" | ||
ENV SUPERCRONIC_CRONTAB "/etc/crontab" | ||
|
||
ENV YQ_VERSION "4.33.3" | ||
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,5 @@ | ||
#!/bin/sh | ||
|
||
echo "Giving OpenSearch time to start..." | ||
"${APP_HOME}"/opensearch_status.sh 2>&1 && echo "OpenSearch is running!" | ||
"${APP_HOME}"/opensearch_status.sh | ||
|
||
exec "$@" |
Oops, something went wrong.