dom/telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Document and add support to input plugins for logging alias (#6357)

Browse Source
This commit is contained in:
Greg
2019-09-23 16:39:50 -06:00
committed by Daniel Nelson
parent e42d2e39c6
commit 817c9a69a9
111 changed files with 961 additions and 659 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/inputs/postgresql_extensible/postgresql_extensible.go
View File

@@ -4,11 +4,9 @@ import (
"bytes"
"fmt"
"io/ioutil"
"log"
"os"
"strings"
// register in driver.
_ "github.com/jackc/pgx/stdlib"
"github.com/influxdata/telegraf"
@@ -23,6 +21,8 @@ type Postgresql struct {
AdditionalTags []string
Query query
Debug bool
Log telegraf.Logger
}
type query []struct {
@@ -186,7 +186,7 @@ func (p *Postgresql) Gather(acc telegraf.Accumulator) error {
if p.Query[i].Version <= db_version {
rows, err := p.DB.Query(sql_query)
if err != nil {
acc.AddError(err)
p.Log.Error(err.Error())
continue
}
@@ -194,7 +194,7 @@ func (p *Postgresql) Gather(acc telegraf.Accumulator) error {
// grab the column information from the result
if columns, err = rows.Columns(); err != nil {
acc.AddError(err)
p.Log.Error(err.Error())
continue
}
@@ -209,7 +209,7 @@ func (p *Postgresql) Gather(acc telegraf.Accumulator) error {
for rows.Next() {
err = p.accRow(meas_name, rows, acc, columns)
if err != nil {
acc.AddError(err)
p.Log.Error(err.Error())
break
}
}
@@ -272,7 +272,7 @@ func (p *Postgresql) accRow(meas_name string, row scanner, acc telegraf.Accumula
fields := make(map[string]interface{})
COLUMN:
for col, val := range columnMap {
log.Printf("D! postgresql_extensible: column: %s = %T: %v\n", col, *val, *val)
p.Log.Debugf("Column: %s = %T: %v\n", col, *val, *val)
_, ignore := ignoredColumns[col]
if ignore || *val == nil {
continue
@@ -290,7 +290,7 @@ COLUMN:
case int64, int32, int:
tags[col] = fmt.Sprintf("%d", v)
default:
log.Println("failed to add additional tag", col)
p.Log.Debugf("Failed to add %q as additional tag", col)
}
continue COLUMN
}

7
plugins/inputs/postgresql_extensible/postgresql_extensible_test.go
View File

@@ -13,6 +13,7 @@ import (
func queryRunner(t *testing.T, q query) *testutil.Accumulator {
p := &Postgresql{
Log: testutil.Logger{},
Service: postgresql.Service{
Address: fmt.Sprintf(
"host=%s user=postgres sslmode=disable",
@@ -232,6 +233,7 @@ func TestPostgresqlIgnoresUnwantedColumns(t *testing.T) {
}
p := &Postgresql{
Log: testutil.Logger{},
Service: postgresql.Service{
Address: fmt.Sprintf(
"host=%s user=postgres sslmode=disable",
@@ -251,7 +253,10 @@ func TestPostgresqlIgnoresUnwantedColumns(t *testing.T) {
}
func TestAccRow(t *testing.T) {
p := Postgresql{}
p := Postgresql{
Log: testutil.Logger{},
}
var acc testutil.Accumulator
columns := []string{"datname", "cat"}