wip

Author: mrnicegyu11

services/minio/template.env

@@ -2,7 +2,3 @@
 MINIO_ACCESS_KEY=${S3_ACCESS_KEY}
 MINIO_SECRET_KEY=${S3_SECRET_KEY}
 STORAGE_DOMAIN=${STORAGE_DOMAIN}
-TEMPO_S3_BUCKET=${TEMPO_S3_BUCKET}
-MONITORING_DOMAIN=${MONITORING_DOMAIN}
-PUBLIC_NETWORK=${PUBLIC_NETWORK}
-MONITORED_NETWORK=${MONITORED_NETWORK}

services/monitoring/docker-compose.yml.j2

@@ -395,56 +395,8 @@ services:
           cpus: "0.5"
         reservations:
           memory: 32M
-          cpus: "0.1"{% endfor %}
-  tempo1:
-    image: grafana/tempo:2.6.1
-    command: "-target=scalable-single-binary -config.file=/etc/tempo.yaml"
-    configs:
-      - source: tempo_config
-        target: /etc/tempo.yaml
-    networks:
-      - monitored
-    deploy:
-      labels:
-        - traefik.enable=true
-        - traefik.docker.network=${PUBLIC_NETWORK}
-        - traefik.http.services.tempo.loadbalancer.server.port=9095
-        - traefik.http.routers.tempo.rule=Host(`${MONITORING_DOMAIN}`) && PathPrefix(`/tempo`)
-        - traefik.http.routers.tempo.priority=10
-        - traefik.http.routers.tempo.entrypoints=https
-        - traefik.http.routers.tempo.tls=true
-        - traefik.http.middlewares.tempo_replace_regex.replacepathregex.regex=^/tempo/?(.*)$$
-        - traefik.http.middlewares.tempo_replace_regex.replacepathregex.replacement=/$${1}
-        - traefik.http.routers.tempo.middlewares=ops_whitelist_ips@swarm, ops_gzip@swarm, tempo_replace_regex
-      resources:
-        limits:
-          memory: 2000M
-          cpus: "2.0"
-  tempo2:
-    image: grafana/tempo:2.6.1
-    command: "-target=scalable-single-binary -config.file=/etc/tempo.yaml"
-    configs:
-      - source: tempo_config
-        target: /etc/tempo.yaml
-    networks:
-      - monitored
-    deploy:
-      labels:
-        - traefik.enable=true
-        - traefik.docker.network=${PUBLIC_NETWORK}
-        - traefik.http.services.tempo.loadbalancer.server.port=9095
-        - traefik.http.routers.tempo.rule=Host(`${MONITORING_DOMAIN}`) && PathPrefix(`/tempo`)
-        - traefik.http.routers.tempo.priority=10
-        - traefik.http.routers.tempo.entrypoints=https
-        - traefik.http.routers.tempo.tls=true
-        - traefik.http.middlewares.tempo_replace_regex.replacepathregex.regex=^/tempo/?(.*)$$
-        - traefik.http.middlewares.tempo_replace_regex.replacepathregex.replacement=/$${1}
-        - traefik.http.routers.tempo.middlewares=ops_whitelist_ips@swarm, ops_gzip@swarm, tempo_replace_regex
-      resources:
-        limits:
-          memory: 2000M
-          cpus: "2.0"
-  tempo3:
+          cpus: "0.1"
+  tempo:
     image: grafana/tempo:2.6.1
     command: "-target=scalable-single-binary -config.file=/etc/tempo.yaml"
     configs:

services/monitoring/grafana/terraform/datasources.tf

@@ -15,3 +15,11 @@ resource "grafana_data_source" "prometheuscatchall" {
   is_default         = false
   uid                = "RmZEr52nz"
 }
+
+resource "grafana_data_source" "tempo" {
+  type               = "tempo"
+  name               = "tempo"
+  url                = var.TEMPO_URL
+  basic_auth_enabled = false
+  is_default         = false
+}

services/monitoring/grafana/terraform/variables.tf

@@ -2,6 +2,10 @@ variable "GRAFANA_URL" {
   description = "grafana_url"
   sensitive   = false
 }
+variable "TEMPO_URL" {
+  description = "tempo_url"
+  sensitive   = false
+}
 variable "GRAFANA_AUTH" {
   description = "Username:Password"
   sensitive   = true

services/monitoring/template.env

@@ -26,3 +26,4 @@ STORAGE_DOMAIN=${STORAGE_DOMAIN}
 S3_REGION=${S3_REGION}
 S3_ACCESS_KEY=${S3_ACCESS_KEY}
 S3_SECRET_KEY=${S3_SECRET_KEY}
+TF_VAR_PROMETHEUS_CATCHALL_URL=${TF_VAR_PROMETHEUS_CATCHALL_URL}

services/monitoring/tempo_config.yaml.j2

@@ -15,14 +15,6 @@ compactor:
   compaction:
     block_retention: 96h             # overall Tempo trace retention.
 
-memberlist:
-  abort_if_cluster_join_fails: false
-  bind_port: 7946
-  join_members:
-  - tempo1:7946
-  - tempo2:7946
-  - tempo3:7946
-
 metrics_generator:
   registry:
     external_labels:
@@ -31,7 +23,7 @@ metrics_generator:
   storage:
     path: /var/tempo/generator/wal
     remote_write:
-      - url: http://prometheuscatchall:9090/api/v1/write
+      - url: {{ TF_VAR_PROMETHEUS_CATCHALL_URL }}/api/v1/write
 
 storage:
   trace:
@@ -50,9 +42,9 @@ storage:
       # endpoint: s3.dualstack.us-west-2.amazonaws.com
       # region: us-west-2
 
-#querier:
-#  frontend_worker:
-#    frontend_address: {{MONITORING_DOMAIN}}/tempo:9095
+querier:
+  frontend_worker:
+    frontend_address: localhost:9095
 
 overrides:
   defaults: