diff --git a/production/helm/README.md b/production/helm/README.md index 2e204ef33f45d76fc10a0907d1ca8369a9a49203..36b55906218cb01479bf44d8de4bf2740f9f10b9 100644 --- a/production/helm/README.md +++ b/production/helm/README.md @@ -26,7 +26,7 @@ $ helm install . -n loki --namespace <YOUR-NAMESPACE> To install Grafana on your cluster with helm, use the following command: ```bash -$ helm install stable/grafana -n loki-grafana -f grafana.yaml --namespace <YOUR-NAMESPACE> +$ helm install stable/grafana -n loki-grafana -f grafana.yaml --namespace <YOUR-NAMESPACE> ``` To get the admin password for the Grafana pod, run the following command: diff --git a/production/helm/templates/loki/deployment.yaml b/production/helm/templates/loki/deployment.yaml index d8dab0363723c626de39b478dbeda63b4d175a58..c8dc8bf1a4ab0c1071bf4e20b82bc38af46c63ac 100644 --- a/production/helm/templates/loki/deployment.yaml +++ b/production/helm/templates/loki/deployment.yaml @@ -40,7 +40,7 @@ spec: - name: {{ .Chart.Name }} image: "{{ .Values.loki.image.repository }}:{{ .Values.loki.image.tag }}" imagePullPolicy: {{ .Values.loki.image.pullPolicy }} - args: + args: - "-config.file=/etc/loki/loki.yaml" volumeMounts: - name: config diff --git a/production/helm/templates/promtail/clusterrole.yaml b/production/helm/templates/promtail/clusterrole.yaml index 84bff8d2e3f6e04f2ec446964090c59e20abc240..8a1f20702936a33c04f1d1f76892202d63516b45 100644 --- a/production/helm/templates/promtail/clusterrole.yaml +++ b/production/helm/templates/promtail/clusterrole.yaml @@ -19,6 +19,6 @@ rules: - nodes/proxy - services - endpoints - - pods + - pods verbs: ["get", "watch", "list"] {{- end}} \ No newline at end of file diff --git a/production/helm/templates/promtail/daemonset.yaml b/production/helm/templates/promtail/daemonset.yaml index 8da09af44c6de506081f707c6786d8d16b8cd85c..8e897b7016c66797784a5ed21157407458faa4e5 100644 --- a/production/helm/templates/promtail/daemonset.yaml +++ b/production/helm/templates/promtail/daemonset.yaml @@ -40,7 +40,7 @@ spec: - name: {{ .Chart.Name }} image: "{{ .Values.promtail.image.repository }}:{{ .Values.promtail.image.tag }}" imagePullPolicy: {{ .Values.promtail.image.pullPolicy }} - args: + args: - "-config.file=/etc/promtail/promtail.yaml" - "-client.url=http://{{ template "loki.fullname" . }}:{{ .Values.loki.service.port }}/api/prom/push" volumeMounts: diff --git a/production/helm/values.yaml b/production/helm/values.yaml index 4f182706d8799b67505fb1e65a54fff0ef9cc0dd..ae55dfec2d31505a49f5b7c898076ecfbdf3df3b 100644 --- a/production/helm/values.yaml +++ b/production/helm/values.yaml @@ -4,9 +4,9 @@ rbac: serviceAccount: create: true - name: + name: -loki: +loki: replicas: 1 deploymentStrategy: RollingUpdate @@ -58,13 +58,15 @@ loki: ## Enable persistence using Persistent Volume Claims ## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/ - ## + ## If you set enabled as "True", you need : + ## - create a pv which above 10Gi and has same namespace with loki + ## - keep storageClassName same with below setting persistence: - enabled: true + enabled: false accessModes: - ReadWriteOnce size: 10Gi - # storageClassName: default + storageClassName: default # annotations: {} # subPath: "" # existingClaim: @@ -97,7 +99,7 @@ promtail: image: repository: grafana/promtail - tag: master + tag: master pullPolicy: IfNotPresent service: