diff --git a/ansible/roles/apps/templates/monitoring-settings.yaml b/ansible/roles/apps/templates/monitoring-settings.yaml
index c367320591d0af222cd4e5b552d79c7f2ff595f8..aec6541f960e880793446ce534849cd49467f6ad 100644
--- a/ansible/roles/apps/templates/monitoring-settings.yaml
+++ b/ansible/roles/apps/templates/monitoring-settings.yaml
@@ -136,3 +136,9 @@ grafana:
     enabled: true
     size: 2Gi
     accessModes: ["ReadWriteOnce"]
+
+  additionalDataSources:
+  - name: Loki
+    url: http://loki-stack.oas.svc.cluster.local:3100
+    type: loki
+    access: proxy
diff --git a/docs/maintenance.md b/docs/maintenance.md
index 180dfa4b04369187e6eef8bd360a13a41fab6356..e38abcb3ff27fd7a72b5c9f494ac1098c1d62cb1 100644
--- a/docs/maintenance.md
+++ b/docs/maintenance.md
@@ -1,5 +1,22 @@
 # Maintaining an Openappstack cluster
 
+## Logging
+
+Logs from pods and containers can be read in different ways:
+
+* In the cluster filesystem at `/var/log/pods/` or `/var/logs/containers/`.
+* Using [kubectl logs](https://kubectl.docs.kubernetes.io/pages/container_debugging/container_logs.html).
+* Querying aggregated logs with grafana, see below.
+
+## Central log aggregation
+
+We use [promtail](https://github.com/grafana/loki/tree/master/docs/clients/promtail),
+[Loki](https://grafana.com/oss/loki/) and [grafana](https://grafana.com/) for
+easy access of aggregated logs.
+The [Loki documentation](https://github.com/grafana/loki#documentation) is a
+good starting point how this setup works, and the [Using Loki in Grafana](https://grafana.com/docs/grafana/latest/features/datasources/loki/)
+gets you started with querying your cluster logs with grafana.
+
 ## Backup
 
 Please take care to backup the following locations:
diff --git a/flux/loki-stack.yml b/flux/loki-stack.yml
new file mode 100644
index 0000000000000000000000000000000000000000..c697ef9302f2a96decad02c4566d28b18c9a9336
--- /dev/null
+++ b/flux/loki-stack.yml
@@ -0,0 +1,14 @@
+---
+apiVersion: helm.fluxcd.io/v1
+kind: HelmRelease
+metadata:
+  name: loki-stack
+  namespace: oas
+  annotations:
+    flux.weave.works/automated: "false"
+spec:
+  releaseName: loki-stack
+  chart:
+    repository: https://grafana.github.io/loki/charts
+    name: loki-stack
+    version: 0.24.0