diff --git a/global/overlay/etc/telegraf/telegraf.conf.d/01-agent.conf b/global/overlay/etc/telegraf/telegraf.conf.d/01-agent.conf
new file mode 100644
index 00000000..0605cb56
--- /dev/null
+++ b/global/overlay/etc/telegraf/telegraf.conf.d/01-agent.conf
@@ -0,0 +1,14 @@
+[agent]
+  interval = "10s"
+  round_interval = true
+  metric_batch_size = 1000
+  metric_buffer_limit = 10000
+  collection_jitter = "0s"
+  flush_interval = "10s"
+  flush_jitter = "0s"
+  precision = ""
+  debug = false
+  quiet = false
+  logfile = ""
+  hostname = ""
+  omit_hostname = false
diff --git a/global/overlay/etc/telegraf/telegraf.conf.d/99-influxdb2.conf b/global/overlay/etc/telegraf/telegraf.conf.d/99-influxdb2.conf
index 8c5d9f61..b632bf33 100644
--- a/global/overlay/etc/telegraf/telegraf.conf.d/99-influxdb2.conf
+++ b/global/overlay/etc/telegraf/telegraf.conf.d/99-influxdb2.conf
@@ -1,13 +1,5 @@
 [[outputs.influxdb_v2]]
-  ## The URLs of the InfluxDB cluster nodes.
-  ##
-  ## Multiple URLs can be specified for a single cluster, only ONE of the
-  ## urls will be written to each interval.
-  ## urls exp: http://127.0.0.1:9999
   urls = ["https://metrics.sunet.se:9999"]
-  ## Token for authentication.
   token = "${INFLUXDB2_TOKEN}"
-  ## Organization is the name of the organization you wish to write to; must exist.
   organization = "${INFLUXDB2_ORG}"
-  ## Destination bucket to write into.
   bucket = "${INFLUXDB2_BUCKET}"