Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ GORUN = $(GOCMD) run
GOTEST = $(GOCMD) test

DOCKER = docker
COMPOSE = $(DOCKER) compose
COMPOSE = $(DOCKER)-compose
PROJECT_DIR = cmd
MAIN = main.go

Expand Down Expand Up @@ -51,4 +51,4 @@ test-routes:
curl "${HOST}/products"
curl "${HOST}/orders"
curl "${HOST}/protected"
curl "${HOST}/external-weather"
curl "${HOST}/external-weather"
14 changes: 0 additions & 14 deletions config/gateway.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,6 @@

connections:
routes:
- path: products
url: http://services:9001
rate-limit:
zone: 10
rate: 5
auth: false

- path: orders
url: http://services:9002
rate-limit:
zone: 10
rate: 5
auth: false

- path: protected
url: http://services:9003
rate-limit:
Expand Down
6 changes: 4 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,8 @@ services:
- GF_PATHS_PROVISIONING=/etc/grafana/provisioning
- GF_AUTH_ANONYMOUS_ENABLED=true
- GF_AUTH_ANONYMOUS_ORG_ROLE=Admin
- GF_SERVER_ROOT_URL=http://synchro-accelerator.com/grafana/
- GF_SERVER_SERVE_FROM_SUB_PATH=true
depends_on:
- gateway
entrypoint:
Expand All @@ -193,7 +195,7 @@ services:
ports:
- "3000:3000"
healthcheck:
test: [ "CMD-SHELL", "wget --no-verbose --tries=1 --spider http://127.0.0.1:3000/api/health || exit 1" ]
test: [ "CMD-SHELL", "wget --no-verbose --tries=1 --spider http://127.0.0.1:3000/grafana/api/health || exit 1" ]
interval: 10s
timeout: 5s
retries: 5
Expand Down Expand Up @@ -286,4 +288,4 @@ services:
image: mingrammer/flog
command: -f json -d 200ms -l
networks:
- loki
- loki
4 changes: 2 additions & 2 deletions management/static/auth.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<a href="/">Home</a>
<a href="/auth">Signup/Login</a>
<a href="/config">Config File</a>
<a href="http://localhost:3000">Dashboard</a>
<a href="/grafana">Dashboard</a>
<a href="/docs">Docs</a>
</nav>
</header>
Expand Down Expand Up @@ -46,4 +46,4 @@ <h1>Login</h1>

<script src="/static/auth.js"></script>
</body>
</html>
</html>
4 changes: 2 additions & 2 deletions management/static/config.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<a href="/">Home</a>
<a href="/auth">Signup/Login</a>
<a href="/config">Config File</a>
<a href="http://localhost:3000">Dashboard</a>
<a href="/grafana">Dashboard</a>
<a href="/docs">Docs</a>
</nav>
</header>
Expand All @@ -25,4 +25,4 @@ <h1>Edit your Config</h1>

<script src="/static/config.js"></script>
</body>
</html>
</html>
4 changes: 2 additions & 2 deletions management/static/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<a href="/">Home</a>
<a href="/auth">Signup/Login</a>
<a href="/config">Config File</a>
<a href="http://localhost:3000">Dashboard</a>
<a href="/grafana">Dashboard</a>
<a href="/docs">Docs</a>
</nav>
</header>
Expand Down Expand Up @@ -41,4 +41,4 @@ <h2>Live Deployment</h2>
</aside>

</body>
</html>
</html>
Loading
Loading