diff --git a/.env b/.env new file mode 100644 index 00000000..8f5293b5 --- /dev/null +++ b/.env @@ -0,0 +1,2 @@ +COMPOSE_PROJECT_NAME=akvorado +COMPOSE_FILE=docker-compose.yml:docker-compose-demo.yml diff --git a/console/data/docs/00-intro.md b/console/data/docs/00-intro.md index a1a21257..bb993ab2 100644 --- a/console/data/docs/00-intro.md +++ b/console/data/docs/00-intro.md @@ -16,9 +16,8 @@ only requirement is to have [Docker](https://docs.docker.com/get-docker/) and [Docker Compose](https://docs.docker.com/compose/install/). Grab the latest tarball from the [release page on -GitHub](https://github.com/akvorado/akvorado/releases), unpack -it, rename the target directory to `akvorado`, then run the -`docker-compose` command: +GitHub](https://github.com/akvorado/akvorado/releases), unpack it, +then run the `docker-compose` command: ```console # docker-compose up @@ -27,8 +26,8 @@ it, rename the target directory to `akvorado`, then run the Once running, *Akvorado* web interface should be running on port 8080. A few synthetic flows are generated in the background. They can be -disabled by removing the `akvorado-exporter*` services from -`docker-compose.yml`, or by stopping them with `docker-compose stop +disabled by removing the `:docker-compose-demo.yml` string from +`.env`, or by stopping them with `docker-compose stop akvorado-exporter{1,2,3,4}`, or by removing the associated configuration in `akvorado.yaml`. diff --git a/console/data/docs/99-changelog.md b/console/data/docs/99-changelog.md index 3641fbb8..1fe87a1a 100644 --- a/console/data/docs/99-changelog.md +++ b/console/data/docs/99-changelog.md @@ -11,6 +11,10 @@ identified with a specific icon: - 🩹: bug fix - 🌱: miscellaneous change +## Unreleased + +- 🌱 *docker*: Split demo exporters out of `docker-compose.yml`. + ## 1.6.0 - 2022-09-30 This release features a BMP collector to grab BGP routes from one or diff --git a/docker-compose-demo.yml b/docker-compose-demo.yml new file mode 100644 index 00000000..c44b4f60 --- /dev/null +++ b/docker-compose-demo.yml @@ -0,0 +1,19 @@ +--- +version: "3" + +services: + akvorado-exporter0: &exporter + image: ghcr.io/akvorado/akvorado:latest + restart: unless-stopped + command: demo-exporter http://akvorado-orchestrator:8080#0 + depends_on: + - akvorado-inlet + akvorado-exporter1: + <<: *exporter + command: demo-exporter http://akvorado-orchestrator:8080#1 + akvorado-exporter2: + <<: *exporter + command: demo-exporter http://akvorado-orchestrator:8080#2 + akvorado-exporter3: + <<: *exporter + command: demo-exporter http://akvorado-orchestrator:8080#3 diff --git a/docker-compose.yml b/docker-compose.yml index b970a578..5662b440 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -114,22 +114,6 @@ services: disable: true volumes: - /var/run/docker.sock:/var/run/docker.sock:ro - # Remove the following exporters if you don't want to get demo data. - akvorado-exporter0: &exporter - <<: *akvorado-image - restart: unless-stopped - command: demo-exporter http://akvorado-orchestrator:8080#0 - depends_on: - - akvorado-inlet - akvorado-exporter1: - <<: *exporter - command: demo-exporter http://akvorado-orchestrator:8080#1 - akvorado-exporter2: - <<: *exporter - command: demo-exporter http://akvorado-orchestrator:8080#2 - akvorado-exporter3: - <<: *exporter - command: demo-exporter http://akvorado-orchestrator:8080#3 clickhouse: image: clickhouse/clickhouse-server:22.8