From 5fb6344bd7a6fa09e149b0ba63043333324e3e21 Mon Sep 17 00:00:00 2001 From: bravecobra <391353+bravecobra@users.noreply.github.com> Date: Sun, 13 Nov 2022 10:49:22 +0100 Subject: [PATCH] Feature/org docker compose (#35) * Moved docker-compose config to separate folder --- README.md | 16 +++++----------- docker-compose.yml | 10 ++++------ .../provisioning/datasources/datasources.yml | 0 .../config}/loki/loki-config.yaml | 0 .../config}/otel/otel-config-aws.yaml | 0 .../config}/otel/otel-config-datadog.yaml | 0 .../config}/otel/otel-config-grafana.yaml | 0 .../config}/prometheus/prometheus.yaml | 0 .../config}/promtail/promtail.yaml | 0 .../config}/tempo/tempo.yaml | 0 .../docker-compose.individual-grafana.yaml | 0 .../docker-compose.individual.yaml | 0 .../docker-compose.otlp-datadog.yaml | 2 +- .../docker-compose.otlp.yaml | 2 +- global.json | 2 +- src/EmojiSvc.Tests/Services/EmojiSvcShould.cs | 2 +- 16 files changed, 13 insertions(+), 21 deletions(-) rename {config => docker-compose/config}/grafana/provisioning/datasources/datasources.yml (100%) rename {config => docker-compose/config}/loki/loki-config.yaml (100%) rename {config => docker-compose/config}/otel/otel-config-aws.yaml (100%) rename {config => docker-compose/config}/otel/otel-config-datadog.yaml (100%) rename {config => docker-compose/config}/otel/otel-config-grafana.yaml (100%) rename {config => docker-compose/config}/prometheus/prometheus.yaml (100%) rename {config => docker-compose/config}/promtail/promtail.yaml (100%) rename {config => docker-compose/config}/tempo/tempo.yaml (100%) rename docker-compose.individual-grafana.yaml => docker-compose/docker-compose.individual-grafana.yaml (100%) rename docker-compose.individual.yaml => docker-compose/docker-compose.individual.yaml (100%) rename docker-compose.otlp-datadog.yaml => docker-compose/docker-compose.otlp-datadog.yaml (92%) rename docker-compose.otlp.yaml => docker-compose/docker-compose.otlp.yaml (92%) diff --git a/README.md b/README.md index 613ff5d..e13400c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# emojivoto-dotnet +# EmojiVoto-dotnet ## Description @@ -45,12 +45,6 @@ Docker now exposes Prometheus-compatible metrics on port 9323. > You only need to enable this if you want metrics from the underlying docker daemon, pulled by the opentelemetry-collector. -### Compile - -```powershell -.\build.ps1 --target Docker-Build -``` - ### Build docker images ```powershell @@ -105,7 +99,7 @@ docker-compose down Providing extra environment variables through `docker-compose.individual.yaml`, the app can be reconfigured to start outputting to those individual services `seq`, `jaeger` and `prometheus`. ```powershell -docker-compose --profile app --profile individual -f docker-compose.yml -f docker-compose.individual.yaml up -d --remove-orphans +docker-compose --profile app --profile individual -f docker-compose.yml -f ./docker-compose/docker-compose.individual.yaml up -d --remove-orphans ``` ```mermaid @@ -190,7 +184,7 @@ graph TD; ``` ```powershell -docker-compose --profile app --profile grafana -f docker-compose.yml -f docker-compose.individual-grafana.yaml up -d --remove-orphans +docker-compose --profile app --profile grafana -f docker-compose.yml -f ./docker-compose/docker-compose.individual-grafana.yaml up -d --remove-orphans ``` Each component is reconfigured to output to each monitoring service. That means each service outputs: @@ -246,7 +240,7 @@ having to reconfigure it in the application itself. Instead of configuring three Reconfiguring to output to opentelemetry ```powershell -docker-compose --profile app --profile otlp -f docker-compose.yml -f docker-compose.otlp.yaml up -d --remove-orphans +docker-compose --profile app --profile otlp -f docker-compose.yml -f ./docker-compose/docker-compose.otlp.yaml up -d --remove-orphans ``` ### Monitoring through opentelemetry (datadog) @@ -288,5 +282,5 @@ graph TD; ``` ```powershell -docker-compose --profile app --profile datadog -f docker-compose.yml -f docker-compose.otlp-datadog.yaml up -d --remove-orphans +docker-compose --profile app --profile datadog -f docker-compose.yml -f ./docker-compose/docker-compose.otlp-datadog.yaml up -d --remove-orphans ``` diff --git a/docker-compose.yml b/docker-compose.yml index 3e440f3..f2f1868 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -122,7 +122,7 @@ services: profiles: ["grafana", "otlp"] command: [ "-config.file=/etc/tempo.yaml" ] volumes: - - ./config/tempo/tempo.yaml:/etc/tempo.yaml + - ./docker-compose/config/tempo/tempo.yaml:/etc/tempo.yaml - tempo:/tmp/tempo ports: - "14268" # jaeger ingest @@ -140,7 +140,7 @@ services: restart: on-failure volumes: - loki:/loki - - ./config/loki/loki-config.yaml:/etc/loki/loki-config.yaml + - ./docker-compose/config/loki/loki-config.yaml:/etc/loki/loki-config.yaml command: -config.file=/etc/loki/loki-config.yaml @@ -158,7 +158,7 @@ services: restart: on-failure volumes: - grafana:/var/lib/grafana - - ./config/grafana/provisioning/:/etc/grafana/provisioning/ + - ./docker-compose/config/grafana/provisioning/:/etc/grafana/provisioning/ depends_on: - loki - prometheus @@ -170,7 +170,7 @@ services: profiles: ["individual", "otlp", "grafana"] volumes: - prometheus:/prometheus - - ./config/prometheus/prometheus.yaml:/etc/prometheus/prometheus.yml + - ./docker-compose/config/prometheus/prometheus.yaml:/etc/prometheus/prometheus.yml ports: - "9090:9090" @@ -179,8 +179,6 @@ services: container_name: otel-collector profiles: ["otlp", "datadog"] command: ["--config=/etc/otel-collector-config.yml"] - # volumes: - # - ./config/otel/otel-config-grafana.yaml:/etc/otel-collector-config.yml ports: - "4317:4317" - "4318:4318" diff --git a/config/grafana/provisioning/datasources/datasources.yml b/docker-compose/config/grafana/provisioning/datasources/datasources.yml similarity index 100% rename from config/grafana/provisioning/datasources/datasources.yml rename to docker-compose/config/grafana/provisioning/datasources/datasources.yml diff --git a/config/loki/loki-config.yaml b/docker-compose/config/loki/loki-config.yaml similarity index 100% rename from config/loki/loki-config.yaml rename to docker-compose/config/loki/loki-config.yaml diff --git a/config/otel/otel-config-aws.yaml b/docker-compose/config/otel/otel-config-aws.yaml similarity index 100% rename from config/otel/otel-config-aws.yaml rename to docker-compose/config/otel/otel-config-aws.yaml diff --git a/config/otel/otel-config-datadog.yaml b/docker-compose/config/otel/otel-config-datadog.yaml similarity index 100% rename from config/otel/otel-config-datadog.yaml rename to docker-compose/config/otel/otel-config-datadog.yaml diff --git a/config/otel/otel-config-grafana.yaml b/docker-compose/config/otel/otel-config-grafana.yaml similarity index 100% rename from config/otel/otel-config-grafana.yaml rename to docker-compose/config/otel/otel-config-grafana.yaml diff --git a/config/prometheus/prometheus.yaml b/docker-compose/config/prometheus/prometheus.yaml similarity index 100% rename from config/prometheus/prometheus.yaml rename to docker-compose/config/prometheus/prometheus.yaml diff --git a/config/promtail/promtail.yaml b/docker-compose/config/promtail/promtail.yaml similarity index 100% rename from config/promtail/promtail.yaml rename to docker-compose/config/promtail/promtail.yaml diff --git a/config/tempo/tempo.yaml b/docker-compose/config/tempo/tempo.yaml similarity index 100% rename from config/tempo/tempo.yaml rename to docker-compose/config/tempo/tempo.yaml diff --git a/docker-compose.individual-grafana.yaml b/docker-compose/docker-compose.individual-grafana.yaml similarity index 100% rename from docker-compose.individual-grafana.yaml rename to docker-compose/docker-compose.individual-grafana.yaml diff --git a/docker-compose.individual.yaml b/docker-compose/docker-compose.individual.yaml similarity index 100% rename from docker-compose.individual.yaml rename to docker-compose/docker-compose.individual.yaml diff --git a/docker-compose.otlp-datadog.yaml b/docker-compose/docker-compose.otlp-datadog.yaml similarity index 92% rename from docker-compose.otlp-datadog.yaml rename to docker-compose/docker-compose.otlp-datadog.yaml index f013db4..29678ff 100644 --- a/docker-compose.otlp-datadog.yaml +++ b/docker-compose/docker-compose.otlp-datadog.yaml @@ -46,5 +46,5 @@ services: - DD_API_KEY=${DD_API_KEY} - DD_SITE=${DD_SITE} volumes: - - ./config/otel/otel-config-datadog.yaml:/etc/otel-collector-config.yml + - ./docker-compose/config/otel/otel-config-datadog.yaml:/etc/otel-collector-config.yml - //var/run/docker.sock:/var/run/docker.sock diff --git a/docker-compose.otlp.yaml b/docker-compose/docker-compose.otlp.yaml similarity index 92% rename from docker-compose.otlp.yaml rename to docker-compose/docker-compose.otlp.yaml index d671be1..c485aca 100644 --- a/docker-compose.otlp.yaml +++ b/docker-compose/docker-compose.otlp.yaml @@ -47,7 +47,7 @@ services: - prometheus otel-collector: volumes: - - ./config/otel/otel-config-grafana.yaml:/etc/otel-collector-config.yml + - ./docker-compose/config/otel/otel-config-grafana.yaml:/etc/otel-collector-config.yml - //var/run/docker.sock:/var/run/docker.sock depends_on: - loki diff --git a/global.json b/global.json index f443bd4..777ddd8 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "6.0", + "version": "6.0.100", "rollForward": "latestMajor", "allowPrerelease": true } diff --git a/src/EmojiSvc.Tests/Services/EmojiSvcShould.cs b/src/EmojiSvc.Tests/Services/EmojiSvcShould.cs index 3edce5f..3d6c6df 100644 --- a/src/EmojiSvc.Tests/Services/EmojiSvcShould.cs +++ b/src/EmojiSvc.Tests/Services/EmojiSvcShould.cs @@ -26,7 +26,7 @@ public EmojiSvcShould() public async Task ReturnAllEmojis() { var sut = new EmojiGrpcSvc(NullLogger.Instance, new AllEmoji(new InMemoryAllEmoji()), _mapper); - var actual = await sut.ListAll(new ListAllEmojiRequest(), null); + var actual = await sut.ListAll(new ListAllEmojiRequest(), null!); Assert.Equal(99, actual.List.Count); }