Skip to content

Commit ed77e3b

Browse files
authored
Merge pull request #498 from splunk/develop
Release/8.2.1
2 parents fd615d4 + 9df1dd5 commit ed77e3b

File tree

20 files changed

+97
-58
lines changed

20 files changed

+97
-58
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
mkdir -p trivy-results
8787
for image in ./workspace_cache/*.tar; do
8888
[ -e "$image" ] || continue
89-
./trivy image --exit-code 1 --format template --template "@contrib/junit.tpl" -o trivy-results/`basename $image`.xml --ignore-unfixed --severity "HIGH,CRITICAL" --no-progress -i "$image"
89+
./trivy image --exit-code 1 --format template --vuln-type os --template "@contrib/junit.tpl" -o trivy-results/`basename $image`.xml --ignore-unfixed --severity "HIGH,CRITICAL" --no-progress -i "$image"
9090
done
9191
- store_test_results:
9292
path: trivy-results

.trivyignore

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
# These are coming from the file below, but it's not actually installed in the container
2-
# /usr/lib/python3.7/site-packages/ansible_collections/netbox/netbox/poetry.lock
3-
CVE-2020-36242
4-
CVE-2020-14343
5-
CVE-2021-29510
6-
71
# Downgraded to LOW severity by the Product Security team as the packages are not actually
82
# shipped with the release.
93
# SPL-203200

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ SPLUNK_ANSIBLE_BRANCH ?= develop
77
SPLUNK_COMPOSE ?= cluster_absolute_unit.yaml
88
# Set Splunk version/build parameters here to define downstream URLs and file names
99
SPLUNK_PRODUCT := splunk
10-
SPLUNK_VERSION := 8.2.0
11-
SPLUNK_BUILD := e053ef3c985f
10+
SPLUNK_VERSION := 8.2.1
11+
SPLUNK_BUILD := ddff1c41e5cf
1212
ifeq ($(shell arch), s390x)
1313
SPLUNK_ARCH = s390x
1414
else

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ Welcome to the official Splunk repository of Dockerfiles for building Splunk Ent
99
----
1010

1111
> :warning: **DEPRECATION NOTICE**
12-
We will no longer be releasing Debian images on Docker Hub after Spring of 2021.
12+
We are no longer releasing Debian images on Docker Hub as of May 2021 (Splunk Enterprise v8.2.0+).
13+
Red Hat images will continue to be published.
1314

1415
----
1516

base/debian-10/install.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ ln -sf /usr/share/zoneinfo/UTC /etc/localtime
3232
# Install utility packages
3333
apt-get install -y --no-install-recommends curl sudo libgssapi-krb5-2 busybox procps acl gcc make \
3434
libffi-dev libssl-dev make build-essential libbz2-dev \
35-
wget xz-utils ca-certificates zlib1g-dev python3-apt \
36-
p11-kit lz4
35+
wget xz-utils ca-certificates zlib1g-dev python3-apt p11-kit lz4 \
36+
libhogweed4=3.4.1-1+deb10u1 libgnutls30=3.6.7-4+deb10u7 libgcrypt20=1.8.4-5+deb10u1
3737

3838
# Install Python and necessary packages
3939
PY_SHORT=${PYTHON_VERSION%.*}
@@ -65,7 +65,7 @@ cp apt_inst.cpython-37m-${ARCH}-linux-gnu.so apt_inst.so
6565
rm -rf /tmp/python3-apt
6666
# Install splunk-ansible dependencies
6767
cd /
68-
pip -q --no-cache-dir install six wheel requests cryptography==3.3.2 ansible jmespath --upgrade
68+
pip -q --no-cache-dir install six wheel requests cryptography==3.3.2 ansible==3.4.0 urllib3==1.26.5 jmespath --upgrade
6969
# Remove tests packaged in python libs
7070
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 '{}' \;
7171
find /usr/lib/ -depth \( -type f -a -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) -exec rm -rf '{}' \;

base/debian-9/install.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,15 @@ ln -sf /usr/share/zoneinfo/UTC /etc/localtime
3232
# Install utility packages
3333
apt-get install -y --no-install-recommends curl sudo libgssapi-krb5-2 busybox procps acl gcc make \
3434
libffi-dev libssl-dev make build-essential libbz2-dev \
35-
wget xz-utils ca-certificates zlib1g-dev lz4
35+
wget xz-utils ca-certificates zlib1g-dev liblz4-dev
3636

3737
# Install Python and necessary packages
3838
PY_SHORT=${PYTHON_VERSION%.*}
3939
wget -O /tmp/python.tgz https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz
4040
wget -O /tmp/Python-gpg-sig-${PYTHON_VERSION}.tgz.asc https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz.asc
4141
apt-get install dirmngr -y
42-
gpg --keyserver pool.sks-keyservers.net --recv-keys $PYTHON_GPG_KEY_ID \
42+
gpg --keyserver keys.openpgp.org --recv-keys $PYTHON_GPG_KEY_ID \
43+
|| gpg --keyserver pool.sks-keyservers.net --recv-keys $PYTHON_GPG_KEY_ID \
4344
|| gpg --keyserver pgp.mit.edu --recv-keys $PYTHON_GPG_KEY_ID \
4445
|| gpg --keyserver keyserver.pgp.com --recv-keys $PYTHON_GPG_KEY_ID
4546
gpg --verify /tmp/Python-gpg-sig-${PYTHON_VERSION}.tgz.asc /tmp/python.tgz
@@ -65,7 +66,7 @@ cp apt_inst.cpython-35m-x86_64-linux-gnu.so apt_inst.so
6566
rm -rf /tmp/python3-apt
6667
# Install splunk-ansible dependencies
6768
cd /
68-
pip -q --no-cache-dir install six wheel requests cryptography==3.3.2 ansible jmespath --upgrade
69+
pip -q --no-cache-dir install six wheel requests cryptography==3.3.2 ansible==3.4.0 urllib3==1.26.5 jmespath --upgrade
6970
# Remove tests packaged in python libs
7071
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 '{}' \;
7172
find /usr/lib/ -depth \( -type f -a -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) -exec rm -rf '{}' \;

base/redhat-8/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# the container catalog moved from registry.access.redhat.com to registry.redhat.io
1717
# So at some point before they deprecate the old registry we have to make sure that
1818
# we have access to the new registry and change where we pull the ubi image from.
19-
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3-291
19+
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4-200.1622548483
2020

2121
LABEL name="splunk" \
2222
maintainer="[email protected]" \

base/redhat-8/install.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ microdnf -y --nodocs update gnutls kernel-headers librepo libnghttp2 tzdata nett
3535
PY_SHORT=${PYTHON_VERSION%.*}
3636
wget -O /tmp/python.tgz https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz
3737
wget -O /tmp/Python-gpg-sig-${PYTHON_VERSION}.tgz.asc https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz.asc
38-
gpg --keyserver pool.sks-keyservers.net --recv-keys $PYTHON_GPG_KEY_ID \
38+
gpg --keyserver keys.openpgp.org --recv-keys $PYTHON_GPG_KEY_ID \
39+
|| gpg --keyserver pool.sks-keyservers.net --recv-keys $PYTHON_GPG_KEY_ID \
3940
|| gpg --keyserver pgp.mit.edu --recv-keys $PYTHON_GPG_KEY_ID \
4041
|| gpg --keyserver keyserver.pgp.com --recv-keys $PYTHON_GPG_KEY_ID
4142
gpg --verify /tmp/Python-gpg-sig-${PYTHON_VERSION}.tgz.asc /tmp/python.tgz
@@ -51,7 +52,7 @@ ln -sf /usr/bin/python${PY_SHORT} /usr/bin/python
5152
ln -sf /usr/bin/pip${PY_SHORT} /usr/bin/pip
5253
# Install splunk-ansible dependencies
5354
cd /
54-
pip -q --no-cache-dir install six wheel requests cryptography==3.3.2 ansible==3.4.0 jmespath --upgrade
55+
pip -q --no-cache-dir install six wheel requests cryptography==3.3.2 ansible==3.4.0 urllib3==1.26.5 jmespath --upgrade
5556
# Remove tests packaged in python libs
5657
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 '{}' \;
5758
find /usr/lib/ -depth \( -type f -a -name '*.pyc' -o -name '*.pyo' -o -name '*.a' \) -exec rm -rf '{}' \;

docs/CHANGELOG.md

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@
33
----
44

55
> :warning: **DEPRECATION NOTICE**
6-
We will no longer be releasing Debian images on Docker Hub after Spring of 2021.
6+
We are no longer releasing Debian images on Docker Hub as of May 2021 (Splunk Enterprise v8.2.0+).
7+
Red Hat images will continue to be published.
78

89
----
910

1011
## Navigation
1112

13+
* [8.2.1](#821)
1214
* [8.2.0](#820)
1315
* [8.1.4](#814)
1416
* [8.1.3](#813)
@@ -57,10 +59,26 @@ We will no longer be releasing Debian images on Docker Hub after Spring of 2021.
5759

5860
---
5961

62+
## 8.2.1
63+
64+
#### What's New?
65+
* Releasing new images to support Splunk Enterprise release.
66+
67+
#### docker-splunk changes:
68+
* Bumping Splunk version. For details, see [Fixed issues for 8.2.1](https://docs.splunk.com/Documentation/Splunk/8.2.1/ReleaseNotes/Fixedissues)
69+
* Updated teardown for more graceful shutdown
70+
* Bugfixes and documentation updates
71+
72+
#### splunk-ansible changes:
73+
* Added support for installing apps locally on a Cluster Manager or Deployer instance using `apps_location_local`
74+
75+
---
76+
6077
## 8.2.0
6178

6279
#### What's New?
6380
* Releasing new images to support Splunk Enterprise release.
81+
* Deprecated Debian image releases. Red Hat images will continue to be published to Docker Hub and the Red Hat Container Catalog.
6482

6583
#### docker-splunk changes:
6684
* Bumping Splunk version. For details, see [Release Notes for 8.2.0](https://docs.splunk.com/Documentation/Splunk/8.2.0/ReleaseNotes/)

docs/STORAGE_OPTIONS.md

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
## Data Storage ##
2-
This section will cover examples of different options for configuring data persistence. This includes both indexed data and configuration items. Splunk only supports data persistence to volumes mounted outside of the container. Data persistence for folders inside of the container is not supported. The following are intended as only as examples and unofficial guidelines.
2+
This section will cover examples of different options for configuring data persistence. This includes both indexed data and configuration items. Splunk only supports data persistence to volumes mounted outside of the container. Data persistence for folders inside of the container is not supported. The following are intended only as examples and unofficial guidelines.
33

44
### Storing indexes and search artifacts ###
5-
Splunk Enterprise, by default, Splunk Enterprise uses the var directory for indexes, search artifacts, etc. In the public image, the Splunk Enterprise home directory is /opt/splunk, and the indexes are configured to run under var/. If you want to persist the indexed data, then mount an external directory into the container under this folder.
5+
By default, Splunk Enterprise uses the var directory for indexes, search artifacts, etc. In the public image, the Splunk Enterprise home directory is /opt/splunk, and the indexes are configured to run under var/. If you want to persist the indexed data, then mount an external directory into the container under this folder.
66

77
If you do not want to modify or persist any configuration changes made outside of what has been defined in the docker image file, then use the following steps for your service.
88

@@ -13,10 +13,10 @@ docker volume create so1-var
1313
```
1414
See Docker's official documentation for more complete instructions and additional options.
1515

16-
#### Step 2: Define the docker compose YAML and start the service####
16+
#### Step 2: Define the docker-compose YAML and start the service ####
1717
Using the Docker Compose format, save the following contents into a docker-compose.yml file:
1818

19-
```
19+
```yaml
2020
version: "3.6"
2121

2222
networks:
@@ -46,7 +46,7 @@ services:
4646
- so1-var:/opt/splunk/var
4747
```
4848
49-
This mounts only the contents of /opt/splunk/var, so anything outside of this folder will not persist. Any configuration changes will not remain when the container exits. Note that changes will persist between starting and stopping a container. See the Docker documentation for more discussion on the difference between starting, stopping, and exiting if the difference between them is unclear.
49+
This mounts only the contents of /opt/splunk/var, so anything outside this folder will not persist. Any configuration changes will not remain when the container exits. Note that changes will persist between starting and stopping a container. See the Docker documentation for more discussion on the difference between starting, stopping, and exiting if the difference between them is unclear.
5050
5151
In the same directory as `docker-compose.yml`, run the following command to start the service.
5252
```
@@ -61,21 +61,21 @@ docker volume inspect so1-var
6161
The output of that command should list where the data is stored.
6262
6363
### Storing indexes, search artifacts, and configuration changes ###
64-
In this section, we build off of the previous example to save the configuration as well. This can make it easier to save modified configurations, but simultaneously allows configuration drift to occur. If you want to keep configuration drift from happening, but still want to be able to persist some of the data, you can save off the specific "local" folders that you want the data to be persisted for (such as etc/system/local). However, be careful when doing this because you will both know what folders you need to save off and the number of volumes can proliferate rapidly - depending on the deployment. Please take the "Administrating Splunk" through Splunk Education prior to attempting this configuration.
64+
In this section, we build off of the previous example to save the configuration as well. This can make it easier to save modified configurations, but simultaneously allows configuration drift to occur. If you want to keep configuration drift from happening, but still want to persist some of the data, you can save off the specific "local" folders that you want the data to be persisted for (such as etc/system/local). However, be careful when doing this because you will both know what folders you need to save off and the number of volumes can increase rapidly - depending on the deployment. Please take the "Administrating Splunk" through Splunk Education before attempting this configuration.
6565
66-
In these examples, we will assume that the entire etc folder is being mounted into the container.
66+
We will assume that the entire /etc folder is being mounted into the container in these examples.
6767
6868
#### Step 1: Create a named volume ####
6969
Again, create a simple named volume in your Docker environment, run the following command
70-
```
70+
```shell
7171
docker volume create so1-etc
7272
```
7373
See Docker's official documentation for more complete instructions and additional options.
7474

7575
#### Step 2: Define the Docker Compose YAML ####
7676
Notice that this differs from the previous example by adding in the so1-etc volume references. In the following example, save the following data into a file named `docker-compose.yml`.
7777

78-
```
78+
```yaml
7979
version: "3.6"
8080

8181
networks:
@@ -104,19 +104,19 @@ services:
104104
- 8089
105105
volumes:
106106
- so1-var:/opt/splunk/var
107-
- so1-etc:/opt/splunk/etc
107+
- so1-etc:/opt/splunk/etc
108108
```
109109
110110
In the same directory as `docker-compose.yml`, run the following command to start the service:
111-
```
111+
```shell
112112
docker-compose up
113113
```
114114

115-
When the volume is mounted the data will persist after the container exits. If a container has exited and restarted, but no data shows up, then check the volume definition and verify that the container did not create a new volume or that the volume mounted is in the same location.
115+
When the volume is mounted, the data will persist after the container exits. If a container has exited and restarted, but no data shows up, check the volume definition and verify that the container did not create a new volume or that the volume mounted is in the same location.
116116

117117
#### Viewing the contents of the volume ####
118-
To view the etc directory outside of the container run one or both of the commands
119-
```
118+
To view the /etc directory outside of the container, run one or both of the commands
119+
```shell
120120
docker volume inspect so1-etc
121121
```
122122
The output of that command should list the directory associated with the volume mount.
@@ -135,7 +135,7 @@ In the same yaml file you initially used to deploy Splunk instances, update the
135135

136136
Below is an example yaml with `SPLUNK_UPGRADE=true`:
137137

138-
```
138+
```yaml
139139
version: "3.6"
140140
141141
networks:
@@ -165,13 +165,13 @@ services:
165165
- 8089
166166
volumes:
167167
- so1-var:/opt/splunk/var
168-
- so1-etc:/opt/splunk/etc
168+
- so1-etc:/opt/splunk/etc
169169
```
170170

171171
#### Step 3: Deploy your containers using the updated yaml ####
172-
Similar to how you initially deployed your containers, run the command with the updated yaml that contains a reference to the new image and SPLUNK_UPGRADE=true in the environment. Make sure that you do NOT destroy previously existing network and volumes. After running the command with the yaml file, your containers should be recreated with the new version of Splunk and persisted data properly mounted to /opt/splunk/var and /opt/splunk/etc.
172+
Like how you initially deployed your containers, run the command with the updated yaml containing a reference to the new image and SPLUNK_UPGRADE=true in the environment. Make sure that you do NOT destroy previously existing networks and volumes. After running the command with the yaml file, your containers should be recreated with the new version of Splunk and persisted data properly mounted to /opt/splunk/var and /opt/splunk/etc.
173173

174174
#### Different types of volumes ####
175-
Using named volume is recommended so it is easier to attach and detach volumes to different Splunk instances while persisting your data. If you use anonymous volumes, Docker gives them random and unique names so you can still reuse anonymous volumes on different containers. If you use bind mounts, make sure that the mounts are setup properly to persist /opt/splunk/var and opt/splunk/etc. Starting new containers without proper mounts will result in a loss of your data.
175+
Using named volume is recommended because it is easier to attach and detach volumes to different Splunk instances while persisting your data. If you use anonymous volumes, Docker gives them random and unique names so you can still reuse anonymous volumes on other containers. If you use bind mounts, make sure that the mounts are set up correctly to persist /opt/splunk/var and opt/splunk/etc. Starting new containers without proper mounts will result in a loss of your data.
176176

177177
See [Create and manage volumes](https://docs.docker.com/storage/volumes/#create-and-manage-volumes) in the Docker documentation for more information.

0 commit comments

Comments
 (0)