update the images

timescale · Jul 13, 2022 · c50b6c9 · c50b6c9
1 parent ce82932
commit c50b6c9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml
@@ -39,7 +39,7 @@ services:
       PROMSCALE_WEB_TELEMETRY_PATH: /metrics-text
       PROMSCALE_DB_URI: postgres://postgres:password@db:5432/postgres?sslmode=allow
       PROMSCALE_TRACING_OTLP_SERVER_ADDRESS: ":9202"
-      PROMSCALE_TELEMETRY_TRACE_JAEGER_ENDPOINT: "http://otel-collector:14268/api/traces"
+      PROMSCALE_TELEMETRY_TRACE_OTEL_ENDPOINT: "otel-collector:4317"
       PROMSCALE_TELEMETRY_TRACE_SAMPLING_RATIO: "0.1"
       PROMSCALE_METRICS_RULES_CONFIG_FILE: /prometheus.yml
 

diff --git a/docker-compose/otel-collector-config.yml b/docker-compose/otel-collector-config.yml
@@ -1,8 +1,8 @@
 receivers:
-  jaeger:
+  otlp:
     protocols:
-      thrift_http:
-        endpoint: "0.0.0.0:14268"
+      grpc:
+      http:
 
 exporters:
   logging:
@@ -21,7 +21,7 @@ service:
 
   pipelines:
     traces:
-      receivers: [jaeger]
+      receivers: [otlp]
       exporters: [otlp, logging]
       processors: [batch]
 
diff --git a/docker-compose/promscale-demo/docker-compose.yaml b/docker-compose/promscale-demo/docker-compose.yaml
@@ -40,24 +40,27 @@ services:
       - ${PWD}/../rules.yml:/rules.yml
       - ${PWD}/../alerts.yml:/alerts.yml
     environment:
+      PROMSCALE_WEB_TELEMETRY_PATH: /metrics-text
       PROMSCALE_DB_URI: postgres://postgres:password@timescaledb:5432/otel_demo?sslmode=allow
-      PROMSCALE_TELEMETRY_TRACE_JAEGER_ENDPOINT: "http://collector:14268/api/traces"
+      PROMSCALE_TELEMETRY_TRACE_OTEL_ENDPOINT: "collector:4317"
       PROMSCALE_TELEMETRY_TRACE_SAMPLING_RATIO: "0.1"
       PROMSCALE_METRICS_RULES_CONFIG_FILE: /prometheus.yml
+      TOBS_PROMSCALE_QUICK_START: "true"
 
   collector:
-    platform: linux/amd64
-    image: "timescale/promscale-demo-collector"
-    command: [ "--config=/etc/otel-collector-config.yaml" ]
+    image: "otel/opentelemetry-collector:0.50.0"
+    command: [ "--config=/etc/otel-collector-config.yml" ]
     depends_on:
       - promscale
     ports:
       - 14268:14268/tcp # jaeger http
       - 4317:4317/tcp
       - 4318:4318/tcp
+    volumes:
+      - ${PWD}/../otel-collector-config.yml:/etc/otel-collector-config.yml
 
   jaeger:
-    image: jaegertracing/jaeger-query:1.33.0
+    image: jaegertracing/jaeger-query:1.35.0
     environment:
       SPAN_STORAGE_TYPE: grpc-plugin
     command: [
@@ -67,7 +70,7 @@ services:
       - "16686:16686"
 
   grafana:
-    image: timescale/promscale-demo-grafana
+    image: vineeth97/promscale-demo-grafana
     volumes:
       - grafana-data:/var/lib/grafana
     ports:
@@ -93,7 +96,7 @@ services:
       - OTEL_EXPORTER_OTLP_ENDPOINT=collector:4317
 
   lower:
-    image: jamesgresql/opentelemetry-demo_lower:0.2
+    image: timescale/promscale-demo-lower
     restart: on-failure
     depends_on:
       - collector