chore(charts): migrate argus grafana to identity.diamond.ac.uk

Author: davehadley

charts/monitoring/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: monitoring
 description: A monitoring stack for the workflows deployment
 type: application
-version: 0.1.14
+version: 0.1.15
 dependencies:
   - name: grafana
     repository: https://grafana.github.io/helm-charts

charts/monitoring/templates/grafana-oauth-secret.yaml

@@ -2,20 +2,17 @@
 apiVersion: bitnami.com/v1alpha1
 kind: SealedSecret
 metadata:
-  annotations:
-    sealedsecrets.bitnami.com/namespace-wide: "true"
   name: grafana-oauth
-  namespace: {{ .Release.Namespace }}
+  namespace: workflows
 spec:
   encryptedData:
-    client-id: AgCVJCtHmUdZ2/sJSXB/dYaaPeCAxLdrXsTh3uJDK3zpqQPGlFMaonm+zgzcUgN5m2Ou0phxI+a/XycrOCw132ZRhVtgJm6PDpsmBXl0DTqng/37I7BeDmM7FxXbOo0WWSgBmqjC4bU/xXs8G0IbWl+n5pKw0BYplzaddzeqj5fsrDxswqfI+J1BBrwLVp6uNjnNEc2Nwyyc2KhY051RauX/F00Zgyx4rsYpDq8ulPC8lEa21W3/9bvyEALcrToBp5Su37YVizoF2bSTAzDpfk7xm9A0rHqqG29y/Oq215V9H8pCo/ocaRaWyOzs5s3JmpLtahDQFvToWat4+Scto/fhPVLyOX2xZE0MZ6dR7jWDxJiu2/RQLX7LM5iQ06d2JDFlkBZRidNJKBrx+h47zNeGd5XjDvfeaX0nCGKXYlaaxhdZ5cLHHF55KszaDgtnBHYAg/I3MUnPp98JPYzy96YUSzX66AEIQpH/XTeFbFQ9kHUAt1ZQbOfEzLXc1hO6tLFpxKAmcxdVbEzLPPfnRBJQ9JTxmXevoUeytCJD1XdhueMP4YBoWVAvThZDDW5Z9NSAgb7ozgPlRmtzAlUevVOIiOzAkGQUbnOOEXx7r6X2tWDnQp11kRSKtpbZnauu8GyUUnGMM7Evh3XZCHTpcGov8UF3b4dMEQai2v/9puFMsk7kyYCQOC5xYYDnvIo0hHI0XR24XoS2Ln8NcrSUlPgYzQ==
-    client-secret: AgBM9XkD4SGqQHKL427bySL2iywfzo24h7OC7lRF/hIR97CybX/QO/OXqFXTrDjbzDNcOzLXuHFfgL6LcTPVrHsox/rQhwvEoybmjCNJK1rQJdMmmtL+RG2v5+9VD5po7+mKRnkottB/lBcCzgIeqBPznmnhr8GGctcH5QtQfBtJYSGAk8vYKnF3YwacGz50LvFHzBrt2sMtC7ustOcuijAvPHZJOqt+dC5dsy4c346kWzRpyV9UoZMzDBujycrA/ukv6C5KTx64BgYXp3i9qXHlB6GRaIpZ/p7r8jcFzenTwK8cfijl4+GEQEceS3NKECnKCympSyiiH2gxH4ap4JVRe7lalwxVn4HCxAIo6dIvwA/Lvh7h/89npIAI7cLKgv1aqJgvEBZz9i1948/7mEO4zbM+h8rMtGSNiyvWriScGJ+BFfVPCY0QaGphf+kCAtfHholEERqkfOXu3Py8e42drpgwXCJf4OiE4VM/URdHtSug+Cv5k2EvVcK5FKaHVu6ivaUzk47QsdxssICIg5bwqDoOcHUdPED7ylfA5BtIMjRTDxd4RLr/2gaPzzwEp6/wb8E/AYOR3Nq0cHHj4vViE1R8UEpofRXyoyGNV2Xrt04ci08HYb/3+twu6rwrJ9NHOPMSpWjbBbwkVRJpNWkZdtCj+oO0sc9rK/9N+Kn8esUhjXFJJ9LVnWorlSgQi/KtA4jSBc2RJp5PvIsS8a2TdkAZJGxlQZMJogUpRKz/wA==
+    client-id: AgB6cWGK5n9LSkX29hVE82ERqV8B3+PU5va4O4s4Dbmk6/IRiJ0P8dn+Xkc0D57dx71HkhkZ4I0mQKj/T4ZfSE0NK7yW4OXCobQMQC3532MQHlBU6gweaAcak89fKgACLM9xCe23JKr9IlSROaNTHEhrpFktoq89PRh8u4zVo0wFsUNpxqqc/LZo/ICC/2CGht3AMxKlcDV66f1XE9GEYMNEHV5qXxq4dCrzBXnTgJZ5aTLUpW0xHUfYvPSmZ2kynGS2UTSrArbp++nphO9hzKg6Id6hPuqeptXO907gDeR1rykEXZkFmVuROWXMdGna/4Cgd5whAktkt9LeURvwa5zQ3UA6y+P2bCHPtKMN4760k+1GTiC3fP+YJkRIjgGTF+TJVKdSzJ6fZ5794IVZ/apdlrapxED7+v8uGRdW+RymrHUMZ26tj0FiSiW0wjvVq4v4GgpxTqmnHF+0U/Rv5402FkASh5/0G52gOAKX7Y/Cur2qozbxy/RVstpiV7BZJb3+8+0PdyUr5znY1tHCJjHeF6T8f5p5BQaMARkIFCkpxW9Q3Lt5iyGLWDsRevuw+nGuQTBfXbcTA6ThMIK1g7qNMH60Roj+robO4SKdWXedB+qEdLMerVOlmagC/EeF9gGZ2NCjTfu3blNjkLdhCV25fJAxhyQC/OwBug585nHA8Kz9jowsFND4+xn0jMNm1nq586687rbc3F4J1fMNQ/FOkg==
+    client-secret: AgB+r2lmnpgSCCnPVfLa24mC1u+nut4WXUVfVWgcDVZQKzVIniZWWa6HPxO+B/V1apcZ60XuyFZGCaEXoFRULRSD/BUOuWvmMnKjU5V15UwOuOZUS39yP0smHRZ2FRfJ/fMbARW6iBt+hfnGZzt2FlIVBiXnQNcgAK9cI0pz17jDeNThT/wvsjNfRkx+UiBzhoa9eukSWMD84+Yi/gllUgDMQcEo2Ej+Ndc3/unlPxSlsKkHGCFpBuJiRqrhfJpJ272hrMgj0ZMY6FgWvg68ZixON7FAO4djuRpo12YWFDWGmKO8UoGEWeQaHQDDioB3I2wizynLItGFF/VrmoTgKuWknET0jktB27wUGT/fsvni5qNKrNvWfBUvMfy9voicWWmDR2ZkH9StUUj8QqaWBpv13qZBZ0mk1HM1CheUehfb0U5rHj9kMUJnHwkrvoPSWuQO94TG+U3Sg6V+yFdnQk+jfCrt+TroD5FHYppx564RiEC+qlfRlVOaZz6L1QFeejbN7XK+uUC4UH0ldKHyzw4GZdpkiTOfShOdKi9Z4wlZNCRrb2t51ghtidXlN3Cfk6ZTXSkNfYxyJ5+c7YHJvMhvZkhcJ6yg2cLXARp3eBNJhATWVcbLNFCL+KuR2oTpH6DhjUhAUSrhZjSu/L8rK1DtgNRYHjfI1Nb8xjdny5RdSETtbutHbkevTY8UuQjY3BFaTCON7w+sGEz0v0PXfBiCD6OKHWQ1LRS+UkXVcWaFiA==
   template:
     metadata:
