diff --git a/TrafficCapture/dockerSolution/README.md b/TrafficCapture/dockerSolution/README.md index c50e14a5d..b35d7047b 100644 --- a/TrafficCapture/dockerSolution/README.md +++ b/TrafficCapture/dockerSolution/README.md @@ -25,7 +25,7 @@ curl --insecure https://localhost:9200/_cat/indices -u 'admin:admin' You can send the same calls to the source cluster while bypassing the Capture Proxy (calls will not be relayed to the target cluster) via `localhost:19200`, and to the target cluster directly at `localhost:29200`. -For sample data that exercises various endpoints with a range of datatypes, you can ssh into the Migration Console +For sample data that exercises various endpoints with a range of datatypes, you can `ssh` into the Migration Console (`docker exec -i -t $(docker ps -aqf "ancestor=migrations/migration_console:latest") bash` or via the Docker console) and run `./runTestBenchmarks.sh`. By default, this runs four workloads from [Opensearch-Benchmark](https://github.com/opensearch-project/opensearch-benchmark) against the Capture Proxy endpoint @@ -33,8 +33,9 @@ and run `./runTestBenchmarks.sh`. By default, this runs four workloads from with the various containers of the solution. You can also access the metrics generated by the solution in Grafana. While the solution is running, go to -[http://localhost:3000](http://localhost:3000/) and enter the default credentials (admin, admin) and do ????? to see -metrics for the migration tools. (TODO: are we actually sending metrics in? I don't see anything in here) +[http://localhost:3000](http://localhost:3000/) and enter the default credentials (admin, admin). Connections to +Jaeger and Prometheus are automatically provisioned (see them under `Connections->Data sources`), so you can go +directly to `Explore` and define a query using the supplied data from either data source. Traces for the capture proxy and replayer are available via Jaeger at [http://localhost:16686](http://localhost:16686). diff --git a/TrafficCapture/dockerSolution/src/main/docker/docker-compose.yml b/TrafficCapture/dockerSolution/src/main/docker/docker-compose.yml index 90c180717..7f22e56c5 100644 --- a/TrafficCapture/dockerSolution/src/main/docker/docker-compose.yml +++ b/TrafficCapture/dockerSolution/src/main/docker/docker-compose.yml @@ -35,6 +35,7 @@ services: - "3000:3000" volumes: - ./grafana_data:/var/lib/grafana + - ./grafana_datasources.yaml:/usr/share/grafana/conf/provisioning/datasources/datasources.yaml environment: - GF_SECURITY_ADMIN_PASSWORD=admin depends_on: diff --git a/TrafficCapture/dockerSolution/src/main/docker/grafana_datasources.yaml b/TrafficCapture/dockerSolution/src/main/docker/grafana_datasources.yaml new file mode 100644 index 000000000..f466234e3 --- /dev/null +++ b/TrafficCapture/dockerSolution/src/main/docker/grafana_datasources.yaml @@ -0,0 +1,22 @@ +apiVersion: 1 +datasources: + - name: Jaeger + type: jaeger + url: http://jaeger:16686 + basicAuth: false + isDefault: false + readOnly: false + jsonData: {} + - name: Prometheus + type: prometheus + url: http://prometheus:9090 + access: proxy + basicAuth: false + isDefault: true + jsonData: + httpMethod: POST + prometheusType: Prometheus + exemplarTraceIdDestinations: + - name: trace_id + urlDisplayLabel: Jaeger + readOnly: false