Merging upstream version 1.32.0.

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

1 files changed, 12 insertions, 26 deletions

diff --git a/health/health.d/riakkv.conf b/health/health.d/riakkv.conf
index b2c0e8d9c..261fd48c6 100644
--- a/health/health.d/riakkv.conf
+++ b/health/health.d/riakkv.conf
@@ -1,24 +1,10 @@
-# Ensure that Riak is running.  template: riak_last_collected_secs
- template: riakkv_last_collected_secs
-       on: riak.kv.throughput
-    class: Database
-component: Riak KV
-     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: dba
 
 # Warn if a list keys operation is running.
  template: riakkv_list_keys_active
        on: riak.core.fsm_active
-    class: Database
+    class: Utilization
+     type: Database
 component: Riak KV
-     type: Utilization
      calc: $list_fsm_active
     units: state machines
     every: 10s
@@ -31,9 +17,9 @@ component: Riak KV
 # KV GET
  template: riakkv_1h_kv_get_mean_latency
        on: riak.kv.latency.get
-    class: Database
+    class: Latency
+     type: Database
 component: Riak KV
-     type: Latency
      calc: $node_get_fsm_time_mean
    lookup: average -1h unaligned of time
     every: 30s
@@ -43,9 +29,9 @@ component: Riak KV
 
  template: riakkv_kv_get_slow
        on: riak.kv.latency.get
-    class: Database
+    class: Latency
+     type: Database
 component: Riak KV
-     type: Latency
      calc: $mean
    lookup: average -3m unaligned of time
     units: ms
@@ -61,9 +47,9 @@ component: Riak KV
 # KV PUT
  template: riakkv_1h_kv_put_mean_latency
        on: riak.kv.latency.put
-    class: Database
+    class: Latency
+     type: Database
 component: Riak KV
-     type: Latency
      calc: $node_put_fsm_time_mean
    lookup: average -1h unaligned of time
     every: 30s
@@ -73,9 +59,9 @@ component: Riak KV
 
  template: riakkv_kv_put_slow
        on: riak.kv.latency.put
-    class: Database
+    class: Latency
+     type: Database
 component: Riak KV
-     type: Latency
      calc: $mean
    lookup: average -3m unaligned of time
     units: ms
@@ -95,9 +81,9 @@ component: Riak KV
 # On systems observed, this is < 2000, but may grow depending on load.
  template: riakkv_vm_high_process_count
        on: riak.vm
-    class: Database
+    class: Utilization
+     type: Database
 component: Riak KV
-     type: Utilization
      calc: $sys_process_count
     units: processes
     every: 10s