fix metrics proxysql global status

debeando · Jul 8, 2020 · 0d2c39c · 0d2c39c
1 parent fc18345
commit 0d2c39c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/command/version.go b/command/version.go
@@ -5,7 +5,7 @@ import (
 )
 
 // Version is a const to have the latest version number for this code.
-const Number string = "1.4.2"
+const Number string = "1.4.3"
 
 // Build date and time when building.
 var BuildTime string

diff --git a/plugins/inputs/proxysql/global/global.go b/plugins/inputs/proxysql/global/global.go
@@ -34,26 +34,30 @@ func (l *InputProxySQLGlobal) Collect() {
  p.Connect(config.File.Inputs.ProxySQL[host].DSN)
 
  var r = p.Query(querySQLGlobal)
+ if len(r) == 0 {
+ continue
+ }
+
+ var v = []metrics.Value{}
 
  for _, i := range r {
  if value, ok := mysql.ParseValue(i["Variable_Value"]); ok {
  log.Debug("InputProxySQLGlobal", map[string]interface{}{
- "attribute": i["Variable_name"],
- "value": value,
+ i["Variable_Name"]: value,
  "hostname": config.File.Inputs.ProxySQL[host].Hostname,
  })
 
- a.Add(metrics.Metric{
- Key: "proxysql_global",
- Tags: []metrics.Tag{
- {"hostname", config.File.Inputs.ProxySQL[host].Hostname},
- },
- Values: []metrics.Value{
- {i["Variable_Name"], value},
- },
- })
+ v = append(v, metrics.Value{i["Variable_Name"], value})
  }
  }
+
+ a.Add(metrics.Metric{
+ Key: "proxysql_global",
+ Tags: []metrics.Tag{
+ {"hostname", config.File.Inputs.ProxySQL[host].Hostname},
+ },
+ Values: v,
+ })
  }
 }
 

diff --git a/plugins/outputs/influxdb/influxdb.go b/plugins/outputs/influxdb/influxdb.go
@@ -79,7 +79,7 @@ func (l *OutputIndluxDB) Collect() {
  time.Now(),
  )
 
- log.Debug("OutputIndluxDB", m["fields"].(map[string]interface{}))
+ log.Debug(fmt.Sprintf("OutputIndluxDB\t%s", k), m["fields"].(map[string]interface{}))
 
  if err != nil {
  log.Error("OutputIndluxDB", map[string]interface{}{"step": "event", "error": err})