Merge pull request #2178 from consideRatio/pr/grafana-github-access

support chart / grafana setup: systematic use of github auth for 2i2c-org
2i2c-org · Feb 8, 2023 · 56ce91f · 56ce91f
2 parents c1c56b4 + 4ffb10b
commit 56ce91f
Show file tree

Hide file tree

Showing 37 changed files with 243 additions and 99 deletions.
diff --git a/config/clusters/2i2c-aws-us/enc-support.secret.values.yaml b/config/clusters/2i2c-aws-us/enc-support.secret.values.yaml
@@ -1,6 +1,11 @@
 prometheusIngressAuthSecret:
     username: ENC[AES256_GCM,data:4DPd7lTWaJ8ND8GceLh6wNzHAY1LeqMIokEHBqObThtXtnfpmE11z7FIMb1Vant+di7SbbCAPcoGgUdvUOsXLQ==,iv:kj0DnH2cCzw7iBraX/dfjENXOIgk/ZC/qCjseisno/c=,tag:AgGZJfGRBsqaYlzqpvSpbg==,type:str]
     password: ENC[AES256_GCM,data:Yt6DejIrACYstASWXxBPshCm6/n4vsSw7NK1RxH9fKMxjn+Bs1x6+MKD7Im2IRxWzSoP3XtURJjmaYdio98U/Q==,iv:HGnhJhRX7O/nn4y4HujGT18nJoB3kPMD0x+x/PSbjps=,tag:hCnTt0eWn57EH/3k5HXexQ==,type:str]
+grafana:
+    grafana.ini:
+        auth.github:
+            client_id: ENC[AES256_GCM,data:fhBw8hcujgJxzM6mdtPYDTr7KRg=,iv:89ceeLKHYSinwbDfbWXqCjtX5YGjlbLtWATzEtqQTM0=,tag:1zbDCjtnsByQHwqvTlI/pw==,type:str]
+            client_secret: ENC[AES256_GCM,data:95aqu0+jMHj+X7zfXTK2W2p2gUWu4CIl6iODEzI+CGYCI62xFYwGVw==,iv:M+eUxU6v1RdF6JqoUvW3Mj3lIX3RW/loAOQu369+LpI=,tag:BRwyzQWwdLSf+IQwIqwf7w==,type:str]
 sops:
     kms: []
     gcp_kms:
