From 03bf87dcb06f7021bfb2df2fa8691593c6148aff Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 30 Nov 2022 19:47:00 +0100
Subject: Adding upstream version 1.37.0.

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

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

diff --git a/health/health.d/mysql.conf b/health/health.d/mysql.conf
index 34452d983..3941c71cc 100644
--- a/health/health.d/mysql.conf
+++ b/health/health.d/mysql.conf
@@ -114,10 +114,10 @@ component: MySQL
     class: Utilization
      type: Database
 component: MySQL
-   lookup: max -2m absolute
+   lookup: max -2m at -1m unaligned
     units: nodes
     every: 10s
-     info: maximum galera cluster size in the last 2 minutes
+     info: maximum galera cluster size in the last 2 minutes starting one minute ago
        to: dba
 
  template: mysql_galera_cluster_size
@@ -136,20 +136,29 @@ component: MySQL
 
 # galera node state
 
- template: mysql_galera_cluster_state
+ template: mysql_galera_cluster_state_warn
        on: mysql.galera_cluster_state
     class: Errors
      type: Database
 component: MySQL
-     calc: $state
+     calc: $donor + $joined
     every: 10s
-     warn: $this == 2 OR $this == 3
-     crit: $this == 0 OR $this == 1 OR $this >= 5
+     warn: $this != nan AND $this != 0
     delay: up 30s down 5m multiplier 1.5 max 1h
-     info: galera node state \
-           (0: Undefined, 1: Joining, 2: Donor/Desynced, 3: Joined, 4: Synced, 5: Inconsistent)
+     info: galera node state is either Donor/Desynced or Joined.
        to: dba
 
+ template: mysql_galera_cluster_state_crit
+       on: mysql.galera_cluster_state
+    class: Errors
+     type: Database
+component: MySQL
+     calc: $undefined + $joining + $error
+    every: 10s
+     crit: $this != nan AND $this != 0
+    delay: up 30s down 5m multiplier 1.5 max 1h
+     info: galera node state is either Undefined or Joining or Error.
+       to: dba
 
 # galera node status
 
@@ -158,11 +167,10 @@ component: MySQL
     class: Errors
      type: Database
 component: MySQL
-     calc: $wsrep_cluster_status
+     calc: $primary
     every: 10s
-     crit: $mysql_galera_cluster_state != nan AND $this != 0
+     crit: $this != nan AND $this != 1
     delay: up 30s down 5m multiplier 1.5 max 1h
-     info: galera node cluster component status \
-           (-1: unknown, 0: primary/quorum present, 1: non-primary/quorum lost, 2: disconnected). \
-           Any other value than primary indicates that the node is part of a nonoperational component.
+     info: galera node is part of a nonoperational component. \
+           This occurs in cases of multiple membership changes that result in a loss of Quorum or in cases of split-brain situations.
        to: dba
-- 
cgit v1.2.3