Merge branch 'pull/collectd-4.1' into collectd-4.1

[collectd.git] / src / apcups.c

diff --git a/src/apcups.c b/src/apcups.c
index a4aa34d..4f0bdfa 100644 (file)
--- a/src/apcups.c
+++ b/src/apcups.c
@@ -1,9 +1,11 @@
 /*
  * collectd - src/apcups.c
+ * Copyright (C) 2007 Florian octo Forster
  * Copyright (C) 2006 Anthony Gialluca <tonyabg at charter.net>
  * Copyright (C) 2000-2004 Kern Sibbald
  * Copyright (C) 1996-99 Andre M. Hedrick <andre at suse.com>
  *
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General
  * Public License as published by the Free Software Foundation.
@@ -391,7 +393,7 @@ static void apc_submit (struct apc_detail_s *apcups_detail)
        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 ("percent",    "load",    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);