diff --git a/aws-reference/lma/site-values.yaml b/aws-reference/lma/site-values.yaml index 3d8d49a..ca7c4cd 100644 --- a/aws-reference/lma/site-values.yaml +++ b/aws-reference/lma/site-values.yaml @@ -16,6 +16,8 @@ global: lokiHost: loki-loki-distributed-gateway lokiPort: 80 + lokiuserHost: loki-loki-user-distributed-gateway + lokiuserPort: 80 s3Service: "minio.lma.svc:9000" # depends on $lmaNameSpace (ex. minio.taco-system.svc) lmaNameSpace: lma @@ -148,13 +150,17 @@ charts: - name: taco-loki host: $(lokiHost) port: $(lokiPort) + lokiuser: + - name: taco-loki-user + host: $(lokiuserHost) + port: $(lokiuserPort) targetLogs: - tag: kube.* bufferChunkSize: 2M bufferMaxSize: 5M - do_not_store_as_default: true + do_not_store_as_default: false index: container - loki_name: taco-loki + loki_name: taco-loki-user memBufLimit: 20MB multi_index: - index: platform @@ -244,7 +250,6 @@ charts: consoleIngress.nodeSelector: $(nodeSelector) postJob.nodeSelector: $(nodeSelector) - - name: thanos override: global.storageClass: $(storageClassName) @@ -341,6 +346,37 @@ charts: aws: s3: http://$(defaultUser):$(defaultPassword)@$(s3Service)/minio +- name: loki-user + override: + global.dnsService: kube-dns + # global.clusterDomain: $(clusterName) # annotate cluste because the cluster name is still cluster.local regardless cluster + gateway.service.type: LoadBalancer + gateway.service.annotations: $(awsNlbAnnotation) + ingester.persistence.storageClass: $(storageClassName) + distributor.persistence.storageClass: $(storageClassName) + queryFrontend.persistence.storageClass: $(storageClassName) + ruler.persistence.storageClass: $(storageClassName) + indexGateway.persistence.storageClass: $(storageClassName) + # select target node's label + ingester.nodeSelector: $(nodeSelector) + distributor.nodeSelector: $(nodeSelector) + querier.nodeSelector: $(nodeSelector) + queryFrontend.nodeSelector: $(nodeSelector) + queryScheduler.nodeSelector: $(nodeSelector) + tableManager.nodeSelector: $(nodeSelector) + gateway.nodeSelector: $(nodeSelector) + compactor.nodeSelector: $(nodeSelector) + ruler.nodeSelector: $(nodeSelector) + indexGateway.nodeSelector: $(nodeSelector) + memcachedChunks.nodeSelector: $(nodeSelector) + memcachedFrontend.nodeSelector: $(nodeSelector) + memcachedIndexQueries.nodeSelector: $(nodeSelector) + memcachedIndexWrites.nodeSelector: $(nodeSelector) + loki: + storageConfig: + aws: + s3: http://$(defaultUser):$(defaultPassword)@$(s3Service)/minio + - name: lma-bucket override: s3.enabled: true