diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a15c313..6033f73 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,6 +7,7 @@ on: - LaraFMz - Pablo-Arreglos - jota + - Fer-monitorizacion pull_request: types: [opened, synchronize, reopened] jobs: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9e4a6a3..1f133da 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -134,6 +134,44 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} registry: ghcr.io workdir: questionservice + docker-push-grafana: + name: Push grafana service Docker Image to GitHub Packages + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + needs: [ e2e-tests ] + steps: + - uses: actions/checkout@v4 + - name: Publish to Registry + uses: elgohr/Publish-Docker-Github-Action@v5 + with: + name: arquisoft/wiq_es05a/grafana + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + registry: ghcr.io + workdir: monitoring/grafana + env: + GF_SECURITY_ADMIN_USER: ${{ secrets.GF_SECURITY_ADMIN_USER }} + GF_SECURITY_ADMIN_PASSWORD: ${{ secrets.GF_SECURITY_ADMIN_PASSWORD }} + GF_SERVER_SERVE_FROM_SUB_PATH: false + docker-push-prometheus: + name: Push prometheus service Docker Image to GitHub Packages + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + needs: [ e2e-tests ] + steps: + - uses: actions/checkout@v4 + - name: Publish to Registry + uses: elgohr/Publish-Docker-Github-Action@v5 + with: + name: arquisoft/wiq_es05a/prometheus + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + registry: ghcr.io + workdir: monitoring/prometheus deploy: name: Deploy over SSH runs-on: ubuntu-latest @@ -143,6 +181,8 @@ jobs: - docker-push-gatewayservice - docker-push-questionservice - docker-push-webapp + - docker-push-grafana + - docker-push-prometheus steps: - name: Deploy over SSH uses: fifsky/ssh-action@master diff --git a/docker-compose.yml b/docker-compose.yml index 2316c65..21b53a2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -106,9 +106,6 @@ services: - grafana_data:/var/lib/grafana environment: - GF_SERVER_HTTP_PORT=9091 -# - GF_AUTH_DISABLE_LOGIN_FORM=true -# - GF_AUTH_ANONYMOUS_ENABLED=true -# - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin - GF_SECURITY_ADMIN_USER=${GF_SECURITY_ADMIN_USER:-admin} - GF_SECURITY_ADMIN_PASSWORD=${GF_SECURITY_ADMIN_PASSWORD:-changeme} - GF_SERVER_SERVE_FROM_SUB_PATH=${GF_SERVER_SERVE_FROM_SUB_PATH:-true}