Skip to content

Commit 357a171

Browse files
authored
Merge pull request #351 from splunk/develop
Release/8.0.3
2 parents 5362d7c + 6c418b3 commit 357a171

36 files changed

+821
-499
lines changed

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ Jenkinsfile
1515
**/test-results
1616
**/molecule
1717
**/*.md
18+
**/wrapper-example

CODEOWNERS

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Code owners are automatically requested for review when someone opens a
2+
# pull request modifying code that they own.
3+
# See: https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
4+
5+
# Note: Each line is a file pattern followed by one or more owners.
6+
# Order matters: The last matching pattern has the most precedence.
7+
8+
# Default owners for everything in docker-splunk:
9+
# * @splunk/if-01
10+
* @nwang92 @alishamayor @arctan5x @lephino @jrigassio-splunk @jmeixensperger @hendolim @jonathan-vega-splunk
11+
12+
# Docs-only pull requests:
13+
/docs/ @alishamayor @nwang92

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.0.2.1
11-
SPLUNK_BUILD := f002026bad55
10+
SPLUNK_VERSION := 8.0.3
11+
SPLUNK_BUILD := a6754d8441bf
1212
ifeq ($(shell arch), s390x)
1313
SPLUNK_ARCH = s390x
1414
else

README.md

Lines changed: 61 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,42 @@
11
# docker-splunk: Containerizing Splunk Enterprise
22

