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

fix(inputs.upsd): Include ups.real_power (#12961)

This commit is contained in:
Joshua Powers 2023-03-28 10:41:43 -06:00 committed by GitHub
parent bfeae49e1b
commit 19d2bbbb90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/inputs/upsd/upsd.go
View File

@ -97,6 +97,7 @@ func (u *Upsd) gatherUps(acc telegraf.Accumulator, name string, variables []nut.
"nominal_input_voltage": "input.voltage.nominal",
"nominal_power": "ups.realpower.nominal",
"output_voltage": "output.voltage",
"real_power": "ups.realpower",
"ups_delay_shutdown": "ups.delay.shutdown",
"ups_delay_start": "ups.delay.start",
}

5
plugins/inputs/upsd/upsd_test.go
View File

@ -44,6 +44,7 @@ func TestUpsdGather(t *testing.T) {
"nominal_input_voltage": float64(230),
"nominal_power": int64(700),
"output_voltage": float64(230),
"real_power": float64(41),
"status_flags": uint64(8),
"time_left_ns": int64(600000000000),
"ups_status": "OL",
@ -72,6 +73,7 @@ func TestUpsdGather(t *testing.T) {
"nominal_input_voltage": float64(230),
"nominal_power": int64(700),
"output_voltage": float64(230),
"real_power": float64(41),
"status_flags": uint64(8),
"time_left_ns": int64(600000000000),
"ups_status": "OL",
@ -99,6 +101,7 @@ func TestUpsdGather(t *testing.T) {
require.Error(t, err)
} else {
require.NoError(t, err)
acc.AssertContainsFields(t, "upsd", tt.fields)
acc.AssertContainsTaggedFields(t, "upsd", tt.fields, tt.tags)
}
cancel()
@ -247,6 +250,7 @@ VAR fake output.voltage "230.0"
VAR fake battery.voltage "13.4"
VAR fake input.voltage.nominal "230.0"
VAR fake battery.voltage.nominal "24.0"
VAR fake ups.realpower "41.0"
VAR fake ups.realpower.nominal "700"
VAR fake ups.firmware "CUSTOM_FIRMWARE"
VAR fake battery.mfr.date "2016-07-26"
@ -264,6 +268,7 @@ END LIST VAR fake
m = appendVariable(m, "battery.voltage", "NUMBER")
m = appendVariable(m, "input.voltage.nominal", "NUMBER")
m = appendVariable(m, "battery.voltage.nominal", "NUMBER")
m = appendVariable(m, "ups.realpower", "NUMBER")
m = appendVariable(m, "ups.realpower.nominal", "NUMBER")
m = appendVariable(m, "ups.firmware", "STRING:64")
m = appendVariable(m, "battery.mfr.date", "STRING:64")