CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(inputs.systemd_units): Handle disabled multi-instance units correctly (#14987)

This commit is contained in:
Sven Rebhan 2024-03-14 16:19:27 +01:00 committed by GitHub
parent cbd6ff5774
commit 288fb06c68
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/inputs/systemd_units/README.md
View File

@ -35,7 +35,7 @@ See the [CONFIGURATION.md][CONFIGURATION.md] for more details.
# details = false # details = false
## Timeout for state-collection ## Timeout for state-collection
# timeout = "1s" # timeout = "5s"
``` ```
This plugin supports two modes of operation: This plugin supports two modes of operation:

2
plugins/inputs/systemd_units/sample.conf
View File

@ -16,4 +16,4 @@
# details = false # details = false
## Timeout for state-collection ## Timeout for state-collection
# timeout = "1s" # timeout = "5s"

2
plugins/inputs/systemd_units/systemd_units.go
View File

@ -29,6 +29,6 @@ func (*SystemdUnits) SampleConfig() string {
func init() { func init() {
inputs.Add("systemd_units", func() telegraf.Input { inputs.Add("systemd_units", func() telegraf.Input {
return &SystemdUnits{Timeout: config.Duration(time.Second)} return &SystemdUnits{Timeout: config.Duration(5 * time.Second)}
}) })
} }

20
plugins/inputs/systemd_units/systemd_units_linux.go
View File

@ -236,6 +236,14 @@ func (s *SystemdUnits) Gather(acc telegraf.Accumulator) error {
continue continue
} }
seen[name] = true seen[name] = true
// Detect disabled multi-instance units and declare them as static
_, suffix, found := strings.Cut(name, "@")
instance, _, _ := strings.Cut(suffix, ".")
if found && instance == "" {
static = append(static, name)
continue
}
disabled = append(disabled, name) disabled = append(disabled, name)
case "static": case "static":
// Make sure we filter already loaded static multi-instance units // Make sure we filter already loaded static multi-instance units
@ -280,7 +288,17 @@ func (s *SystemdUnits) Gather(acc telegraf.Accumulator) error {
// Filter units of the wrong type // Filter units of the wrong type
props, err := s.client.GetUnitTypePropertiesContext(ctx, state.Name, s.UnitType) props, err := s.client.GetUnitTypePropertiesContext(ctx, state.Name, s.UnitType)
if err != nil { if err != nil {
continue // Skip units returning "Unknown interface" errors as those indicate
// that the unit is of the wrong type.
if strings.Contains(err.Error(), "Unknown interface") {
continue
}
// For other units we make up properties, usually those are
// disabled multi-instance units
props = map[string]interface{}{
"StatusErrno": int64(-1),
"NRestarts": uint64(0),
}
} }
u := unitInfo{ u := unitInfo{