diff --git a/loki/helm-values.yaml b/loki/helm-values.yaml index 9f8a965..11f7f3b 100644 --- a/loki/helm-values.yaml +++ b/loki/helm-values.yaml @@ -1,35 +1,23 @@ # Loki Helm Values # Chart: https://grafana.github.io/helm-charts -# Single binary deployment with S3 (MinIO) storage +# Single binary deployment with local filesystem storage loki: - # Use S3 storage (MinIO) + # Use filesystem storage (local-path PVC) storage: - type: s3 - s3: - endpoint: http://minio.minio.svc.cluster.local:9000 - region: us-east-1 - bucketNames: - chunks: loki - ruler: loki - admin: loki - s3ForcePathStyle: true - insecure: true - bucketNames: - chunks: loki - ruler: loki - admin: loki + type: filesystem # Single binary mode with 1 replica commonConfig: replication_factor: 1 + path_prefix: /var/loki - # Schema config + # Schema config - filesystem backend schemaConfig: configs: - from: "2024-01-01" store: tsdb - object_store: s3 + object_store: filesystem schema: v13 index: prefix: index_ @@ -51,23 +39,16 @@ deploymentMode: SingleBinary singleBinary: replicas: 1 persistence: - enabled: false - # Run on master node for stability (consistent with Thanos/Tempo) + enabled: true + storageClass: local-path + size: 10Gi + # Run on master node for stability tolerations: - key: node-role.kubernetes.io/control-plane operator: Exists effect: NoSchedule nodeSelector: node-role.kubernetes.io/control-plane: "true" - extraEnvFrom: - - secretRef: - name: minio-s3-credentials - extraVolumes: - - name: loki-data - emptyDir: {} - extraVolumeMounts: - - name: loki-data - mountPath: /var/loki resources: requests: cpu: 23m diff --git a/tempo/helm-values.yaml b/tempo/helm-values.yaml index f307bbe..66852f0 100644 --- a/tempo/helm-values.yaml +++ b/tempo/helm-values.yaml @@ -3,7 +3,7 @@ # # Architecture: # - Single binary (monolithic) mode for small clusters -# - MinIO S3 for trace storage +# - Local filesystem for trace storage # - OTLP receiver for OpenTelemetry data # - Integrates with Grafana for trace visualization @@ -41,17 +41,14 @@ tempo: # Retention settings retention: 72h # Keep traces for 3 days - # Backend storage (MinIO S3) - # Uses environment variable expansion + # Backend storage (local filesystem) storage: trace: - backend: s3 - s3: - bucket: tempo - endpoint: minio.minio.svc.cluster.local:9000 - access_key: ${S3_ACCESS_KEY} - secret_key: ${S3_SECRET_KEY} - insecure: true + backend: local + local: + path: /var/tempo/traces + wal: + path: /var/tempo/wal # Query settings querier: @@ -63,30 +60,13 @@ tempo: enabled: true remoteWriteUrl: http://prometheus-kube-prometheus-prometheus.prometheus.svc:9090/api/v1/write - # Enable environment variable expansion in config - extraArgs: - config.expand-env: "true" - - # Environment variables from secret for S3 credentials - extraEnv: - - name: S3_ACCESS_KEY - valueFrom: - secretKeyRef: - name: tempo-s3-secret - key: S3_ACCESS_KEY - - name: S3_SECRET_KEY - valueFrom: - secretKeyRef: - name: tempo-s3-secret - key: S3_SECRET_KEY - # ============================================================================= -# Persistence (local cache) +# Persistence (local-path PVC) # ============================================================================= persistence: enabled: true storageClassName: local-path - size: 2Gi + size: 5Gi # ============================================================================= # Service