lowered the warning and critical levels of the prediction for out of space and increa...

diff --git a/conf.d/health.d/disks.conf b/conf.d/health.d/disks.conf
index 2e31f0694ed2cf111f21cacd299b74aa7164a609..ddd48d7c814acb8c871f136ed45db1f1139c2c1c 100644 (file)
--- a/conf.d/health.d/disks.conf
+++ b/conf.d/health.d/disks.conf
@@ -21,7 +21,7 @@ template: disk_space_usage
 
 # calculate the rate the disk fills
 # use as base, the available space change
-# during the last 30 minutes
+# during the last hour
 
 # this is just a calculation - it has no alarm
 # we will use it in the next template to find
@@ -29,25 +29,25 @@ template: disk_space_usage
 
 template: disk_fill_rate
       on: disk.space
-  lookup: min -5m at -30m unaligned of avail
-    calc: ($this - $avail) / (($now - $after) / 60)
+  lookup: min -10m at -50m unaligned of avail
+    calc: ($this - $avail) / (($now - $after) / 3600)
    every: 1m
-   units: GB/min
-    info: average rate the disk fills up (positive), or frees up (negative) space, for the last 30 minutes
+   units: GB/hour
+    info: average rate the disk fills up (positive), or frees up (negative) space, for the last hour
 
 
 # calculate the hours remaining
 # if the disk continues to fill
 # in this rate
 
-template: out_of_disk_space
+template: out_of_disk_space_time
       on: disk.space
-    calc: $avail / ($disk_fill_rate * 60)
+    calc: $avail / $disk_fill_rate
    every: 10s
-    warn: $this > 0 and $this < 48
-    crit: $this > 0 and $this < 24
+    warn: $this > 0 and $this < 8
+    crit: $this > 0 and $this < 2
    units: hours
-    info: estimated time the disk will run out of space, if the system continues to add data with the rate of the last 30 minutes
+    info: estimated time the disk will run out of space, if the system continues to add data with the rate of the last hour
       to: sysadmin
 
 

diff --git a/conf.d/health.d/memcached.conf b/conf.d/health.d/memcached.conf
index bd14b70cacc0444eeba57449093ab5b26d06bb4d..573e03398050ff23c88ce98d47ce54269d91e158 100644 (file)
--- a/conf.d/health.d/memcached.conf
+++ b/conf.d/health.d/memcached.conf
@@ -27,23 +27,23 @@ template: memcached_cache_memory_usage
 
 # find the rate memcached cache is filling
 
-template: memcached_cache_fill_rate
+template: cache_fill_rate
       on: memcached.cache
-  lookup: min -5m at -30m unaligned of available
-    calc: ($this - $available) / (($now - $after) / 60)
+  lookup: min -10m at -50m unaligned of available
+    calc: ($this - $available) / (($now - $after) / 3600)
    every: 1m
-   units: KB/min
-    info: average rate the cache fills up (positive), or frees up (negative) space, for the last 30 minutes
+   units: KB/hour
+    info: average rate the cache fills up (positive), or frees up (negative) space, for the last hour
 
 
 # find the hours remaining until memcached cache is full
 
-template: memcached_out_of_cache_space
+template: out_of_cache_space_time
       on: memcached.cache
-    calc: $available / ($memcached_cache_fill_rate * 60)
+    calc: $available / $cache_fill_rate
    every: 10s
-    warn: $this > 0 and $this < 48
-    crit: $this > 0 and $this < 24
+    warn: $this > 0 and $this < 8
+    crit: $this > 0 and $this < 2
    units: hours
-    info: estimated time the cache will run out of space, if the system continues to add data with the rate of the last 30 minutes
+    info: estimated time the cache will run out of space, if the system continues to add data with the rate of the last hour
       to: dba

