Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ executors:
- image: cimg/python:3.7
circleci_large:
machine:
image: ubuntu-1604:202007-01
image: ubuntu-2004:202201-02
resource_class: large
circleci_xlarge:
machine:
image: ubuntu-1604:202007-01
image: ubuntu-2004:202201-02
resource_class: xlarge

orbs:
Expand Down Expand Up @@ -122,7 +122,7 @@ jobs:
- run:
name: Setup python3
command: |
pyenv global 2.7.18 3.7.8
pyenv global 2.7.18 3.10.2
python --version
pip --version
python3 --version
Expand Down Expand Up @@ -154,7 +154,7 @@ jobs:
- run:
name: Setup python3
command: |
pyenv global 2.7.18 3.7.8
pyenv global 2.7.18 3.10.2
python --version
pip --version
python3 --version
Expand Down Expand Up @@ -186,7 +186,7 @@ jobs:
- run:
name: Setup python3
command: |
pyenv global 2.7.18 3.7.8
pyenv global 2.7.18 3.10.2
python --version
pip --version
python3 --version
Expand Down Expand Up @@ -221,7 +221,7 @@ jobs:
- run:
name: Setup python3
command: |
pyenv global 2.7.18 3.7.8
pyenv global 2.7.18 3.10.2
python --version
pip --version
python3 --version
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.6
SPLUNK_BUILD := a6fe1ee8894b
SPLUNK_VERSION := 9.0.0
SPLUNK_BUILD := 6818ac46f2ec
ifeq ($(shell arch), s390x)
SPLUNK_ARCH = s390x
else
Expand Down
3 changes: 2 additions & 1 deletion base/redhat-8/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ microdnf -y --nodocs install wget sudo shadow-utils procps tar make gcc \
# Patch security updates
microdnf -y --nodocs update gnutls kernel-headers librepo libnghttp2 nettle \
libpwquality libxml2 systemd-libs glib2 lz4-libs \
rpm rpm-libs sqlite-libs cyrus-sasl-lib vim
rpm rpm-libs sqlite-libs cyrus-sasl-lib vim expat \
openssl-libs xz-libs zlib

# Reinstall tzdata (originally stripped from minimal image): https://bugzilla.redhat.com/show_bug.cgi?id=1903219
microdnf -y --nodocs reinstall tzdata || microdnf -y --nodocs update tzdata
Expand Down
16 changes: 16 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Red Hat images will continue to be published.

## Navigation

* [9.0.0](#900)
* [8.2.6](#826)
* [8.2.5](#825)
* [8.2.4](#824)
Expand Down Expand Up @@ -72,6 +73,21 @@ Red Hat images will continue to be published.

---

## 9.0.0

#### What's New?
* Releasing new images to support Splunk Enterprise release.

#### docker-splunk changes:
* Bumping Splunk version. For details, see [Release notes for 9.0.0](https://docs.splunk.com/Documentation/Splunk/9.0.0/ReleaseNotes/)
* Security patches & errata fixes

#### splunk-ansible changes:
* Patch support for new major Splunk release
* Documentation updates + bugfixes

---

## 8.2.6

#### What's New?
Expand Down
2 changes: 1 addition & 1 deletion splunk/common-files/make-minimal-exclude.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
print("*/etc/apps/gettingstarted*")
else:
print("*/etc/apps/splunk_metrics_workspace*")
elif int(m.group(1)) > 7:
elif 7 < int(m.group(1)) < 9:
print("*/etc/apps/splunk_metrics_workspace*")
if int(m.group(2)) < 1:
print("*/bin/parsetest*")