@@ -10,8 +15,8 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2022-12-02T16:48:55Z"
-    mac: ENC[AES256_GCM,data:0jbzDZ/5aY022XU6u3ftcafKdnujPZNOowH4zyafVDSkDAZJAKQE4GnJpW9s32NVSkptmnCA6Xr2u0dm7UAuWBFrepnHt0PLTJaUr33DtgAO8QfwXbDAD2MdrAPoH1Lvd43XwTqCY4ujX8Of/Vd6FsfIToHdKrDv3znI+6g6UTs=,iv:56pLW3wQ7AenXVl9GaI/A/e09co9F2gLdVznX57w66E=,tag:QWr3kQuOuGRaCWXIYE7Xtg==,type:str]
+    lastmodified: "2023-02-08T13:54:33Z"
+    mac: ENC[AES256_GCM,data:lyVhSyZ8YWBc/XKasEl8ITed9lZvPaunNCryUtY1+/HXr8SFz1v8gTFQtClXyoahw27iJX3BsfqdLpGM4nktjGDXqukbLT6OLmFmHQo0F/lxTXqt6ZdUtOLfxmallXKi68/8o58GpXC0oY9pnozvcOL4VXD0sQqopMMFw9tLh2k=,iv:Qw3rQ9Eb00uSzDMupa1St8ZhF9u9KAln3hZ7CiLw2LU=,tag:tNi8mkFT84x9WeM0x5OHXg==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.7.3
diff --git a/config/clusters/2i2c-aws-us/support.values.yaml b/config/clusters/2i2c-aws-us/support.values.yaml
@@ -5,6 +5,9 @@ grafana:
   grafana.ini:
     server:
       root_url: https://grafana.aws.2i2c.cloud/
+    auth.github:
+      enabled: true
+      allowed_organizations: 2i2c-org
   ingress:
     hosts:
       - grafana.aws.2i2c.cloud

diff --git a/config/clusters/2i2c-uk/enc-support.secret.values.yaml b/config/clusters/2i2c-uk/enc-support.secret.values.yaml
@@ -1,6 +1,11 @@
 prometheusIngressAuthSecret:
     username: ENC[AES256_GCM,data:Qkfs/MqhEIEQ0uGl6sbSXJIPRi8k/TGNFgCtI0VIU0mYr4Lff+kAK2Zd5FG8rR91Q2xsNYMojCv3GV/YZfa8Vg==,iv:c3pPdTYivRYtgsi32nwHiKKDnDM71ZSA9WI4frdkqd8=,tag:sx++V6n6Zkq188AZJJhHlA==,type:str]
     password: ENC[AES256_GCM,data:BB1KIaJvWApPBtjIoS3brcg2ZIYeNJYvDcN41Cg14tPSY1bg6m43VLV4BfEo7DeCPxNF5c+W5NwaQXqDrx3raw==,iv:P2kztAXT+AMzPTcyoGZYxV/Qgw+4WdKvEF6gV56nhks=,tag:VS/MGouTH7zLLxlBLPX9YA==,type:str]
+grafana:
+    grafana.ini:
+        auth.github:
+            client_id: ENC[AES256_GCM,data:eGH4zTJtiJb8ixWcJjfjHRfUH+A=,iv:XkIfVP1M8sOazLVc0hTHmRHdonExh5M5RnluRW6xRZQ=,tag:Tdd87ubFQaVGYB23VmofrQ==,type:str]
+            client_secret: ENC[AES256_GCM,data:pkC7g7U6wAJDTXjMv1doJTAC2MmQDSJDLve4EWjx2WzF9PHih1LVdg==,iv:fqZ30SKh367SlUji0USUI54QG0LRpfqtSn8TTp6HFTo=,tag:eNNEAWc4YNtwkS+oECBoyQ==,type:str]
 sops:
     kms: []
     gcp_kms:
@@ -10,8 +15,8 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2022-09-22T08:38:18Z"
-    mac: ENC[AES256_GCM,data:reL3wgqIrHTJGgluNwEJni0nuxQ72ojIN7RffCQ5pFbutu0pHdDsDUccrKjViKmWhJIEY7BYKoRHy+YrJhNdYcprZSXKuMtvHW+b/sG8Hb5qUc+WN10xx/G1zt82vi8Djd41MnGVhqNwJmaLRpkV2UNiQWfd7uy26AClMagAuSg=,iv:sXcS/v4/wS6KsP3N1GwPUxEDG5FUTdV0lQBGTf/42Dg=,tag:zvL/ipNXifxCUXq3JKZuVg==,type:str]
+    lastmodified: "2023-02-08T13:57:25Z"
+    mac: ENC[AES256_GCM,data:RzK1JdpUrIqp0whfGJytF7STvM3qkLB8rTnHgZmh3L18/JHrP9POztuPSkL50kmZVwrh20kRV7g+1kIXeYDKMbYxSfabT+xXNWuY2SawUxjPyR0vPyiv7ce4WqoH8bKNnbEBQxkU7wh2BqKk63cS8c7qK6fp5OZmSQeul5kadwU=,iv:21mFZxBGdxnJbmgdCkfffg0bucNRn71SCK8Sr54iXxw=,tag:n6RxsjLgRYw6TexwEd6QNw==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.7.3
diff --git a/config/clusters/2i2c-uk/support.values.yaml b/config/clusters/2i2c-uk/support.values.yaml
@@ -11,10 +11,14 @@ prometheus:
         - secretName: prometheus-tls
           hosts:
             - prometheus.uk.2i2c.cloud
+
 grafana:
   grafana.ini:
     server:
       root_url: https://grafana.uk.2i2c.cloud/
+    auth.github:
+      enabled: true
+      allowed_organizations: 2i2c-org
   ingress:
     hosts:
       - grafana.uk.2i2c.cloud

diff --git a/config/clusters/2i2c/support.values.yaml b/config/clusters/2i2c/support.values.yaml
@@ -18,22 +18,18 @@ prometheus:
       limits:
         cpu: 2
         memory: 4Gi
+
 grafana:
+  grafana.ini:
+    server:
+      root_url: https://grafana.pilot.2i2c.cloud/
+    auth.github:
+      enabled: true
+      allowed_organizations: 2i2c-org
   ingress:
     hosts:
       - grafana.pilot.2i2c.cloud
     tls:
       - secretName: grafana-tls
         hosts:
           - grafana.pilot.2i2c.cloud
-  grafana.ini:
-    server:
-      root_url: https://grafana.pilot.2i2c.cloud/
-    auth.github:
-      enabled: true
-      allow_sign_up: true
-      scopes: user:email,read:org
-      auth_url: https://github.com/login/oauth/authorize
-      token_url: https://github.com/login/oauth/access_token
-      api_url: https://api.github.com/user
-      allowed_organizations: 2i2c-org
diff --git a/config/clusters/awi-ciroh/enc-support.secret.values.yaml b/config/clusters/awi-ciroh/enc-support.secret.values.yaml
@@ -1,6 +1,11 @@
 prometheusIngressAuthSecret:
     username: ENC[AES256_GCM,data:VdgjxTemXfrrWoSAbpJGuKQPnTKj2TRB+SMfdpc0UaCN4iW5ikJfp2ekoQGkSUoSMGOuGLXfr1Fzo6RSi3GRDw==,iv:bVhIOxIKCo9LWixZUarHkSKbr01N2j+S4uSGX9IDm3Y=,tag:Ys1JM7L30mjeDQCWZaPKVQ==,type:str]
     password: ENC[AES256_GCM,data:D8/XRBacGtcKhd5BnzrLxV+IEXEvgo0c5KzrKR+BC/HEl5qUk8yPs7uZ0x2pAkZzgvkLz/FeqEej74X4ZW8Z1w==,iv:yC1uoNwmlu3FoVThfGQnSCICpuYxiPCzlc564Fe+/Tw=,tag:mgTCOfAqibEWXnjMFsa12Q==,type:str]
+grafana:
+    grafana.ini:
+        auth.github:
+            client_id: ENC[AES256_GCM,data:Dl8d7l4U13d4+ZgEkZbdyZ/gc/s=,iv:4FYffWWrT4I/vfplptjG52h39kwIzjltsniwz5Ej69Q=,tag:Hn6Czq6lhFTeGnuOkAv0UQ==,type:str]
+            client_secret: ENC[AES256_GCM,data:qGnNIOIR9yqNSRYK6rIRoZGWcmQOPbxQMXmVg24nJrmjfPhJhEL5/w==,iv:rcSdsWsZB7qwX6zxqskRy2/CNe+hZcsFTUKQc39NwEA=,tag:gtVUDju1aQiQsN1nqfYdlA==,type:str]
 sops:
     kms: []
     gcp_kms:
@@ -10,8 +15,8 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2022-07-22T12:53:23Z"
-    mac: ENC[AES256_GCM,data:b7BvuPil5HrCcwJxc84x/Jqyj8aDEwGMIsYH4AAYwuU2BmheYHQYnJUISPzPz6EE5vHITtsU+5bkJozgNOfYQaOz4lbyWr2+nGyneHp2ugksd4MlmJzdWqmBhI7gMQmbRqMW+vTssNJ24c7jDnPmARtnLicqvEwOTfvSdiQVr44=,iv:XYIxoLpU3yGoO7f3RXbfZkDn/b2sS1rUwMerIxC+NY4=,tag:9+DVaMXNhQ+tmAuWfAmETA==,type:str]
+    lastmodified: "2023-02-08T13:58:32Z"
+    mac: ENC[AES256_GCM,data:1ha6X1G7fmjVtLlxzm/0Ok6i2IGpiKshMSHo8PpQWHk4NESCVscVpzKUA5QF37ubOv/iEWkLPc4NASIsozA2rAb0jFD81KWJOT4DkMUzGeuChr2MuMhTwifDGCZmgO6//0HweCgalxd1RL/L+fEFQf54TLOZarbdgm9NvInTYb8=,iv:K7aPfOVLE1l18SMImO5qGU5IaNbuZaHeBkRWZBNu3UY=,tag:/vX/8d31suwuoQa3lkIpAw==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.7.3
diff --git a/config/clusters/awi-ciroh/support.values.yaml b/config/clusters/awi-ciroh/support.values.yaml
@@ -5,6 +5,9 @@ grafana:
   grafana.ini:
     server:
       root_url: https://grafana.ciroh.awi.2i2c.cloud/
+    auth.github:
+      enabled: true
+      allowed_organizations: 2i2c-org
   ingress:
     hosts:
       - grafana.ciroh.awi.2i2c.cloud

diff --git a/config/clusters/callysto/enc-support.secret.values.yaml b/config/clusters/callysto/enc-support.secret.values.yaml
@@ -1,6 +1,11 @@
 prometheusIngressAuthSecret:
     username: ENC[AES256_GCM,data:PRxijXnlvkmjCkQyK/I+l2wWbaDkaJP94EmX7URKnBwZgokrPVG8azrHDJt5lEGo5PhX6waXTLHVgpK+ocP3Kg==,iv:HOVnan28Mpfg0X8jo284ZVdHUtV1CmgW3fR3hd+Vah8=,tag:vc2rLFUvs/p6JpoaIvQp5Q==,type:str]
     password: ENC[AES256_GCM,data:mKNG8ASGy/G0fR3i6iOumvofaecFsT/lgZgKf3EitAz/bjqZ1MS4ofV73TQDdfxPx8/xYXjg1xH37mWd9s19aw==,iv:2AWZ1wnbBY+MFxtfu9SKPykIU6zih+7a+VhvTxWKM3A=,tag:uEH9uCPrIjywqcC53CZZTQ==,type:str]
+grafana:
+    grafana.ini:
+        auth.github:
+            client_id: ENC[AES256_GCM,data:KuO3irah/twI6TQucSyppd9oLg8=,iv:D4Z9iipzgb3J9nZ8hv+Jv66R0Mi0iEFbMKambqTalRY=,tag:E9Ml95cTLk8PtwgWjS0TjQ==,type:str]
+            client_secret: ENC[AES256_GCM,data:Gn6XVtOQlRGw7qS6ctFWUwPDV8dsH87Epx1V6DIDuCylssZBq+W0Yw==,iv:3hF7N7QMzYQL1BAg/zwsofCZ4Wz3ulhLqiJ1BZzqlC8=,tag:dr5ryYXOJ6fr4/G/e+mMRw==,type:str]
 sops:
     kms: []
     gcp_kms:
@@ -10,8 +15,8 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2022-08-25T11:13:09Z"
-    mac: ENC[AES256_GCM,data:CUb2/JqU7OnlIzdiSDwhYP6YurH26B1nQi+n2TSwOb4kTapWeMnx8qxvl1LIW4WkXHsBdKtZ7CPXp0gKuD+vlsLafWNLACl+R6bRF5YqHqBU+VvapcITnwiDOF809MrpR1Rj0x4iDmICrzjOGGBCdLitCcIe9X8P8FHZc2ocr3k=,iv:4OXNg885TP4FVNRitthgUOaPHfHuwuQ8kWq1W12E98U=,tag:ocMeOFCY56gnb6zC0EaYpw==,type:str]
+    lastmodified: "2023-02-08T14:00:05Z"
+    mac: ENC[AES256_GCM,data:E/VDvnHvE1CjjR4uYo0LS3dNo8uEG3Cp4IEp/WIWPDSAYWfCiMMGQSwXQCmFtZyjhQ+0Ve+nbfzsmXTNfCobzadStzA938uvT3L1i/hGpUne0CBCninyRERd0h8jkzbs2l9kDFMDIQEEkSet0OfRVg3yl0956o06ocQzcdd9jWY=,iv:iq44FBwxVud/1KYkWodQEdrXjHnn0VBnMlAlbfdkIl0=,tag:6n/kYOqwtgExIdLtD7MCiQ==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.7.3
diff --git a/config/clusters/callysto/support.values.yaml b/config/clusters/callysto/support.values.yaml
@@ -11,10 +11,14 @@ prometheus:
         - secretName: prometheus-tls
           hosts:
             - prometheus.callysto.2i2c.cloud
+
 grafana:
   grafana.ini:
     server:
       root_url: https://grafana.callysto.2i2c.cloud/
+    auth.github:
+      enabled: true
+      allowed_organizations: 2i2c-org
   ingress:
     hosts:
       - grafana.callysto.2i2c.cloud

diff --git a/config/clusters/carbonplan/enc-support.secret.values.yaml b/config/clusters/carbonplan/enc-support.secret.values.yaml
@@ -1,6 +1,11 @@
 prometheusIngressAuthSecret:
     username: ENC[AES256_GCM,data:TSCjdYydQsYNp5otbeAzcDi/H1TdjbilhNfzd31FJ+mGIl+LE6DwHN+04NTcEqIKGprWWSqesPCKWcsGw++jQA==,iv:mlN6ku7DKTckZeOU3PXCuAPGbrhNF06N5M04NIBmOEo=,tag:0Ze7D7IoK/F3V5FjcbLUDA==,type:str]
     password: ENC[AES256_GCM,data:yXZqIHPziZLUN2WG/yWotx72kbESAAx5zwNIgPzlDFmqegP62hUIWY8uwFSjpVl8PIQ4MSLgorrbm6Pq7eHu3w==,iv:w9MghOkbt5RoTXlh9jyemGalyB0COWpP/lzdgWm3ehI=,tag:k5f1Nq4yZzS8bTN2Lcl6Iw==,type:str]
+grafana:
+    grafana.ini:
+        auth.github:
+            client_id: ENC[AES256_GCM,data:nxrFL8XmiKnYa5YPrinCNW6rOqw=,iv:c/W9a0TM29vLD3DxdsNaxW7u84/umHNhqdHkhvXfBUI=,tag:YzErxTXHMCxoxHyN8MgxwA==,type:str]
+            client_secret: ENC[AES256_GCM,data:Ycqb/J+LpIqulB5+Ez3M1L82o6pokuXUS1dnmVI2/sYFAianMza3YQ==,iv:0RRD0G3t+gjFY+y3k8CrcaSKSHcxyYxoT24TOVGNIUQ=,tag:aF6yp5U6bCZv5WbDxUkaJA==,type:str]
 sops:
     kms: []
     gcp_kms:
@@ -10,8 +15,8 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2022-03-14T20:52:45Z"
-    mac: ENC[AES256_GCM,data:/qGFeUCA9zU9oz4d9OobQ/oZHJtC7uoqDjxYIy3vnxC9w4HEktde1lCBOc/YdWWFiKxjKU31d2hceb6+tvB/IUmybcERxeVCQVMAqXXSmtTm78irppJjrNIrifQMBG4dOtXyaHSp4TZsLEWQmiC1pq1i1sXHcPcAf+jBcyJbFfs=,iv:oKelZoxcF6em7TsG6Q949X9AdfTfx+RB2PJPg34Bc58=,tag:gIZojWD7T7gpMYfvD0Hp/w==,type:str]
+    lastmodified: "2023-02-08T14:00:59Z"
+    mac: ENC[AES256_GCM,data:bXDsN9d54w4IgLpMbhYgqR7JN8ApuQJs8lAC1XgAf4UtH6OSZlBAgE29oVj90tZ5ttPwKgMBHByMCp1i3wEVgaRf0yPV778j9abUR02tY3vfgT+KGESOMsIIMiMldQIj9ut0/jY6dziboe8T1bn4BoFBAtuP2IvDpwTVdA/Snn0=,iv:HUOjJEXKE4bPGyVMvxAL/6zhWTF7MdsCfk8AQzpa3vE=,tag:mTszwRrT8JI/uXFc28FsGg==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
-    version: 3.7.1
+    version: 3.7.2
diff --git a/config/clusters/carbonplan/support.values.yaml b/config/clusters/carbonplan/support.values.yaml
@@ -18,15 +18,20 @@ prometheus:
       limits:
         cpu: 4
         memory: 8Gi
+
 cluster-autoscaler:
   enabled: true
   autoDiscovery:
     clusterName: carbonplanhub
   awsRegion: us-west-2
+
 grafana:
   grafana.ini:
     server:
       root_url: https://grafana.carbonplan.2i2c.cloud/
+    auth.github:
+      enabled: true
+      allowed_organizations: 2i2c-org
   ingress:
     hosts:
       - grafana.carbonplan.2i2c.cloud

diff --git a/config/clusters/cloudbank/support.values.yaml b/config/clusters/cloudbank/support.values.yaml
@@ -11,10 +11,14 @@ prometheus:
         - secretName: prometheus-tls
           hosts:
             - prometheus.cloudbank.2i2c.cloud
+
 grafana:
   grafana.ini:
     server:
       root_url: https://grafana.cloudbank.2i2c.cloud/
+    auth.github:
+      enabled: true
+      allowed_organizations: 2i2c-org
   ingress:
     hosts:
       - grafana.cloudbank.2i2c.cloud

diff --git a/config/clusters/gridsst/enc-support.secret.values.yaml b/config/clusters/gridsst/enc-support.secret.values.yaml
@@ -1,6 +1,11 @@
 prometheusIngressAuthSecret:
     username: ENC[AES256_GCM,data:RgttnPfuHqciM3qaxAwUgmvZjm3AkYvMveK9X5QqQLcwPjDOtpsFo98iqXs/IgJSrfDFs7vNM3F/U5iYjP77Rg==,iv:R7tmVYIh+1YDdQ1qTchaYNJ5OD727s9H0E/7R0kzU7w=,tag:zp+ctVogJG7jyEhu6xRcuA==,type:str]
     password: ENC[AES256_GCM,data:M/AswbGMmcNN6bIwMKyRDsW6sdaQvcP3DQbL2f7Wn1yOcY59cVE8avSEqpJAg+d52XzkPMG6Z/RmYDMN4LQi7g==,iv:FK64RqgZUJRpkInbqdIJtwL4rol5MXGHN6Y+7B4XTPw=,tag:7d98TTIiTaXc/Ssiy0vvuA==,type:str]
+grafana:
+    grafana.ini:
+        auth.github:
+            client_id: ENC[AES256_GCM,data:R72hgUbGv5yycxUbvq3kfU9dZk8=,iv:WIVPG1dP1IEWoTAdwJcgonRA7tJhvMhX+JgiPHA+zNw=,tag:K5uvA+YXLCPGIkbxURLT2A==,type:str]
+            client_secret: ENC[AES256_GCM,data:W4U5P9QoEHOsLKyg3RIEPie40hBXR6dubhF3JLIiC3UyUfbonVWVrQ==,iv:f5tNG0m7auKQMMY0GqHtqCuFzvTAhQlvmuWGpa3nhgw=,tag:WbtHXKAkxWFdjBwQ5VTFhA==,type:str]
 sops:
     kms: []
     gcp_kms:
@@ -10,8 +15,8 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2022-10-27T14:20:54Z"
-    mac: ENC[AES256_GCM,data:uzg3XNJ/lawV4P7R5xV1IupvCrZPT8Z0/3C0coVZzdEyEXHZmsTFRJElp8o1DcsxC/8nyJnooC68zF5acuTSeFR1rVndD0M7umxIB4X5fJ1gXl29fhRYfLpRpvc8y5aX/OnCxmAROGbes9/KIyaOiq9H94gFh8OtdZABgHh5Wn8=,iv:pwI8iXG5dUT2n0YX2JX9udYtfK5ysevG5MNwVh8XZmU=,tag:ijemxgU2fMooiyXRFhhNBg==,type:str]
+    lastmodified: "2023-02-08T14:02:02Z"
+    mac: ENC[AES256_GCM,data:VHw69wu12NEi1Nke67jsF2IYoycuVWJLpenkEaBOPE8z2QZSDL+JMniLpT9RSpNlQgVFWinfQU4pPEv66BfJDm7yzVLkMDjPX62R2M/mP0Gtuc7JjcS71KHcTR0tELvF0zpzny6FHbaeYUpzwy3z0i/HaBFMIzAicp8nEbCG7NM=,iv:vUlhDDs8IL9QMaCeP6Bogz7Rle90ZlWU/JbSo0MoPC8=,tag:cckV05WOGEYsNuWu1hK4nw==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.7.3
diff --git a/config/clusters/gridsst/support.values.yaml b/config/clusters/gridsst/support.values.yaml
@@ -11,6 +11,9 @@ grafana:
   grafana.ini:
     server:
       root_url: https://grafana.gridsst.2i2c.cloud/
+    auth.github:
+      enabled: true
+      allowed_organizations: 2i2c-org
   ingress:
     hosts:
       - grafana.gridsst.2i2c.cloud

diff --git a/config/clusters/leap/support.values.yaml b/config/clusters/leap/support.values.yaml
@@ -25,21 +25,16 @@ prometheus:
         memory: 22Gi
 
 grafana:
+  grafana.ini:
+    server:
+      root_url: https://grafana.leap.2i2c.cloud/
+    auth.github:
+      enabled: true
+      allowed_organizations: 2i2c-org
   ingress:
     hosts:
       - grafana.leap.2i2c.cloud
     tls:
       - secretName: grafana-tls
         hosts:
           - grafana.leap.2i2c.cloud
-  grafana.ini:
-    server:
-      root_url: https://grafana.leap.2i2c.cloud/
-    auth.github:
-      enabled: true
-      allow_sign_up: true
-      scopes: user:email,read:org
-      auth_url: https://github.com/login/oauth/authorize
-      token_url: https://github.com/login/oauth/access_token
-      api_url: https://api.github.com/user
-      allowed_organizations: 2i2c-org
diff --git a/config/clusters/linked-earth/enc-support.secret.values.yaml b/config/clusters/linked-earth/enc-support.secret.values.yaml
@@ -1,6 +1,11 @@
 prometheusIngressAuthSecret:
     username: ENC[AES256_GCM,data:KvJa9NuUXutQ4ZkCP56KbfyD+Si+TMTb6iplc1i3FJ9u9q6qfB5gtL6g52CzNwttegicb7fuD//Fn9IhdfiyBg==,iv:Zbt/i1rHXTNMVXrrqTbLqjE2sdMG5zzIOHgJrHIVH+I=,tag:IwhOr90toCsjbjWsQbpQzw==,type:str]
     password: ENC[AES256_GCM,data:58zXLP3t6nSj7vwE1teMkZNbC3N9BhVDuJ70nZ838ZjJpgUkfnOU7pS/QyAvae4QIzqloCpNosev4gANmj+ylw==,iv:PJA1/2OEEY0OrQaUVRBffIKSzNTY/j8vTtN/SXFAnG4=,tag:oP7nz0PFC0VhLPK2WmWm7Q==,type:str]
+grafana:
+    grafana.ini:
+        auth.github:
+            client_id: ENC[AES256_GCM,data:sHHDZo9zySW+qgpXlELt7vSEe/A=,iv:65Hf1AuTTT/NceeTZjhxG97RWDpe+eKle5MJwwLrJFI=,tag:gIw51rQambcqfeUV1UWnxQ==,type:str]
+            client_secret: ENC[AES256_GCM,data:QFLasNiwqX3dVnLWwViQHwM6MMhdNspOMxY+hV+TuF9dlaQLwDEqng==,iv:r/aLpr+2+LA9GCyayOe2+yDWk6ZoajSZKzUc2A9kMmo=,tag:hAlGz1RDWyJ34HeLbpkNZw==,type:str]
 sops:
     kms: []
     gcp_kms:
@@ -10,8 +15,8 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2022-06-28T10:36:15Z"
-    mac: ENC[AES256_GCM,data:5EecXQhmTHpMkXcnLyzUTyH6/B3x80h3kNrUcyk/YhihCf2kS/LnWgtnhyKcDoo6ExgURQEAXxaat3vEDUaNSz0JnmLvcYqnKjbwlbI/QXt0YSKzUhCDAf6NGM+ZULdXVZ+v6BjOwBwGdH5QAELdgr4SppvTlzaIsn5oxl6Zrho=,iv:ezvmKIcp3zMPbGPxikfQqtjE/Kg7Wf2TAkmSXYKWfyc=,tag:RaO1SF+sg+pFmiuiRdzPaQ==,type:str]
+    lastmodified: "2023-02-08T14:03:38Z"
+    mac: ENC[AES256_GCM,data:zcYg/gNHre+kftU9sk0aAkaaPmaCxG/SWiv9Rbq8V/LIThxMRf5trD42EFwssFkvavWnxAc3+6pNKdZgGvuz5C2r8woBhfN+HChjpKNn48SygchOcWs+Hv2yG7ygAHZRe08RkabQDVYMDVL6Sagem+NaHM5se3qFIJ9xB/HPR4I=,iv:aZDX15aKvYtW3z96baS7QY4QVYJxAI5Q8WhRipK4kYA=,tag:26mnsGGgpLlr/xH+B5a2yA==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
-    version: 3.7.1
+    version: 3.7.2
diff --git a/config/clusters/linked-earth/support.values.yaml b/config/clusters/linked-earth/support.values.yaml
@@ -16,6 +16,9 @@ grafana:
   grafana.ini:
     server:
       root_url: https://grafana.linkedearth.2i2c.cloud/
+    auth.github:
+      enabled: true
+      allowed_organizations: 2i2c-org
   ingress:
     hosts:
       - grafana.linkedearth.2i2c.cloud

diff --git a/config/clusters/m2lines/support.values.yaml b/config/clusters/m2lines/support.values.yaml
@@ -4,24 +4,19 @@ nvidiaDevicePlugin:
     version: "latest"
 
 grafana:
+  grafana.ini:
+    server:
+      root_url: https://grafana.m2lines.2i2c.cloud/
+    auth.github:
+      enabled: true
+      allowed_organizations: 2i2c-org
   ingress:
     hosts:
       - grafana.m2lines.2i2c.cloud
     tls:
       - secretName: grafana-tls
         hosts:
           - grafana.m2lines.2i2c.cloud
-  grafana.ini:
-    server:
-      root_url: https://grafana.m2lines.2i2c.cloud
-    auth.github:
-      enabled: true
-      allow_sign_up: true
-      scopes: "user:email,read:org"
-      auth_url: https://github.com/login/oauth/authorize
-      token_url: https://github.com/login/oauth/access_token
-      api_url: https://api.github.com/user
-      allowed_organizations: 2i2c-org
 
 prometheusIngressAuthSecret:
   enabled: true

diff --git a/config/clusters/meom-ige/enc-support.secret.values.yaml b/config/clusters/meom-ige/enc-support.secret.values.yaml
@@ -1,6 +1,11 @@
 prometheusIngressAuthSecret:
     username: ENC[AES256_GCM,data:UgQfeU/OUU3z+8ylT3OQTvWh6R7QevM5lPd/XkJ+AltY7Po6INJxSluH/esJLC2V8q7jZF2mCejGNKy7dt8Xjw==,iv:rh1VPMfvXlqgrVgLzqj8eL+PA+lqZ0Esa+Aklswn24Y=,tag:uTIm1HBAQjTLJDQBfyJKjg==,type:str]
     password: ENC[AES256_GCM,data:caUmNT2gG5MFm2PpLjazqHLWZkI7GXRdqdeK7wxhI15FMO+8led5dW3Bd8pm0aLkIhgs0v4wCxL69oBw80qaKw==,iv:A/26GE1/R9S4mCBvknNvFtWyxI+PCBoXUVRbYZLAmzU=,tag:3ajE+3UUKKaev87P+afcOA==,type:str]
+grafana:
+    grafana.ini:
+        auth.github:
+            client_id: ENC[AES256_GCM,data:t3qbhHOugDCX92DSZW8b64jA8zI=,iv:Q5uFboxxAn3zfSj0f6V2E7IiSfbcajXIw+jpuz363DQ=,tag:KnwAlvNmXulaMXOLdDyGJA==,type:str]
+            client_secret: ENC[AES256_GCM,data:xdLGBSiGYIhaWIYWklRKCSCoxz6CRbklDZas0zw2ZrcrZF/QP7tBYg==,iv:TK9YV+qbaBrZnoIiR6R1H7EkdEip2YOg5pcJ+L4A3xc=,tag:gXUgcoCOKnjGAVa4qcCISg==,type:str]
 sops:
     kms: []
     gcp_kms:
@@ -10,8 +15,8 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2022-05-19T11:58:54Z"
-    mac: ENC[AES256_GCM,data:tRu30bx2qkFQ2T+QOtR3pFa4dhrgXhdaFuKfFOvuPQkUzCyW+aSRolPkgiBcmON6rWOvVHf2EpyMZbTEqE5JAdZV2mz0z+yIBnqlhxh0Vsorl1cP7fjSguHdjYYI5uzxj96OSt4GW4gdXr8nPSzzmByLTswPdsIBa1Q4hIF6JLg=,iv:6phRu509nLWPuVVXiBc/zHq1ZQ13vZDKd0NKUZopAho=,tag:1uOZzo7p79dKxhxH/i2IVw==,type:str]
+    lastmodified: "2023-02-08T14:04:32Z"
+    mac: ENC[AES256_GCM,data:/uUXimr/7fhBZwJ301GfI0J92pREWp8l5VgVZwC5d1sWwXhGf7BPz4Taftqe80/4vkY8HJPCmV47oSHxGOYuMYU6kuI1NNmoabT3O866vxFIsE+keurUzVC0x5KfCbCCIr6AOtW8HMbKBkFc8I0x59KBMH+XR6GgYeKzc6xxXsQ=,iv:7TI/zCMoSCavyv71tyjRMUYKRJzNKLE5Hq+tQ62ZUB4=,tag:5MOATCS9HixUQxnW+wcQvA==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.7.3