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

plugins/inputs/sysstat/README.md

@@ -16,18 +16,15 @@ the created binary data file with the `sadf` utility.
   ## On Debian and Arch Linux the default path is /usr/lib/sa/sadc whereas
   ## on RHEL and CentOS the default path is /usr/lib64/sa/sadc
   sadc_path = "/usr/lib/sa/sadc" # required
-  #
-  #
+
   ## Path to the sadf command, if it is not in PATH
   # sadf_path = "/usr/bin/sadf"
-  #
-  #
+
   ## Activities is a list of activities, that are passed as argument to the
   ## sadc collector utility (e.g: DISK, SNMP etc...)
   ## The more activities that are added, the more data is collected.
   # activities = ["DISK"]
-  #
-  #
+
   ## Group metrics to measurements.
   ##
   ## If group is false each metric will be prefixed with a description
@@ -35,8 +32,7 @@ the created binary data file with the `sadf` utility.
   ##
   ## If Group is true, corresponding metrics are grouped to a single measurement.
   # group = true
-  #
-  #
+
   ## Options for the sadf command. The values on the left represent the sadf options and
   ## the values on the right their description (wich are used for grouping and prefixing metrics).
   ##
@@ -58,8 +54,7 @@ the created binary data file with the `sadf` utility.
 	-w = "task"
   #	-H = "hugepages"        # only available for newer linux distributions
   #	"-I ALL" = "interrupts" # requires INT activity
-  #
-  #
+
   ## Device tags can be used to add additional tags for devices. For example the configuration below
   ## adds a tag vg with value rootvg for all metrics with sda devices.
   # [[inputs.sysstat.device_tags.sda]]

plugins/inputs/sysstat/sysstat.go

@@ -7,7 +7,6 @@ import (
 	"encoding/csv"
 	"fmt"
 	"io"
-	"log"
 	"os"
 	"os/exec"
 	"path"
@@ -67,6 +66,8 @@ type Sysstat struct {
 	DeviceTags map[string][]map[string]string `toml:"device_tags"`
 	tmpFile    string
 	interval   int
+
+	Log telegraf.Logger
 }
 
 func (*Sysstat) Description() string {
@@ -81,18 +82,15 @@ var sampleConfig = `
   ##   Arch:          /usr/lib/sa/sadc
   ##   RHEL/CentOS:   /usr/lib64/sa/sadc
   sadc_path = "/usr/lib/sa/sadc" # required
-  #
-  #
+
   ## Path to the sadf command, if it is not in PATH
   # sadf_path = "/usr/bin/sadf"
-  #
-  #
+
   ## Activities is a list of activities, that are passed as argument to the
   ## sadc collector utility (e.g: DISK, SNMP etc...)
   ## The more activities that are added, the more data is collected.
   # activities = ["DISK"]
-  #
-  #
+
   ## Group metrics to measurements.
   ##
   ## If group is false each metric will be prefixed with a description
@@ -100,8 +98,7 @@ var sampleConfig = `
   ##
   ## If Group is true, corresponding metrics are grouped to a single measurement.
   # group = true
-  #
-  #
+
   ## Options for the sadf command. The values on the left represent the sadf
   ## options and the values on the right their description (which are used for
   ## grouping and prefixing metrics).
@@ -125,8 +122,7 @@ var sampleConfig = `
     -w = "task"
   #  -H = "hugepages"        # only available for newer linux distributions
   #  "-I ALL" = "interrupts" # requires INT activity
-  #
-  #
+
   ## Device tags can be used to add additional tags for devices.
   ## For example the configuration below adds a tag vg with value rootvg for
   ## all metrics with sda devices.
@@ -196,7 +192,7 @@ func (s *Sysstat) collect() error {
 	out, err := internal.CombinedOutputTimeout(cmd, time.Second*time.Duration(collectInterval+parseInterval))
 	if err != nil {
 		if err := os.Remove(s.tmpFile); err != nil {
-			log.Printf("E! failed to remove tmp file after %s command: %s", strings.Join(cmd.Args, " "), err)
+			s.Log.Errorf("Failed to remove tmp file after %q command: %s", strings.Join(cmd.Args, " "), err.Error())
 		}
 		return fmt.Errorf("failed to run command %s: %s - %s", strings.Join(cmd.Args, " "), err, string(out))
 	}

plugins/inputs/sysstat/sysstat_test.go

@@ -13,6 +13,7 @@ import (
 )
 
 var s = Sysstat{
+	Log:        testutil.Logger{},
 	interval:   10,
 	Sadc:       "/usr/lib/sa/sadc",
 	Sadf:       "/usr/bin/sadf",