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

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

View File

@@ -2,7 +2,6 @@ package diskio
import (
"fmt"
"log"
"regexp"
"strings"
@@ -24,6 +23,8 @@ type DiskIO struct {
NameTemplates []string
SkipSerialNumber bool
Log telegraf.Logger
infoCache map[string]diskInfoCache
deviceFilter filter.Filter
initialized bool
@@ -75,7 +76,7 @@ func (s *DiskIO) init() error {
if hasMeta(device) {
filter, err := filter.Compile(s.Devices)
if err != nil {
return fmt.Errorf("error compiling device pattern: %v", err)
return fmt.Errorf("error compiling device pattern: %s", err.Error())
}
s.deviceFilter = filter
}
@@ -99,7 +100,7 @@ func (s *DiskIO) Gather(acc telegraf.Accumulator) error {
diskio, err := s.ps.DiskIO(devices)
if err != nil {
return fmt.Errorf("error getting disk io info: %s", err)
return fmt.Errorf("error getting disk io info: %s", err.Error())
}
for _, io := range diskio {
@@ -166,7 +167,7 @@ func (s *DiskIO) diskName(devName string) (string, []string) {
}
if err != nil {
log.Printf("W! Error gathering disk info: %s", err)
s.Log.Warnf("Error gathering disk info: %s", err)
return devName, devLinks
}
@@ -199,7 +200,7 @@ func (s *DiskIO) diskTags(devName string) map[string]string {
di, err := s.diskInfo(devName)
if err != nil {
log.Printf("W! Error gathering disk info: %s", err)
s.Log.Warnf("Error gathering disk info: %s", err)
return nil
}

View File

@@ -103,6 +103,7 @@ func TestDiskIO(t *testing.T) {
var acc testutil.Accumulator
diskio := &DiskIO{
Log: testutil.Logger{},
ps: &mps,
Devices: tt.devices,
}