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

7
plugins/inputs/win_services/win_services.go
View File

@@ -4,7 +4,6 @@ package win_services
import (
"fmt"
"log"
"os"
"github.com/influxdata/telegraf"
@@ -90,6 +89,8 @@ var description = "Input plugin to report Windows services info."
//WinServices is an implementation if telegraf.Input interface, providing info about Windows Services
type WinServices struct {
Log telegraf.Logger
ServiceNames []string `toml:"service_names"`
mgrProvider ManagerProvider
}
@@ -125,9 +126,9 @@ func (m *WinServices) Gather(acc telegraf.Accumulator) error {
service, err := collectServiceInfo(scmgr, srvName)
if err != nil {
if IsPermission(err) {
log.Printf("D! Error in plugin [inputs.win_services]: %v", err)
m.Log.Debug(err.Error())
} else {
acc.AddError(err)
m.Log.Error(err.Error())
}
continue
}

6
plugins/inputs/win_services/win_services_integration_test.go
View File

@@ -47,7 +47,11 @@ func TestGatherErrors(t *testing.T) {
if testing.Short() {
t.Skip("Skipping integration test in short mode")
}
ws := &WinServices{InvalidServices, &MgProvider{}}
ws := &WinServices{
Log: testutil.Logger{},
ServiceNames: InvalidServices,
mgrProvider: &MgProvider{},
}
require.Len(t, ws.ServiceNames, 3, "Different number of services")
var acc testutil.Accumulator
require.NoError(t, ws.Gather(&acc))

41
plugins/inputs/win_services/win_services_test.go
View File

@@ -3,8 +3,10 @@
package win_services
import (
"bytes"
"errors"
"fmt"
"log"
"testing"
"github.com/influxdata/telegraf/testutil"
@@ -128,47 +130,51 @@ var testErrors = []testData{
func TestBasicInfo(t *testing.T) {
winServices := &WinServices{nil, &FakeMgProvider{testErrors[0]}}
winServices := &WinServices{testutil.Logger{}, nil, &FakeMgProvider{testErrors[0]}}
assert.NotEmpty(t, winServices.SampleConfig())
assert.NotEmpty(t, winServices.Description())
}
func TestMgrErrors(t *testing.T) {
//mgr.connect error
winServices := &WinServices{nil, &FakeMgProvider{testErrors[0]}}
winServices := &WinServices{testutil.Logger{}, nil, &FakeMgProvider{testErrors[0]}}
var acc1 testutil.Accumulator
err := winServices.Gather(&acc1)
require.Error(t, err)
assert.Contains(t, err.Error(), testErrors[0].mgrConnectError.Error())
////mgr.listServices error
winServices = &WinServices{nil, &FakeMgProvider{testErrors[1]}}
winServices = &WinServices{testutil.Logger{}, nil, &FakeMgProvider{testErrors[1]}}
var acc2 testutil.Accumulator
err = winServices.Gather(&acc2)
require.Error(t, err)
assert.Contains(t, err.Error(), testErrors[1].mgrListServicesError.Error())
////mgr.listServices error 2
winServices = &WinServices{[]string{"Fake service 1"}, &FakeMgProvider{testErrors[3]}}
winServices = &WinServices{testutil.Logger{}, []string{"Fake service 1"}, &FakeMgProvider{testErrors[3]}}
var acc3 testutil.Accumulator
err = winServices.Gather(&acc3)
require.NoError(t, err)
assert.Len(t, acc3.Errors, 1)
buf := &bytes.Buffer{}
log.SetOutput(buf)
require.NoError(t, winServices.Gather(&acc3))
require.Contains(t, buf.String(), testErrors[2].services[0].serviceOpenError.Error())
}
func TestServiceErrors(t *testing.T) {
winServices := &WinServices{nil, &FakeMgProvider{testErrors[2]}}
winServices := &WinServices{testutil.Logger{}, nil, &FakeMgProvider{testErrors[2]}}
var acc1 testutil.Accumulator
require.NoError(t, winServices.Gather(&acc1))
assert.Len(t, acc1.Errors, 3)
//open service error
assert.Contains(t, acc1.Errors[0].Error(), testErrors[2].services[0].serviceOpenError.Error())
//query service error
assert.Contains(t, acc1.Errors[1].Error(), testErrors[2].services[1].serviceQueryError.Error())
//config service error
assert.Contains(t, acc1.Errors[2].Error(), testErrors[2].services[2].serviceConfigError.Error())
buf := &bytes.Buffer{}
log.SetOutput(buf)
require.NoError(t, winServices.Gather(&acc1))
//open service error
require.Contains(t, buf.String(), testErrors[2].services[0].serviceOpenError.Error())
//query service error
require.Contains(t, buf.String(), testErrors[2].services[1].serviceQueryError.Error())
//config service error
require.Contains(t, buf.String(), testErrors[2].services[2].serviceConfigError.Error())
}
var testSimpleData = []testData{
@@ -179,7 +185,7 @@ var testSimpleData = []testData{
}
func TestGather2(t *testing.T) {
winServices := &WinServices{nil, &FakeMgProvider{testSimpleData[0]}}
winServices := &WinServices{testutil.Logger{}, nil, &FakeMgProvider{testSimpleData[0]}}
var acc1 testutil.Accumulator
require.NoError(t, winServices.Gather(&acc1))
assert.Len(t, acc1.Errors, 0, "There should be no errors after gather")
@@ -193,5 +199,4 @@ func TestGather2(t *testing.T) {
tags["display_name"] = s.displayName
acc1.AssertContainsTaggedFields(t, "win_services", fields, tags)
}
}