Merge pull request #1 from SCT-Engineering/lokiv3

Lokiv3
SCT-Engineering · Jul 19, 2024 · d95b0d7 · d95b0d7
2 parents c8932fd + 42f8912
commit d95b0d7
Show file tree

Hide file tree

Showing 5 changed files with 185 additions and 153 deletions.
diff --git a/README.md b/README.md
@@ -3,5 +3,6 @@
 Installs the loki as the log aggregation sink, and promtail to forward the logs
 to loki.
 
+* Requires additional Node HD space - 40GB is not enough.
 
 # tfmod-loki
diff --git a/copy_images.tf b/copy_images.tf
@@ -1,7 +1,11 @@
 locals {
   loki_key        = format("%v#%v", "grafana/loki", var.loki_tag)
+  canary_key      = format("%v#%v", "grafana/loki-canary", var.canary_tag)
   provisioner_key = format("%v#%v", "grafana/enterprise-logs-provisioner", var.enterprise_logs_provisioner_tag)
   gateway_key     = format("%v#%v", "grafana/nginx-unprivileged", var.gateway_tag)
+  sidecar_key     = format("%v#%v", "kiwigrid/k8s-sidecar", var.sidecar_tag)
+  memcached_key   = format("%v#%v", "memcached", var.memcached_tag)
+  exporter_key    = format("%v#%v", "prom/memcached-exporter", var.exporter_tag)
 
   image_config = [
     {
@@ -13,6 +17,42 @@ locals {
       source_tag      = var.loki_tag
       tag             = var.loki_tag
     },
+    {
+      enabled         = true
+      dest_path       = null
+      name            = "grafana/loki-canary"
+      source_image    = "grafana/loki-canary"
+      source_registry = "docker.io"
+      source_tag      = var.canary_tag
+      tag             = var.canary_tag
+    },
+    {
+      enabled         = true
+      dest_path       = null
+      name            = "memcached"
+      source_image    = "memcached"
+      source_registry = "docker.io"
+      source_tag      = var.memcached_tag
+      tag             = var.memcached_tag
+    },
+    {
+      enabled         = true
+      dest_path       = null
+      name            = "prom/memcached-exporter"
+      source_image    = "prom/memcached-exporter"
+      source_registry = "docker.io"
+      source_tag      = var.exporter_tag
+      tag             = var.exporter_tag
+    },
+    {
+      enabled         = true
+      dest_path       = null
+      name            = "kiwigrid/k8s-sidecar"
+      source_image    = "kiwigrid/k8s-sidecar"
+      source_registry = "quay.io"
+      source_tag      = var.sidecar_tag
+      tag             = var.sidecar_tag
+    },
     {
       enabled         = true
       dest_path       = null
@@ -35,7 +75,7 @@ locals {
 }
 
 module "images" {
-  source = "git@github.e.it.census.gov:terraform-modules/aws-ecr-copy-images.git/?ref=2.0.2"
+  source = "git@github.e.it.census.gov:terraform-modules/aws-ecr-copy-images.git/?ref=tf-upgrade"
 
   profile          = var.profile
   application_name = var.cluster_name
@@ -51,5 +91,7 @@ module "images" {
   ##  region               = ""
   ##  source_password      = ""
   ##  source_username      = ""
-}
 
+  enable_lifecycle_policy = true
+  lifecycle_policy_all    = true
+}