X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fapcups.c;h=174febe45f5a5346124d7ad97ec83890cc964bda;hb=ad05cf135ac41af52f761d21f9acd3cd07540c7e;hp=62c7a3c404844dcc1b8f9d66d2bdf72c7b75c32d;hpb=785feb9d2544aff7f561fbda30aa762eec9e07bc;p=collectd.git

diff --git a/src/apcups.c b/src/apcups.c
index 62c7a3c4..174febe4 100644
--- 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);
@@ -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",    "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)