From 5f740b85e5a547f2df57ccc8ab8aae1fdfcbae2e Mon Sep 17 00:00:00 2001 From: algarfer Date: Wed, 1 May 2024 02:52:13 +0200 Subject: [PATCH 1/6] Another attemp to fix grafana forwarding --- .github/workflows/deploy.yml | 8 ++++++++ docker-compose.yml | 3 +-- proxy/default.conf | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4e0419f..f2000bf 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -446,6 +446,14 @@ jobs: rm -rf ./* wget https://raw.githubusercontent.com/arquisoft/wiq_es05b/master/docker-compose.yml -O docker-compose.yml wget https://raw.githubusercontent.com/arquisoft/wiq_es05b/master/.env -O .env + echo "GF_SECURITY_ADMIN_USER=${{ secrets.GF_SECURITY_ADMIN_USER }}" >> .env + echo "GF_SECURITY_ADMIN_PASSWORD=${{ secrets.GF_SECURITY_ADMIN_PASSWORD }}" >> .env + echo "GF_SERVER_SERVE_FROM_SUB_PATH=false" >> .env + echo "GF_SERVER_DOMAIN=cyt.is-cool.dev" >> .env + echo "GF_SERVER_PROTOCOL=https" >> .env + echo "ELASTIC_PASSWORD=${{ secrets.ELASTIC_PASSWORD }}" >> .env + echo "LOGSTASH_INTERNAL_PASSWORD=${{ secrets.LOGSTASH_INTERNAL_PASSWORD }}" >> .env + echo "KIBANA_SYSTEM_PASSWORD=${{ secrets.KIBANA_SYSTEM_PASSWORD }}" >> .env docker logout ghcr.io docker logout ghcr docker image prune -f diff --git a/docker-compose.yml b/docker-compose.yml index 7f52a51..7dc32d7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -229,8 +229,7 @@ services: - GF_SECURITY_ADMIN_PASSWORD=${GF_SECURITY_ADMIN_PASSWORD:-changeme} - GF_SERVER_SERVE_FROM_SUB_PATH=${GF_SERVER_SERVE_FROM_SUB_PATH:-true} - GF_SERVER_DOMAIN=${GF_SERVER_DOMAIN:-} - - GF_SERVER_HTTP_PORT=${GF_SERVER_HTTP_PORT:-} - - GF_SERVER_PROTOCOL=${GF_PROTOCOL:-} + - GF_SERVER_PROTOCOL=${GF_SERVER_PROTOCOL:-} ports: - "9091:9091" depends_on: diff --git a/proxy/default.conf b/proxy/default.conf index a9aff9f..f7d9988 100644 --- a/proxy/default.conf +++ b/proxy/default.conf @@ -22,7 +22,7 @@ server { } location /grafana/ { - proxy_pass http://grafana:9091; + proxy_pass http://grafana:9091/; proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header Host $http_host; } From b2f4951fe8ad22a3ba779bec1a2162b92b3d56c1 Mon Sep 17 00:00:00 2001 From: algarfer Date: Wed, 1 May 2024 03:53:53 +0200 Subject: [PATCH 2/6] grafana proxy --- proxy/default.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/default.conf b/proxy/default.conf index f7d9988..a9aff9f 100644 --- a/proxy/default.conf +++ b/proxy/default.conf @@ -22,7 +22,7 @@ server { } location /grafana/ { - proxy_pass http://grafana:9091/; + proxy_pass http://grafana:9091; proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header Host $http_host; } From b705e03afaabab7e590c5eaa090a10c5acc3784d Mon Sep 17 00:00:00 2001 From: algarfer Date: Wed, 1 May 2024 04:25:57 +0200 Subject: [PATCH 3/6] =?UTF-8?q?=F0=9F=98=8E=F0=9F=A4=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 2 +- monitoring/grafana/grafana.ini | 2 +- proxy/default.conf | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index f2000bf..9161206 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -450,7 +450,7 @@ jobs: echo "GF_SECURITY_ADMIN_PASSWORD=${{ secrets.GF_SECURITY_ADMIN_PASSWORD }}" >> .env echo "GF_SERVER_SERVE_FROM_SUB_PATH=false" >> .env echo "GF_SERVER_DOMAIN=cyt.is-cool.dev" >> .env - echo "GF_SERVER_PROTOCOL=https" >> .env + echo "GF_SERVER_PROTOCOL=http" >> .env echo "ELASTIC_PASSWORD=${{ secrets.ELASTIC_PASSWORD }}" >> .env echo "LOGSTASH_INTERNAL_PASSWORD=${{ secrets.LOGSTASH_INTERNAL_PASSWORD }}" >> .env echo "KIBANA_SYSTEM_PASSWORD=${{ secrets.KIBANA_SYSTEM_PASSWORD }}" >> .env diff --git a/monitoring/grafana/grafana.ini b/monitoring/grafana/grafana.ini index 884ec51..d8bff16 100644 --- a/monitoring/grafana/grafana.ini +++ b/monitoring/grafana/grafana.ini @@ -53,7 +53,7 @@ # The full public facing url you use in browser, used for redirects and emails # If you use reverse proxy and sub path specify full url (with sub path) -root_url = %(protocol)s://%(domain)s:%(http_port)s/grafana +root_url = %(protocol)s://%(domain)s:%(http_port)s/grafana/ # Serve Grafana from subpath specified in `root_url` setting. By default it is set to `false` for compatibility reasons. serve_from_sub_path = true diff --git a/proxy/default.conf b/proxy/default.conf index a9aff9f..62d3ef3 100644 --- a/proxy/default.conf +++ b/proxy/default.conf @@ -22,9 +22,11 @@ server { } location /grafana/ { - proxy_pass http://grafana:9091; + proxy_pass http://grafana:9091/; proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; } location /robots.txt { From 6e076f6aed1ec6867173d6c8ff180a81ab857e24 Mon Sep 17 00:00:00 2001 From: Luna <144900498+uo289321@users.noreply.github.com> Date: Wed, 1 May 2024 16:12:45 +0200 Subject: [PATCH 4/6] Update sonar-project.properties Changed the sources bc they were wrong --- sonar-project.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sonar-project.properties b/sonar-project.properties index 6c96b9e..2955c70 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -11,7 +11,7 @@ sonar.language=js sonar.coverage.exclusions=**/*.test.js,**/*.draft.js sonar.cpd.exclusions=**/*.test.js,**/*.draft.js -sonar.sources=users/authservice/routes,users/userservice/routes,gatewayservice/routes,webapp/src,userhistory/routes,jordi/routes +sonar.sources=sonar.sources=users/authservice,users/userservice,gatewayservice,webapp/src,userhistory,jordi sonar.sourceEncoding=UTF-8 sonar.exclusions=node_modules/** -sonar.javascript.lcov.reportPaths=**/coverage/lcov.info \ No newline at end of file +sonar.javascript.lcov.reportPaths=**/coverage/lcov.info From 2085d5e11b46f4fa0da25a1905ec3537e01ffd18 Mon Sep 17 00:00:00 2001 From: Luna <144900498+uo289321@users.noreply.github.com> Date: Wed, 1 May 2024 16:13:08 +0200 Subject: [PATCH 5/6] Update sonar-project.properties I messed it up, changed it to how it's supossed to be --- sonar-project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index 2955c70..8e72342 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -11,7 +11,7 @@ sonar.language=js sonar.coverage.exclusions=**/*.test.js,**/*.draft.js sonar.cpd.exclusions=**/*.test.js,**/*.draft.js -sonar.sources=sonar.sources=users/authservice,users/userservice,gatewayservice,webapp/src,userhistory,jordi +sonar.sources=users/authservice,users/userservice,gatewayservice,webapp/src,userhistory,jordi sonar.sourceEncoding=UTF-8 sonar.exclusions=node_modules/** sonar.javascript.lcov.reportPaths=**/coverage/lcov.info From e2f394a37fa7c39878dc1793a1bcb5760029c4f7 Mon Sep 17 00:00:00 2001 From: algarfer Date: Wed, 1 May 2024 18:19:09 +0200 Subject: [PATCH 6/6] Updated sonar properties --- sonar-project.properties | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sonar-project.properties b/sonar-project.properties index 8e72342..df2d560 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -12,6 +12,10 @@ sonar.language=js sonar.coverage.exclusions=**/*.test.js,**/*.draft.js sonar.cpd.exclusions=**/*.test.js,**/*.draft.js sonar.sources=users/authservice,users/userservice,gatewayservice,webapp/src,userhistory,jordi +#users/authservice,users/userservice,gatewayservice,webapp/src,userhistory,jordi sonar.sourceEncoding=UTF-8 sonar.exclusions=node_modules/** sonar.javascript.lcov.reportPaths=**/coverage/lcov.info + +#sonar.login= +sonar.verbose=true \ No newline at end of file