3-
[![Build Status](https://circleci.com/gh/splunk/docker-splunk/tree/develop.svg?style=svg)](https://circleci.com/gh/splunk/docker-splunk/tree/develop)
3+
[![Build Status](https://circleci.com/gh/splunk/docker-splunk/tree/develop.svg?style=svg)](https://circleci.com/gh/splunk/docker-splunk/tree/develop) 
4+
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) 
5+
[![GitHub release](https://img.shields.io/github/v/tag/splunk/docker-splunk?sort=semver&label=Version)](https://github.com/splunk/docker-splunk/releases)
46

5-
Welcome to Splunk's official repository containing Dockerfiles for building Splunk Enterprise and Universal Forwarder images using containerization technology.
6-
7-
The provisioning of these disjoint containers is handled by the [splunk-ansible](https://github.com/splunk/splunk-ansible) project. Please refer to [Ansible documentation](http://docs.ansible.com/) for more details about Ansible concepts and how it works.
7+
Welcome to Splunk's official repository of Dockerfiles for building Splunk Enterprise and Splunk Universal Forwarder images using containerization technology.
88

99
----
1010

1111
## Table of Contents
1212

1313
1. [Purpose](#purpose)
1414
2. [Quickstart](#quickstart)
15-
3. [Support](#support)
16-
4. [Contributing](#contributing)
17-
5. [License](#license)
15+
3. [Documentation](#documentation)
16+
4. [Support](#support)
17+
5. [Contributing](#contributing)
18+
6. [License](#license)
1819

1920
----
2021

2122
## Purpose
2223

23-
##### What is Splunk Enterprise?
24+
#### What is Splunk Enterprise?
2425
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.
2526

26-
Please refer to [Splunk products](https://www.splunk.com/en_us/software.html) for more knowledge about the features and capabilities of Splunk, and how you can bring it into your organization.
27+
Refer to [Splunk products](https://www.splunk.com/en_us/software.html) for more knowledge about the features and capabilities of Splunk, and how you can bring it into your organization.
2728

28-
##### What is docker-splunk?
29+
#### What is docker-splunk?
2930
This is the official source code repository for building Docker images of Splunk Enterprise and Splunk Universal Forwarder. By introducing containerization, we can marry the ideals of infrastructure-as-code and declarative directives to manage and run Splunk Enterprise.
3031

32+
The provisioning of these containers is handled by the [splunk-ansible](https://github.com/splunk/splunk-ansible) project. See the [Ansible documentation](http://docs.ansible.com/) for more details about Ansible concepts and how it works.
33+
34+
----
35+
3136
## Quickstart
3237
Use the following command to start a single standalone instance of Splunk Enterprise:
33-
```
34-
$ docker run -it -p 8000:8000 -e "SPLUNK_PASSWORD=<password>" -e "SPLUNK_START_ARGS=--accept-license" splunk/splunk:latest
38+
```bash
39+
$ docker run -it --name so1 -p 8000:8000 -e "SPLUNK_PASSWORD=<password>" -e "SPLUNK_START_ARGS=--accept-license" splunk/splunk:latest
3540
```
3641

3742
Let's break down what this command does:
@@ -42,23 +47,62 @@ Let's break down what this command does:
4247

4348
After the container starts up successfully, you should be able to access SplunkWeb at http://localhost:8000 with `admin:<password>`.
4449

45-
For full usage instructions (including examples, advanced deployments, scenarios), please visit the [docker-splunk documentation](https://splunk.github.io/docker-splunk/) page.
50+
To view the logs from the container created above, run:
51+
```bash
52+
$ docker logs -f so1
53+
```
54+
55+
To enter the container and run some Splunk CLI commands:
56+
```bash
57+
# Defaults to "ansible" user
58+
docker exec -it so1 /bin/bash
59+
# Run shell as "splunk" user
60+
docker exec -u splunk -it so1 bash
61+
```
62+
63+
For an example of how to enable TCP 10514 for listening:
64+
```bash
65+
docker exec -u splunk so1 /opt/splunk/bin/splunk add tcp 10514 \
66+
-sourcetype syslog -resolvehost true \
67+
-auth "admin:${SPLUNK_PASSWORD}"
68+
```
69+
70+
To install an app:
71+
```bash
72+
# Alternatively, apps can be installed at Docker run-time, ex:
73+
# docker run -e SPLUNK_APPS_URL=http://web/app.tgz ...
74+
docker exec -u splunk so1 /opt/splunk/bin/splunk install \
75+
/path/to/app.tar -auth "admin:${SPLUNK_PASSWORD}"
76+
```
77+
78+
Additional information on Docker support for Splunk Enterprise can be found [here](https://docs.splunk.com/Documentation/Splunk/latest/Installation/DeployandrunSplunkEnterpriseinsideDockercontainers).
79+
80+
---
81+
82+
## Documentation
83+
Visit the [docker-splunk documentation](https://splunk.github.io/docker-splunk/) page for full usage instructions, including installation, examples, and advanced deployment scenarios.
84+
85+
---
4686

4787
## Support
48-
Please use the [GitHub issue tracker](https://github.com/splunk/docker-splunk/issues) to submit bugs or request features.
88+
Use the [GitHub issue tracker](https://github.com/splunk/docker-splunk/issues) to submit bugs or request features.
4989

5090
If you have additional questions or need more support, you can:
5191
* Post a question to [Splunk Answers](http://answers.splunk.com)
5292
* Join the [#docker](https://splunk-usergroups.slack.com/messages/C1RH09ERM/) room in the [Splunk Slack channel](http://splunk-usergroups.slack.com)
5393
* 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
5494

55-
For more detailed informations on support, please see the official [support guidelines](docs/SUPPORT.md).
95+
See the official [support guidelines](docs/SUPPORT.md) for more detailed information.
96+
97+
---
5698

5799
## Contributing
58-
We welcome feedback and contributions from the community! Please see our [contribution guidelines](docs/CONTRIBUTING.md) for more information on how to get involved.
100+
We welcome feedback and contributions from the community! See our [contribution guidelines](docs/CONTRIBUTING.md) for more information on how to get involved.
101+
102+
---
59103

60104
## License
61-
Copyright 2018-2019 Splunk.
105+
Copyright 2018-2020 Splunk.
62106

63107
Distributed under the terms of our [license](docs/LICENSE.md), splunk-ansible is free and open source software.
64108

0 commit comments

Comments
 (0)