fix tags

provectus · May 6, 2021 · 04f649e · 04f649e
1 parent 4d85642
commit 04f649e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/logging/loki/README.md b/logging/loki/README.md
@@ -56,10 +56,10 @@ No modules.
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | <a name="input_argocd"></a> [argocd](#input\_argocd) | A set of values for enabling deployment through ArgoCD | `map(string)` | n/a | yes |
-| <a name="input_chart_version"></a> [chart\_version](#input\_chart\_version) | A Helm Chart version | `string` | `"2.0.0"` | no |
+| <a name="input_chart_version"></a> [chart\_version](#input\_chart\_version) | A Helm Chart version | `string` | `"2.3.1"` | no |
 | <a name="input_cluster_name"></a> [cluster\_name](#input\_cluster\_name) | A name of the Amazon EKS cluster | `string` | `null` | no |
 | <a name="input_conf"></a> [conf](#input\_conf) | A custom configuration for deployment | `map(string)` | `{}` | no |
-| <a name="input_domains"></a> [domains](#input\_domains) | A list of domains to use for ingresses | `list(string)` | `[]` | no |
+| <a name="input_domains"></a> [domains](#input\_domains) | A list of domains to use for ingresses | `list(string)` | <pre>[<br>  "local"<br>]</pre> | no |
 | <a name="input_grafana_loki_password"></a> [grafana\_loki\_password](#input\_grafana\_loki\_password) | Password for grafana admin | `string` | `""` | no |
 | <a name="input_module_depends_on"></a> [module\_depends\_on](#input\_module\_depends\_on) | A list of explicit dependencies | `list(any)` | `[]` | no |
 | <a name="input_namespace"></a> [namespace](#input\_namespace) | A name of the existing namespace | `string` | `""` | no |

diff --git a/logging/loki/main.tf b/logging/loki/main.tf
@@ -85,11 +85,15 @@ locals {
     "promtail.enabled"                    = true
     "fluent-bit.enabled"                  = false
     "grafana.enabled"                     = true
-    "grafana.pvc.enabled"                 = true
+    "grafana.ingress.enabled"             = true
+    "grafana.ingress.hosts[0]"            = "grafana-loki.${var.domains[0]}"
+    "grafana.persistence.enabled"         = true
+    "grafana.persistence.size"            = "1Gi"
     "grafana.adminPassword"               = "KMS_ENC:${aws_kms_ciphertext.grafana_loki_password[0].ciphertext_blob}:"
     "grafana.sidecar.datasources.enabled" = true
-    "grafana.image.tag"                   = "6.7.0"
     "prometheus.enabled"                  = false
+    "loki.persistence.enabled"            = true
+    "loki.persistence.size"               = "10Gi"
   }
 
   application = {

diff --git a/logging/loki/variables.tf b/logging/loki/variables.tf
@@ -30,7 +30,7 @@ variable "grafana_loki_password" {
 
 variable "domains" {
   type        = list(string)
-  default     = []
+  default     = ["local"]
   description = "A list of domains to use for ingresses"
 }
 
@@ -50,7 +50,7 @@ variable "namespace_name" {
 variable "chart_version" {
   type        = string
   description = "A Helm Chart version"
-  default     = "2.0.0"
+  default     = "2.3.1"
 }
 
 variable "tags" {