Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 6 additions & 18 deletions apps/logs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ metadata:
spec:
project: default
source:
repoURL: https://grafana.github.io/helm-charts
repoURL: https://grafana-community.github.io/helm-charts
chart: loki
targetRevision: 6.30.1
targetRevision: 17.4.0
helm:
values: |
deploymentMode: SingleBinary
deploymentMode: Monolithic

loki:
auth_enabled: false
Expand All @@ -37,11 +37,12 @@ spec:
limits_config:
allow_structured_metadata: true

singleBinary:
monolithic:
replicas: 1

persistence:
enabled: true
type: pvc
storageClass: local-path
size: 20Gi

Expand All @@ -62,15 +63,6 @@ spec:
test:
enabled: false

backend:
replicas: 0

read:
replicas: 0

write:
replicas: 0

chunksCache:
enabled: false

Expand All @@ -79,7 +71,6 @@ spec:

minio:
enabled: false

destination:
server: https://kubernetes.default.svc
namespace: monitoring
Expand All @@ -99,17 +90,15 @@ metadata:
- resources-finalizer.argocd.argoproj.io
spec:
project: default

source:
repoURL: https://grafana.github.io/helm-charts
chart: promtail
targetRevision: 6.17.0

helm:
values: |
config:
clients:
- url: http://grafana-loki.monitoring.svc.cluster.local:3100/loki/api/v1/push
- url: http://loki-monolithic.monitoring.svc.cluster.local:3100/loki/api/v1/push

resources:
requests:
Expand All @@ -118,7 +107,6 @@ spec:
limits:
cpu: 100m
memory: 100Mi

destination:
server: https://kubernetes.default.svc
namespace: monitoring
Expand Down
15 changes: 7 additions & 8 deletions apps/monitoring.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,13 @@ spec:
loadBalancerClass: tailscale
annotations:
tailscale.com/hostname: "monitoring-grafana"
additionalDataSources:
- name: Loki
type: loki
access: proxy
url: http://grafana-loki.monitoring.svc.cluster.local:3100
jsonData:
maxLines: 1000
editable: true
additionalDataSources:
- name: Loki
type: loki
access: proxy
url: http://loki-monolithic.monitoring.svc.cluster.local:3100
jsonData:
maximumAlerts: 11

kube-state-metrics:
enabled: true
Expand Down
Loading