Generate deploy resources (from Build and Push Container images run #…

… 226)
edeandrea · Jul 15, 2022 · 0271f22 · 0271f22
1 parent 960f45f
commit 0271f22
Show file tree

Hide file tree

Showing 129 changed files with 3,277 additions and 2,414 deletions.
diff --git a/deploy/docker-compose/java11.yml b/deploy/docker-compose/java11.yml
@@ -57,6 +57,7 @@ services:
       QUARKUS_STORK_HERO_SERVICE_SERVICE_DISCOVERY_ADDRESS_LIST: rest-heroes:8083
       QUARKUS_STORK_VILLAIN_SERVICE_SERVICE_DISCOVERY_ADDRESS_LIST: rest-villains:8084
       MP_MESSAGING_CONNECTOR_SMALLRYE_KAFKA_APICURIO_REGISTRY_URL: http://apicurio:8086/apis/registry/v2
+      QUARKUS_OPENTELEMETRY_TRACER_EXPORTER_OTLP_ENDPOINT: http://otel-collector:4317
     restart: on-failure
     networks:
       default:
@@ -103,11 +104,14 @@ services:
     ports:
       - "8084:8084"
     environment:
+#      This will be added back in once https://github.com/quarkusio/quarkus/issues/26304 is addressed
+#      QUARKUS_DATASOURCE_JDBC_URL: jdbc:otel:postgresql://villains-db:5432/villains_database
       QUARKUS_DATASOURCE_JDBC_URL: jdbc:postgresql://villains-db:5432/villains_database
       QUARKUS_HIBERNATE_ORM_DATABASE_GENERATION: validate
       QUARKUS_DATASOURCE_USERNAME: superbad
       QUARKUS_DATASOURCE_PASSWORD: superbad
       QUARKUS_HIBERNATE_ORM_SQL_LOAD_SCRIPT: no-file
+      QUARKUS_OPENTELEMETRY_TRACER_EXPORTER_OTLP_ENDPOINT: http://otel-collector:4317
     restart: on-failure
     networks:
       default:
@@ -135,6 +139,7 @@ services:
       QUARKUS_DATASOURCE_USERNAME: superman
       QUARKUS_DATASOURCE_PASSWORD: superman
       QUARKUS_HIBERNATE_ORM_SQL_LOAD_SCRIPT: no-file
+      QUARKUS_OPENTELEMETRY_TRACER_EXPORTER_OTLP_ENDPOINT: http://otel-collector:4317
     restart: on-failure
     networks:
       default:
@@ -160,6 +165,7 @@ services:
     environment:
       KAFKA_BOOTSTRAP_SERVERS: PLAINTEXT://fights-kafka:9092
       MP_MESSAGING_CONNECTOR_SMALLRYE_KAFKA_APICURIO_REGISTRY_URL: http://apicurio:8086/apis/registry/v2
+      QUARKUS_OPENTELEMETRY_TRACER_EXPORTER_OTLP_ENDPOINT: http://otel-collector:4317
     restart: on-failure
     networks:
       default:

diff --git a/deploy/docker-compose/java17.yml b/deploy/docker-compose/java17.yml
@@ -57,6 +57,7 @@ services:
       QUARKUS_STORK_HERO_SERVICE_SERVICE_DISCOVERY_ADDRESS_LIST: rest-heroes:8083
       QUARKUS_STORK_VILLAIN_SERVICE_SERVICE_DISCOVERY_ADDRESS_LIST: rest-villains:8084
       MP_MESSAGING_CONNECTOR_SMALLRYE_KAFKA_APICURIO_REGISTRY_URL: http://apicurio:8086/apis/registry/v2
+      QUARKUS_OPENTELEMETRY_TRACER_EXPORTER_OTLP_ENDPOINT: http://otel-collector:4317
     restart: on-failure
     networks:
       default:
@@ -103,11 +104,14 @@ services:
     ports:
       - "8084:8084"
     environment:
+#      This will be added back in once https://github.com/quarkusio/quarkus/issues/26304 is addressed
+#      QUARKUS_DATASOURCE_JDBC_URL: jdbc:otel:postgresql://villains-db:5432/villains_database
       QUARKUS_DATASOURCE_JDBC_URL: jdbc:postgresql://villains-db:5432/villains_database
       QUARKUS_HIBERNATE_ORM_DATABASE_GENERATION: validate
       QUARKUS_DATASOURCE_USERNAME: superbad
       QUARKUS_DATASOURCE_PASSWORD: superbad
       QUARKUS_HIBERNATE_ORM_SQL_LOAD_SCRIPT: no-file
