Skip to content

Commit

Permalink
Changing name from splunkenterprisetrial to splunk.
Browse files Browse the repository at this point in the history
  • Loading branch information
mchene committed Sep 30, 2016
2 parents 915bfcd + 7a16610 commit 211196b
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 18 deletions.
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

This is the official repository for the Splunk Enterprise and Splunk universal forwarder Docker effort. It contains Dockerfiles that you can use to build [Splunk](https://splunk.com) Docker images.

To learn more about the Splunk Enterprise Docker image, see the [Splunk Enterprise Docker image README](https://github.com/splunk/docker-splunk/enterprise/README.md).
To learn more about the Splunk Enterprise Docker image, see the [Splunk Enterprise Docker image README](https://github.com/splunk/docker-splunk/blob/master/enterprise/README.md).

To learn more about the Splunk universal forwarder image, see the [Splunk universal forwarder Docker image README](https://github.com/splunk/docker-splunk/blob/master/universalforwarder/README.md).

To learn more about the Splunk universal forwarder image, see the [Splunk universal forwarder Docker image README](https://github.com/splunk/docker-splunk/universalforwarder/README.md).
# What is Splunk Enterprise?

Splunk Enterprise is the platform for operational intelligence. The 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.
Expand Down
22 changes: 11 additions & 11 deletions enterprise/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ If you have not used Docker before, see the [Getting started tutorial](https://d
0. Enter the following command to pull the Splunk Enterprise version 6.5.0 image.<br>

```bash
docker pull splunk/enterprisetrial
docker pull splunk/splunk
```
0. Run the Docker image.

```bash
docker run -d -e "SPLUNK_START_ARGS=--accept-license" -e "SPLUNK_USER=root" -p "8000:8000" splunk/enterprisetrial
docker run -d -e "SPLUNK_START_ARGS=--accept-license" -e "SPLUNK_USER=root" -p "8000:8000" splunk/splunk
```
0. Access the Splunk instance with a browser by using the Docker machine IP address and Splunk Web port. For example, ``http://localhost:8000`

Expand All @@ -37,13 +37,13 @@ The following commands can be run from a shell prompt or Docker QuickStart Termi
### Pull an image for version 6.5.0 of Splunk Enterprise from this repository

```bash
docker pull splunk/enterprisetrial:6.5.0
docker pull splunk/splunk:6.5.0
```

### Pull an image that uses the latest version of Splunk Enterprise from this repository

```bash
docker pull splunk/enterprisetrial:latest
docker pull splunk/splunk:latest
```

### Start a Splunk Enterprise container and automatically accept the license agreement
Expand All @@ -57,7 +57,7 @@ docker run --name splunk --hostname splunk -p 8000:8000 -d -e "SPLUNK_START_ARGS

```bash
docker run --name vsplunk -v /opt/splunk/etc -v /opt/splunk/var busybox
docker run --hostname splunk --name splunk --volumes-from=vsplunk -p 8000:8000 -d -e "SPLUNK_START_ARGS=--accept-license" splunk/enterprisetrial:6.5.0
docker run --hostname splunk --name splunk --volumes-from=vsplunk -p 8000:8000 -d -e "SPLUNK_START_ARGS=--accept-license" splunk/splunk:6.5.0
```

### Use entrypoint.sh to execute Splunk commands
Expand Down Expand Up @@ -87,7 +87,7 @@ You can also use entrypoint.sh to configure Splunk services with environment var
- /opt/splunk/etc
- /opt/splunk/var
splunk:
image: splunk/enterprisetrial:6.5.0-monitor
image: splunk/splunk:6.5.0-monitor
hostname: splunkenterprise
environment:
SPLUNK_START_ARGS: --accept-license --answer-yes
Expand Down Expand Up @@ -116,12 +116,12 @@ You can also use entrypoint.sh to configure Splunk services with environment var

### Image Variants

The `splunk/enterprisetrial` image comes in several variants:
The `splunk/splunk` image comes in several variants:

`splunk/enterprisetrial:6.5.0`
`splunk/splunk:6.5.0`
This is the default Splunk Enterprise image.

`splunk/enterprisetrial:6.5.0-monitor`
`splunk/splunk:6.5.0-monitor`
This image comes with some data inputs activated (e.g., file monitor of docker host JSON logs, HTTP Event Collector, Syslog, etc.). It also includes the Docker app which has dashboards to help you analyze collected logs and docker information such as stats, events, tops, and inspect from your running images.

### Data Store
Expand Down Expand Up @@ -198,14 +198,14 @@ Following is an example of how to configure Splunk Enterprise and the Splunk uni
--name splunkdeploymentserver \
--publish 8000 \
--env SPLUNK_ENABLE_DEPLOY_SERVER=true \
splunk/enterprisetrial
splunk/splunk
> echo "Starting Splunk Enterprise"
> docker run -d --net splunk \
--hostname splunkenterprise \
--name splunkenterprise \
--publish 8000 \
--env SPLUNK_ENABLE_LISTEN=9997 \
splunk/enterprisetrial
splunk/splunk
> echo "Starting forwarder, which forwards data to Splunk"
> docker run -d --net splunk \
--name forwarder \
Expand Down
4 changes: 2 additions & 2 deletions enterprise/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ if [ -z $CURRENT ]; then
CURRENT=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
fi

docker build --no-cache=true -t splunk/enterprisetrial:6.5.0 $CURRENT
#docker build -t splunk/enterprisetrial:latest $CURRENT
docker build --no-cache=true -t splunk/splunk:6.5.0 $CURRENT
#docker build -t splunk/splunk:latest $CURRENT
4 changes: 2 additions & 2 deletions enterprise/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ services:
- /opt/splunk/var
splunkenterprise:
#build: .
hostname: splunkenterprisetrial
image: splunk/enterprisetrial:6.5.0
hostname: splunkenterprise
image: splunk/splunk:6.5.0
environment:
SPLUNK_START_ARGS: --accept-license
SPLUNK_ENABLE_LISTEN: 9997
Expand Down
2 changes: 1 addition & 1 deletion enterprise/publishImage.sh
Original file line number Diff line number Diff line change
@@ -1 +1 @@
docker push splunk/enterprisetrial:6.5.0
docker push splunk/splunk:6.5.0

0 comments on commit 211196b

Please sign in to comment.