Merge branch 'collectd-4.0' into collectd-4.1

[collectd.git] / src / apcups.c

diff --git a/src/apcups.c b/src/apcups.c
index 62c7a3c..8f315c9 100644 (file)
--- a/src/apcups.c
+++ b/src/apcups.c
@@ -389,14 +389,14 @@ static void apc_submit_generic (char *type, char *type_inst, double value)
 
 static void apc_submit (struct apc_detail_s *apcups_detail)
 {
-       apc_submit_generic ("apcups_voltage",    "input",   apcups_detail->linev);
-       apc_submit_generic ("apcups_voltage",    "output",  apcups_detail->outputv);
-       apc_submit_generic ("apcups_voltage",    "battery", apcups_detail->battv);
-       apc_submit_generic ("apcups_charge",     "",        apcups_detail->bcharge);
-       apc_submit_generic ("apcups_charge_pct", "",        apcups_detail->loadpct);
-       apc_submit_generic ("apcups_timeleft",   "",        apcups_detail->timeleft);
-       apc_submit_generic ("apcups_temp",       "",        apcups_detail->itemp);
-       apc_submit_generic ("apcups_frequency",  "input",   apcups_detail->linefreq);
+       apc_submit_generic ("voltage",    "input",   apcups_detail->linev);
+       apc_submit_generic ("voltage",    "output",  apcups_detail->outputv);
+       apc_submit_generic ("voltage",    "battery", apcups_detail->battv);
+       apc_submit_generic ("charge",     "",        apcups_detail->bcharge);
+       apc_submit_generic ("percent",    "charge",  apcups_detail->loadpct);
+       apc_submit_generic ("timeleft",   "",        apcups_detail->timeleft);
+       apc_submit_generic ("temperature", "",       apcups_detail->itemp);
+       apc_submit_generic ("frequency",  "input",   apcups_detail->linefreq);
 }
 
 static int apcups_read (void)