Refactor docker compose setups (monolithic vs microservices) and (cloud vs cloud.otlp)

Author: ppcano

.env.local

@@ -1,14 +1,10 @@
-PUBLIC_BACKEND_ENDPOINT=http://localhost:3333
-PUBLIC_BACKEND_WS_ENDPOINT=ws://localhost:3333
-
-# Override the default Alloy configuration file used by docker-compose-local.yaml or docker-compose-cloud.yaml
+# Override the default Alloy configuration file used by docker compose files
 # ALLOY_FILE_NAME=
 
 # To use a custom localimage (e.g., locally built)
 # Example: docker build -t local-quickpizza:latest .
 # QUICKPIZZA_IMAGE=local-quickpizza:latest
 
-# docker-compose-cloud.yaml env variables
 QUICKPIZZA_CONF_FARO_URL=GRAFANA_CLOUD_FARO_URL
 
 # https://github.com/grafana/alloy-modules/tree/main/modules/cloud/grafana/cloud

README.md

@@ -109,19 +109,21 @@ The [docker-compose-local.yaml](./docker-compose-local.yaml) file is set up to r
 
 Grafana Alloy collects traces, metrics, logs and profiling data from the QuickPizza app, forwarding them to the Tempo, Prometheus and Loki. Finally, you can visualize and correlate data stored in these containers with the locally running Grafana instance.
 
-To start the local environment, use the following command:
+To start the local environment with the complete observability stack, use the following command:
 
 ```bash
-docker compose -f docker-compose-local.yaml up -d
+docker compose -f compose.grafana-local-stack.monolithic.yaml up -d
 ```
 
