Merging upstream version 1.31.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 37 insertions, 28 deletions

diff --git a/health/health.d/scaleio.conf b/health/health.d/scaleio.conf
index ab9771bb4..3c0dc1168 100644
--- a/health/health.d/scaleio.conf
+++ b/health/health.d/scaleio.conf
@@ -1,38 +1,47 @@
 
 # make sure scaleio is running
 
-template: scaleio_last_collected_secs
-      on: scaleio.system_capacity_total
-    calc: $now - $last_collected_t
-   units: seconds ago
-   every: 10s
-    warn: $this > (($status >= $WARNING)  ? ($update_every) : ( 5 * $update_every))
-    crit: $this > (($status == $CRITICAL) ? ($update_every) : (60 * $update_every))
-   delay: down 5m multiplier 1.5 max 1h
-    info: number of seconds since the last successful data collection
-      to: sysadmin
+ template: scaleio_last_collected_secs
+       on: scaleio.system_capacity_total
+    class: Storage
+component: ScaleIO
+     type: Latency
+     calc: $now - $last_collected_t
+    units: seconds ago
+    every: 10s
+     warn: $this > (($status >= $WARNING)  ? ($update_every) : ( 5 * $update_every))
+     crit: $this > (($status == $CRITICAL) ? ($update_every) : (60 * $update_every))
+    delay: down 5m multiplier 1.5 max 1h
+     info: number of seconds since the last successful data collection
+       to: sysadmin
 
 # make sure Storage Pool capacity utilization is under limit
 
-template: scaleio_storage_pool_capacity_utilization
-      on: scaleio.storage_pool_capacity_utilization
-    calc: $used
-   units: %
-   every: 10s
-    warn: $this > (($status >= $WARNING)  ? (80) : (90))
-    crit: $this > (($status == $CRITICAL) ? (90) : (98))
-   delay: down 15m multiplier 1.5 max 1h
-    info: storage pool capacity utilization
-      to: sysadmin
+ template: scaleio_storage_pool_capacity_utilization
+       on: scaleio.storage_pool_capacity_utilization
+    class: Storage
+component: ScaleIO
+     type: Utilization
+     calc: $used
+    units: %
+    every: 10s
+     warn: $this > (($status >= $WARNING)  ? (80) : (90))
+     crit: $this > (($status == $CRITICAL) ? (90) : (98))
+    delay: down 15m multiplier 1.5 max 1h
+     info: storage pool capacity utilization
+       to: sysadmin
 
 
 # make sure Sdc is connected to MDM
 
-template: scaleio_sdc_mdm_connection_state
-      on: scaleio.sdc_mdm_connection_state
-    calc: $connected
-   every: 10s
-    warn: $this != 1
-   delay: up 30s down 5m multiplier 1.5 max 1h
-    info: Data Client (SDC) to Metadata Manager (MDM) connection state (0: disconnected, 1: connected)
-      to: sysadmin
+ template: scaleio_sdc_mdm_connection_state
+       on: scaleio.sdc_mdm_connection_state
+    class: Storage
+component: ScaleIO
+     type: Utilization
+     calc: $connected
+    every: 10s
+     warn: $this != 1
+    delay: up 30s down 5m multiplier 1.5 max 1h
+     info: Data Client (SDC) to Metadata Manager (MDM) connection state (0: disconnected, 1: connected)
+       to: sysadmin