Update prometheus Dockerfile

.github/workflows/test_build_and_deploy.yml

@@ -31,6 +31,7 @@ jobs:
           SECRET_KEY_BASE=${{secrets.SECRET_KEYBASE}}
           JELLYFISH_ADDRESS=${{env.JELLYFISH_ADDRESS}}
           JELLYFISH_ADDRESSES=${{secrets.SANDBOX_HOST}}:5002 ${{secrets.SANDBOX2_HOST}}:4000
+          PROMETHEUS_TARGETS=${{secrets.SANDBOX_HOST}}:9568,${{secrets.SANDBOX2_HOST}}:9568
           BACKEND_ADDRESS=${{env.BACKEND_ADDRESS}}
           BEAM_PORT=9000
           GF_SECURITY_ADMIN_PASSWORD=${{secrets.GF_SECURITY_ADMIN_PASSWORD}}

docker-compose-deploy.yaml

@@ -94,16 +94,16 @@ services:
     build:
       context: ./prometheus
       dockerfile: Dockerfile
-      args:
-        JELLYFISH2_IP: $JELLYFISH2_IP
+    environment:
+      TARGETS: ${PROMETHEUS_TARGETS:-jellyfish1:9568 jellyfish2:9568}
     container_name: prometheus
     restart: on-failure
     command:
       - --config.file=/etc/prometheus/prometheus.yml
       - --storage.tsdb.path=/prometheus
       - '--web.console.libraries=/usr/share/prometheus/console_libraries'
       - '--web.console.templates=/usr/share/prometheus/consoles'
-      # - '--enable-feature=expand-external-labels'
+      - '--enable-feature=expand-external-labels'
     volumes:
       - prometheus_data:/prometheus
     depends_on:

docker-compose-distributed-metrics.yaml

@@ -90,13 +90,16 @@ services:
     build:
       context: ./prometheus
       dockerfile: Dockerfile
+    environment:
+      TARGETS: ${PROMETHEUS_TARGETS:-jellyfish1:9568 jellyfish2:9568}
     container_name: prometheus
     restart: on-failure
     command:
       - --config.file=/etc/prometheus/prometheus.yml
       - --storage.tsdb.path=/prometheus
       - '--web.console.libraries=/usr/share/prometheus/console_libraries'
       - '--web.console.templates=/usr/share/prometheus/consoles'
+      - '--enable-feature=expand-external-labels'
     volumes:
       - prometheus_data:/prometheus
     depends_on:

docker-compose-metrics.yaml

@@ -33,19 +33,6 @@ services:
       - "49999:49999"
       - "50000-50500:50000-50500/udp"
 
-  jellyfish2:
-    <<: *jellyfish-template
-    container_name: jellyfish2
-    environment:
-      <<: *jellyfish-environment
-      INTEGRATED_TURN_PORT_RANGE: "50501-51000"
-      INTEGRATED_TCP_TURN_PORT: "499998"
-      PORT: 5003
-    ports:
-      - "5003:5003"
-      - "49998:49998"
-      - "50501-51000:50501-51000/udp"
-
   frontend:
     build:
       context: ./assets
@@ -87,18 +74,20 @@ services:
     build:
       context: ./prometheus
       dockerfile: Dockerfile
+    environment:
+      TARGETS: ${PROMETHEUS_TARGETS:-jellyfish1:9568 jellyfish2:9568}
     container_name: prometheus
     restart: on-failure
     command:
       - --config.file=/etc/prometheus/prometheus.yml
       - --storage.tsdb.path=/prometheus
       - '--web.console.libraries=/usr/share/prometheus/console_libraries'
       - '--web.console.templates=/usr/share/prometheus/consoles'
+      - '--enable-feature=expand-external-labels'
     volumes:
       - prometheus_data:/prometheus
     depends_on:
       - jellyfish1
-      - jellyfish2
 
   grafana:
     build:

prometheus/Dockerfile

@@ -1,10 +1,4 @@
-FROM prom/prometheus:v2.22.0
+FROM prom/prometheus:v2.27.0
 
-LABEL version="1.0.0"
-
-RUN echo "  - job_name: 'jellyfish2'" >> ./prometheus.yaml
-RUN echo "    static_configs:" >> ./prometheus.yaml
-RUN echo "      - targets: ['$JELLYFISH2_IP:9568']" >> ./prometheus.yaml
-
-COPY ./prometheus.yaml /etc/prometheus/prometheus.yml
 
+COPY ./prometheus.yaml /etc/prometheus/prometheus.yml

prometheus/prometheus.yaml

@@ -5,6 +5,6 @@ global:
     monitor: 'codelab-monitor'
 
 scrape_configs:
-  - job_name: 'jellyfish1'
+  - job_name: 'jellyfishes'
     static_configs:
-      - targets: ['jellyfish1:9568']
+      - targets: [${TARGETS}]