added families lines to disk and network alarm templates

diff --git a/conf.d/health.d/disks.conf b/conf.d/health.d/disks.conf
index 8e3753164e53e0ea153c7f30107b0e459dcd8b53..0549bac268b51ea0034c1b8b6edc025d5d2a05d2 100644 (file)
--- a/conf.d/health.d/disks.conf
+++ b/conf.d/health.d/disks.conf
@@ -4,6 +4,7 @@
 # for mount points
 template: disk_space_last_collected_secs
       on: disk.space
+families: *
     calc: $now - $last_collected_t
    units: seconds ago
    every: 10s
@@ -16,6 +17,7 @@ template: disk_space_last_collected_secs
 # for block devices
 template: disk_last_collected_secs
       on: disk.io
+families: *
     calc: $now - $last_collected_t
    units: seconds ago
    every: 10s
@@ -35,6 +37,7 @@ template: disk_last_collected_secs
 
 template: disk_space_usage
       on: disk.space
+families: *
     calc: $used * 100 / ($avail + $used)
    units: %
    every: 1m
@@ -46,6 +49,7 @@ template: disk_space_usage
 
 template: disk_inode_usage
       on: disk.inodes
+families: *
     calc: $used * 100 / ($avail + $used)
    units: %
    every: 1m
@@ -69,6 +73,7 @@ template: disk_inode_usage
 
 template: disk_fill_rate
       on: disk.space
+families: *
   lookup: min -10m at -50m unaligned of avail
     calc: ($this - $avail) / (($now - $after) / 3600)
    every: 1m
@@ -82,6 +87,7 @@ template: disk_fill_rate
 
 template: out_of_disk_space_time
       on: disk.space
+families: *
     calc: ($disk_fill_rate > 0) ? ($avail / $disk_fill_rate) : (0)
    units: hours
    every: 10s
@@ -101,6 +107,7 @@ template: out_of_disk_space_time
 
 template: 10min_disk_utilization
       on: disk.util
+families: *
   lookup: average -10m unaligned
    units: %
    every: 1m
@@ -120,6 +127,7 @@ template: 10min_disk_utilization
 
 template: 10min_disk_backlog
       on: disk.backlog
+families: *
   lookup: average -10m unaligned
    units: ms
    every: 1m

diff --git a/conf.d/health.d/net.conf b/conf.d/health.d/net.conf
index f969f17b9c47cbe0e2f109392e9656d6311ebfad..11f7c43e7bf9480c5b2ffbd09b6dfd7cc21fedb5 100644 (file)
--- a/conf.d/health.d/net.conf
+++ b/conf.d/health.d/net.conf
@@ -3,6 +3,7 @@
 
 template: interface_last_collected_secs
       on: net.net
+families: *
     calc: $now - $last_collected_t
    units: seconds ago
    every: 10s
@@ -22,6 +23,7 @@ template: interface_last_collected_secs
 
 template: 1hour_packet_drops_inbound
       on: net.drops
+families: *
   lookup: sum -1h unaligned absolute of inbound
    units: packets
    every: 1m
@@ -32,6 +34,7 @@ template: 1hour_packet_drops_inbound
 
 template: 1hour_packet_drops_outbound
       on: net.drops
+families: *
   lookup: sum -1h unaligned absolute of outbound
    units: packets
    every: 1m
@@ -42,6 +45,7 @@ template: 1hour_packet_drops_outbound
 
 template: 1hour_packet_drops_ratio_inbound
       on: net.packets
+families: *
   lookup: sum -1h unaligned absolute of received
     calc: (($1hour_packet_drops_inbound != nan AND $this > 0) ? ($1hour_packet_drops_inbound * 100 / $this) : (0))
    units: %
@@ -54,6 +58,7 @@ template: 1hour_packet_drops_ratio_inbound
 
 template: 1hour_packet_drops_ratio_outbound
       on: net.packets
+families: *
   lookup: sum -1h unaligned absolute of sent
     calc: (($1hour_packet_drops_outbound != nan AND $this > 0) ? ($1hour_packet_drops_outbound * 100 / $this) : (0))
    units: %
@@ -75,6 +80,7 @@ template: 1hour_packet_drops_ratio_outbound
 
 template: 1hour_fifo_errors
       on: net.fifo
+families: *
   lookup: sum -1h unaligned absolute
    units: errors
    every: 1m
@@ -95,6 +101,7 @@ template: 1hour_fifo_errors
 
 template: 1m_received_packets_rate
       on: net.packets
+families: *
   lookup: average -1m of received
    units: packets
    every: 10s
@@ -102,6 +109,7 @@ template: 1m_received_packets_rate
 
 template: 10s_received_packets_storm
       on: net.packets
+families: *
   lookup: average -10s of received
     calc: $this * 100 / (($1m_received_packets_rate < 1000)?(1000):($1m_received_packets_rate))
    every: 10s