+      QUARKUS_OPENTELEMETRY_TRACER_EXPORTER_OTLP_ENDPOINT: http://otel-collector:4317
     restart: on-failure
     networks:
       default:
@@ -135,6 +139,7 @@ services:
       QUARKUS_DATASOURCE_USERNAME: superman
       QUARKUS_DATASOURCE_PASSWORD: superman
       QUARKUS_HIBERNATE_ORM_SQL_LOAD_SCRIPT: no-file
+      QUARKUS_OPENTELEMETRY_TRACER_EXPORTER_OTLP_ENDPOINT: http://otel-collector:4317
     restart: on-failure
     networks:
       default:
@@ -160,6 +165,7 @@ services:
     environment:
       KAFKA_BOOTSTRAP_SERVERS: PLAINTEXT://fights-kafka:9092
       MP_MESSAGING_CONNECTOR_SMALLRYE_KAFKA_APICURIO_REGISTRY_URL: http://apicurio:8086/apis/registry/v2
+      QUARKUS_OPENTELEMETRY_TRACER_EXPORTER_OTLP_ENDPOINT: http://otel-collector:4317
     restart: on-failure
     networks:
       default:

diff --git a/deploy/docker-compose/monitoring.yml b/deploy/docker-compose/monitoring.yml
@@ -0,0 +1,31 @@
+version: "3"
+services:
+
+  prometheus:
+    image: quay.io/prometheus/prometheus:v2.33.1
+    container_name: prometheus
+    ports:
+      - "9090:9090"
+    volumes:
+      - ../../deploy/docker-compose/monitoring/prometheus_scrape_configs.yml:/etc/prometheus/prometheus.yml
+
+  jaeger:
+    image: jaegertracing/all-in-one:1
+    container_name: jaeger
+    ports:
+      - "16686:16686" # Jaeger UI
+      - "14268"       # Accept thrift spans
+      - "14250"       # Accept gRPC spans
+
+  otel-collector:
+    image: otel/opentelemetry-collector:0.53.0
+    container_name: otel-collector
+    command:
+      - "--config=/conf/otel-collector-config.yml"
+    volumes:
+      - ../../deploy/docker-compose/monitoring/otel-collector-config.yml:/conf/otel-collector-config.yml
+    ports:
+      - "13133:13133" # health_check extension
+      - "4317:4317"   # OTLP gRPC receiver
+    depends_on:
+      - jaeger
diff --git a/deploy/docker-compose/monitoring/otel-collector-config.yml b/deploy/docker-compose/monitoring/otel-collector-config.yml
@@ -0,0 +1,29 @@
+receivers:
+  otlp:
+    protocols:
+      grpc:
+        endpoint: otel-collector:4317
+
+exporters:
+  jaeger:
+    endpoint: jaeger:14250
+    tls:
+      insecure: true
+
+processors:
+  batch:
+
+extensions:
+  health_check:
+
+service:
+  extensions:
+    - health_check
+  pipelines:
+    traces:
+      receivers:
+        - otlp
+      processors:
+        - batch
+      exporters:
+        - jaeger
diff --git a/deploy/docker-compose/native-java11.yml b/deploy/docker-compose/native-java11.yml
@@ -57,6 +57,7 @@ services:
       QUARKUS_STORK_HERO_SERVICE_SERVICE_DISCOVERY_ADDRESS_LIST: rest-heroes:8083
       QUARKUS_STORK_VILLAIN_SERVICE_SERVICE_DISCOVERY_ADDRESS_LIST: rest-villains:8084
       MP_MESSAGING_CONNECTOR_SMALLRYE_KAFKA_APICURIO_REGISTRY_URL: http://apicurio:8086/apis/registry/v2
+      QUARKUS_OPENTELEMETRY_TRACER_EXPORTER_OTLP_ENDPOINT: http://otel-collector:4317
     restart: on-failure
     networks:
       default:
@@ -103,11 +104,14 @@ services:
     ports:
       - "8084:8084"
     environment:
