Update some configs and fixes the Pulp dashboard.

.github/workflows/ci.yaml

@@ -104,13 +104,14 @@ jobs:
 
       - name: Test that the correct plugins are installed and that the API_ROOT was successfully changed.
         run: |
-          curl localhost:5001/my/custom/api/api/v3/status/ | jq -r ".versions" | grep pulpcore
-          curl localhost:5001/my/custom/api/api/v3/status/ | jq -r ".versions" | grep pulp-file
+
+          curl localhost:5001/my/custom/api/api/v3/status/ | jq -r '.versions[]|select (.component=="core").component=="core"'
+          curl localhost:5001/my/custom/api/api/v3/status/ | jq -r '.versions[]|select (.component=="file").component=="file"'
 
       - name: Test that the second instance of oci-env is running correctly.
         run: |
-          curl localhost:7210/my/custom/api/api/v3/status/ | jq -r ".versions" | grep pulpcore
-          curl localhost:7210/my/custom/api/api/v3/status/ | jq -r ".versions" | grep pulp-file
+          curl localhost:7210/my/custom/api/api/v3/status/ | jq -r '.versions[]|select (.component=="core").component=="core"'
+          curl localhost:7210/my/custom/api/api/v3/status/ | jq -r '.versions[]|select (.component=="file").component=="file"'
 
       - name: Test functional tests
         run: |

profiles/opentelemetry_dev/compose.yaml

@@ -7,28 +7,27 @@ services:
     container_name: jaeger
     image: jaegertracing/all-in-one:latest
     environment:
-      COLLECTOR_OTLP_ENABLED: "true"
+      # COLLECTOR_OTLP_ENABLED: "true"
       JAEGER_DISABLED: "true"
     ports:
       - "16686:16686"
-      - "14250:14250"
-      - "14268:14268"
-      - "14269:14269"
+      - "14250"
+      - "14268"
+      - "4317"
 
   otel-collector:
     container_name: otel-collector
     image: otel/opentelemetry-collector
     command: [--config=/etc/otel-collector/otel-collector-config.yaml]
     volumes:
-      - {OCI_ENV_DIR}/profiles/{COMPOSE_PROFILE}/otel-collector:/etc/otel-collector
+      - "{OCI_ENV_DIR}/profiles/{COMPOSE_PROFILE}/otel-collector:/etc/otel-collector"
     ports:
-      - "1888:1888"   # pprof extension
-      - "8888:8888"   # Prometheus metrics exposed by the collector
-      - "8889:8889"   # Prometheus exporter metrics
-      - "13133:13133" # health_check extension
-      - "4317:4317"   # OTLP gRPC receiver
-      - "4318:4318"   # OTLP http receiver
-      - "55679:55679" # zpages extension
+      - "1888"   # pprof extension
+      - "8888"   # Prometheus metrics exposed by the collector
+      - "8889"   # Prometheus exporter metrics
+      - "13133" # health_check extension
+      - "4318"   # OTLP http receiver
+      - "55679" # zpages extension
     depends_on:
       - prometheus
       - jaeger
@@ -37,21 +36,22 @@ services:
     container_name: prometheus
     image: prom/prometheus
     volumes:
-      - {OCI_ENV_DIR}/profiles/{COMPOSE_PROFILE}/prometheus:/etc/prometheus
+      - "{OCI_ENV_DIR}/profiles/{COMPOSE_PROFILE}/prometheus:/etc/prometheus"
     ports:
-      - "9090:9090"
+      - "9090"
 
   grafana:
     image: grafana/grafana
     depends_on:
       - prometheus
     restart: "always"
     volumes:
-      - {OCI_ENV_DIR}/profiles/{COMPOSE_PROFILE}/grafana/provisioning:/etc/grafana/provisioning
-      - {OCI_ENV_DIR}/profiles/{COMPOSE_PROFILE}/grafana/dashboards:/var/lib/grafana/dashboards
-      - type: bind
-        source: ./grafana/config.ini
-        target: /etc/grafana/config.ini
+      - "{OCI_ENV_DIR}/profiles/{COMPOSE_PROFILE}/grafana/provisioning:/etc/grafana/provisioning"
+      - "{OCI_ENV_DIR}/profiles/{COMPOSE_PROFILE}/grafana/dashboards:/var/lib/grafana/dashboards"
+      - "{OCI_ENV_DIR}/profiles/{COMPOSE_PROFILE}/grafana/config.ini:/etc/grafana/config.ini"
+      # - type: bind
+      #   source: ./grafana/config.ini
+      #   target: /etc/grafana/config.ini
     ports:
       - "3000:3000"