Merge remote-tracking branch 'origin/master' into dgxdeploy

Former-commit-id: db33fec0

Merge remote-tracking branch 'origin/master' into dgxdeploy
a8dc312b · Andreas Hamacher · de4cfbbc · 9a31b019 · a8dc312b
Commit a8dc312b authored 5 years ago by Andreas Hamacher
--- a/roles/telegraf/templates/telegraf.conf.j2
+++ b/roles/telegraf/templates/telegraf.conf.j2
@@ -142,7 +142,7 @@
  ]
  data_format = "influx"
  timeout="4s"
-  interval="60s"
+  interval="900s"
  [inputs.exec.tags]
    influxdb_database="slurm"
 {% endif %}