diff --git a/grafana-influx/docker-compose.yml b/grafana-influx/docker-compose.yml
index e03b3ce..6a15b3b 100644
--- a/grafana-influx/docker-compose.yml
+++ b/grafana-influx/docker-compose.yml
@@ -29,6 +29,26 @@ services:
       caddy: grafana.dmeiburg.de
       caddy.reverse_proxy: "{{upstreams 3000}}"
 
+  mosquitto:
+    image: eclipse-mosquitto:latest
+    container_name: mosquitto
+    restart: unless-stopped
+    ports:
+      - "1883:1883"
+      - "9001:9001"
+    volumes:
+      - ./mosquitto.conf:/mosquitto/config/mosquitto.conf
+
+  telegraf:
+    image: telegraf
+    container_name: telegraf
+    restart: unless-stopped
+    volumes:
+      - ./telegraf.conf:/etc/telegraf/telegraf.conf:ro
+    depends_on:
+      - mosquitto
+      - influxdb
+
 volumes:
   influxdb-data:
   grafana-data:
diff --git a/grafana-influx/mosquitto.conf b/grafana-influx/mosquitto.conf
new file mode 100644
index 0000000..c8348ac
--- /dev/null
+++ b/grafana-influx/mosquitto.conf
@@ -0,0 +1,2 @@
+listener 1883
+allow_anonymous true
diff --git a/grafana-influx/telegraf.conf b/grafana-influx/telegraf.conf
new file mode 100644
index 0000000..e85800b
--- /dev/null
+++ b/grafana-influx/telegraf.conf
@@ -0,0 +1,9 @@
+[[outputs.influxdb]]
+  urls = ["http://influxdb:8086"]
+  database = "simplecloud"
+  skip_database_creation = true
+[[inputs.mqtt_consumer]]
+  servers = ["tcp://mosquitto:1883"]
+  topics = [
+    "climate/#"
+]