Update to docker-compose

timescale · Jul 19, 2022 · ae33606 · ae33606
1 parent 47cdad5
commit ae33606
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 15 deletions.
diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml
@@ -36,7 +36,6 @@ services:
       - ${PWD}/rules.yml:/rules.yml
       - ${PWD}/alerts.yml:/alerts.yml
     environment:
-      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_OTEL_ENDPOINT: "otel-collector:4317"

diff --git a/docker-compose/high-availability/docker-compose.yaml b/docker-compose/high-availability/docker-compose.yaml
@@ -43,7 +43,6 @@ services:
     environment:
       PROMSCALE_METRICS_HIGH_AVAILABILITY: true
       PROMSCALE_DB_URI: postgres://postgres:password@db:5432/postgres?sslmode=allow
-      PROMSCALE_WEB_TELEMETRY_PATH: /metrics-text
       PROMSCALE_METRICS_RULES_CONFIG_FILE: /prometheus.yml
 
   promscale-connector2:
@@ -61,7 +60,6 @@ services:
     environment:
       PROMSCALE_METRICS_HIGH_AVAILABILITY: true
       PROMSCALE_DB_URI: postgres://postgres:password@db:5432/postgres?sslmode=allow
-      PROMSCALE_WEB_TELEMETRY_PATH: /metrics-text
       PROMSCALE_METRICS_RULES_CONFIG_FILE: /prometheus.yml
 
   node_exporter:

diff --git a/docker-compose/high-availability/prometheus1.yml b/docker-compose/high-availability/prometheus1.yml
@@ -34,7 +34,6 @@ scrape_configs:
     static_configs:
       - targets: ['node_exporter:9100']
   - job_name: promscale
-    metrics_path: '/metrics-text'
     static_configs:
       - targets: 
           - 'promscale-connector1:9201'

diff --git a/docker-compose/high-availability/prometheus2.yml b/docker-compose/high-availability/prometheus2.yml
@@ -32,7 +32,6 @@ scrape_configs:
     static_configs:
       - targets: ['node_exporter:9100']
   - job_name: promscale
-    metrics_path: '/metrics-text'
     static_configs:
       - targets: 
           - 'promscale-connector1:9201'

diff --git a/docker-compose/prometheus.yml b/docker-compose/prometheus.yml
@@ -9,7 +9,6 @@ scrape_configs:
     static_configs:
       - targets: ['node_exporter:9100']
   - job_name: promscale
-    metrics_path: '/metrics-text'
     static_configs:
       - targets: ['promscale:9201']
 

diff --git a/docker-compose/promscale-demo/docker-compose.yaml b/docker-compose/promscale-demo/docker-compose.yaml
@@ -10,7 +10,7 @@ services:
     environment:
       POSTGRES_PASSWORD: password
       POSTGRES_USER: postgres
-      POSTGRES_DB: otel_demo
+      POSTGRES_DB: tsdb
       POSTGRES_HOST_AUTH_METHOD: trust
 
   prometheus:
@@ -40,12 +40,9 @@ 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_OTEL_ENDPOINT: "collector:4317"
-      PROMSCALE_TELEMETRY_TRACE_SAMPLING_RATIO: "0.1"
+      PROMSCALE_DB_URI: postgres://postgres:password@timescaledb:5432/tsdb?sslmode=allow
       PROMSCALE_METRICS_RULES_CONFIG_FILE: /prometheus.yml
-      TOBS_PROMSCALE_QUICK_START: "true"
+      PROMSCALE_PKG: "docker-quick-start"
 
   collector:
     image: "otel/opentelemetry-collector:0.55.0"
@@ -143,9 +140,6 @@ services:
     restart: on-failure
     depends_on:
       - generator
-    deploy:
-      mode: replicated
-      replicas: 3
 
 volumes:
   timescaledb-data: