Skip to content

Commit

Permalink
Update ELK Stack container files
Browse files Browse the repository at this point in the history
  • Loading branch information
rooftopcellist committed Mar 19, 2020
1 parent c4e6978 commit 9a38971
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 3 deletions.
12 changes: 11 additions & 1 deletion tools/docker-compose/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@

## How to start the Dev container

In the root directory of your awx clone, run the following to build your docker image:
In the root directory of your awx clone, run the following to build your docker image.
This step takes a while, but once your image is built, you don't need to do this again
unless you make changes to the Dockerfile or any of the files used by the Dockerfile.

```
make docker-compose-build
```

> Note: By default, this image will be tagged with your branch name.
Copy over your local settings

```
Expand All @@ -26,6 +30,8 @@ Run the container
make docker-compose
```

> Note: You may need to add `COMPOSE_TAG=<yourbranch>` at the end of this to use the correct image for your branch.
The app should now be accessible in your browser at `https://localhost:8043/#/home`


Expand Down Expand Up @@ -74,3 +80,7 @@ An example of how to view the most recent logs from the container:
```
docker exec -i -t $(docker ps -aqf "name=tools_logstash_1") tail -n 50 /logstash.log
```

#### How to add logstash plugins

Add any plugins you need in `tools/elastic/logstash/Dockerfile` before running the container.
1 change: 1 addition & 0 deletions tools/elastic/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ done by getting via bash in the running Docker machine. Example:
```bash
docker-machine ssh default sudo sysctl -w vm.max_map_count=262144
```
> Note: If you are running docker natively on linux, you need only run `sysctl -w vm.max_map_count=262144`
After this, the containers can be started up with commands like:

Expand Down
4 changes: 2 additions & 2 deletions tools/elastic/docker-compose.logstash-link.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
version: '2'
services:
# Primary Tower Development Container
tower:
# Primary AWX Development Container
awx:
links:
- logstash

0 comments on commit 9a38971

Please sign in to comment.