Compare commits
4 Commits
16ec931a9a
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 448d1d1772 | |||
| 4c057f44ba | |||
| c748e71a91 | |||
| 41a687a5ab |
17
helm.tf
17
helm.tf
@@ -4,9 +4,14 @@ resource "helm_release" "this" {
|
|||||||
|
|
||||||
repository = "https://grafana.github.io/helm-charts"
|
repository = "https://grafana.github.io/helm-charts"
|
||||||
chart = "grafana"
|
chart = "grafana"
|
||||||
version = "6.50.7"
|
version = "10.1.4"
|
||||||
|
|
||||||
values = [
|
values = [
|
||||||
|
jsonencode({
|
||||||
|
initChownData = {
|
||||||
|
enabled = false
|
||||||
|
}
|
||||||
|
}),
|
||||||
jsonencode({
|
jsonencode({
|
||||||
ingress = {
|
ingress = {
|
||||||
enabled = true
|
enabled = true
|
||||||
@@ -43,6 +48,12 @@ resource "helm_release" "this" {
|
|||||||
org_role = "Viewer"
|
org_role = "Viewer"
|
||||||
hide_version = true
|
hide_version = true
|
||||||
}
|
}
|
||||||
|
"smtp" = {
|
||||||
|
enabled = true
|
||||||
|
host = "smtp.lawndale.:25"
|
||||||
|
from = "noreply@grafana.thomasklein.me"
|
||||||
|
from_name = "Grafana"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
|
|
||||||
@@ -55,6 +66,10 @@ resource "helm_release" "this" {
|
|||||||
// below, the `?` is necessary to fix a bad assumtion on grafana's side
|
// below, the `?` is necessary to fix a bad assumtion on grafana's side
|
||||||
GF_AUTH_GENERIC_OAUTH_API_URL = "${local.cognito_userinfo_url}?"
|
GF_AUTH_GENERIC_OAUTH_API_URL = "${local.cognito_userinfo_url}?"
|
||||||
GF_AUTH_GENERIC_OAUTH_SCOPES = "email openid profile"
|
GF_AUTH_GENERIC_OAUTH_SCOPES = "email openid profile"
|
||||||
|
// https://github.com/grafana/grafana/issues/70203#issuecomment-1603895013
|
||||||
|
// https://github.com/advisories/GHSA-mpv3-g8m3-3fjc
|
||||||
|
// https://grafana.com/docs/grafana/latest/setup-grafana/configure-security/configure-authentication/#enable-email-lookup
|
||||||
|
GF_AUTH_OAUTH_ALLOW_INSECURE_EMAIL_LOOKUP = "true"
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
]
|
]
|
||||||
|
|||||||
Reference in New Issue
Block a user