Changes some configs and add new graphs to the pulp dashboard

pulp · Jan 25, 2024 · fee4634 · fee4634
1 parent 8a13705
commit fee4634
Show file tree

Hide file tree

Showing 6 changed files with 4,836 additions and 58 deletions.
diff --git a/.github/workflows/ci.yaml b/.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: |

diff --git a/profiles/opentelemetry_dev/compose.yaml b/profiles/opentelemetry_dev/compose.yaml
@@ -7,26 +7,25 @@ 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"
+      - "4317: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
     depends_on:
@@ -37,7 +36,7 @@ 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"
 
@@ -47,9 +46,9 @@ services:
       - 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
-      - {OCI_ENV_DIR}/profiles/{COMPOSE_PROFILE}/grafana/config.ini:/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