Increase interval for GlusterFS alarms

This change also increase the default collection interval for Telegraf
for the same reason that GlusterFS doesn't cope well with concurrent
client requests.

Change-Id: I5975f89509ed65f5056b19f3a752edf43f61b16b
Depends-On: I500e8785bcb22aa61612e5a17a2a60bb3b99eed0
diff --git a/glusterfs/meta/heka.yml b/glusterfs/meta/heka.yml
index b1c8f34..0b3b631 100644
--- a/glusterfs/meta/heka.yml
+++ b/glusterfs/meta/heka.yml
@@ -62,7 +62,7 @@
       - metric: glusterfs_check
         relational_operator: '=='
         threshold: 0
-        window: 60
+        window: 150
         periods: 0
         function: last
   alarm:
diff --git a/glusterfs/meta/telegraf.yml b/glusterfs/meta/telegraf.yml
index 4ea04af..fab100d 100644
--- a/glusterfs/meta/telegraf.yml
+++ b/glusterfs/meta/telegraf.yml
@@ -5,9 +5,7 @@
   input:
     glusterfs:
       template: glusterfs/files/telegraf.conf
-{%- if monitoring.interval is defined or server.check_timeout is defined %}
-      interval: {{ monitoring.interval|default(server.check_timeout) }}
-{%- endif %}
+      interval: 60s
       use_sudo: true
 {%- endif %}
 {%- endif %}