Merge branch 'collectd-4.1' into collectd-4.2

[collectd.git] / src / apcups.c

diff --git a/src/apcups.c b/src/apcups.c
index 75de03e..174febe 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.
@@ -134,7 +136,7 @@ static int net_open (char *host, char *service, int port)
        if (status != 0)
        {
                char errbuf[1024];
-               DEBUG ("getaddrinfo failed: %s",
+               INFO ("getaddrinfo failed: %s",
                                (status == EAI_SYSTEM)
                                ? sstrerror (errno, errbuf, sizeof (errbuf))
                                : gai_strerror (status));
@@ -165,7 +167,7 @@ static int net_open (char *host, char *service, int port)
        if (status != 0) /* `connect(2)' failed */
        {
                char errbuf[1024];
-               DEBUG ("connect failed: %s",
+               INFO ("connect failed: %s",
                                sstrerror (errno, errbuf, sizeof (errbuf)));
                close (sd);
                return (-1);
@@ -387,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",    "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);
 }
 
 static int apcups_read (void)