Merge branch 'develop' into docs/kramdown

Author: Brent Boe

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 := 7.3.0
-SPLUNK_BUILD := 657388c7a488
+SPLUNK_VERSION := 7.3.1
+SPLUNK_BUILD := bd63e13aa157
 ifeq ($(shell arch), s390x)
 	SPLUNK_ARCH = s390x
 else

base/redhat-8/Dockerfile

@@ -12,9 +12,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# NOTE that since OpenShift Container Platform 3.11
+# the container catalog moved from registry.access.redhat.com to registry.redhat.io
+# So at some point before they deprecate the old registry we have to make sure that
+# we have access to the new registry and change where we pull the ubi image from.
 FROM registry.access.redhat.com/ubi8/ubi-minimal
-LABEL maintainer="support@splunk.com"
+LABEL name="splunk" \
+      maintainer="support@splunk.com" \
+      vendor="splunk" \
+      version="7.3.1" \
+      release="1" \
+      summary="UBI 8 Docker image of Splunk Enterprise" \
+      description="Splunk Enterprise is a platform for operational intelligence. Our software lets you collect, analyze, and act upon the untapped value of big data that your technology infrastructure, security systems, and business applications generate. It gives you insights to drive operational performance and business results."
+
+RUN mkdir /licenses; \
+	curl -o /licenses/apache-2.0.txt https://www.apache.org/licenses/LICENSE-2.0.txt; \
+	curl -o /licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf https://www.redhat.com/licenses/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf
 
 COPY install.sh /install.sh
-COPY EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf /EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf
 RUN /install.sh && rm -rf /install.sh

base/redhat-8/EULA_Red_Hat_Universal_Base_Image_English_20190422.pdf

@@ -2,6 +2,7 @@
 
 ## Navigation
 
+* [7.3.1](#731)
 * [7.3.0](#730)
 * [7.2.7](#727)
 * [7.2.6](#726)
@@ -15,6 +16,24 @@
 
 ---
 
+## 7.3.1
+
+#### What's New?
+* New Splunk Enterprise release of 7.3.1
+
+#### docker-splunk changes:
+* Bumping Splunk version. For details, see: https://docs.splunk.com/Documentation/Splunk/7.3.1/ReleaseNotes/Fixedissues
+* Documentation update
+* Minor bug fixes
+
+#### splunk-ansible changes:
+* Fixed Enterprise Security application installation issues
+* Refactored Systemd
+* Fixed Ansible formatting issue
+* Cleaned up Python files before install
+
+---
+
 ## 7.3.0
 
 #### What's New?

docs/CHANGELOG.md

@@ -0,0 +1,101 @@
+version: "3.6"
+
+networks:
+  splunknet:
+    driver: bridge
+    attachable: true
+
+volumes:
+  mnt-spark:
+  mnt-jdk:
+
+services:
+  init:
+    image: ${SPARK_IMAGE:-splunk/spark:latest}
+    entrypoint: [ "sh", "-c" ]
+    command: [ "cp -r /opt/jdk /mnt && cp -r /opt/spark /mnt" ]
+    hostname: init
+    container_name: init
+    networks:
+      splunknet:
+        aliases:
+          - init
+    volumes:
+      - mnt-spark:/mnt/spark
+      - mnt-jdk:/mnt/jdk
+
+  sh1:
+    networks:
+      splunknet:
+        aliases:
+          - sh1
+    image: ${SPLUNK_IMAGE:-splunk/splunk:latest}
+    command: start
+    hostname: sh1
+    container_name: sh1
+    environment:
+      - SPLUNK_START_ARGS=--accept-license
+      - SPLUNK_SEARCH_HEAD_URL=sh1
+      - SPLUNK_INDEXER_URL=idx1
+      - SPLUNK_ROLE=splunk_search_head
+      - SPLUNK_LICENSE_URI
+      - SPLUNK_PASSWORD
+      - DEBUG=true
+      - SPLUNK_ENABLE_DFS=true
+      - SPARK_MASTER_HOST=spark-master
+      - SPARK_MASTER_WEBUI_PORT=8009
+      - JAVA_HOME=/mnt/jdk
+      - SPARK_HOME=/mnt/spark
+      - SPLUNK_DFW_NUM_SLOTS_ENABLED=false
+    ports:
+      - 8000
+      - 8089
+    depends_on:
+      - init
+    volumes:
+      - mnt-spark:/mnt/spark
+      - mnt-jdk:/mnt/jdk
+
+  idx1:
+    networks:
+      splunknet:
+        aliases:
+          - idx1
+    image: ${SPLUNK_IMAGE:-splunk/splunk:latest}
+    command: start
+    hostname: idx1
+    container_name: idx1
+    environment:
+      - SPLUNK_START_ARGS=--accept-license
+      - SPLUNK_SEARCH_HEAD_URL=sh1
+      - SPLUNK_INDEXER_URL=idx1
+      - SPLUNK_ROLE=splunk_indexer
+      - SPLUNK_LICENSE_URI
+      - SPLUNK_PASSWORD
+      - DEBUG=true
+    ports:
+      - 8000
+      - 8089
+
+  spark-master:
+    image: ${SPARK_IMAGE:-splunk/spark:latest}
+    hostname: spark-master
+    container_name: spark-master
+    networks:
+      splunknet:
+        aliases:
+          - spark-master
+    environment:
+      - SPLUNK_ROLE=splunk_spark_master
+
+  spark-worker:
+    image: ${SPARK_IMAGE:-splunk/spark:latest}
+    hostname: spark-worker
+    container_name: spark-worker
+    networks:
+      splunknet:
+        aliases:
+          - spark-worker
+    environment:
+      - SPLUNK_ROLE=splunk_spark_worker
+      - SPARK_MASTER_HOSTNAME=spark-master