Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace Elasticsearch in crossdock CI with remote memstore #3843

Merged
merged 1 commit into from Aug 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 4 additions & 9 deletions .github/workflows/ci-crossdock.yml
Expand Up @@ -10,12 +10,7 @@ on:
jobs:
crossdock:
runs-on: ubuntu-latest
strategy:
matrix:
steps:
- name: crossdock
cmd: bash scripts/build-crossdock.sh
name: ${{ matrix.steps.name }}

steps:
- uses: actions/checkout@v3
with:
Expand All @@ -34,11 +29,11 @@ jobs:

- name: Install tools
run: make install-ci

- uses: docker/setup-qemu-action@v2

- name: Build, test, and publish ${{ matrix.steps.name }} image
run: ${{ matrix.steps.cmd }}
- name: Build, test, and publish crossdock image
run: bash scripts/build-crossdock.sh
env:
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion crossdock/docker-compose.yml
Expand Up @@ -40,7 +40,7 @@ services:
ports:
- "8080-8082"
depends_on:
# UDP sender needs to know agent's address
# UDP sender needs to know agent's address
- jaeger-agent

python:
Expand Down
36 changes: 20 additions & 16 deletions crossdock/jaeger-docker-compose.yml
@@ -1,33 +1,46 @@
version: '2'

services:
jaeger-remote-storage:
image: jaegertracing/jaeger-remote-storage
command:
- "--log-level=debug"
environment:
- SPAN_STORAGE_TYPE=memory
ports:
- "17271:17271"

jaeger-collector:
image: jaegertracing/jaeger-collector
command: ["--es.num-shards=1", "--es.num-replicas=0", "--es.server-urls=http://elasticsearch:9200", "--collector.zipkin.host-port=:9411"]
command:
- "--grpc-storage.server=jaeger-remote-storage:17271"
- "--collector.zipkin.host-port=:9411"
- "--log-level=debug"
ports:
- "14269"
- "14268:14268"
- "14250"
- "9411:9411"
environment:
- SPAN_STORAGE_TYPE=elasticsearch
- SPAN_STORAGE_TYPE=grpc-plugin
- LOG_LEVEL=debug
restart: on-failure
depends_on:
- elasticsearch
- jaeger-remote-storage

jaeger-query:
image: jaegertracing/jaeger-query
command: ["--es.num-shards=1", "--es.num-replicas=0", "--es.server-urls=http://elasticsearch:9200"]
command:
- "--grpc-storage.server=jaeger-remote-storage:17271"
- "--log-level=debug"
ports:
- "16686:16686"
- "16687"
environment:
- SPAN_STORAGE_TYPE=elasticsearch
- LOG_LEVEL=debug
- SPAN_STORAGE_TYPE=grpc-plugin
restart: on-failure
depends_on:
- elasticsearch
- jaeger-remote-storage

jaeger-agent:
image: jaegertracing/jaeger-agent
Expand All @@ -42,12 +55,3 @@ services:
restart: on-failure
depends_on:
- jaeger-collector

elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.3
environment:
- discovery.type=single-node
ports:
- "9200:9200/tcp"