corretto conflitto grafana

marmila · Jan 7, 2024 · a34f4c3 · a34f4c3
1 parent 0231fa3
commit a34f4c3
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/argocd/system/monitoring/values.yaml b/argocd/system/monitoring/values.yaml
@@ -145,14 +145,9 @@ kube-prometheus-stack:
     envFromSecret: grafana-env-secret
     grafana.ini:
       server:
-<<<<<<< HEAD
-        domain: monitoring.picluster.marmilan.com
-        root_url: "%(protocol)s://%(domain)s:%(http_port)s/grafana/"
-=======
         # Configuring /grafana subpath
-        domain: monitoring.picluster.ricsanfre.com
+        domain: monitoring.picluster.marmilan.com
         root_url: "https://%(domain)s/grafana/"
->>>>>>> upstream/master
         # rewrite rules configured in nginx rules
         # https://grafana.com/tutorials/run-grafana-behind-a-proxy/
         serve_from_sub_path: false
@@ -167,11 +162,11 @@ kube-prometheus-stack:
         email_attribute_path: email
         login_attribute_path: username
         name_attribute_path: full_name
-        auth_url: https://sso.picluster.ricsanfre.com/realms/picluster/protocol/openid-connect/auth
-        token_url: https://sso.picluster.ricsanfre.com/realms/picluster/protocol/openid-connect/token
-        api_url: https://sso.picluster.ricsanfre.com/realms/picluster/protocol/openid-connect/userinfo
+        auth_url: https://sso.picluster.marmilan.com/realms/picluster/protocol/openid-connect/auth
+        token_url: https://sso.picluster.marmilan.com/realms/picluster/protocol/openid-connect/token
+        api_url: https://sso.picluster.marmilan.com/realms/picluster/protocol/openid-connect/userinfo
         role_attribute_path: contains(roles[*], 'admin') && 'Admin' || contains(roles[*], 'editor') && 'Editor' || 'Viewer'
-        signout_redirect_url: https://sso.picluster.ricsanfre.com/realms/picluster/protocol/openid-connect/logout?client_id=grafana&post_logout_redirect_uri=https%3A%2F%2Fmonitoring.picluster.ricsanfre.com%2Fgrafana%2Flogin%2Fgeneric_oauth
+        signout_redirect_url: https://sso.picluster.marmilan.com/realms/picluster/protocol/openid-connect/logout?client_id=grafana&post_logout_redirect_uri=https%3A%2F%2Fmonitoring.picluster.marmilan.com%2Fgrafana%2Flogin%2Fgeneric_oauth
     # Set admin password
     # adminPassword: ""
     # Install required plugins