Merge pull request #418 from splunk/develop

Release/8.0.6

.circleci/config.yml

@@ -35,6 +35,7 @@ jobs:
   debian10-testing:
     machine:
       image: circleci/classic:latest
+    resource_class: xlarge
     steps:
       - checkout
       - run:
@@ -61,9 +62,13 @@ jobs:
           name: Test if image size increase
           command: make test_debian10_image_size
       - run:
-          name: Run Debian 10 image tests
-          command: make run_tests_debian10
+          name: Run small Debian 10 image tests
+          command: make run_small_tests_debian10
           no_output_timeout: 20m
+      - run:
+          name: Run large Debian 10 image tests
+          command: make run_large_tests_debian10
+          no_output_timeout: 1h
       - store_artifacts:
           path: test-results
           destination: test-results
@@ -72,6 +77,7 @@ jobs:
   redhat8-testing:
     machine:
       image: circleci/classic:latest
+    resource_class: xlarge
     steps:
       - checkout
       - run:
@@ -95,9 +101,13 @@ jobs:
           command: |
             make uf-redhat-8
       - run:
-          name: Run Redhat 8 image tests
-          command: make run_tests_redhat8
+          name: Run small Redhat 8 image tests
+          command: make run_small_tests_redhat8
           no_output_timeout: 20m
+      - run:
+          name: Run large Redhat 8 image tests
+          command: make run_large_tests_redhat8
+          no_output_timeout: 1h
       - store_artifacts:
           path: test-results
           destination: test-results
@@ -144,6 +154,4 @@ workflows:
       - security-scanning
       - debian10-testing
       - container-validation
-      - redhat8-testing
-
-
+      - redhat8-testing

.gitignore

@@ -8,5 +8,4 @@ splunk-ansible
 *.xml
 *clair-scanner*
 .env
