diff --git a/app/readme.md b/app/readme.md index 18045d0..e301887 100644 --- a/app/readme.md +++ b/app/readme.md @@ -1,3 +1,3 @@ Making changes to trigger an app update. -3 \ No newline at end of file +4 \ No newline at end of file diff --git a/terraform/monitoring.tf b/terraform/monitoring.tf index 93d85e9..1a97696 100644 --- a/terraform/monitoring.tf +++ b/terraform/monitoring.tf @@ -41,31 +41,14 @@ resource "helm_release" "prometheus_operator" { root_url = "https://${var.dns_name}/grafana/" domain = var.dns_name serve_from_sub_path = true + cookie_samesite = "none" + cookie_secure = true } } adminPassword = var.GRAFANA_ADMIN_PASSWORD } })] - env = [ - { - name = "GF_SERVER_ROOT_URL" - value = "https://${var.dns_name}/grafana/" - }, - { - name = "GF_SERVER_SERVE_FROM_SUB_PATH" - value = "true" - }, - { - name = "GF_SECURITY_COOKIE_SAMESITE" - value = "none" - }, - { - name = "GF_SECURITY_COOKIE_SECURE" - value = "true" - } - ] - set { name = "prometheus.prometheusSpec.retention" value = "15d" diff --git a/terraform/output.tf b/terraform/output.tf index 3ec1365..ee403f5 100644 --- a/terraform/output.tf +++ b/terraform/output.tf @@ -7,7 +7,7 @@ output "cluster_name" { } output "repository_name" { - value = aws_ecr_repository.ecr.repository_name + value = aws_ecr_repository.ecr.name } output "cluster_ip" {