+#      This will be added back in once https://github.com/quarkusio/quarkus/issues/26304 is addressed
+#      QUARKUS_DATASOURCE_JDBC_URL: jdbc:otel:postgresql://villains-db:5432/villains_database
       QUARKUS_DATASOURCE_JDBC_URL: jdbc:postgresql://villains-db:5432/villains_database
       QUARKUS_HIBERNATE_ORM_DATABASE_GENERATION: validate
       QUARKUS_DATASOURCE_USERNAME: superbad
       QUARKUS_DATASOURCE_PASSWORD: superbad
       QUARKUS_HIBERNATE_ORM_SQL_LOAD_SCRIPT: no-file
+      QUARKUS_OPENTELEMETRY_TRACER_EXPORTER_OTLP_ENDPOINT: http://otel-collector:4317
     restart: on-failure
     networks:
       default:
@@ -135,6 +139,7 @@ services:
       QUARKUS_DATASOURCE_USERNAME: superman
       QUARKUS_DATASOURCE_PASSWORD: superman
       QUARKUS_HIBERNATE_ORM_SQL_LOAD_SCRIPT: no-file
+      QUARKUS_OPENTELEMETRY_TRACER_EXPORTER_OTLP_ENDPOINT: http://otel-collector:4317
     restart: on-failure
     networks:
       default:
@@ -160,6 +165,7 @@ services:
     environment:
       KAFKA_BOOTSTRAP_SERVERS: PLAINTEXT://fights-kafka:9092
       MP_MESSAGING_CONNECTOR_SMALLRYE_KAFKA_APICURIO_REGISTRY_URL: http://apicurio:8086/apis/registry/v2
+      QUARKUS_OPENTELEMETRY_TRACER_EXPORTER_OTLP_ENDPOINT: http://otel-collector:4317
     restart: on-failure
     networks:
       default:

diff --git a/deploy/docker-compose/native-java17.yml b/deploy/docker-compose/native-java17.yml
@@ -57,6 +57,7 @@ services:
       QUARKUS_STORK_HERO_SERVICE_SERVICE_DISCOVERY_ADDRESS_LIST: rest-heroes:8083
       QUARKUS_STORK_VILLAIN_SERVICE_SERVICE_DISCOVERY_ADDRESS_LIST: rest-villains:8084
       MP_MESSAGING_CONNECTOR_SMALLRYE_KAFKA_APICURIO_REGISTRY_URL: http://apicurio:8086/apis/registry/v2
+      QUARKUS_OPENTELEMETRY_TRACER_EXPORTER_OTLP_ENDPOINT: http://otel-collector:4317
     restart: on-failure
     networks:
       default:
@@ -103,11 +104,14 @@ services:
     ports:
       - "8084:8084"
     environment:
+#      This will be added back in once https://github.com/quarkusio/quarkus/issues/26304 is addressed
+#      QUARKUS_DATASOURCE_JDBC_URL: jdbc:otel:postgresql://villains-db:5432/villains_database
       QUARKUS_DATASOURCE_JDBC_URL: jdbc:postgresql://villains-db:5432/villains_database
       QUARKUS_HIBERNATE_ORM_DATABASE_GENERATION: validate
       QUARKUS_DATASOURCE_USERNAME: superbad
       QUARKUS_DATASOURCE_PASSWORD: superbad
       QUARKUS_HIBERNATE_ORM_SQL_LOAD_SCRIPT: no-file
+      QUARKUS_OPENTELEMETRY_TRACER_EXPORTER_OTLP_ENDPOINT: http://otel-collector:4317
     restart: on-failure
     networks:
       default:
@@ -135,6 +139,7 @@ services:
       QUARKUS_DATASOURCE_USERNAME: superman
       QUARKUS_DATASOURCE_PASSWORD: superman
       QUARKUS_HIBERNATE_ORM_SQL_LOAD_SCRIPT: no-file
+      QUARKUS_OPENTELEMETRY_TRACER_EXPORTER_OTLP_ENDPOINT: http://otel-collector:4317
     restart: on-failure
     networks:
       default:
@@ -160,6 +165,7 @@ services:
     environment:
       KAFKA_BOOTSTRAP_SERVERS: PLAINTEXT://fights-kafka:9092
       MP_MESSAGING_CONNECTOR_SMALLRYE_KAFKA_APICURIO_REGISTRY_URL: http://apicurio:8086/apis/registry/v2
+      QUARKUS_OPENTELEMETRY_TRACER_EXPORTER_OTLP_ENDPOINT: http://otel-collector:4317
     restart: on-failure
     networks:
       default:

diff --git a/deploy/docker-compose/prometheus.yml b/deploy/docker-compose/prometheus.yml