From 5ae865977930f5df6eb42e5fb175fe57c6f20102 Mon Sep 17 00:00:00 2001
From: Sean-notebook <ksw6125000@naver.com>
Date: Tue, 7 May 2024 16:54:20 +0900
Subject: [PATCH] =?UTF-8?q?Fix:=20ArgoCD=20=EC=A0=95=EC=83=81=ED=99=94=20-?=
 =?UTF-8?q?=20loki=20=EC=98=A4=EB=A5=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

중복되어 있던 파일 제거 후 다시 시도

Related to: #15
---
 charts/jsvill-chart/Chart.yaml                | 12 +--
 charts/jsvill-chart/templates/loki.yaml       | 27 -------
 charts/jsvill-chart/templates/prometheus.yaml | 35 ---------
 charts/jsvill-chart/templates/promtail.yaml   | 16 ----
 charts/jsvill-chart/values.yaml               | 76 +++++++++----------
 5 files changed, 44 insertions(+), 122 deletions(-)
 delete mode 100644 charts/jsvill-chart/templates/loki.yaml
 delete mode 100644 charts/jsvill-chart/templates/prometheus.yaml
 delete mode 100644 charts/jsvill-chart/templates/promtail.yaml

diff --git a/charts/jsvill-chart/Chart.yaml b/charts/jsvill-chart/Chart.yaml
index 9c1df56..328db26 100644
--- 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
\ No newline at end of file
+  - 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
\ No newline at end of file
diff --git a/charts/jsvill-chart/templates/loki.yaml b/charts/jsvill-chart/templates/loki.yaml
deleted file mode 100644
index 1c83ce2..0000000
--- a/charts/jsvill-chart/templates/loki.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-apiVersion: v2
-name: loki
-description: A Helm chart for Loki in Kubernetes
-version: 5.41.8
-appVersion: "1.0"
-
-# Default values for loki.
-# values from values-loki.yaml
-minio:
-  enabled: true
-  size: 3Gi
-loki:
-  auth_enabled: false
-write:
-  persistence:
-    size: 3Gi
-read:
-  persistence:
-    size: 3Gi
-backend:
-  persistence:
-    size: 3Gi
-
-monitoring:
-  selfMonitoring:
-    grafanaAgent:
-      installOperator: false
diff --git a/charts/jsvill-chart/templates/prometheus.yaml b/charts/jsvill-chart/templates/prometheus.yaml
deleted file mode 100644
index 40f3fe5..0000000
--- a/charts/jsvill-chart/templates/prometheus.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-apiVersion: v2
-name: prometheus
-description: A Helm chart for Prometheus Stack in Kubernetes
-version: 56.2.0
-appVersion: "1.0"
-
-
-# Default values for kube-prometheus-stack.
-# values from values-prometheus.yaml
-prometheus:
-  prometheusSpec:
-    storageSpec:
-      volumeClaimTemplate:
-        spec:
-          accessModes: [ "ReadWriteOnce" ]
-          resources:
-            requests:
-              storage: 3Gi
-grafana:
-  grafana.ini:
-    server:
-      domain: 35.221.202.91
-  service:
-    type: LoadBalancer
-    loadBalancerIP: 35.221.202.91
-  adminUser: sean
-  adminPassword: '1730'
-  persistence:
-    type: pvc
-    enabled: true
-    accessModes:
-      - ReadWriteOnce
-    size: 3Gi
-    finalizers:
-      - kubernetes.io/pvc-protection
diff --git a/charts/jsvill-chart/templates/promtail.yaml b/charts/jsvill-chart/templates/promtail.yaml
deleted file mode 100644
index 9c31775..0000000
--- a/charts/jsvill-chart/templates/promtail.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-apiVersion: v2
-name: promtail
-description: A Helm chart for Promtail in Kubernetes
-version: 6.15.4
-appVersion: "1.0"
-
-# Default values for promtail.
-# values from values-promtail.yaml
-scrape_configs:
-  - job_name: jsvill-logs
-    static_configs:
-      - targets:
-          - localhost
-        labels:
-          job: jsvill-helm
-          __path__: /var/log/contains/*.log
diff --git a/charts/jsvill-chart/values.yaml b/charts/jsvill-chart/values.yaml
index 2d4e0e9..6c14258 100644
--- 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