-      annotations:
-        sealedsecrets.bitnami.com/namespace-wide: "true"
       name: grafana-oauth
-      namespace: {{ .Release.Namespace }}
+      namespace: workflows
+    type: Opaque
 {{- else if eq .Values.cluster "pollux" }}
 apiVersion: bitnami.com/v1alpha1
 kind: SealedSecret

charts/monitoring/values.yaml

@@ -40,9 +40,9 @@ grafana:
       client_id: $__file{/etc/secrets/oauth_provider/client-id}
       client_secret: $__file{/etc/secrets/oauth_provider/client-secret}
       scopes: openid profile email offline_access
-      auth_url: https://authn.diamond.ac.uk/realms/master/protocol/openid-connect/auth
-      token_url: https://authn.diamond.ac.uk/realms/master/protocol/openid-connect/token
-      api_url: https://authn.diamond.ac.uk/realms/master/protocol/openid-connect/userinfo
+      auth_url: https://identity.diamond.ac.uk/realms/dls/protocol/openid-connect/auth
+      token_url: https://identity.diamond.ac.uk/realms/dls/protocol/openid-connect/token
+      api_url: https://identity.diamond.ac.uk/realms/dls/protocol/openid-connect/userinfo
       use_pkce: true
       use_refresh_token: true
       email_attribute_path: id