EOX GitLab Instance

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

V

VS
- Activity
- Members
- Labels
- Incidents
- Service Desk

Snippets Groups Projects

- ESA
- PRISM
- VS
- Commits
978799ec

Commit 978799ec authored 4 years ago by Bernhard Mallinger

Downloads
- Plain Diff

Merge branch '9-logging-setup' into 'master'

Resolve "Integrate ELK stack with Fluentd"

Closes #9

See merge request !17

parents b9cf7150 13423f36

No related branches found

No related tags found

1 merge request!17Resolve "Integrate ELK stack with Fluentd"

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 10 additions, 0 deletions

.gitlab-ci.yml
README.md 10 additions, 0 deletions

README.md
cache/run-httpd.sh 2 additions, 2 deletions

cache/run-httpd.sh
docker-compose.dem.dev.yml 12 additions, 0 deletions

docker-compose.dem.dev.yml
docker-compose.emg.dev.yml 12 additions, 0 deletions

docker-compose.emg.dev.yml
docker-compose.logging.dev.yml 18 additions, 0 deletions

docker-compose.logging.dev.yml
docker-compose.logging.ops.yml 31 additions, 0 deletions

docker-compose.logging.ops.yml
docker-compose.logging.yml 48 additions, 0 deletions

docker-compose.logging.yml
docker-compose.vhr18.dev.yml 12 additions, 0 deletions

docker-compose.vhr18.dev.yml
docker-compose.vhr18.yml 18 additions, 0 deletions

docker-compose.vhr18.yml
fluentd/Dockerfile 40 additions, 0 deletions

fluentd/Dockerfile
fluentd/conf/fluent.conf 49 additions, 0 deletions

fluentd/conf/fluent.conf
gitlab_test.sh 1 addition, 1 deletion

gitlab_test.sh

with 263 additions and 3 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment