Skip to content

Commit 66fac66

Browse files
authored
pure-docker: remove jaeger entirely (#852)
#849 took a conservative approach to sourcegraph/sourcegraph#40455 by keeping Jaeger around. I've since reached out to the only customer using this deployment mechanism (https://sourcegraph.slack.com/archives/C012V43N8E7/p1662138872279299) which indicates there is no strong interest in keeping Jaeger around, so this change removes it entirely.
1 parent 5a80ef0 commit 66fac66

File tree

6 files changed

+2
-29
lines changed

6 files changed

+2
-29
lines changed

pure-docker/deploy-frontend-internal.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ docker run --detach \
3636
-e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \
3737
-e REPO_UPDATER_URL=http://repo-updater:3182 \
3838
-e GRAFANA_SERVER_URL=http://grafana:3000 \
39-
-e JAEGER_SERVER_URL=http://jaeger:16686 \
4039
-e GITHUB_BASE_URL=http://github-proxy:3180 \
4140
-e PROMETHEUS_URL=http://prometheus:9090 \
4241
-v $VOLUME:/mnt/cache \

pure-docker/deploy-frontend.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ docker run --detach \
3737
-e SRC_FRONTEND_INTERNAL=sourcegraph-frontend-internal:3090 \
3838
-e REPO_UPDATER_URL=http://repo-updater:3182 \
3939
-e GRAFANA_SERVER_URL=http://grafana:3370 \
40-
-e JAEGER_SERVER_URL=http://jaeger:16686 \
4140
-e GITHUB_BASE_URL=http://github-proxy:3180 \
4241
-e PROMETHEUS_URL=http://prometheus:9090 \
4342
-v $VOLUME:/mnt/cache \

pure-docker/deploy-jaeger.sh

Lines changed: 0 additions & 24 deletions
This file was deleted.

pure-docker/deploy-otel-collector.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ docker run --detach \
1616
-e JAEGER_HOST=jaeger \
1717
-v $(pwd)/../otel-collector/config.yaml:/etc/otel-collector/config.yaml \
1818
index.docker.io/sourcegraph/opentelemetry-collector:169257_2022-08-25_bb67d3645e59@sha256:a10375336bc505767533b1ec2d32c319e379365e5d6809c1d1dcab1b7fb4798f \
19-
--config /etc/otel-collector/configs/jaeger.yaml
19+
--config /etc/otel-collector/configs/logging.yaml

pure-docker/deploy.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ docker network create sourcegraph &>/dev/null || true
1414
./deploy-github-proxy.sh
1515
for i in $(seq 0 $(($NUM_GITSERVER - 1))); do ./deploy-gitserver.sh $i; done
1616
./deploy-grafana.sh
17-
./deploy-jaeger.sh
1817
./deploy-precise-code-intel-worker.sh
1918
./deploy-pgsql.sh
2019
./deploy-codeintel-db.sh

test/smoke-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ deploy_sourcegraph() {
1313
expect_containers="62"
1414
else
1515
# Expected number of containers on `master` branch.
16-
expect_containers="26"
16+
expect_containers="25"
1717
fi
1818
elif [[ "$TEST_TYPE" == "docker-compose-test" ]]; then
1919
docker-compose --file docker-compose/docker-compose.yaml up -d -t 600

0 commit comments

Comments
 (0)