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.

Sign up for GitHub

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

Añadiendo grafana y prometheus al despliegue #187

Merged
merged 6 commits into from
Apr 28, 2024
Merged

Añadiendo grafana y prometheus al despliegue #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b79f872
Merge pull request #180 from Arquisoft/develop
baraganio Apr 28, 2024
f8a962a
Merge pull request #182 from Arquisoft/develop
baraganio Apr 28, 2024
e7a8e48
Merge pull request #184 from Arquisoft/develop
UO290054 Apr 28, 2024
b6b1bad
Merge pull request #186 from Arquisoft/develop
UO290054 Apr 28, 2024
0fa3f58
Merge branch 'develop', remote-tracking branch 'origin' into carlos
baraganio Apr 28, 2024
4b6975d
Añadiendo grafana y prometheus al despliegue
baraganio Apr 28, 2024
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
34 changes: 34 additions & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,40 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}
registry: ghcr.io
workdir: gatewayservice
docker-push-prometheus:
name: Push Prometheus 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_es2c/gatewayservice/monitoring/prometheus
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
registry: ghcr.io
workdir: gatewayservice/monitoring/prometheus
docker-push-grafana:
name: Push Grafana 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_es2c/gatewayservice/monitoring/grafana
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
registry: ghcr.io
workdir: gatewayservice/monitoring/grafana
deploy:
name: Deploy over SSH
runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ services:
prometheus:
image: prom/prometheus
container_name: prometheus-${teamname:-defaultASW}
profiles: ["dev"]
profiles: ["dev","prod"]
networks:
- mynetwork
volumes:
Expand All @@ -115,7 +115,7 @@ services:
grafana:
image: grafana/grafana
container_name: grafana-${teamname:-defaultASW}
profiles: ["dev"]
profiles: ["dev","prod"]
networks:
- mynetwork
volumes:
Expand Down
3 changes: 3 additions & 0 deletions gatewayservice/monitoring/grafana/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FROM grafana/grafana

COPY . .
3 changes: 3 additions & 0 deletions gatewayservice/monitoring/prometheus/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FROM prom/prometheus

COPY . .