diff --git a/conf.d/health_alarm_notify.conf b/conf.d/health_alarm_notify.conf
index e724d299ef029cce47d399d536107a245fb65f1d..0e3d23f9b1badd715eda31c5a110e45df08fd39a 100644 (file)
--- a/conf.d/health_alarm_notify.conf
+++ b/conf.d/health_alarm_notify.conf
@@ -1,9 +1,16 @@
-# Configuration for alarms recipients
-
-# netdata alarms have been categorized to allow different roles to receive
-# alarms related to their work.
+# Configuration for alarm notifications
+#
+# this configuration is used by: alarm-notify.sh
+# changes take effect immendiately (the next alarm will use them).
+#
+# alarm-notify.sh can send:
+# - e-mails,
+# - push notifications to your mobile phone,
+# - messages to your slack team
+#
+# the recipient given in netdata alarms defines a role, so that different
+# people can be notified for each role.
 #
-# This file defines the addresses for each role.
 # This file is a BASH script itself.
 
 ###############################################################################
@@ -48,7 +55,7 @@ SEND_PUSHOVER="YES"
 # Without it, netdata cannot send pushover notifications.
 PUSHOVER_APP_TOKEN=""
 
-# if a role recipient is not configured, a notification will be send to
+# if a role's recipients are not configured, a notification will be send to
 # this pushover user token:
 DEFAULT_RECIPIENT_PUSHOVER=""
 
@@ -67,7 +74,7 @@ SEND_SLACK="YES"
 # Without it, netdata cannot send slack notifications.
 SLACK_WEBHOOK_URL=""
 
-# if a role recipient is not configured, a notification will be send to
+# if a role's recipients are not configured, a notification will be send to
 # this slack channel:
 DEFAULT_RECIPIENT_SLACK=""
 

diff --git a/web/index.html b/web/index.html
index 214d4b19d1e03843899a73b4c962dcb25533129a..df54b3e043c84cc7d29e1da0c30fa163511595b1 100644 (file)
--- a/web/index.html
+++ b/web/index.html
@@ -2593,7 +2593,7 @@ function alarmsUpdateModal() {
     var active = '<h3>Raised Alarms</h3><table class="table">';
     var all = '<h3>All Running Alarms</h3><div class="panel-group" id="alarms_all_accordion" role="tablist" aria-multiselectable="true">';
     var log = '<h3>Alarm Log</h3><table class="table"><tr><th>When</th><th>Chart</th><th>Alarm</th><th>Status</th>';
-    var footer = '<hr/><a href="https://github.com/firehol/netdata/wiki/Generating-Badges" target="_blank">netdata badges</a> refresh automatically. Their color indicates the state of the alarm: <span style="color: #e05d44"><b>&nbsp;red&nbsp;</b></span> is critical, <span style="color:#fe7d37"><b>&nbsp;orange&nbsp;</b></span> is warning, <span style="color: #4c1"><b>&nbsp;bright green&nbsp;</b></span> is ok, <span style="color: #9f9f9f"><b>&nbsp;light grey&nbsp;</b></span> is undefined (i.e. no data or no status), <span style="color: #000"><b>&nbsp;black&nbsp;</b></span> is not initialized. You can copy and paste their URLs to embed them in any web page.';
+    var footer = '<hr/><a href="https://github.com/firehol/netdata/wiki/Generating-Badges" target="_blank">netdata badges</a> refresh automatically. Their color indicates the state of the alarm: <span style="color: #e05d44"><b>&nbsp;red&nbsp;</b></span> is critical, <span style="color:#fe7d37"><b>&nbsp;orange&nbsp;</b></span> is warning, <span style="color: #4c1"><b>&nbsp;bright green&nbsp;</b></span> is ok, <span style="color: #9f9f9f"><b>&nbsp;light grey&nbsp;</b></span> is undefined (i.e. no data or no status), <span style="color: #000"><b>&nbsp;black&nbsp;</b></span> is not initialized. You can copy and paste their URLs to embed them in any web page.<br/>netdata can send notifications for these alarms. Check <a href="https://github.com/firehol/netdata/blob/master/conf.d/health_alarm_notify.conf">this configuration file</a> for more information.';
 
     NETDATA.alarms.get('all', function(data) {
         options.alarm_families = new Array();