diff --git a/Makefile b/Makefile index aa741830..573d4bde 100644 --- a/Makefile +++ b/Makefile @@ -7,18 +7,18 @@ SPLUNK_ANSIBLE_BRANCH ?= develop SPLUNK_COMPOSE ?= cluster_absolute_unit.yaml # Set Splunk version/build parameters here to define downstream URLs and file names SPLUNK_PRODUCT := splunk -SPLUNK_VERSION := 9.2.1 -SPLUNK_BUILD := 78803f08aabb +SPLUNK_VERSION := 9.4.0 +SPLUNK_BUILD := 6b4ebe426ca6 ifeq ($(shell arch), s390x) SPLUNK_ARCH = s390x else - SPLUNK_ARCH = x86_64 + SPLUNK_ARCH = amd64 endif # Linux Splunk arguments -SPLUNK_LINUX_FILENAME ?= splunk-${SPLUNK_VERSION}-${SPLUNK_BUILD}-Linux-${SPLUNK_ARCH}.tgz +SPLUNK_LINUX_FILENAME ?= splunk-${SPLUNK_VERSION}-${SPLUNK_BUILD}-linux-${SPLUNK_ARCH}.tgz SPLUNK_LINUX_BUILD_URL ?= https://download.splunk.com/products/${SPLUNK_PRODUCT}/releases/${SPLUNK_VERSION}/linux/${SPLUNK_LINUX_FILENAME} -UF_LINUX_FILENAME ?= splunkforwarder-${SPLUNK_VERSION}-${SPLUNK_BUILD}-Linux-${SPLUNK_ARCH}.tgz +UF_LINUX_FILENAME ?= splunkforwarder-${SPLUNK_VERSION}-${SPLUNK_BUILD}-linux-${SPLUNK_ARCH}.tgz UF_LINUX_BUILD_URL ?= https://download.splunk.com/products/universalforwarder/releases/${SPLUNK_VERSION}/linux/${UF_LINUX_FILENAME} # Windows Splunk arguments SPLUNK_WIN_FILENAME ?= splunk-${SPLUNK_VERSION}-${SPLUNK_BUILD}-x64-release.msi diff --git a/README.md b/README.md index 4d9af0b8..c2637b38 100644 --- a/README.md +++ b/README.md @@ -56,6 +56,8 @@ This command does the following: After the container starts up, you can access Splunk Web at with `admin:`. +The license you are accepting is the Splunk General Terms, available [here](https://www.splunk.com/en_us/legal/splunk-general-terms.html). Unless you have jointly executed with Splunk a negotiated version of these General Terms that explicitly supersedes this agreement, by accessing or using Splunk software, you are agreeing to the Splunk General Terms. Please read and make sure you agree to the Splunk General Terms before you access or use this software. Only once you've done so should you include the `accept-license` flag to indicate your acceptance of the Splunk General Terms available here and launch this software. + To view the logs from the container created above, run: ```bash $ docker logs -f so1 @@ -113,9 +115,13 @@ We welcome feedback and contributions from the community! See our [contribution --- ## License -Copyright 2018-2020 Splunk. +Copyright 2018-2024 Splunk. Distributed under the terms of our [license](docs/LICENSE.md), splunk-ansible is free and open source software. +The software in this container is licensed under and subject to the [Splunk General Terms](https://www.splunk.com/en_us/legal/splunk-general-terms.html). By accessing this container and its software you agree to the [Splunk General Terms](https://www.splunk.com/en_us/legal/splunk-general-terms.html). + +If you do not agree, do not access or use this software. + ## Authors Splunk Inc. and the Splunk Community diff --git a/base/redhat-8/install.sh b/base/redhat-8/install.sh index 790f7217..1f0ddbca 100755 --- a/base/redhat-8/install.sh +++ b/base/redhat-8/install.sh @@ -29,7 +29,7 @@ export LANG=en_US.utf8 # Install utility packages microdnf -y --nodocs install wget sudo shadow-utils procps tar make gcc \ openssl-devel bzip2-devel libffi-devel findutils \ - libssh-devel libcurl-devel glib2-devel ncurses-devel \ + libssh-devel libcurl-devel ncurses-devel \ diffutils bzip2 # Patch security updates microdnf -y --nodocs update gnutls kernel-headers libdnf librepo libnghttp2 nettle \ @@ -78,7 +78,7 @@ ln -sf /usr/bin/pip${PY_SHORT} /usr/bin/pip3 # Install splunk-ansible dependencies cd / /usr/bin/python3.9 -m pip install --upgrade pip -pip -q --no-cache-dir install --upgrade "requests_unixsocket<2.29" "requests<2.29" six wheel Mako "urllib3<2.0.0" certifi jmespath future avro cryptography lxml protobuf setuptools ansible +pip -q --no-cache-dir install --upgrade requests_unixsocket requests six wheel Mako "urllib3<2.0.0" certifi jmespath future avro cryptography lxml protobuf setuptools ansible # Remove tests packaged in python libs find /usr/lib/ -depth \( -type d -a -not -wholename '*/ansible/plugins/test' -a \( -name test -o -name tests -o -name idle_test \) \) -exec rm -rf '{}' \; @@ -87,7 +87,7 @@ find /usr/lib/ -depth \( -type f -a -name 'wininst-*.exe' \) -exec rm -rf '{}' \ ldconfig # Cleanup -microdnf remove -y make gcc openssl-devel bzip2-devel findutils glib2-devel glibc-devel cpp binutils \ +microdnf remove -y make gcc openssl-devel bzip2-devel findutils glibc-devel cpp binutils \ keyutils-libs-devel krb5-devel libcom_err-devel libffi-devel libcurl-devel \ libselinux-devel libsepol-devel libssh-devel libverto-devel libxcrypt-devel \ ncurses-devel pcre2-devel zlib-devel diffutils bzip2 diff --git a/splunk/common-files/entrypoint.sh b/splunk/common-files/entrypoint.sh index 02f8b492..91571c14 100755 --- a/splunk/common-files/entrypoint.sh +++ b/splunk/common-files/entrypoint.sh @@ -18,7 +18,11 @@ set -e setup() { # Check if the user accepted the license if [[ "$SPLUNK_START_ARGS" != *"--accept-license"* ]]; then - printf "License not accepted, please ensure the environment variable SPLUNK_START_ARGS contains the '--accept-license' flag\n" + printf "License not accepted, please adjust SPLUNK_START_ARGS to indicate you have accepted the license.\n" + printf "The license you are accepting is the Splunk General Terms, available here: https://www.splunk.com/en_us/legal/splunk-general-terms.html\n" + printf "Unless you have jointly executed with Splunk a negotiated version of these General Terms that explicitly supersedes this agreement, by accessing or using Splunk software, you are agreeing to the Splunk General Terms.\n" + printf "Please read and make sure you agree to the Splunk General Terms before you access or use this software.\n" + printf "Only once you've done so should you include the '--accept-license' flag to indicate your acceptance of the Splunk General Terms and launch this software.\n" printf "For example: docker run -e SPLUNK_START_ARGS=--accept-license -e SPLUNK_PASSWORD splunk/splunk\n\n" printf "For additional information and examples, see the help: docker run -it splunk/splunk help\n" exit 1 @@ -62,10 +66,10 @@ watch_for_failure(){ # Any crashes/errors while Splunk is running should get logged to splunkd_stderr.log and sent to the container's stdout if [ -z "$SPLUNK_TAIL_FILE" ]; then echo Ansible playbook complete, will begin streaming splunkd_stderr.log - ${RUN_AS_SPLUNK} tail -n 0 -f ${SPLUNK_HOME}/var/log/splunk/splunkd_stderr.log & + ${RUN_AS_SPLUNK} tail -n 0 -F ${SPLUNK_HOME}/var/log/splunk/splunkd_stderr.log & else echo Ansible playbook complete, will begin streaming ${SPLUNK_TAIL_FILE} - ${RUN_AS_SPLUNK} tail -n 0 -f ${SPLUNK_TAIL_FILE} & + ${RUN_AS_SPLUNK} tail -n 0 -F ${SPLUNK_TAIL_FILE} & fi if [[ "$DISABLE_ENTIRE_SHELL_ACCESS" == "true" ]]; then disable_entire_shell_access_for_container diff --git a/uf/common-files/entrypoint.sh b/uf/common-files/entrypoint.sh index 19c24dae..5a2d5def 100755 --- a/uf/common-files/entrypoint.sh +++ b/uf/common-files/entrypoint.sh @@ -19,7 +19,11 @@ set -e setup() { # Check if the user accepted the license if [[ "$SPLUNK_START_ARGS" != *"--accept-license"* ]]; then - printf "License not accepted, please ensure the environment variable SPLUNK_START_ARGS contains the '--accept-license' flag\n" + printf "License not accepted, please adjust SPLUNK_START_ARGS to indicate you have accepted the license.\n" + printf "The license you are accepting is the Splunk General Terms, available here: https://www.splunk.com/en_us/legal/splunk-general-terms.html\n" + printf "Unless you have jointly executed with Splunk a negotiated version of these General Terms that explicitly supersedes this agreement, by accessing or using Splunk software, you are agreeing to the Splunk General Terms.\n" + printf "Please read and make sure you agree to the Splunk General Terms before you access or use this software.\n" + printf "Only once you've done so should you include the '--accept-license' flag to indicate your acceptance of the Splunk General Terms and launch this software.\n" printf "For example: docker run -e SPLUNK_START_ARGS=--accept-license splunk/universalforwarder\n\n" printf "For additional information and examples, see the help: docker run -it splunk/universalforwarder help\n" exit 1 @@ -63,9 +67,9 @@ watch_for_failure(){ fi # Any crashes/errors while Splunk is running should get logged to splunkd_stderr.log and sent to the container's stdout if [ -z "$SPLUNK_TAIL_FILE" ]; then - ${RUN_AS_SPLUNK} tail -n 0 -f ${SPLUNK_HOME}/var/log/splunk/splunkd_stderr.log & + ${RUN_AS_SPLUNK} tail -n 0 -F ${SPLUNK_HOME}/var/log/splunk/splunkd_stderr.log & else - ${RUN_AS_SPLUNK} tail -n 0 -f ${SPLUNK_TAIL_FILE} & + ${RUN_AS_SPLUNK} tail -n 0 -F ${SPLUNK_TAIL_FILE} & fi wait }