loki simple scalable

charlie-haley · Dec 8, 2023 · 826e0d7 · 826e0d7
1 parent 97bc9e2
commit 826e0d7
Showing 1 changed file with 13 additions and 92 deletions.
diff --git a/kubernetes/manifests/apps/observability/loki.yaml b/kubernetes/manifests/apps/observability/loki.yaml
@@ -35,108 +35,29 @@ values:
             index:
               prefix: loki_index_
               period: 24h
-      common:
-        path_prefix: /var/loki
-        replication_factor: 3
-        storage:
-          s3:
-            s3: null
-            insecure: true
-            s3forcepathstyle: true
-        ring:
-          kvstore:
-            store: memberlist
-      ruler:
-        enable_api: true
-        enable_alertmanager_v2: true
-        alertmanager_url: http://kube-prometheus-stack-alertmanager:9093
-        storage:
-          type: local
-          local:
-            directory: /rules
-        rule_path: /tmp/scratch
-        ring:
-          kvstore:
-            store: memberlist
-      distributor:
-        ring:
-          kvstore:
-            store: memberlist
-      compactor:
-        working_directory: /var/loki/boltdb-shipper-compactor
-        shared_store: s3
-        compaction_interval: 10m
-        retention_enabled: true
-        retention_delete_delay: 2h
-        retention_delete_worker_count: 150
-      ingester:
-        max_chunk_age: 1h
-        lifecycler:
-          ring:
-            kvstore:
-              store: memberlist
-      analytics:
-        reporting_enabled: false
-  gateway:
-    enabled: true
-    replicas: 3
-    deploymentStrategy:
-      type: RollingUpdate
-      rollingUpdate:
-        maxSurge: 1
-        maxUnavailable: 1
-    ingress:
-      enabled: true
-      ingressClassName: "nginx"
-      annotations:
-        hajimari.io/enable: "false"
-      hosts:
-        - host: &host "loki.${SECRET_PUBLIC_DOMAIN}"
-          paths:
-            - path: /
-              pathType: Prefix
-      tls:
-        - hosts:
-            - *host
-  write:
-    replicas: 3
-    persistence:
-      size: 10Gi
-      storageClass: ceph-block
-  read:
-    replicas: 3
-    extraVolumeMounts:
-      - name: loki-rules
-        mountPath: /rules/fake
-      - name: loki-rules-tmp
-        mountPath: /tmp/scratch
-      - name: loki-tmp
-        mountPath: /tmp/loki-tmp
-    extraVolumes:
-      - name: loki-rules
-        configMap:
-          name: loki-alerting-rules
-      - name: loki-rules-tmp
-        emptyDir: {}
-      - name: loki-tmp
-        emptyDir: {}
-    persistence:
-      size: 10Gi
-      storageClass: ceph-block
+    storage:
+      bucketNames:
+        chunks: chunks
+        ruler: ruler
+        admin: admin
+      type: s3
+      s3:
+        s3ForcePathStyle: false
+        insecure: true
   valuesFrom:
-    - targetPath: loki.structuredConfig.common.storage.s3.bucketnames
+    - targetPath: loki.storage.s3.bucketnames
       kind: ConfigMap
       name: loki-v1
       valuesKey: BUCKET_NAME
-    - targetPath: loki.structuredConfig.common.storage.s3.endpoint
+    - targetPath: loki.storage.s3.endpoint
       kind: ConfigMap
       name: loki-v1
       valuesKey: BUCKET_HOST
-    - targetPath: loki.structuredConfig.common.storage.s3.access_key_id
+    - targetPath: loki.storage.s3.access_key_id
       kind: Secret
       name: loki-v1
       valuesKey: AWS_ACCESS_KEY_ID
-    - targetPath: loki.structuredConfig.common.storage.s3.secret_access_key
+    - targetPath: loki.storage.s3.secret_access_key
       kind: Secret
       name: loki-v1
       valuesKey: AWS_SECRET_ACCESS_KEY