fix - mysql with empty conn

debeando · Oct 10, 2023 · 73f1484 · 73f1484
1 parent 84c9b8a
commit 73f1484
Show file tree

Hide file tree

Showing 13 changed files with 67 additions and 34 deletions.
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.21
 
 require (
 	github.com/aws/aws-sdk-go v1.45.24
-	github.com/debeando/go-common v0.2.1
+	github.com/debeando/go-common v0.2.2
 	github.com/go-yaml/yaml v2.1.0+incompatible
 	github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c
 	github.com/kardianos/service v1.2.2

diff --git a/monitor/plugins/inputs/mysql/aurora/main.go b/monitor/plugins/inputs/mysql/aurora/main.go
@@ -41,7 +41,10 @@ func (p *Plugin) Collect(name string, cnf *config.Config, mtc *metrics.Items) {
 		})
 
 		m := mysql.New(cnf.Inputs.MySQL[host].Hostname, cnf.Inputs.MySQL[host].DSN)
-		m.Connect()
+		err := m.Connect()
+		if err != nil {
+			continue
+		}
 
 		c, _ := m.Query("SELECT 1 FROM information_schema.TABLES WHERE (table_schema = 'mysql') AND (table_name = 'ro_replica_status')")
 		if len(c) == 0 {

diff --git a/monitor/plugins/inputs/mysql/overflow/main.go b/monitor/plugins/inputs/mysql/overflow/main.go
@@ -65,7 +65,10 @@ func (p *Plugin) Collect(name string, cnf *config.Config, mtc *metrics.Items) {
 		})
 
 		m := mysql.New(cnf.Inputs.MySQL[host].Hostname, cnf.Inputs.MySQL[host].DSN)
