Skip to content

Commit

Permalink
refactor chart values
Browse files Browse the repository at this point in the history
  • Loading branch information
@morga471
morga471 committed Apr 1, 2025
1 parent b8a5c25 commit 63c38f7
Show file tree
Hide file tree
Showing 2 changed files with 294 additions and 0 deletions.
109 changes: 109 additions & 0 deletions main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ resource "helm_release" "loki" {
provisioner_image_tag = module.images.images[local.provisioner_key].tag
gateway_image_repository = module.images.images[local.gateway_key].dest_repository
gateway_image_tag = module.images.images[local.gateway_key].tag
<<<<<<< HEAD
=======
canary_image_repository = module.images.images[local.canary_key].dest_repository
canary_image_tag = module.images.images[local.canary_key].tag
>>>>>>> 98921ea (refactor chart values)
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]
Expand All @@ -69,3 +74,107 @@ resource "helm_release" "loki" {
})
]
}
# # Storage-related dynamic configurations
# set {
# name = "loki.storage.bucketNames.chunks"
# value = module.loki_s3.s3_requested_bucket_name
# }
# set {
# name = "loki.storage.bucketNames.ruler"
# value = module.loki_s3.s3_requested_bucket_name
# }
# set {
# name = "loki.storage.bucketNames.admin"
# value = module.loki_s3.s3_requested_bucket_name
# }
# set {
# name = "loki.storage.type"
# value = "s3"
# }
# set {
# name = "loki.storage.s3.s3"
# value = format("s3://%v", var.region)
# }
# set {
# name = "loki.storage.s3.region"
# value = var.region
# }
# set {
# name = "loki.storage_config.aws.s3"
# value = format("s3://%v/%v",
# var.region,
# module.loki_s3.s3_requested_bucket_name
# )
# }
# # Storage class configurations
# set {
# name = "write.persistence.storageClass"
# value = var.rwo_storage_class
# }
# set {
# name = "backend.persistence.storageClass"
# value = var.rwo_storage_class
# }
# set {
# name = "read.persistence.storageClass"
# value = var.rwo_storage_class
# }
# # Image configurations for additional components
# set {
# name = "loki.provisioner.image.repository"
# value = split(":", module.images.images[local.provisioner_key].dest_full_path)[0]
# }
# set {
# name = "loki.provisioner.image.tag"
# value = module.images.images[local.provisioner_key].tag
# }
# set {
# name = "gateway.image.repository"
# value = module.images.images[local.gateway_key].dest_repository
# }
# set {
# name = "gateway.image.tag"
# value = module.images.images[local.gateway_key].tag
# }
# set {
# name = "lokiCanary.image.repository"
# value = module.images.images[local.canary_key].dest_repository
# }
# set {
# name = "lokiCanary.image.tag"
# value = module.images.images[local.canary_key].tag
# }
# set {
# name = "sidecar.image.repository"
# value = split(":", module.images.images[local.sidecar_key].dest_full_path)[0]
# }
# set {
# name = "sidecar.image.tag"
# value = module.images.images[local.sidecar_key].tag
# }
# set {
# name = "memcached.image.repository"
# value = split(":", module.images.images[local.memcached_key].dest_full_path)[0]
# }
# set {
# name = "memcached.image.tag"
# value = module.images.images[local.memcached_key].tag
# }
# set {
# name = "memcachedExporter.image.repository"
# value = split(":", module.images.images[local.exporter_key].dest_full_path)[0]
# }
# set {
# name = "memcachedExporter.image.tag"
# value = module.images.images[local.exporter_key].tag
# }
# }
185 changes: 185 additions & 0 deletions values/loki.yml.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ global:

# Main Loki configuration
loki:
<<<<<<< HEAD
auth_enabled: false
image:
repository: ${loki_image_repository}
Expand All @@ -22,11 +23,35 @@ loki:
max_streams_per_user: 1000
query_timeout: 300s
retention_period: 2160h
=======
image:
repository: ${loki_image_repository}
tag: ${loki_image_tag}
auth_enabled: false
analytics:
reporting_enabled: true
use_thanos_objstore: true
# Storage configuration
storage:
type: s3
bucketNames:
chunks: ${s3_bucket_name}
ruler: ${s3_bucket_name}
admin: ${s3_bucket_name}
s3:
s3: s3://${region}
region: ${region}
storage_config:
aws:
s3: s3://${region}/${s3_bucket_name}

>>>>>>> 98921ea (refactor chart values)
# Provisioner settings
provisioner:
image:
repository: ${provisioner_image_repository}
tag: ${provisioner_image_tag}
<<<<<<< HEAD
querier:
max_concurrent: 4
replication_factor: 1
Expand Down Expand Up @@ -56,10 +81,29 @@ loki:


