Merge branch 'collectd-4.2'

[collectd.git] / src / apcups.c

diff --git a/src/apcups.c b/src/apcups.c
index 8f315c9..174febe 100644 (file)
--- a/src/apcups.c
+++ b/src/apcups.c
@@ -136,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));
@@ -167,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);
@@ -393,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);