+This setup runs QuickPizza in monolithic mode, where all QuickPizza components run in a single instance.
+
 Like before, QuickPizza is available at [localhost:3333](http://localhost:3333). It's time to discover some fancy pizzas!
 
 Then, you can visit the Grafana instance running at [localhost:3000](http://localhost:3000) and use **Explore** or **Drilldown apps** to access QuickPizza data.
 
 ![Use Profiles Drilldown](./docs/images/drilldown-profiles.png)
 
-To find the labels applied to the telemetry data, refer to [local.alloy](./alloy/local.alloy) and [docker-compose-local.yaml](./docker-compose-local.yaml).
+To find the labels applied to the telemetry data, refer to [local.alloy](./alloy/local.alloy) and [compose.grafana-local-stack.monolithic.yaml](./compose.grafana-local-stack.monolithic.yaml).
 
 ### Send k6 Test Results to Prometheus and visualize them in Grafana with prebuilt dashboards
 
@@ -139,9 +141,9 @@ For detailed instructions about the different options of the k6 Prometheus outpu
 
 ## Run locally and observe with Grafana Cloud ☁📊
 
-The [docker-compose-cloud.yaml](./docker-compose-cloud.yaml) file is set up to run the QuickPizza and Grafana Alloy containers.
+The [compose.grafana-cloud.microservices.yaml](./compose.grafana-cloud.microservices.yaml) file is set up to run QuickPizza in microservice mode with a Grafana Alloy instance.
 
-In this setup, Grafana Alloy collects observability data from the QuickPizza app and forwards it to [Grafana Cloud](https://grafana.com/products/cloud/).
+In this setup, Grafana Alloy collects observability data from the QuickPizza microservices and forwards it to [Grafana Cloud](https://grafana.com/products/cloud/).
 
 You will need the following settings:
 
@@ -157,10 +159,10 @@ GRAFANA_CLOUD_STACK=
 GRAFANA_CLOUD_TOKEN=
 ```
 
-Finally, execute the Docker Compose command using the `docker-compose-cloud.yaml` file, just as in the local setup:
+Finally, execute the Docker Compose command using the `compose.grafana-cloud.microservices.yaml` file, just as in the local setup:
 
 ```bash
-docker compose -f docker-compose-cloud.yaml up -d
+docker compose -f compose.grafana-cloud.microservices.yaml up -d
 ```
 
 QuickPizza is available at [localhost:3333](http://localhost:3333). Click the `Pizza, Please!` button and discover some awesome pizzas!
@@ -171,7 +173,7 @@ Now, you can log in to [Grafana Cloud](https://grafana.com/products/cloud/) and
 
 ![Use Profiles Drilldown](./docs/images/grafana-cloud-drilldown-profiles.png)
 
-To find the labels applied to the telemetry data, refer to [cloud.alloy](./alloy/cloud.alloy) and [docker-compose-cloud.yaml](./docker-compose-cloud.yaml) .
+To find the labels applied to the telemetry data, refer to [cloud.alloy](./alloy/cloud.alloy) and [compose.grafana-cloud.microservices.yaml](./compose.grafana-cloud.microservices.yaml) .
 
 ### Monitor QuickPizza with Grafana Cloud Application and Frontend Observability
 
@@ -199,11 +201,11 @@ QUICKPIZZA_CONF_FARO_URL=
 QUICKPIZZA_CONF_FARO_APP_NAME=
 ```
 
-4. Restart the `docker-compose-cloud.yaml` environment:
+4. Restart the `compose.grafana-cloud.microservices.yaml` environment:
 
     ```bash
-    docker compose -f docker-compose-cloud.yaml down
-    docker compose -f docker-compose-cloud.yaml up -d
+    docker compose -f compose.grafana-cloud.microservices.yaml down
+    docker compose -f compose.grafana-cloud.microservices.yaml up -d
     ```
 
 ![Frontend Observability](./docs/images/grafana-cloud-frontend-observability-quickpizza.png)

alloy/cloud-microservices.alloy

@@ -1,4 +1,85 @@
-// Receive traces
+
+import.git "grafana_cloud" {
+  repository = "https://github.com/grafana/alloy-modules.git"
+  revision = "main"
+  path = "modules/cloud/grafana/cloud/module.alloy"
+  pull_frequency = "0s"
+}
+
+grafana_cloud.stack "receivers" {
+  stack_name = env("GRAFANA_CLOUD_STACK")
+  token = env("GRAFANA_CLOUD_TOKEN")
+}
+
+// discover containers running QuickPizza
+discovery.docker "application_containers" {
+  host = "unix:///var/run/docker.sock"
+  filter {
+    name   = "label"
+    values = ["service.type=application"]
+  }
+}
+
+// set expected labels
+discovery.relabel "application_containers" {
+  rule {
+    target_label = "job"
+    source_labels = [
+      "__meta_docker_container_name",
+    ]
+    regex = "/(.*)"
+    replacement = "quickpizza/${1}"
+  }
+  rule {
+    target_label = "instance"
+    source_labels = [
+      "__meta_docker_container_name",
+    ]
+    regex = "/(.*)"
+    replacement = "${1}"
+  }
+  rule {
+    target_label = "service_namespace"
+    replacement = "quickpizza"
+  }
+  // the `namespace` label is for visualizing Profiles in Application Observability
+  rule {
+    target_label = "namespace"
+    replacement = "quickpizza"
+  }
+  rule {
+    target_label = "service_name"
+    source_labels = [
+      "__meta_docker_container_name",
+    ]
+    regex = "/(.*)"
+    replacement = "${1}"
+  }
+  targets = discovery.docker.application_containers.targets
+}
+
+// Metrics
+prometheus.scrape "application_containers" {
+  scrape_interval = "10s"
+  targets = discovery.relabel.application_containers.output
+  forward_to = [grafana_cloud.stack.receivers.metrics]
+}
+// Logs
+loki.source.docker "application_containers" {
+  host       = "unix:///var/run/docker.sock"
+  targets    = discovery.relabel.application_containers.output
+  forward_to = [grafana_cloud.stack.receivers.logs]
+}
+
+// Profiling Pull Mode
+pyroscope.scrape "application_containers" {
+  // https://grafana.com/docs/pyroscope/latest/configure-client/grafana-alloy/go_pull/
+  scrape_interval = "30s"
+  targets = discovery.relabel.application_containers.output
+  forward_to = [grafana_cloud.stack.receivers.profiles]
+}
+
+// Traces
 otelcol.receiver.otlp "default" {
   grpc {
     endpoint = "0.0.0.0:4317"
@@ -29,80 +110,8 @@ otelcol.exporter.prometheus "otlp_metrics" {
     grafana_cloud.stack.receivers.metrics,
   ]
 }
-
 otelcol.processor.batch "default" {
   output {
     traces = [grafana_cloud.stack.receivers.traces]
   }
-}
-
-// Scrape Metrics
-prometheus.scrape "default" {
-  forward_to = [
-    grafana_cloud.stack.receivers.metrics,
-  ]
-  targets = [
-    {
-      "__address__" = env("QUICKPIZZA_HOST"),
-      "job" = "quickpizza",
-      "instance" = "local",
-      "service_name" = "quickpizza",
-      "service_namespace" = "quickpizza",
-    },
-  ]
-}
-
-discovery.docker "all_containers" {
-  host = "unix:///var/run/docker.sock"
-}
-
-discovery.relabel "quickpizza" {
-  rule {
-    target_label = "instance"
-    source_labels = [
-      "__meta_docker_container_name",
-    ]
-    regex ="/(.*)"
-    action = "replace"
-  }
-  rule {
-    target_label = "job"
-    source_labels = [
-      "__meta_docker_container_label_com_docker_compose_project",
-    ]
-    regex = ".*quickpizza.*"
-    action = "keep"
-  }
-  targets = discovery.docker.all_containers.targets
-}
-
-loki.source.docker "default" {
-  host       = "unix:///var/run/docker.sock"
-  targets    = discovery.relabel.quickpizza.output
-  forward_to = [grafana_cloud.stack.receivers.logs]
-  labels = {
-    service_name = "quickpizza",
-    service_namespace = "quickpizza",
-  }
-}
-
-import.git "grafana_cloud" {
-  repository = "https://github.com/grafana/alloy-modules.git"
-  revision = "main"
-  path = "modules/cloud/grafana/cloud/module.alloy"
-  pull_frequency = "0s"
-}
-
-// Receive profiling data
-pyroscope.receive_http "default" {
-   http {
-       listen_address = "0.0.0.0"
-       listen_port = 9999
-   }
-   forward_to = [grafana_cloud.stack.receivers.profiles]
-}
-
-grafana_cloud.stack "receivers" {
-  stack_name = env("GRAFANA_CLOUD_STACK")
-  token = env("GRAFANA_CLOUD_TOKEN")
 }