backend:
=======

schemaConfig:
configs:
- from: 2024-04-01
index:
period: 24h
prefix: index_
object_store: s3
schema: v13
store: tsdb

backend:
persistence:
enabled: true
storageClass: ${rwo_storage_class}
replicas: 1
>>>>>>> 98921ea (refactor chart values)
autoscaling:
enabled: true
minReplicas: 1
targetCPUUtilizationPercentage: 80
<<<<<<< HEAD
persistence:
storageClass: ${rwo_storage_class}
replicas: 3
Expand All @@ -80,13 +124,39 @@ compactor:
replicas: 0
distributer:
replicas: 0
=======
resources:
requests:
cpu: 1m
memory: 1Mi
limits:
cpu: 200m
memory: 256Mi

compactor:
working_directory: /loki/compactor
shared_store: s3
compaction_interval: 10m
retention_enabled: true
retention_delete_delay: 2h
retention_delete_worker_count: 150
resources:
requests:
cpu: 1m
memory: 1Mi
limits:
cpu: 200m
memory: 256Mi

>>>>>>> 98921ea (refactor chart values)
gateway:
image:
repository: ${gateway_image_repository}
tag: ${gateway_image_tag}
autoscaling:
enabled: true
targetCPUUtilizationPercentage: 80
<<<<<<< HEAD
replicas: 1
resources:
requests:
Expand Down Expand Up @@ -116,10 +186,67 @@ queryFrontend:
queryScheduler:
replicas: 0
read:
=======
resources:
requests:
cpu: 1m
memory: 1Mi
limits:
cpu: 100m
memory: 128Mi

lokiCanary:
enabled: false
image:
repository: ${canary_image_repository}
tag: ${canary_image_tag}
resources:
requests:
cpu: 1m
memory: 1Mi
limits:
cpu: 100m
memory: 128Mi

memcached:
chunk_cache:
enabled: true
results_cache:
enabled: true
image:
repository: ${memcached_image_repository}
tag: ${memcached_image_tag}
resources:
requests:
cpu: 1m
memory: 1Mi
limits:
cpu: 200m
memory: 256Mi

memcachedExporter:
image:
repository: ${exporter_image_repository}
tag: ${exporter_image_tag}
resources:
requests:
cpu: 1m
memory: 1Mi
limits:
cpu: 200m
memory: 256Mi

read:
persistence:
enabled: true
storageClass: ${rwo_storage_class}
replicas: 1
>>>>>>> 98921ea (refactor chart values)
autoscaling:
enabled: true
minReplicas: 1
targetCPUUtilizationPercentage: 80
<<<<<<< HEAD
replicas: 3
resources:
requests:
Expand All @@ -135,12 +262,32 @@ ruler:
serviceAccount:
annotations:
eks.amazonaws.com/role-arn: ${iam_role_arn}
=======
resources:
requests:
cpu: 1m
memory: 1Mi
limits:
cpu: 200m
memory: 256Mi

ruler:
resources:
requests:
cpu: 1m
memory: 1Mi
limits:
cpu: 200m
memory: 256Mi

>>>>>>> 98921ea (refactor chart values)
sidecar:
image:
repository: ${sidecar_image_repository}
tag: ${sidecar_image_tag}
resources:
requests:
<<<<<<< HEAD
cpu: 10m
memory: 128Mi
limits:
Expand All @@ -154,14 +301,52 @@ write:
persistence:
storageClass: ${rwo_storage_class}
replicas: 3
=======
cpu: 1m
memory: 1Mi
limits:
cpu: 200m
memory: 256Mi


memberlist:
service:
publishNotReadyAddresses: false

serviceAccount:
annotations:
eks.amazonaws.com/role-arn: ${iam_role_arn}

test:
enabled: false

write:
persistence:
enabled: true
storageClass: ${rwo_storage_class}
replicas: 1
>>>>>>> 98921ea (refactor chart values)
autoscaling:
enabled: true
minReplicas: 1
targetCPUUtilizationPercentage: 80
resources:
requests:
<<<<<<< HEAD
cpu: 10m
memory: 128Mi
limits:
cpu: 1000m
memory: 512Mi
=======
cpu: 1m
memory: 1Mi
limits:
cpu: 200m
memory: 256Mi
extraVolumesMounts:
- name: data
mountPath: /loki
extraVolumes:
- name: loki
>>>>>>> 98921ea (refactor chart values)

0 comments on commit 63c38f7

Please sign in to comment.