commit dacd875b680823c435cf78330fe6322d50ffadd4
author Ales Komarek <akomarek@mirantis.com> Tue Jul 11 12:29:21 2017 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> Tue Jul 11 12:29:24 2017 +0000
tree 52aa6875aa7e6e1d82766f1436664584514f3dd1
parent 7f4f16141122d785fb2d7705f2f57271683a4dcd
parent 08beac1090d1c480121f839444b2576133dfd039

Merge "Fix parameters for Telegraf outputs in Heka"

heka/log_collector/output/telegraf.yml

diff --git a/heka/log_collector/output/telegraf.yml b/heka/log_collector/output/telegraf.yml
index 94171cb..e6a9488 100644
--- a/heka/log_collector/output/telegraf.yml
+++ b/heka/log_collector/output/telegraf.yml
@@ -6,3 +6,5 @@
       telegraf_host: 127.0.0.1
       telegraf_port: ${_param:log_collector_telegraf_port}
       telegraf_timeout: 2000
+      emit_rates: false
+      alarms_enabled: false

heka/remote_collector/output/telegraf.yml

diff --git a/heka/remote_collector/output/telegraf.yml b/heka/remote_collector/output/telegraf.yml
index 7f7a5c0..48da337 100644
--- a/heka/remote_collector/output/telegraf.yml
+++ b/heka/remote_collector/output/telegraf.yml
@@ -6,3 +6,5 @@
       influxdb_host: ${_param:remote_collector_telegraf_host}
       influxdb_port: ${_param:remote_collector_telegraf_port}
       influxdb_timeout: 2000
+      emit_rates: false
+      alarms_enabled: false