From 483926a283e118590da3f9ecfa75a8a4d62143ce Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 1 Dec 2021 07:15:11 +0100
Subject: Merging upstream version 1.32.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 health/health.d/mysql.conf | 62 ++++++++++++++++------------------------------
 1 file changed, 22 insertions(+), 40 deletions(-)

(limited to 'health/health.d/mysql.conf')

diff --git a/health/health.d/mysql.conf b/health/health.d/mysql.conf
index 91860c4a7..34452d983 100644
--- a/health/health.d/mysql.conf
+++ b/health/health.d/mysql.conf
@@ -1,29 +1,11 @@
 
-# make sure mysql is running
-
- template: mysql_last_collected_secs
-       on: mysql.queries
-    class: Database
-component: MySQL
-     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
-
-
-# -----------------------------------------------------------------------------
 # slow queries
 
  template: mysql_10s_slow_queries
        on: mysql.queries
-    class: Database
+    class: Latency
+     type: Database
 component: MySQL
-     type: Latency
    lookup: sum -10s of slow_queries
     units: slow queries
     every: 10s
@@ -39,9 +21,9 @@ component: MySQL
 
  template: mysql_10s_table_locks_immediate
        on: mysql.table_locks
-    class: Database
+    class: Utilization
+     type: Database
 component: MySQL
-     type: Utilization
    lookup: sum -10s absolute of immediate
     units: immediate locks
     every: 10s
@@ -50,9 +32,9 @@ component: MySQL
 
  template: mysql_10s_table_locks_waited
        on: mysql.table_locks
-    class: Database
+    class: Latency
+     type: Database
 component: MySQL
-     type: Latency
    lookup: sum -10s absolute of waited
     units: waited locks
     every: 10s
@@ -61,9 +43,9 @@ component: MySQL
 
  template: mysql_10s_waited_locks_ratio
        on: mysql.table_locks
-    class: Database
+    class: Latency
+     type: Database
 component: MySQL
-     type: Latency
      calc: ( ($mysql_10s_table_locks_waited + $mysql_10s_table_locks_immediate) > 0 ) ? (($mysql_10s_table_locks_waited * 100) / ($mysql_10s_table_locks_waited + $mysql_10s_table_locks_immediate)) : 0
     units: %
     every: 10s
@@ -79,9 +61,9 @@ component: MySQL
 
  template: mysql_connections
        on: mysql.connections_active
-    class: Database
+    class: Utilization
+     type: Database
 component: MySQL
-     type: Utilization
      calc: $active * 100 / $limit
     units: %
     every: 10s
@@ -97,9 +79,9 @@ component: MySQL
 
  template: mysql_replication
        on: mysql.slave_status
-    class: Database
+    class: Errors
+     type: Database
 component: MySQL
-     type: Errors
      calc: ($sql_running <= 0 OR $io_running <= 0)?0:1
     units: ok/failed
     every: 10s
@@ -110,9 +92,9 @@ component: MySQL
 
  template: mysql_replication_lag
        on: mysql.slave_behind
-    class: Database
+    class: Latency
+     type: Database
 component: MySQL
-     type: Errors
      calc: $seconds
     units: seconds
     every: 10s
@@ -129,9 +111,9 @@ component: MySQL
 
  template: mysql_galera_cluster_size_max_2m
        on: mysql.galera_cluster_size
-    class: Database
+    class: Utilization
+     type: Database
 component: MySQL
-     type: Utilization
    lookup: max -2m absolute
     units: nodes
     every: 10s
@@ -140,9 +122,9 @@ component: MySQL
 
  template: mysql_galera_cluster_size
        on: mysql.galera_cluster_size
-    class: Database
+    class: Utilization
+     type: Database
 component: MySQL
-     type: Utilization
      calc: $nodes
     units: nodes
     every: 10s
@@ -156,9 +138,9 @@ component: MySQL
 
  template: mysql_galera_cluster_state
        on: mysql.galera_cluster_state
-    class: Database
+    class: Errors
+     type: Database
 component: MySQL
-     type: Errors
      calc: $state
     every: 10s
      warn: $this == 2 OR $this == 3
@@ -173,9 +155,9 @@ component: MySQL
 
  template: mysql_galera_cluster_status
        on: mysql.galera_cluster_status
-    class: Database
+    class: Errors
+     type: Database
 component: MySQL
-     type: Errors
      calc: $wsrep_cluster_status
     every: 10s
      crit: $mysql_galera_cluster_state != nan AND $this != 0
-- 
cgit v1.2.3