From 240034280eb51105cd95ea1af2182870a86864f6 Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Fri, 28 Oct 2022 11:37:46 +0100 Subject: [PATCH] Enable GitHub auth for m2lines grafana --- .../m2lines/enc-support.secret.values.yaml | 19 ++++++++++++------- config/clusters/m2lines/support.values.yaml | 11 +++++++++++ 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/config/clusters/m2lines/enc-support.secret.values.yaml b/config/clusters/m2lines/enc-support.secret.values.yaml index 53aebfe177..9a2e8033b2 100644 --- a/config/clusters/m2lines/enc-support.secret.values.yaml +++ b/config/clusters/m2lines/enc-support.secret.values.yaml @@ -1,17 +1,22 @@ prometheusIngressAuthSecret: - username: ENC[AES256_GCM,data:Gs9mrGaLFU6hsYF8/wwpODWAt8xpcEu/heuDkneWhqiL47KISnLGBVOL6BsuljKKREJxuXOSwU8YTI/DPzUQ2w==,iv:0MVlwiPlxxRW4FLobzwaclFASLIfhuAolyjWkT6ytcs=,tag:xhC0iH+Gf+3E/ISk1D88aA==,type:str] - password: ENC[AES256_GCM,data:xQPRntL+XM1w6s41zFu3QKvrPGUV+egeJfqdHiqV8Ps18ebvWEYevUyt8fuujtmlEt9EJOqKoy7UrbaptmF2jA==,iv:HJLjntlpEGUiHKXsbfPPd42GJ/FBOnaO7nI3Ac1PnDs=,tag:2dveWGpIs0u9cfGp/at+Iw==,type:str] + username: ENC[AES256_GCM,data:bisiUHR25ma+Q2MTh8UcjaWDvX/RUVGmAvdfl95ehQ6vmAa0PmMRgZc6pmNwRQSV6+l/D7POI39UaXNCS/mUgg==,iv:See29zO/q0q3xeCij8Gx8Dk1KObVuA2snECw24c8bQc=,tag:osdytedbJLqwYBFwD3GlPg==,type:str] + password: ENC[AES256_GCM,data:CKBA27Rq5acAl+BrMENZvLcrG0BBNC6VQCKMldyenS6tcwX2yM0ZH3mZLspDlWSuNhyh7UxSK/Ks0pds+olWpQ==,iv:/O8DoKRPWktMFKwJ6IxpVhSpnISnJGiguOkr+CmF+OE=,tag:J4fTMgoV7NtTG8/iIUCW9w==,type:str] +grafana: + grafana.ini: + auth.github: + client_id: ENC[AES256_GCM,data:AwOgzy07q0befQjbfzk3HYVHW54=,iv:DUjQ1ceqlSMpIdlDVpmpm3ILfrNszWcaD7dvyqZZNdI=,tag:gwQpWYI8gg4uelWQx0Yb/g==,type:str] + client_secret: ENC[AES256_GCM,data:fCFbmAkCjS59Fr8P8Qx+DxcX5Higkq++GOICB1GyEnV3yMKl9kDjqg==,iv:eJe1meggvTxYSlvoqklEH7+d8Oi+H3qOgdYB0n81rIQ=,tag:nLlxy8pcv9f8e/mKZl1ncg==,type:str] sops: kms: [] gcp_kms: - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs - created_at: "2022-03-14T20:52:45Z" - enc: CiQA4OM7eJtxMekwe8M2xF3+DD4ZunAeBVpTJD9wg1PKaJEy7kASSQDm5XgWsVdfRQVoQaTbAptAhyIRxdJKiLlAOxNTfUwsLXxRC30PYheM5d5nBv5Ah5e0xtxAdMrYEnJvwtUy7d6Ugek02bncmfg= + created_at: "2022-10-28T10:24:36Z" + enc: CiQA4OM7eEkEE5hlcqPybmYOWbqZJAuksYMnSYYHwqmeljiimJcSSQDuy/p85YMbh9sMf/+H0NY9f60vz8QAuT4/mkTan/zsKLTQFTX66vaFwiYPaKpqVowanzx39SLyIhHSfQHnsGpg/bAFRK23+Os= azure_kv: [] hc_vault: [] age: [] - lastmodified: "2022-04-21T23:32:50Z" - mac: ENC[AES256_GCM,data:s96EB617sgeDleLEQeCMTttKe06aMsE3IrvCYJAhf4hMGW4fdAovnZOSdSZ2p1oAQWnU8byblkhcRotPCd30GNZvtzIf6thYb2ZoH4o5Pnt9dEsVmgpVQvMLgZMrDO8Z8QCOalnw1nyUfWQIyta9GMbFEy71+op7tq0D9CgVmJ4=,iv:7+DHiE/smIR6aPCgnpsNsxSNFBaDjPQJ9EQA6xqagdA=,tag:EHfY6OE9itzpqdF0goNfVg==,type:str] + lastmodified: "2022-10-28T10:24:36Z" + mac: ENC[AES256_GCM,data:G5BitI2XFqq+5FwJr52c8kIVvAPkwoYKCvQ7k6gdallcLNFHPJnN7UYXF+TWZXk1cLVxn7NDK56WhujtIuiz+tXe+XUyu1dLnXnZxtI5Rg5HUMmX7/yCD5smpgfa5UsYrd0fRhnXVaPP0V1m/fRJ4C5iQ62jkKFq16uqf7uqoiE=,iv:TMVE109vKpTi8ncgIo0ojgQszsT5P0JXcw/tB32imtM=,tag:MsO9YA9fz6DXylahqzTlpA==,type:str] pgp: [] unencrypted_suffix: _unencrypted - version: 3.7.1 + version: 3.7.3 diff --git a/config/clusters/m2lines/support.values.yaml b/config/clusters/m2lines/support.values.yaml index 18d81bb9ed..27b4101e92 100644 --- a/config/clusters/m2lines/support.values.yaml +++ b/config/clusters/m2lines/support.values.yaml @@ -11,6 +11,17 @@ grafana: - 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