From 4def7cc5e17d1347c4cdce22a24b5c3e67c602ca Mon Sep 17 00:00:00 2001
From: Ben Hymans <6125803+benhymans@users.noreply.github.com>
Date: Wed, 11 Dec 2019 13:42:54 -0600
Subject: [PATCH] Add option to control collecting global variables to mysql
 input (#6790)

---
 plugins/inputs/mysql/README.md |  3 +++
 plugins/inputs/mysql/mysql.go  | 22 +++++++++++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/plugins/inputs/mysql/README.md b/plugins/inputs/mysql/README.md
index af00da03d..3e07229da 100644
--- a/plugins/inputs/mysql/README.md
+++ b/plugins/inputs/mysql/README.md
@@ -69,6 +69,9 @@ This plugin gathers the statistic data from MySQL server
   ## gather metrics from SHOW BINARY LOGS command output
   # gather_binary_logs = false
 
+  ## gather metrics from SHOW GLOBAL VARIABLES command output
+  # gather_global_variables = true
+
   ## gather metrics from PERFORMANCE_SCHEMA.TABLE_IO_WAITS_SUMMARY_BY_TABLE
   # gather_table_io_waits = false
 
diff --git a/plugins/inputs/mysql/mysql.go b/plugins/inputs/mysql/mysql.go
index 3ca955beb..a2dc56505 100644
--- a/plugins/inputs/mysql/mysql.go
+++ b/plugins/inputs/mysql/mysql.go
@@ -36,6 +36,7 @@ type Mysql struct {
 	GatherTableSchema                   bool     `toml:"gather_table_schema"`
 	GatherFileEventsStats               bool     `toml:"gather_file_events_stats"`
 	GatherPerfEventsStatements          bool     `toml:"gather_perf_events_statements"`
+	GatherGlobalVars                    bool     `toml:"gather_global_variables"`
 	IntervalSlow                        string   `toml:"interval_slow"`
 	MetricVersion                       int      `toml:"metric_version"`
 
@@ -94,6 +95,9 @@ const sampleConfig = `
   ## gather metrics from SHOW BINARY LOGS command output
   # gather_binary_logs = false
 
+  ## gather metrics from PERFORMANCE_SCHEMA.GLOBAL_VARIABLES
+  # gather_global_variables = true
+
   ## gather metrics from PERFORMANCE_SCHEMA.TABLE_IO_WAITS_SUMMARY_BY_TABLE
   # gather_table_io_waits = false
 
@@ -134,6 +138,7 @@ const (
 	defaultPerfEventsStatementsDigestTextLimit = 120
 	defaultPerfEventsStatementsLimit           = 250
 	defaultPerfEventsStatementsTimeLimit       = 86400
+	defaultGatherGlobalVars                    = true
 )
 
 func (m *Mysql) SampleConfig() string {
@@ -431,14 +436,16 @@ func (m *Mysql) gatherServer(serv string, acc telegraf.Accumulator) error {
 		return err
 	}
 
-	// Global Variables may be gathered less often
-	if len(m.IntervalSlow) > 0 {
-		if uint32(time.Since(m.lastT).Seconds()) >= m.scanIntervalSlow {
-			err = m.gatherGlobalVariables(db, serv, acc)
-			if err != nil {
-				return err
+	if m.GatherGlobalVars {
+		// Global Variables may be gathered less often
+		if len(m.IntervalSlow) > 0 {
+			if uint32(time.Since(m.lastT).Seconds()) >= m.scanIntervalSlow {
+				err = m.gatherGlobalVariables(db, serv, acc)
+				if err != nil {
+					return err
+				}
+				m.lastT = time.Now()
 			}
-			m.lastT = time.Now()
 		}
 	}
 
@@ -1767,6 +1774,7 @@ func init() {
 			PerfEventsStatementsDigestTextLimit: defaultPerfEventsStatementsDigestTextLimit,
 			PerfEventsStatementsLimit:           defaultPerfEventsStatementsLimit,
 			PerfEventsStatementsTimeLimit:       defaultPerfEventsStatementsTimeLimit,
+			GatherGlobalVars:                    defaultGatherGlobalVars,
 		}
 	})
 }