Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
1c55b5c
kv for new tenant
gitafolabi Jun 21, 2026
dc77bc2
fix: correct KV URL, tenant ID, secret key names and disable service-…
gitafolabi Jun 21, 2026
b615ba1
feat: enable Grafana, Prometheus and Alertmanager in kube-prometheus-…
gitafolabi Jun 21, 2026
a4ecd1c
fix eso for grafana
gitafolabi Jun 21, 2026
116c346
Merge branch 'main' into fix/kv-config
gitafolabi Jun 21, 2026
d84db8d
fix: move Loki datasource to Helm values, disable sidecar to prevent …
gitafolabi Jun 21, 2026
e3fb05d
fix: disable default datasource provisioning, define Prometheus and L…
gitafolabi Jun 21, 2026
e293496
Merge branch 'main' into fix/kv-config
gitafolabi Jun 21, 2026
aab8be8
fix: set loki datasource isDefault false to resolve Grafana dual-defa…
gitafolabi Jun 21, 2026
99c0ff8
Merge branch 'main' into fix/kv-config
gitafolabi Jun 21, 2026
1bbef4d
fix: disable grafana sidecar to prevent loki-stack ConfigMap conflict
gitafolabi Jun 21, 2026
017b3e8
fix: ignore loki-stack datasource ConfigMap diff to allow isDefault o…
gitafolabi Jun 21, 2026
cba1c9b
fix: update monitoring ingress service names to match prometheus-oper…
gitafolabi Jun 21, 2026
eb34366
fix: add all datasources via additionalDataSources since sidecar is d…
gitafolabi Jun 21, 2026
6148979
fix: disable prometheus operator admission webhooks to resolve TLS ce…
gitafolabi Jun 21, 2026
1d72fc3
ix: use cert-manager for prometheus operator admission webhook TLS
gitafolabi Jun 21, 2026
a1fe630
feat: upgrade loki to 3.x (chart 6.7.4) and split promtail into separ…
gitafolabi Jun 21, 2026
4aa467b
Merge branch 'main' into fix/kv-config
gitafolabi Jun 21, 2026
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
1 change: 1 addition & 0 deletions gitops/kustomization.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ resources:
- grafana-external-secret.yml
- cert-manager-argo.yml
- loki.yml
- promtail.yml
# ELK stack — commented out to avoid resource exhaustion; uncomment to deploy:
# - elasticsearch-argo.yml
# - logstash-argo.yml
Expand Down
74 changes: 46 additions & 28 deletions gitops/loki.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,42 +9,60 @@ spec:
project: default
source:
repoURL: 'https://grafana.github.io/helm-charts'
chart: loki-stack
targetRevision: 2.10.2
chart: loki
targetRevision: 6.7.4
helm:
values: |
deploymentMode: SingleBinary

loki:
enabled: true
auth_enabled: false
commonConfig:
replication_factor: 1
storage:
type: filesystem
schemaConfig:
configs:
- from: "2024-04-01"
store: tsdb
object_store: filesystem
schema: v13
index:
prefix: loki_index_
period: 24h

singleBinary:
replicas: 1
resources:
requests:
cpu: 50m
memory: 64Mi
cpu: 100m
memory: 128Mi
limits:
cpu: 100m
memory: 128Mi
persistence:
enabled: false # prod: true, storageClassName: default, size: 10Gi
config:
table_manager:
retention_deletes_enabled: true
retention_period: 168h # 7 days
promtail:
enabled: true
resources:
requests:
cpu: 25m
memory: 32Mi
limits:
cpu: 50m
memory: 64Mi
grafana:
cpu: 200m
memory: 256Mi

read:
replicas: 0
write:
replicas: 0
backend:
replicas: 0

chunksCache:
enabled: false
resultsCache:
enabled: false

minio:
enabled: false

gateway:
enabled: false
sidecar:
datasources:
isDefaultDatasource: false
prometheus:

test:
enabled: false
fluent-bit:

lokiCanary:
enabled: false
destination:
server: 'https://kubernetes.default.svc'
Expand Down
34 changes: 34 additions & 0 deletions gitops/promtail.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: promtail
namespace: argocd
annotations:
argocd.argoproj.io/sync-wave: "3"
spec:
project: default
source:
repoURL: 'https://grafana.github.io/helm-charts'
chart: promtail
targetRevision: 6.16.6
helm:
values: |
config:
clients:
- url: http://loki-stack:3100/loki/api/v1/push
resources:
requests:
cpu: 25m
memory: 32Mi
limits:
cpu: 50m
memory: 64Mi
destination:
server: 'https://kubernetes.default.svc'
namespace: monitoring
syncPolicy:
automated:
prune: true
selfHeal: true
syncOptions:
- CreateNamespace=true
Loading