-tests/fixtures/*
 venv

Makefile

@@ -7,8 +7,8 @@ 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 := 8.0.5
-SPLUNK_BUILD := a1a6394cc5ae
+SPLUNK_VERSION := 8.0.6
+SPLUNK_BUILD := 152fb4b2bb96
 ifeq ($(shell arch), s390x)
 	SPLUNK_ARCH = s390x
 else
@@ -289,23 +289,35 @@ sample-compose-up: sample-compose-down
 sample-compose-down:
 	docker-compose -f test_scenarios/${SPLUNK_COMPOSE} down --volumes --remove-orphans || true
 
-test: clean ansible test_setup all run_tests_centos7 run_tests_redhat8 run_tests_debian9
+test: clean ansible test_setup all run_small_tests run_large_tests
 
-test_centos7: clean ansible splunk-centos-7 uf-centos-7 test_setup run_tests_centos7
+run_small_tests: run_small_tests_centos7 run_small_tests_redhat8 run_small_tests_debian9 run_small_tests_debian10
 
-test_redhat8: clean ansible splunk-redhat-8 uf-redhat-8 test_setup run_tests_redhat8
+run_large_tests: run_large_tests_centos7 run_large_tests_redhat8 run_large_tests_debian9 run_large_tests_debian10
 
-test_debian9: clean ansible splunk-debian-9 uf-debian-9 test_setup run_tests_debian9
+test_centos7: clean ansible splunk-centos-7 uf-centos-7 test_setup run_small_tests_centos7 run_large_tests_centos7
 
-test_debian10: clean ansible splunk-debian-10 uf-debian-10 test_setup run_tests_debian10
+test_redhat8: clean ansible splunk-redhat-8 uf-redhat-8 test_setup run_small_tests_redhat8 run_large_tests_redhat8
 
-run_tests_centos7:
-	@echo 'Running the super awesome tests; CentOS 7'
-	pytest -sv tests/test_docker_splunk.py --platform centos-7 --junitxml test-results/centos7-result/testresults_centos7.xml
+test_debian9: clean ansible splunk-debian-9 uf-debian-9 test_setup run_small_tests_debian9 run_large_tests_debian9
 
-run_tests_redhat8:
-	@echo 'Running the super awesome tests; RedHat 8'
-	pytest -sv tests/test_docker_splunk.py --platform redhat-8 --junitxml test-results/redhat8-result/testresults_redhat8.xml
+test_debian10: clean ansible splunk-debian-10 uf-debian-10 test_setup run_small_tests_debian10 run_large_tests_debian10
+
+run_small_tests_centos7:
+	@echo 'Running the super awesome small tests; CentOS 7'
+	pytest -n 2 --reruns 1 -sv tests/test_single_splunk_image.py --platform centos-7 --junitxml test-results/centos7-result/testresults_small_centos7.xml
+
+run_large_tests_centos7:
+	@echo 'Running the super awesome large tests; CentOS 7'
+	pytest -n 2 --reruns 1 -sv tests/test_distributed_splunk_image.py --platform centos-7 --junitxml test-results/centos7-result/testresults_large_centos7.xml
+
+run_small_tests_redhat8:
+	@echo 'Running the super awesome small tests; RedHat 8'
+	pytest -n 2 --reruns 1 -sv tests/test_single_splunk_image.py --platform redhat-8 --junitxml test-results/redhat8-result/testresults_small_redhat8.xml
+
+run_large_tests_redhat8:
+	@echo 'Running the super awesome large tests; RedHat 8'
+	pytest -n 2 --reruns 1 -sv tests/test_distributed_splunk_image.py --platform redhat-8 --junitxml test-results/redhat8-result/testresults_large_redhat8.xml
 
 test_setup:
 	@echo 'Install test requirements'
@@ -316,13 +328,21 @@ test_setup:
 	mkdir test-results/debian10-result || true
 	mkdir test-results/redhat8-result || true
 
-run_tests_debian9:
-	@echo 'Running the super awesome tests; Debian 9'
-	pytest -sv tests/test_docker_splunk.py --platform debian-9 --junitxml test-results/debian9-result/testresults_debian9.xml
+run_small_tests_debian9:
+	@echo 'Running the super awesome small tests; Debian 9'
+	pytest -n 2 --reruns 1 -sv tests/test_single_splunk_image.py --platform debian-9 --junitxml test-results/debian9-result/testresults_small_debian9.xml
+
+run_large_tests_debian9:
+	@echo 'Running the super awesome large tests; Debian 9'
+	pytest -n 2 --reruns 1 -sv tests/test_distributed_splunk_image.py --platform debian-9 --junitxml test-results/debian9-result/testresults_large_debian9.xml
+
+run_small_tests_debian10:
+	@echo 'Running the super awesome small tests; Debian 10'
+	pytest -n 2 --reruns 1 -sv tests/test_single_splunk_image.py --platform debian-10 --junitxml test-results/debian10-result/testresults_small_debian10.xml
 
-run_tests_debian10:
-	@echo 'Running the super awesome tests; Debian 10'
-	pytest -sv tests/test_docker_splunk.py --platform debian-10 --junitxml test-results/debian10-result/testresults_debian10.xml
+run_large_tests_debian10:
+	@echo 'Running the super awesome large tests; Debian 10'
+	pytest -n 2 --reruns 1 -sv tests/test_distributed_splunk_image.py --platform debian-10 --junitxml test-results/debian10-result/testresults_large_debian10.xml
 
 save_containers:
 	@echo 'Saving the following containers:${CONTAINERS_TO_SAVE}'

README.md

@@ -95,7 +95,7 @@ Use the [GitHub issue tracker](https://github.com/splunk/docker-splunk/issues) t
 
 If you have additional questions or need more support, you can:
 * Post a question to [Splunk Answers](http://answers.splunk.com)
-* Join the [#docker](https://splunk-usergroups.slack.com/messages/C1RH09ERM/) room in the [Splunk Slack channel](http://splunk-usergroups.slack.com)
+* Join the [#docker](https://splunk-usergroups.slack.com/messages/C1RH09ERM/) room in the [Splunk Slack channel](http://splunk-usergroups.slack.com). If you're a new Splunk customer you can register for Slack [here](http://splk.it/slack)
 * If you are a Splunk Enterprise customer with a valid support entitlement contract and have a Splunk-related question, you can also open a support case on the https://www.splunk.com/ support portal
 
 See the official [support guidelines](docs/SUPPORT.md) for more detailed information.

base/debian-10/install.sh

@@ -43,6 +43,8 @@ tar -xf /usr/bin/scloud.tar.gz -C /usr/bin/
 rm /usr/bin/scloud.tar.gz
 
 cd /bin
+ln -s busybox clear
+ln -s busybox find
 ln -s busybox killall
 ln -s busybox netstat
 ln -s busybox nslookup

base/debian-9/install.sh

@@ -43,6 +43,8 @@ tar -xf /usr/bin/scloud.tar.gz -C /usr/bin/
 rm /usr/bin/scloud.tar.gz
 
 cd /bin
+ln -s busybox clear
+ln -s busybox find
 ln -s busybox diff
 ln -s busybox killall
 ln -s busybox netstat

base/redhat-8/install.sh

@@ -35,7 +35,7 @@ chmod +x /bin/busybox
 microdnf -y --nodocs update gnutls kernel-headers
 microdnf -y --nodocs install python2-pip python2-devel redhat-rpm-config gcc libffi-devel openssl-devel
 pip2 --no-cache-dir install requests ansible jmespath
-microdnf -y remove gcc openssl-devel redhat-rpm-config python2-devel device-mapper-libs device-mapper trousers systemd systemd-pam \
+microdnf -y remove gcc openssl-devel redhat-rpm-config python2-devel device-mapper-libs device-mapper trousers \
                    dwz dbus dbus-common dbus-daemon dbus-tools dbus-libs go-srpm-macros iptables-libs annobin cryptsetup-libs \
                    ocaml-srpm-macros openblas-srpm-macros qt5-srpm-macros perl-srpm-macros rust-srpm-macros ghc-srpm-macros \
                    efi-srpm-macros python-srpm-macros python-rpm-macros python3-rpm-macros python2-rpm-macros python3-rpm-generators \
@@ -50,6 +50,8 @@ tar -xf /usr/bin/scloud.tar.gz -C /usr/bin/
 rm /usr/bin/scloud.tar.gz
 
 cd /bin
+ln -s busybox clear || true
+ln -s busybox find || true
 ln -s python2 python || true
 ln -s busybox diff || true
 ln -s busybox hostname || true

docs/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Navigation
 
+* [8.0.6](#806)
+* [8.0.5.1](#8051)
 * [8.0.5](#805)
 * [8.0.4.1](#8041)
 * [8.0.4](#804)
@@ -35,6 +37,35 @@
 
 ---
 
+## 8.0.6
+
+#### What's New?
+* Releasing new images to support Splunk Enterprise maintenance patch.
+
+#### docker-splunk changes:
+* Bumping Splunk version. For details, see [Fixed issues for 8.0.6](https://docs.splunk.com/Documentation/Splunk/8.0.6/ReleaseNotes/Fixedissues)
+* Test rewrite for parallelization
+* Decouples `etc` backup directory from `SPLUNK_HOME`
+* Added tests and documentation for new features
+
+#### splunk-ansible changes:
+* Support for declarative admin password, enabling password updates and rotations. `splunk.password` will always be the password for the admin user and changes to `splunk.password` will drive password reconciliation.
+* Added flag to disable pop-ups and new user tour
+* Fixed default variable propagation order
+
+---
+
+## 8.0.5.1
+
+#### What's New?
+* New Splunk Enterprise maintenance patch. For details, see [Fixed issues for 8.0.5.1](https://docs.splunk.com/Documentation/Splunk/8.0.5/ReleaseNotes/Fixedissues)
+* Bundling in changes to be consistent with the release of [8.0.6](#806)
+
+#### Changes
+* See [8.0.6](#806) changes
+
+---
+
 ## 8.0.5
 
 #### What's New?

splunk/common-files/entrypoint.sh

@@ -124,6 +124,7 @@ Environment Variables:
   * SPLUNK_GROUP - group under which to run Splunk (default: splunk)
   * SPLUNK_HOME - home directory where Splunk gets installed (default: /opt/splunk)
   * SPLUNK_START_ARGS - arguments to pass into the Splunk start command; you must include '--accept-license' to start Splunk (default: none)
+  * SPLUNK_PASSWORD - password to log into this Splunk instance, you must include a password (default: none)
   * SPLUNK_ROLE - the role of this Splunk instance (default: splunk_standalone)
       Acceptable values:
         - splunk_standalone
@@ -140,9 +141,9 @@ Environment Variables:
   * SPLUNK_APPS_URL - comma-separated list of URLs to Splunk apps which will be downloaded and installed
 
 Examples:
-  * docker run -it -p 8000:8000 splunk/splunk start
-  * docker run -it -e SPLUNK_START_ARGS=--accept-license -p 8000:8000 -p 8089:8089 splunk/splunk start
-  * docker run -it -e SPLUNK_START_ARGS=--accept-license -e SPLUNK_LICENSE_URI=http://example.com/splunk.lic -p 8000:8000 splunk/splunk start
+  * docker run -it -e SPLUNK_PASSWORD=helloworld -p 8000:8000 splunk/splunk start
+  * docker run -it -e SPLUNK_START_ARGS=--accept-license -e SPLUNK_PASSWORD=helloworld -p 8000:8000 -p 8089:8089 splunk/splunk start
+  * docker run -it -e SPLUNK_START_ARGS=--accept-license -e SPLUNK_LICENSE_URI=http://example.com/splunk.lic -e SPLUNK_PASSWORD=helloworld -p 8000:8000 splunk/splunk start
   * docker run -it -e SPLUNK_START_ARGS=--accept-license -e SPLUNK_INDEXER_URL=idx1,idx2 -e SPLUNK_SEARCH_HEAD_URL=sh1,sh2 -e SPLUNK_ROLE=splunk_search_head --hostname sh1 --network splunknet --network-alias sh1 -e SPLUNK_PASSWORD=helloworld -e SPLUNK_LICENSE_URI=http://example.com/splunk.lic splunk/splunk start
 
 EOF

splunk/common-files/updateetc.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2018 Splunk
+# Copyright 2018-2020 Splunk
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,15 +15,17 @@
 # limitations under the License.
 #
 
-if [[ -f "${SPLUNK_HOME}-etc/splunk.version" ]]; then
-	IMAGE_VERSION_SHA=`cat ${SPLUNK_HOME}-etc/splunk.version | sha512sum`
+SPLUNK_ETC_BAK="${SPLUNK_ETC_BAK:-/opt/splunk-etc}"
+
+if [[ -f "${SPLUNK_ETC_BAK}/splunk.version" ]]; then
+	IMAGE_VERSION_SHA=`cat ${SPLUNK_ETC_BAK}/splunk.version | sha512sum`
 
 	if [[ -f "${SPLUNK_HOME}/etc/splunk.version" ]]; then
 		ETC_VERSION_SHA=`cat ${SPLUNK_HOME}/etc/splunk.version | sha512sum`
 	fi
 
 	if [[ "x${IMAGE_VERSION_SHA}" != "x${ETC_VERSION_SHA}" ]]; then
     	echo Updating ${SPLUNK_HOME}/etc
-    	(cd ${SPLUNK_HOME}-etc; tar cf - *) | (cd ${SPLUNK_HOME}/etc; tar xf -)
+    	(cd ${SPLUNK_ETC_BAK}; tar cf - *) | (cd ${SPLUNK_HOME}/etc; tar xf -)
 	fi
 fi

test_scenarios/1dep3sh2idx1dmc.yaml

@@ -22,6 +22,7 @@ services:
       - SPLUNK_SEARCH_HEAD_CAPTAIN_URL=sh1
       - SPLUNK_DEPLOYER_URL=dep1
       - SPLUNK_ROLE=splunk_deployer
+      - SPLUNK_SHC_PASS4SYMMKEY=mylittlepony
       - SPLUNK_LICENSE_URI
       - DEBUG=true
       - SPLUNK_PASSWORD
@@ -45,6 +46,7 @@ services:
       - SPLUNK_SEARCH_HEAD_CAPTAIN_URL=sh1
       - SPLUNK_DEPLOYER_URL=dep1
       - SPLUNK_ROLE=splunk_search_head_captain
+      - SPLUNK_SHC_PASS4SYMMKEY=mylittlepony
       - SPLUNK_LICENSE_URI
       - DEBUG=true
       - SPLUNK_PASSWORD
@@ -68,6 +70,7 @@ services:
       - SPLUNK_SEARCH_HEAD_CAPTAIN_URL=sh1
       - SPLUNK_DEPLOYER_URL=dep1
       - SPLUNK_ROLE=splunk_search_head
+      - SPLUNK_SHC_PASS4SYMMKEY=mylittlepony
       - SPLUNK_LICENSE_URI
       - DEBUG=true
       - SPLUNK_PASSWORD
@@ -91,6 +94,7 @@ services:
       - SPLUNK_SEARCH_HEAD_CAPTAIN_URL=sh1
       - SPLUNK_DEPLOYER_URL=dep1
       - SPLUNK_ROLE=splunk_search_head
+      - SPLUNK_SHC_PASS4SYMMKEY=mylittlepony
       - SPLUNK_LICENSE_URI
       - DEBUG=true
       - SPLUNK_PASSWORD
@@ -114,6 +118,7 @@ services:
       - SPLUNK_SEARCH_HEAD_CAPTAIN_URL=sh1
       - SPLUNK_DEPLOYER_URL=dep1
       - SPLUNK_ROLE=splunk_indexer
+      - SPLUNK_SHC_PASS4SYMMKEY=mylittlepony
       - SPLUNK_LICENSE_URI
       - DEBUG=true
       - SPLUNK_PASSWORD
@@ -137,6 +142,7 @@ services:
       - SPLUNK_SEARCH_HEAD_CAPTAIN_URL=sh1
       - SPLUNK_DEPLOYER_URL=dep1
       - SPLUNK_ROLE=splunk_indexer
+      - SPLUNK_SHC_PASS4SYMMKEY=mylittlepony
       - SPLUNK_LICENSE_URI
       - DEBUG=true
       - SPLUNK_PASSWORD
@@ -160,6 +166,7 @@ services:
       - SPLUNK_SEARCH_HEAD_CAPTAIN_URL=sh1
       - SPLUNK_DEPLOYER_URL=dep1
       - SPLUNK_ROLE=splunk_monitor
+      - SPLUNK_SHC_PASS4SYMMKEY=mylittlepony
       - SPLUNK_LICENSE_URI
       - SPLUNK_PASSWORD
       - DEBUG=true

test_scenarios/1deployment1cm.yaml

@@ -13,7 +13,6 @@ services:
           - appserver
     image: nwang92/nginx-mitm
     hostname: appserver
-    container_name: appserver
     ports:
       - 80
     volumes:
@@ -26,13 +25,13 @@ services:
           - depserver1
     image: ${SPLUNK_IMAGE:-splunk/splunk:latest}
     hostname: depserver1
-    container_name: depserver1
     environment:
       - SPLUNK_START_ARGS=--accept-license
       - SPLUNK_ROLE=splunk_deployment_server
-      - SPLUNK_APPS_URL=http://appserver/splunk_app_example.tgz
+      - SPLUNK_APPS_URL
       - DEBUG=true
       - SPLUNK_PASSWORD
+      - SPLUNK_DEFAULTS_URL
     ports:
       - 8089
     volumes:
@@ -45,14 +44,14 @@ services:
           - cm1
     image: ${SPLUNK_IMAGE:-splunk/splunk:latest}
     hostname: cm1
-    container_name: cm1
     environment:
       - SPLUNK_START_ARGS=--accept-license
       - SPLUNK_DEPLOYMENT_SERVER=depserver1
       - SPLUNK_ROLE=splunk_cluster_master
       - SPLUNK_CLUSTER_MASTER_URL=cm1
       - DEBUG=true
       - SPLUNK_PASSWORD
+      - SPLUNK_DEFAULTS_URL
     ports:
       - 8000
       - 8089