-		m.Connect()
+		err := m.Connect()
+		if err != nil {
+			continue
+		}
 
 		rows, _ := m.Query(queryFields)
 		for row := range rows {

diff --git a/monitor/plugins/inputs/mysql/replica/main.go b/monitor/plugins/inputs/mysql/replica/main.go
@@ -46,7 +46,10 @@ func (p *Plugin) Collect(name string, cnf *config.Config, mtc *metrics.Items) {
 		var v = metrics.Values{}
 
 		m := mysql.New(cnf.Inputs.MySQL[host].Hostname, cnf.Inputs.MySQL[host].DSN)
-		m.Connect()
+		err := m.Connect()
+		if err != nil {
+			continue
+		}
 
 		r, _ := m.Query(query)
 		if len(r) == 0 {

diff --git a/monitor/plugins/inputs/mysql/status/main.go b/monitor/plugins/inputs/mysql/status/main.go
@@ -40,7 +40,10 @@ func (p *Plugin) Collect(name string, cnf *config.Config, mtc *metrics.Items) {
 		})
 
 		m := mysql.New(cnf.Inputs.MySQL[host].Hostname, cnf.Inputs.MySQL[host].DSN)
-		m.Connect()
+		err := m.Connect()
+		if err != nil {
+			continue
+		}
 
 		r, _ := m.Query(query)
 		if len(r) == 0 {

diff --git a/monitor/plugins/inputs/mysql/tables/main.go b/monitor/plugins/inputs/mysql/tables/main.go
@@ -50,7 +50,10 @@ func (p *Plugin) Collect(name string, cnf *config.Config, mtc *metrics.Items) {
 		})
 
 		m := mysql.New(cnf.Inputs.MySQL[host].Hostname, cnf.Inputs.MySQL[host].DSN)
-		m.Connect()
+		err := m.Connect()
+		if err != nil {
+			continue
+		}
 
 		r, _ := m.Query(query)
 		if len(r) == 0 {

diff --git a/monitor/plugins/inputs/mysql/variables/main.go b/monitor/plugins/inputs/mysql/variables/main.go
@@ -42,7 +42,10 @@ func (p *Plugin) Collect(name string, cnf *config.Config, mtc *metrics.Items) {
 		var v = metrics.Values{}
 
 		m := mysql.New(cnf.Inputs.MySQL[host].Hostname, cnf.Inputs.MySQL[host].DSN)
-		m.Connect()
+		err := m.Connect()
+		if err != nil {
+			continue
+		}
 
 		r, _ := m.Query(query)
 		if len(r) == 0 {

diff --git a/monitor/plugins/inputs/proxysql/commands/main.go b/monitor/plugins/inputs/proxysql/commands/main.go
@@ -41,7 +41,10 @@ func (p *Plugin) Collect(name string, cnf *config.Config, mtc *metrics.Items) {
 		})
 
 		m := mysql.New(cnf.Inputs.MySQL[host].Hostname, cnf.Inputs.MySQL[host].DSN)
-		m.Connect()
+		err := m.Connect()
+		if err != nil {
+			continue
+		}
 
 		r, _ := m.Query(query)
 		if len(r) == 0 {

diff --git a/monitor/plugins/inputs/proxysql/errors/main.go b/monitor/plugins/inputs/proxysql/errors/main.go
@@ -43,7 +43,10 @@ func (p *Plugin) Collect(name string, cnf *config.Config, mtc *metrics.Items) {
 		})
 
 		m := mysql.New(cnf.Inputs.MySQL[host].Hostname, cnf.Inputs.MySQL[host].DSN)
-		m.Connect()
+		err := m.Connect()
+		if err != nil {
+			continue
+		}
 
 		r, _ := m.Query(query)
 		if len(r) == 0 {

diff --git a/monitor/plugins/inputs/proxysql/global/main.go b/monitor/plugins/inputs/proxysql/global/main.go
@@ -46,7 +46,10 @@ func (p *Plugin) Collect(name string, cnf *config.Config, mtc *metrics.Items) {
 		var v = metrics.Values{}
 
 		m := mysql.New(cnf.Inputs.MySQL[host].Hostname, cnf.Inputs.MySQL[host].DSN)
-		m.Connect()
+		err := m.Connect()
+		if err != nil {
+			continue
+		}
 
 		r, _ := m.Query(query)
 		if len(r) == 0 {

diff --git a/monitor/plugins/inputs/proxysql/pool/main.go b/monitor/plugins/inputs/proxysql/pool/main.go
@@ -61,7 +61,10 @@ func (p *Plugin) Collect(name string, cnf *config.Config, mtc *metrics.Items) {
 		})
 
 		m := mysql.New(cnf.Inputs.MySQL[host].Hostname, cnf.Inputs.MySQL[host].DSN)
-		m.Connect()
+		err := m.Connect()
+		if err != nil {
+			continue
+		}
 
 		r, _ := m.Query(query)
 		if len(r) == 0 {

diff --git a/monitor/plugins/inputs/proxysql/queries/main.go b/monitor/plugins/inputs/proxysql/queries/main.go
@@ -73,7 +73,10 @@ func (p *Plugin) Collect(name string, cnf *config.Config, mtc *metrics.Items) {
 		re, _ = regexp.Compile(ReQuery)
 
 		m := mysql.New(cnf.Inputs.MySQL[host].Hostname, cnf.Inputs.MySQL[host].DSN)
-		m.Connect()
+		err := m.Connect()
+		if err != nil {
+			continue
+		}
 
 		r, _ := m.Query(querySQDigestL)
 		if len(r) == 0 {

diff --git a/monitor/plugins/plugins.go b/monitor/plugins/plugins.go
@@ -9,30 +9,30 @@ import (
 	"zenit/monitor/plugins/inputs"
 	"zenit/monitor/plugins/outputs"
 
-	_ "zenit/monitor/plugins/inputs/aws/cloudwatch/rds"
+	// _ "zenit/monitor/plugins/inputs/aws/cloudwatch/rds"
 	_ "zenit/monitor/plugins/inputs/aws/discover/rds"
-	_ "zenit/monitor/plugins/inputs/mongodb/serverstatus"
-	_ "zenit/monitor/plugins/inputs/mysql/aurora"
-	_ "zenit/monitor/plugins/inputs/mysql/overflow"
-	_ "zenit/monitor/plugins/inputs/mysql/replica"
-	_ "zenit/monitor/plugins/inputs/mysql/status"
-	_ "zenit/monitor/plugins/inputs/mysql/tables"
+	// _ "zenit/monitor/plugins/inputs/mongodb/serverstatus"
+	// _ "zenit/monitor/plugins/inputs/mysql/aurora"
+	// _ "zenit/monitor/plugins/inputs/mysql/overflow"
+	// _ "zenit/monitor/plugins/inputs/mysql/replica"
+	// _ "zenit/monitor/plugins/inputs/mysql/status"
+	// _ "zenit/monitor/plugins/inputs/mysql/tables"
 	_ "zenit/monitor/plugins/inputs/mysql/variables"
-	_ "zenit/monitor/plugins/inputs/os/cpu"
-	_ "zenit/monitor/plugins/inputs/os/disk"
-	_ "zenit/monitor/plugins/inputs/os/mem"
-	_ "zenit/monitor/plugins/inputs/os/net"
-	_ "zenit/monitor/plugins/inputs/os/sys"
-	_ "zenit/monitor/plugins/inputs/percona/deadlock"
-	_ "zenit/monitor/plugins/inputs/percona/delay"
-	_ "zenit/monitor/plugins/inputs/percona/kill"
-	_ "zenit/monitor/plugins/inputs/percona/osc"
-	_ "zenit/monitor/plugins/inputs/percona/xtrabackup"
-	_ "zenit/monitor/plugins/inputs/proxysql/commands"
-	_ "zenit/monitor/plugins/inputs/proxysql/errors"
-	_ "zenit/monitor/plugins/inputs/proxysql/global"
-	_ "zenit/monitor/plugins/inputs/proxysql/pool"
-	_ "zenit/monitor/plugins/inputs/proxysql/queries"
+	// _ "zenit/monitor/plugins/inputs/os/cpu"
+	// _ "zenit/monitor/plugins/inputs/os/disk"
+	// _ "zenit/monitor/plugins/inputs/os/mem"
+	// _ "zenit/monitor/plugins/inputs/os/net"
+	// _ "zenit/monitor/plugins/inputs/os/sys"
+	// _ "zenit/monitor/plugins/inputs/percona/deadlock"
+	// _ "zenit/monitor/plugins/inputs/percona/delay"
+	// _ "zenit/monitor/plugins/inputs/percona/kill"
+	// _ "zenit/monitor/plugins/inputs/percona/osc"
+	// _ "zenit/monitor/plugins/inputs/percona/xtrabackup"
+	// _ "zenit/monitor/plugins/inputs/proxysql/commands"
+	// _ "zenit/monitor/plugins/inputs/proxysql/errors"
+	// _ "zenit/monitor/plugins/inputs/proxysql/global"
+	// _ "zenit/monitor/plugins/inputs/proxysql/pool"
+	// _ "zenit/monitor/plugins/inputs/proxysql/queries"
 	_ "zenit/monitor/plugins/outputs/influxdb"
 
 	"github.com/debeando/go-common/log"