diff --git a/ansible/roles/monitoring/docker-stack.yml.j2 b/ansible/roles/monitoring/docker-stack.yml.j2
index c8639bc..cf1253c 100644
--- a/ansible/roles/monitoring/docker-stack.yml.j2
+++ b/ansible/roles/monitoring/docker-stack.yml.j2
@@ -4,6 +4,7 @@ version: "3.8"
 networks:
   traefik:
     external: true
+  grafana:
 
 configs:
   esdatasource:
@@ -80,6 +81,7 @@ services:
     image: grafana/grafana-oss
     networks:
       - traefik
+      - grafana
     deploy:
       labels:
         - traefik.enable=true
@@ -100,6 +102,21 @@ services:
       - source: esdatasource
         target: /etc/grafana/provisioning/datasources/elasticsearch.yaml
 
+  grafana-ntfy:
+    image: kittyandrew/grafana-to-ntfy:master
+    ports:
+      - 8080:8080
+    networks:
+      grafana:
+        aliases:
+          - grafana-ntfy
+    environment:
+      - NTFY_URL=https://ntfy.kun.is/alerts
+      - NTFY_BAUTH_USER=pim
+      - NTFY_BAUTH_PASS=p2UfXybMxTRtEBT4FHnXzmHnvoha9ducIrTo19rK
+      - BAUTH_USER=admin
+      - BAUTH_PASS=test
+
   fluentd:
     image: git.kun.is/pim/fluentd:1.0.1
     ports:
diff --git a/ansible/roles/monitoring/elasticsearch.yml.j2 b/ansible/roles/monitoring/elasticsearch.yml.j2
index c2aa853..aeb30af 100644
--- a/ansible/roles/monitoring/elasticsearch.yml.j2
+++ b/ansible/roles/monitoring/elasticsearch.yml.j2
@@ -17,3 +17,11 @@ datasources:
     jsonData:
       index: 'fluentd.memory-*'
       timeField: '@timestamp'
+
+  - name: diskfree
+    type: elasticsearch
+    access: proxy
+    url: http://maestro.dmz:{{ elasticsearch_port }}
+    jsonData:
+      index: 'fluentd.diskfree-*'
+      timeField: '@timestamp'
diff --git a/terraform/elasticsearch/main.tf b/terraform/elasticsearch/main.tf
index a1fbe06..818dba0 100644
--- a/terraform/elasticsearch/main.tf
+++ b/terraform/elasticsearch/main.tf
@@ -30,7 +30,7 @@ resource "elasticstack_elasticsearch_index_template" "metrics_template" {
   name = "metrics_template"
 
   priority = 42
-  index_patterns = ["fluentd.cpu*", "fluentd.memory*"]
+  index_patterns = ["fluentd.cpu-*", "fluentd.memory-*", "fluentd.diskfree-*"]
 
   template {
     settings = jsonencode({