Merge branch 'master' of https://github.com/Arquisoft/wiq_es05b

Arquisoft · May 1, 2024 · 4018267 · 4018267
2 parents dbb3e13 + e2f394a
commit 4018267
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git 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=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
           docker logout ghcr.io
           docker logout ghcr
           docker image prune -f

diff --git 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/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
@@ -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 {

diff --git a/sonar-project.properties b/sonar-project.properties
@@ -11,7 +11,11 @@ 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=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.javascript.lcov.reportPaths=**/coverage/lcov.info
+
+#sonar.login=
+sonar.verbose=true