Skip to content

Commit

Permalink
try new grafana
Browse files Browse the repository at this point in the history
  • Loading branch information
UnicoYal committed Dec 16, 2024
1 parent 8d510a1 commit 42a1e7b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 16 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ jobs:
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Build and push facade
if: steps.check_facade.outputs.changed == 'true'
uses: docker/build-push-action@v4
with:
context: .
Expand All @@ -156,6 +157,7 @@ jobs:
tags: ${{ secrets.DOCKER_USERNAME }}/facade_app:latest

- name: Build and push user_service
if: steps.check_user_service.outputs.changed == 'true'
uses: docker/build-push-action@v4
with:
context: .
Expand All @@ -164,6 +166,7 @@ jobs:
tags: ${{ secrets.DOCKER_USERNAME }}/user_app:latest

- name: Build and push movie_service
if: steps.check_movie_service.outputs.changed == 'true'
uses: docker/build-push-action@v4
with:
context: .
Expand All @@ -172,6 +175,7 @@ jobs:
tags: ${{ secrets.DOCKER_USERNAME }}/movie_app:latest

- name: Build and push payment_service
if: steps.check_payment_service.outputs.changed == 'true'
uses: docker/build-push-action@v4
with:
context: .
Expand All @@ -180,6 +184,7 @@ jobs:
tags: ${{ secrets.DOCKER_USERNAME }}/payment_app:latest

- name: Build and push auth_service
if: steps.check_auth_service.outputs.changed == 'true'
uses: docker/build-push-action@v4
with:
context: .
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ services:
environment:
- GF_SECURITY_ADMIN_USER=${GF_SECURITY_ADMIN_USER}
- GF_SECURITY_ADMIN_PASSWORD=${GF_SECURITY_ADMIN_PASSWORD}
- GF_SERVER_ROOT_URL=https://cassette-world.ru/grafana
- GF_SERVER_ROOT_URL=http://cassette-world.ru/grafana
- GF_SERVER_SERVE_FROM_SUB_PATH=true
volumes:
- grafana-data:/var/lib/grafana
Expand Down
15 changes: 0 additions & 15 deletions internal/middleware/middleware.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,21 +127,6 @@ func logRequest(r *http.Request, start time.Time, msg string, requestID string,
log.Error().Err(err).Msg("invalid-request-body")
}

if isWebSocket(r) {
log.Info().
Str("websocket", path).
Str("request-id", requestID).
Bytes("body", bodyBytes).
Str("real_ip", realIP(r)).
Int64("content_length", r.ContentLength).
Str("start_time", start.Format(time.RFC3339)).
Str("duration_human", duration.String()).
Int64("duration_ms", duration.Milliseconds()).
Msg(msg)

return
}

log.Info().
Str("method", r.Method).
Str("remote_addr", r.RemoteAddr).
Expand Down

0 comments on commit 42a1e7b

Please sign in to comment.