gitops/xmidt
1
0
Fork 0
mirror of https://github.com/outbackdingo/xmidt.git synced 2026-08-25 07:20:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Feature/some updates (#48)

Browse Source 
* ignore IDE config folder

* Add zipkin to visualize traces

* work around for aker issue

* docker-compose is now in docker cli

* export spans to zipkin

* add access level capability for testing
This commit is contained in:
Joel Unzain
2021-05-27 12:02:32 -07:00
committed by GitHub
parent e10ab4c61a
commit cad8710674
4 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+2
View File
@@ -1,5 +1,7 @@
diagrams/*.png diagrams/*.png
.idea
rendered.* rendered.*
./deploy/kubernetes/helm/xmidt-cloud-ship/ ./deploy/kubernetes/helm/xmidt-cloud-ship/
./deploy/kubernetes/helm/charts/ ./deploy/kubernetes/helm/charts/
deploy/docker-compose/deploy.sh
+1 -1
View File
@@ -19,7 +19,7 @@ PETASOS_VERSION=${PETASOS_VERSION:-latest} \
TALARIA_VERSION=${TALARIA_VERSION:-latest} \ TALARIA_VERSION=${TALARIA_VERSION:-latest} \
THEMIS_VERSION=${THEMIS_VERSION:-latest} \ THEMIS_VERSION=${THEMIS_VERSION:-latest} \
SIMULATOR_VERSION=${SIMULATOR_VERSION:-latest} \ SIMULATOR_VERSION=${SIMULATOR_VERSION:-latest} \
docker-compose -f $ROOT_DIR/deploy/docker-compose/docker-compose.yml up -d $@ docker compose -f $ROOT_DIR/deploy/docker-compose/docker-compose.yml up -d $@
if [[ $? -ne 0 ]]; then if [[ $? -ne 0 ]]; then
exit 1 exit 1
fi fi
deploy/docker-compose/docker-compose.yml
+22
View File
@@ -17,6 +17,8 @@ services:
environment: environment:
- CONSUL_HOST=consul0:8500 - CONSUL_HOST=consul0:8500
- ARGUS_HOST=http://argus:6600 - ARGUS_HOST=http://argus:6600
- TRACING_PROVIDER_NAME=zipkin
- TRACING_PROVIDER_ENDPOINT=http://zipkin:9411/api/v2/spans
ports: ports:
- "6100-6103:6100-6103" - "6100-6103:6100-6103"
depends_on: depends_on:
@@ -30,6 +32,8 @@ services:
image: xmidt/talaria:${TALARIA_VERSION} image: xmidt/talaria:${TALARIA_VERSION}
environment: environment:
- CONSUL_HOST=consul0:8500 - CONSUL_HOST=consul0:8500
- TRACING_PROVIDER_NAME=zipkin
- TRACING_PROVIDER_ENDPOINT=http://zipkin:9411/api/v2/spans
ports: ports:
- "6200-6204:6200-6204" - "6200-6204:6200-6204"
depends_on: depends_on:
@@ -41,18 +45,24 @@ services:
<<: *talaria <<: *talaria
environment: environment:
- CONSUL_HOST=consul0:8500 - CONSUL_HOST=consul0:8500
- TRACING_PROVIDER_NAME=zipkin
- TRACING_PROVIDER_ENDPOINT=http://zipkin:9411/api/v2/spans
ports: ports:
- "6210-6214:6200-6204" - "6210-6214:6200-6204"
talaria-2: talaria-2:
<<: *talaria <<: *talaria
environment: environment:
- CONSUL_HOST=consul1:8500 - CONSUL_HOST=consul1:8500
- TRACING_PROVIDER_NAME=zipkin
- TRACING_PROVIDER_ENDPOINT=http://zipkin:9411/api/v2/spans
ports: ports:
- "6220-6224:6200-6204" - "6220-6224:6200-6204"
scytale: scytale:
image: xmidt/scytale:${SCYTALE_VERSION} image: xmidt/scytale:${SCYTALE_VERSION}
environment: environment:
- CONSUL_HOST=consul0:8500 - CONSUL_HOST=consul0:8500
- TRACING_PROVIDER_NAME=zipkin
- TRACING_PROVIDER_ENDPOINT=http://zipkin:9411/api/v2/spans
ports: ports:
- "6300-6303:6300-6303" - "6300-6303:6300-6303"
depends_on: depends_on:
@@ -76,6 +86,8 @@ services:
image: xmidt/themis:${THEMIS_VERSION} image: xmidt/themis:${THEMIS_VERSION}
environment: environment:
- CONSUL_HOST=consul0:8500 - CONSUL_HOST=consul0:8500
- TRACING_PROVIDER_NAME=zipkin
- TRACING_PROVIDER_ENDPOINT=http://zipkin:9411/api/v2/spans
ports: ports:
- "6500-6504:6500-6504" - "6500-6504:6500-6504"
networks: networks:
@@ -85,6 +97,9 @@ services:
image: xmidt/argus:${ARGUS_VERSION} image: xmidt/argus:${ARGUS_VERSION}
environment: environment:
- "AWS_ENDPOINT=http://dynamodb:8000" - "AWS_ENDPOINT=http://dynamodb:8000"
- TRACING_PROVIDER_NAME=zipkin
- TRACING_PROVIDER_ENDPOINT=http://zipkin:9411/api/v2/spans
- ACCESS_LEVEL_CAPABILITY=x1:issuer:test:.*:all
ports: ports:
- "6600-6603:6600-6603" - "6600-6603:6600-6603"
depends_on: depends_on:
@@ -166,5 +181,12 @@ services:
networks: networks:
- xmidt - xmidt
zipkin:
image: openzipkin/zipkin
ports:
- "9411:9411"
networks:
- xmidt
networks: networks:
xmidt: xmidt:
simulator/Dockerfile
+1
View File
@@ -21,6 +21,7 @@ RUN cd /build && \
cd /build && \ cd /build && \
git clone https://github.com/Comcast/aker.git && \ git clone https://github.com/Comcast/aker.git && \
cd aker && \ cd aker && \
git checkout cfb54022fa6e0ba70040e419d34655da955637b5 && \
mkdir build && \ mkdir build && \
cd build && \ cd build && \
cmake .. && make cmake .. && make