wip

proposals-app · Jan 20, 2025 · 4d2afe1 · 4d2afe1
1 parent e4c0138
commit 4d2afe1
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 35 deletions.
diff --git a/apps/observe/docker-compose.yml b/apps/observe/docker-compose.yml
@@ -49,6 +49,7 @@ services:
       - GF_DATABASE_NAME=grafana
       - GF_DATABASE_USER=grafana
       - GF_DATABASE_PASSWORD=your_secure_db_password
+      - GF_FEATURE_TOGGLES_ENABLE=traceqlEditor traceQLStreaming metricsSummary
     networks:
       - observe-network
     depends_on:

diff --git a/apps/observe/prometheus/prometheus.yml b/apps/observe/prometheus/prometheus.yml
@@ -1,16 +1,14 @@
 global:
-  scrape_interval: 15s
-  evaluation_interval: 15s
+  scrape_interval: 5s
+  evaluation_interval: 5s
 
 scrape_configs:
   - job_name: "prometheus"
     static_configs:
       - targets: ["localhost:9090"]
-
   - job_name: "otel-collector"
     static_configs:
       - targets: ["otel-collector:8889"]
-
   - job_name: "tempo-metrics"
     static_configs:
       - targets: ["tempo:3200"]
diff --git a/apps/observe/tempo/tempo-config.yml b/apps/observe/tempo/tempo-config.yml
@@ -1,5 +1,7 @@
+stream_over_http_enabled: true
 server:
   http_listen_port: 3200
+  log_level: info
 
 distributor:
   receivers:
@@ -9,11 +11,21 @@ distributor:
           endpoint: "0.0.0.0:4317"
         http:
           endpoint: "0.0.0.0:4318"
-    jaeger:
-      protocols:
-        thrift_http:
-          endpoint: "0.0.0.0:14268"
-    zipkin:
+
+compactor:
+  compaction:
+    block_retention: 48h
+
+metrics_generator:
+  registry:
+    external_labels:
+      source: tempo
+
+storage:
+  trace:
+    backend: local
+    local:
+      path: /var/tempo/traces
 
 ingester:
   max_block_duration: 5m
@@ -25,32 +37,7 @@ ingester:
       replication_factor: 1
     final_sleep: 0s
 
-storage:
-  trace:
-    backend: local
-    local:
-      path: /var/tempo/traces
-
-compactor:
-  compaction:
-    block_retention: 48h
-
-metrics_generator:
-  registry:
-    external_labels:
-      source: tempo
-  storage:
-    path: /var/tempo/generator/wal
-    remote_write:
-      - url: http://prometheus:9090/api/v1/write
-        send_exemplars: true
-  traces_storage:
-    path: /var/tempo/generator/traces
-
 overrides:
+  metrics_generator_processors: [service-graphs, span-metrics, local-blocks]
   max_global_traces_per_user: 10000000
   max_traces_per_user: 10000000
-  defaults:
-    metrics_generator:
-      processors: [service-graphs, span-metrics, local-blocks] # enables metrics generator
-      generate_native_histograms: both