Fix: ArgoCD 정상화 - loki 오류

중복되어 있던 파일 제거 후 다시 시도 Related to: #15
Sean-creative · May 7, 2024 · 5ae8659 · 5ae8659
1 parent bb8f0e2
commit 5ae8659
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 122 deletions.
diff --git a/charts/jsvill-chart/Chart.yaml b/charts/jsvill-chart/Chart.yaml
@@ -5,9 +5,9 @@ dependencies:
   - name: kube-prometheus-stack
     version: 58.4.0
     repository: https://prometheus-community.github.io/helm-charts
-#  - name: loki
-#    version: 6.5.0
-#    repository: https://grafana.github.io/helm-charts
-#  - name: promtail
-#    version: 6.15.5
-#    repository: https://grafana.github.io/helm-charts
+  - name: loki
+    version: 6.5.0
+    repository: https://grafana.github.io/helm-charts
+  - name: promtail
+    version: 6.15.5
+    repository: https://grafana.github.io/helm-charts
diff --git a/charts/jsvill-chart/templates/loki.yaml b/charts/jsvill-chart/templates/loki.yaml
diff --git a/charts/jsvill-chart/templates/prometheus.yaml b/charts/jsvill-chart/templates/prometheus.yaml
diff --git a/charts/jsvill-chart/templates/promtail.yaml b/charts/jsvill-chart/templates/promtail.yaml
diff --git a/charts/jsvill-chart/values.yaml b/charts/jsvill-chart/values.yaml
@@ -5,41 +5,41 @@ prometheus:
     adminUser: sean
     adminPassword: '1730'
 
-#loki:
-#  enabled: true
-#  schemaConfig:
-#    configs:
-#      - from: 2024-05-07
-#        store: boltdb-shipper
-#        object_store: filesystem
-#        schema: v11
-#        index:
-#          prefix: index_
-#          period: 24h
-#  minio:
-#    enabled: false
-#  loki:
-#    auth_enabled: false
-#  write:
-#    persistence:
-#      size: 3Gi
-#  read:
-#    persistence:
-#      size: 3Gi
-#  backend:
-#    persistence:
-#      size: 3Gi
-#  monitoring:
-#    selfMonitoring:
-#      grafanaAgent:
-#        installOperator: false
-#
-#promtail:
-#  scrape_configs:
-#    - job_name: jsvill-logs
-#      static_configs:
-#        - targets:
-#            - localhost
-#          labels:
-#            job: jsvill-helm
-#            __path__: /var/log/contains/*.log
+loki:
+  enabled: true
+  schemaConfig:
+    configs:
+      - from: 2024-05-07
+        store: boltdb-shipper
+        object_store: filesystem
+        schema: v11
+        index:
+          prefix: index_
+          period: 24h
+  minio:
+    enabled: false
+  loki:
+    auth_enabled: false
+  write:
+    persistence:
+      size: 3Gi
+  read:
+    persistence:
+      size: 3Gi
+  backend:
+    persistence:
+      size: 3Gi
+  monitoring:
+    selfMonitoring:
+      grafanaAgent:
+        installOperator: false
+
+promtail:
+  scrape_configs:
+    - job_name: jsvill-logs
+      static_configs:
+        - targets:
+            - localhost
+          labels:
+            job: jsvill-helm
+            __path__: /var/log/contains/*.log