Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: 2i2c-org/infrastructure
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7c1cb376c7dad73ea3c3523a24b6d8ad5da741fb
Choose a base ref
..
head repository: 2i2c-org/infrastructure
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8b76f4707ba234d11b453198e91860186cdd1991
Choose a head ref
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
grafana_token: ENC[AES256_GCM,data:eEkdDwt4Nh5A3vK+0gZWKFClfX8r432opI5k+DDSs5Xubl8uMBYL7dQDPKwJ1Q==,iv:GIcnnq6A8FlC5n0zIcBtRXarbiVPIyUD4IA0upwv/iY=,tag:hpuE3LjlkOHnfRgS8EEr1Q==,type:str]
sops:
kms: []
gcp_kms:
- resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs
created_at: "2023-05-08T23:52:20Z"
enc: CiUA4OM7eMWtsPtGolINvWRXEfk4g47adZDWn9sU/Dx5Ncw8DJWgEkkALQgViHdizcHRkCq7nYnKwxDED5hO786C0CzFoP7dTKlncH+CHD4DPVJLTqbipss7jlDs3Aa4j2o3AiwpiLIYhEQ+dOR/xuip
azure_kv: []
hc_vault: []
age: []
lastmodified: "2023-05-08T23:52:21Z"
mac: ENC[AES256_GCM,data:nCdHJEhLW6PO3sldQunY/aG/ugH75lL+D9YOZUA5HiOR42LXtxP35IO9MEepSpEzmDkC1wkKOHiXGbBeDAZFhhbHbv8oJp9lbO0crO9fKYeMdWy1lg1mTfc1EtJ5Mx7Xujfbh4gMunFaM9+hw2siy1Y6b7GiZ9VLGbiBaLnPgAg=,iv:yexANic9yZn2o0bzJRTDt7n1rtzoFuNV2XLspMsgRZw=,tag:znGhZZudQ0DS4YKcKcpdEg==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.7.3
4 changes: 2 additions & 2 deletions config/clusters/qcl/support.values.yaml
Original file line number Diff line number Diff line change
@@ -30,10 +30,10 @@ grafana:
allowed_organizations: 2i2c-org QuantifiedCarbon
ingress:
hosts:
- grafana.qcl.2i2c.cloud
- grafana.quantifiedcarbon.com
- grafana.qcl.2i2c.cloud
tls:
- secretName: grafana-tls
hosts:
- grafana.qcl.2i2c.cloud
- grafana.quantifiedcarbon.com
- grafana.qcl.2i2c.cloud
8 changes: 7 additions & 1 deletion docs/howto/grafana-github-auth.md
Original file line number Diff line number Diff line change
@@ -30,7 +30,13 @@ To enable logging into Grafana using GitHub, follow these steps:
server:
# root_url should point to the domain we redirect to if we have multiple
# domain names configured and redirects from one to another
root_url: https://<grafana.ingress.hosts[#]>
#
# FIXME: root_url is also required to be the same as the
# grafana.ingress.hosts[0] config specifically until
# https://github.com/2i2c-org/infrastructure/issues/2533 is
# resolved.
#
root_url: https://<grafana.ingress.hosts[0]>/
auth.github:
enabled: true
# allowed_organizations should be a space separated list
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ prometheusIngressAuthSecret:
grafana:
grafana.ini:
server:
root_url: https://<grafana-domain>
root_url: https://<grafana-domain>/
auth.github:
enabled: true
allowed_organizations: 2i2c-org
2 changes: 1 addition & 1 deletion helm-charts/support/values.yaml
Original file line number Diff line number Diff line change
@@ -246,7 +246,7 @@ grafana:
# secret:
#
# server:
# root_url: https://grafana.<cluster_name>.2i2c.cloud
# root_url: https://grafana.<cluster_name>.2i2c.cloud/
# auth.github:
# enabled: true
# allowed_organizations: "2i2c-org some-other-gh-org"