Tidies build and completes migration off docker.io images during build #3281
Conversation
This makes some editorial changes to make this project look the same as zipkin-aws and zipkin-gcp. It also completes migration off docker.io images so that routine test and development cannot cause a build outage. Fixes #3279
| set -xeuo pipefail | ||
|
|
||
| if ! curl --retry 5 --retry-connrefused --retry-delay 0 -sf https://grafana:3000/api/dashboards/name/prom; then | ||
| if ! curl --retry 5 --retry-connrefused --retry-delay 0 -sf https://grafana:3000/api/datasources/name/prom; then | ||
| curl -sf -X POST -H "Content-Type: application/json" \ | ||
| --data-binary '{"name":"prom","type":"prometheus","url":"https://prometheus:9090","access":"proxy","isDefault":true}' \ | ||
| https://grafana:3000/api/datasources |
There was a problem hiding this comment.
this was a pre-flight check that checked the wrong condition, but wouldn't have mattered
|
fyi I verified grafana works in docker-compose, but for some reason, it starts, but doesn't import the dashboard in ServerIntegratedBenchmark. I'm leaving that as is for now as don't have time to figure out why. |
| new GenericContainer<>(parse("quay.io/rackspace/curl:7.70.0")) | ||
| .withNetwork(Network.SHARED) | ||
| .withWorkingDirectory("/tmp") | ||
| .withLogConsumer(new Slf4jLogConsumer(LOG)) |
There was a problem hiding this comment.
this is the container that I can't tell if even worked or not despite it being fine in docker-compose externally. Even it logged nothing though the logging properties here are set to info -> stdout.
There was a problem hiding this comment.
If grafana has the zipkin dashboards, it should be working ok.
| new GenericContainer<>(parse("quay.io/rackspace/curl:7.70.0")) | ||
| .withNetwork(Network.SHARED) | ||
| .withWorkingDirectory("/tmp") | ||
| .withLogConsumer(new Slf4jLogConsumer(LOG)) |
There was a problem hiding this comment.
If grafana has the zipkin dashboards, it should be working ok.
problem is that it doesn't :P not in the benchmark script anyway |
|
we can debug the grafana dashboard lack in another PR. thanks for the look @anuraaga! |
This makes some editorial changes to make this project look the same as
zipkin-aws and zipkin-gcp. It also completes migration off docker.io
images so that routine test and development cannot cause a build outage.
Fixes #3279