unified config

SCT-Engineering · Apr 1, 2025 · 2308742 · 2308742
1 parent 74b1694
commit 2308742
Show file tree

Hide file tree

Showing 5 changed files with 92 additions and 85 deletions.
diff --git a/README.md b/README.md
@@ -50,11 +50,9 @@ to loki.
 |------|-------------|------|---------|:--------:|
 | <a name="input_cluster_name"></a> [cluster\_name](#input\_cluster\_name) | EKS cluster name name component used through out the EKS cluster describing its purpose (ex: dice-dev) | `string` | n/a | yes |
 | <a name="input_enterprise_logs_provisioner_tag"></a> [enterprise\_logs\_provisioner\_tag](#input\_enterprise\_logs\_provisioner\_tag) | The version of the grafana/enterprise-logs-provisioner image to use. | `string` | `"v1.7.0"` | no |
-| <a name="input_exporter_tag"></a> [exporter\_tag](#input\_exporter\_tag) | The version of prom/memcached-exporter to use for the gateway. | `string` | `"v0.14.4"` | no |
 | <a name="input_gateway_tag"></a> [gateway\_tag](#input\_gateway\_tag) | The version of nginxinc/nginx-unprivileged to use for the gateway. | `string` | `"1.25.2-alpine"` | no |
 | <a name="input_loki_chart_version"></a> [loki\_chart\_version](#input\_loki\_chart\_version) | Which version of the grafana/loki helm chart to use. | `string` | `"6.10.2"` | no |
 | <a name="input_loki_tag"></a> [loki\_tag](#input\_loki\_tag) | The tag of the loki image to use. | `string` | `"3.1.1"` | no |
-| <a name="input_memcached_tag"></a> [memcached\_tag](#input\_memcached\_tag) | The version of memcached to use for the gateway. | `string` | `"1.6.23-alpine"` | no |
 | <a name="input_namespace"></a> [namespace](#input\_namespace) | The namespace into which grafana will be deployed | `string` | `"loki"` | no |
 | <a name="input_oidc_provider_arn"></a> [oidc\_provider\_arn](#input\_oidc\_provider\_arn) | The ARN in the EKS cluster for the OpenID Connect identity provider. | `string` | n/a | yes |
 | <a name="input_profile"></a> [profile](#input\_profile) | AWS config profile used to upload images into ECR | `string` | `""` | no |

diff --git a/copy_images.tf b/copy_images.tf
@@ -1,9 +1,7 @@
 locals {
-  exporter_key    = format("%v#%v", "prom/memcached-exporter", var.exporter_tag)
-  gateway_key     = format("%v#%v", "grafana/nginx-unprivileged", var.gateway_tag)
   loki_key        = format("%v#%v", "grafana/loki", var.loki_tag)
-  memcached_key   = format("%v#%v", "memcached", var.memcached_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)
 
   image_config = [
@@ -16,24 +14,6 @@ locals {
       source_tag      = var.loki_tag
       tag             = var.loki_tag
     },
-    {
-      enabled         = true
-      dest_path       = null
-      name            = "memcached"
-      source_image    = "bitnami/memcached"
-      source_registry = "public.ecr.aws"
-      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

diff --git a/main.tf b/main.tf
@@ -55,10 +55,6 @@ resource "helm_release" "loki" {
       gateway_image_tag            = module.images.images[local.gateway_key].tag
       sidecar_image_repository     = split(":", module.images.images[local.sidecar_key].dest_full_path)[0]
       sidecar_image_tag            = module.images.images[local.sidecar_key].tag
-      memcached_image_repository   = split(":", module.images.images[local.memcached_key].dest_full_path)[0]
-      memcached_image_tag          = module.images.images[local.memcached_key].tag
-      exporter_image_repository    = split(":", module.images.images[local.exporter_key].dest_full_path)[0]
-      exporter_image_tag           = module.images.images[local.exporter_key].tag
       # Storage configuration
       s3_bucket_name = module.loki_s3.s3_requested_bucket_name
       region         = var.region

diff --git a/values/loki.yml.tpl b/values/loki.yml.tpl
@@ -8,6 +8,7 @@ global:
 
 # Main Loki configuration
 loki:
+<<<<<<< HEAD
 <<<<<<< HEAD
   auth_enabled: false
   image:
@@ -24,33 +25,49 @@ loki:
     query_timeout: 300s
     retention_period: 2160h
 =======
+=======
+  analytics:
+    reporting_enabled: true
+  auth_enabled: false
+>>>>>>> 54f31cf (unified config)
   image:
     repository: ${loki_image_repository}
     tag: ${loki_image_tag}
-  auth_enabled: false
-  analytics:
-    reporting_enabled: true
-  use_thanos_objstore: true
+  ingester:
+    chunk_encoding: snappy
+  limits_config:
+    allow_structured_metadata: true
+    query_timeout: 30s
+    max_streams_per_user: 1000
+    max_query_parallelism: 32
+    max_query_length: 2160h
+    ingestion_rate_strategy: local
+    split_queries_by_interval: 15m
+    max_cache_freshness_per_query: 10m
+    reject_old_samples_max_age: 168h
+    reject_old_samples: true
+    retention_period: 2160h
   # Storage configuration
-  storage:
-    type: s3
-    bucketNames:
-      chunks: ${s3_bucket_name}
-      ruler: ${s3_bucket_name}
-      admin: ${s3_bucket_name}
+  use_thanos_objstore: true
+  object_store:
     s3:
-      s3: s3://${region}
+      bucketName: ${s3_bucket_name}
+      endpoint: s3.${region}.amazonaws.com
       region: ${region}
+<<<<<<< HEAD
   storage_config:
     aws:
       s3: s3://${region}/${s3_bucket_name}
 
 >>>>>>> 98921ea (refactor chart values)
+=======
+>>>>>>> 54f31cf (unified config)
   # Provisioner settings
   provisioner:
     image:
       repository: ${provisioner_image_repository}
       tag: ${provisioner_image_tag}
+<<<<<<< HEAD
 <<<<<<< HEAD
   querier:
     max_concurrent: 4
@@ -83,6 +100,9 @@ loki:
 backend:
 =======
 
+=======
+  replication_factor: 1
+>>>>>>> 54f31cf (unified config)
   schemaConfig:
     configs:
       - from: 2024-04-01
@@ -92,17 +112,23 @@ backend:
         object_store: s3
         schema: v13
         store: tsdb
+  tracing:
+    enabled: true
 
 backend:
+<<<<<<< HEAD
   persistence:
     enabled: true
     storageClass: ${rwo_storage_class}
   replicas: 1
 >>>>>>> 98921ea (refactor chart values)
+=======
+>>>>>>> 54f31cf (unified config)
   autoscaling:
     enabled: true
     minReplicas: 1
     targetCPUUtilizationPercentage: 80
+<<<<<<< HEAD
 <<<<<<< HEAD
   persistence:
     storageClass: ${rwo_storage_class}
@@ -125,15 +151,27 @@ compactor:
 distributer:
   replicas: 0
 =======
+=======
+  persistence:
+    enabled: true
+    storageClass: ${rwo_storage_class}
+  replicas: 1
+>>>>>>> 54f31cf (unified config)
   resources:
     requests:
       cpu: 1m
       memory: 1Mi
     limits:
       cpu: 200m
       memory: 256Mi
-
+bloomCompactor:
+  replicas: 0
+bloomGateway:
+  replicas: 0
+chunksCache:
+  enabled: false
 compactor:
+  replicas: 0
   working_directory: /loki/compactor
   shared_store: s3
   compaction_interval: 10m
@@ -147,8 +185,13 @@ compactor:
     limits:
       cpu: 200m
       memory: 256Mi
+<<<<<<< HEAD
 
 >>>>>>> 98921ea (refactor chart values)
+=======
+distributer:
+  replicas: 0
+>>>>>>> 54f31cf (unified config)
 gateway:
   image:
     repository: ${gateway_image_repository}
@@ -194,48 +237,41 @@ read:
     limits:
       cpu: 100m
       memory: 128Mi
-
+indexGateway:
+  replicas: 0
+ingester:
+  replicas: 0
 lokiCanary:
   enabled: false
-
 memcached:
+  enabled: false
   chunk_cache:
-    enabled: true
+    enabled: false
   results_cache:
-    enabled: true
-  image:
-    repository: ${memcached_image_repository}
-    tag: ${memcached_image_tag}
-  resources:
-    requests:
-      cpu: 1m
-      memory: 1Mi
-    limits:
-      cpu: 200m
-      memory: 256Mi
-
+    enabled: false
 memcachedExporter:
-  image:
-    repository: ${exporter_image_repository}
-    tag: ${exporter_image_tag}
-  resources:
-    requests:
-      cpu: 1m
-      memory: 1Mi
-    limits:
-      cpu: 200m
-      memory: 256Mi
-
+  enabled: false
+querier:
+  replicas: 0
+  max_concurrent: 4
+queryFrontend:
+  replicas: 0
+queryScheduler:
+  replicas: 0
 read:
+<<<<<<< HEAD
   persistence:
     enabled: true
     storageClass: ${rwo_storage_class}
   replicas: 1
 >>>>>>> 98921ea (refactor chart values)
+=======
+>>>>>>> 54f31cf (unified config)
   autoscaling:
     enabled: true
     minReplicas: 1
     targetCPUUtilizationPercentage: 80
+<<<<<<< HEAD
 <<<<<<< HEAD
   replicas: 3
   resources:
@@ -253,15 +289,23 @@ serviceAccount:
   annotations:
     eks.amazonaws.com/role-arn: ${iam_role_arn}
 =======
+=======
+  persistence:
+    enabled: true
+    storageClass: ${rwo_storage_class}
+  replicas: 1
+>>>>>>> 54f31cf (unified config)
   resources:
     requests:
       cpu: 1m
       memory: 1Mi
     limits:
       cpu: 200m
       memory: 256Mi
-
+resultsCache:
+  enabled: false
 ruler:
+<<<<<<< HEAD
   resources:
     requests:
       cpu: 1m
@@ -271,6 +315,12 @@ ruler:
       memory: 256Mi
 
 >>>>>>> 98921ea (refactor chart values)
+=======
+  enabled: false
+serviceAccount:
+  annotations:
+    eks.amazonaws.com/role-arn: ${iam_role_arn}
+>>>>>>> 54f31cf (unified config)
 sidecar:
   image:
     repository: ${sidecar_image_repository}
@@ -297,15 +347,10 @@ write:
     limits:
       cpu: 200m
       memory: 256Mi
-
-
-serviceAccount:
-  annotations:
-    eks.amazonaws.com/role-arn: ${iam_role_arn}
-
+singleBinary:
+  replicas: 0
 test:
   enabled: false
-
 write:
   persistence:
     enabled: true

diff --git a/variables.tf b/variables.tf
@@ -65,18 +65,6 @@ variable "gateway_tag" {
   default     = "1.25.2-alpine"
 }
 
-variable "memcached_tag" {
-  description = "The version of memcached to use for the gateway."
-  type        = string
-  default     = "1.6.23-alpine"
-}
-
-variable "exporter_tag" {
-  description = "The version of prom/memcached-exporter to use for the gateway."
-  type        = string
-  default     = "v0.14.4"
-}
-
 variable "sidecar_tag" {
   description = "The version of kiwigrid/k8s-sidecar to use for the gateway."
   type        = string