/*
* 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.
#include "common.h" /* rrd_update_file */
#include "plugin.h" /* plugin_register, plugin_submit */
#include "configfile.h" /* cf_register */
-#include "utils_debug.h"
-
-<<<<<<< .mine
-#include <string.h>
-#include <errno.h>
-#include <netdb.h>
-#include <sys/socket.h> /* Used for socket connections */
-#include <netinet/in.h> /* Used for socket connections */
-#include <arpa/inet.h> /* Used for socket connections */
-=======
+
#if HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
#if HAVE_NETDB_H
# include <netdb.h>
#endif
+
#if HAVE_NETINET_IN_H
# include <netinet/in.h>
#endif
-#if 0
-#if HAVE_ARPA_INET_H
-# include <arpa/inet.h> /* inet_addr */
-#endif
-#include <pwd.h>
-#include <setjmp.h> /* FIXME: Is this really neccessary? */
-#include <termios.h> /* FIXME: Is this really neccessary? */
-#include <sys/ioctl.h> /* FIXME: Is this really neccessary? */
-#include <sys/ipc.h> /* FIXME: Is this really neccessary? */
-#include <sys/sem.h> /* FIXME: Is this really neccessary? */
-#include <sys/shm.h> /* FIXME: Is this really neccessary? */
-#endif
->>>>>>> .r743
-
-
-
#define NISPORT 3551
-#define _(String) (String)
-#define N_(String) (String)
#define MAXSTRING 256
#define MODULE_NAME "apcups"
-<<<<<<< .mine
+#define APCUPS_DEFAULT_HOST "localhost"
-=======
->>>>>>> .r743
-/* Default values for contacting daemon */
-<<<<<<< .mine
-static char *host = "localhost"; /* the default host to connect to */
-static int port = NISPORT; /* the default port to connect to */
-=======
-static char *global_host = NULL;
-static int global_port = NISPORT;
->>>>>>> .r743
-
-<<<<<<< .mine
/*
- * This is used in do_apc_status() to track the last connection state.
- * We do not want the read function spitting out an error every "step"
- * seconds (usually 10 secs).
- */
-static int apcConnStatus = 0;
-
-static struct sockaddr_in tcp_serv_addr; /* socket information */
-static char *net_errmsg = NULL; /* pointer to error message */
-static char net_errbuf[256]; /* error message buffer for messages */
-
-=======
->>>>>>> .r743
-/*
- * The following are normally compiled, when the module is compiled with its
- * own main for testing these are ifdef'd out.
- */
-/*
- * FIXME: Rename DSes to be more generic and follow established conventions.
- * However, they currently match the values put out by apcupsd.
+ * Private data types
*/
-#ifndef APCMAIN
-static char *bvolt_file_template = "apcups/voltage-%s.rrd";
-static char *bvolt_ds_def[] =
-{
- "DS:voltage:GAUGE:"COLLECTD_HEARTBEAT":0:U",
-};
-static int bvolt_ds_num = 1;
-
-static char *load_file_template = "apcups/charge_percent.rrd";
-static char *load_ds_def[] =
-{
- "DS:percent:GAUGE:"COLLECTD_HEARTBEAT":0:100",
-};
-static int load_ds_num = 1;
-
-static char *charge_file_template = "apcups/charge.rrd";
-static char *charge_ds_def[] =
-{
- "DS:charge:GAUGE:"COLLECTD_HEARTBEAT":0:U",
-};
-static int charge_ds_num = 1;
-
-static char *time_file_template = "apcups/time.rrd";
-static char *time_ds_def[] =
-{
- "DS:timeleft:GAUGE:"COLLECTD_HEARTBEAT":0:100",
-};
-static int time_ds_num = 1;
-
-static char *temp_file_template = "apcups/temperature.rrd";
-static char *temp_ds_def[] =
-{
- /* -273.15 is absolute zero */
- "DS:temperature:GAUGE:"COLLECTD_HEARTBEAT":-274:U",
-};
-static int temp_ds_num = 1;
-
-static char *freq_file_template = "apcups/frequency-%s.rrd";
-static char *freq_ds_def[] =
-{
- "DS:frequency:GAUGE:"COLLECTD_HEARTBEAT":0:U",
-};
-static int freq_ds_num = 1;
-
-static char *config_keys[] =
-{
- "Host",
- "Port",
- NULL
-};
-static int config_keys_num = 2;
-
-#endif /* ifndef APCMAIN */
-
struct apc_detail_s
{
-<<<<<<< .mine
- int connected;
- float linev;
- float loadpct;
- float bcharge;
- float timeleft;
- float outputv;
- float itemp;
- float battv;
- float linefreq;
-=======
double linev;
double loadpct;
double bcharge;
double itemp;
double battv;
double linefreq;
->>>>>>> .r743
};
-<<<<<<< .mine
-=======
-#define BIG_BUF 4096
-
->>>>>>> .r743
/*
- * Read nbytes from the network.
- * It is possible that the total bytes require in several
- * read requests
+ * Private variables
*/
-static int read_nbytes (int fd, char *ptr, int nbytes)
-{
- int nleft, nread;
-
- nleft = nbytes;
-
- while (nleft > 0) {
- do {
- nread = read (fd, ptr, nleft);
- } while (nread == -1 && (errno == EINTR || errno == EAGAIN));
-
- if (nread <= 0) {
- return (nread); /* error, or EOF */
- }
-
- nleft -= nread;
- ptr += nread;
- }
+/* Default values for contacting daemon */
+static char *conf_host = NULL;
+static int conf_port = NISPORT;
- return (nbytes - nleft); /* return >= 0 */
-}
+static int global_sockfd = -1;
-/*
- * Write nbytes to the network.
- * It may require several writes.
- */
-static int write_nbytes (int fd, void *buf, int buflen)
+static const char *config_keys[] =
{
- int nleft;
- int nwritten;
- char *ptr;
-
- ptr = (char *) buf;
-
-<<<<<<< .mine
- if (nwritten <= 0) {
- return (nwritten); /* error */
-=======
- nleft = buflen;
- while (nleft > 0)
- {
- nwritten = write (fd, ptr, nleft);
-
- if (nwritten <= 0)
- {
- syslog (LOG_ERR, "Writing to socket failed: %s", strerror (errno));
- return (nwritten);
->>>>>>> .r743
- }
-
- nleft -= nwritten;
- ptr += nwritten;
- }
-
- /* If we get here, (nleft <= 0) is true */
- return (buflen);
-}
+ "Host",
+ "Port",
+ NULL
+};
+static int config_keys_num = 2;
/* Close the network connection */
-static void net_close (int sockfd)
+static int apcups_shutdown (void)
{
- short pktsiz = 0;
+ uint16_t packet_size = 0;
+
+ if (global_sockfd < 0)
+ return (0);
+
+ DEBUG ("Gracefully shutting down socket %i.", global_sockfd);
/* send EOF sentinel */
- write_nbytes (sockfd, &pktsiz, sizeof (short));
- close (sockfd);
-}
+ swrite (global_sockfd, (void *) &packet_size, sizeof (packet_size));
+ close (global_sockfd);
+ global_sockfd = -1;
+
+ return (0);
+} /* int apcups_shutdown */
/*
* Open a TCP connection to the UPS network server
status = getaddrinfo (host, port_str, &ai_hints, &ai_return);
if (status != 0)
{
- DBG ("getaddrinfo failed: %s", status == EAI_SYSTEM ? strerror (errno) : gai_strerror (status));
+ char errbuf[1024];
+ DEBUG ("getaddrinfo failed: %s",
+ (status == EAI_SYSTEM)
+ ? sstrerror (errno, errbuf, sizeof (errbuf))
+ : gai_strerror (status));
return (-1);
}
if (sd < 0)
{
- DBG ("Unable to open a socket");
+ DEBUG ("Unable to open a socket");
freeaddrinfo (ai_return);
return (-1);
}
if (status != 0) /* `connect(2)' failed */
{
- DBG ("connect failed: %s", strerror (errno));
+ char errbuf[1024];
+ DEBUG ("connect failed: %s",
+ sstrerror (errno, errbuf, sizeof (errbuf)));
+ close (sd);
return (-1);
}
+ DEBUG ("Done opening a socket %i", sd);
+
return (sd);
} /* int net_open (char *host, char *service, int port) */
* Returns -1 on hard end of file (i.e. network connection close)
* Returns -2 on error
*/
-static int net_recv (int sockfd, char *buf, int buflen)
+static int net_recv (int *sockfd, char *buf, int buflen)
{
- int nbytes;
- short pktsiz;
+ uint16_t packet_size;
/* get data size -- in short */
- if ((nbytes = read_nbytes (sockfd, (char *) &pktsiz, sizeof (short))) <= 0)
+ if (sread (*sockfd, (void *) &packet_size, sizeof (packet_size)) != 0)
+ {
+ *sockfd = -1;
return (-1);
+ }
- if (nbytes != sizeof (short))
- return (-2);
-
- pktsiz = ntohs (pktsiz);
- if (pktsiz > buflen)
+ packet_size = ntohs (packet_size);
+ if (packet_size > buflen)
{
- DBG ("record length too large");
+ DEBUG ("record length too large");
return (-2);
}
- if (pktsiz == 0)
+ if (packet_size == 0)
return (0);
/* now read the actual data */
- if ((nbytes = read_nbytes (sockfd, buf, pktsiz)) <= 0)
- return (-2);
-
- if (nbytes != pktsiz)
- return (-2);
+ if (sread (*sockfd, (void *) buf, packet_size) != 0)
+ {
+ *sockfd = -1;
+ return (-1);
+ }
- return (nbytes);
-} /* static int net_recv (int sockfd, char *buf, int buflen) */
+ return ((int) packet_size);
+} /* static int net_recv (int *sockfd, char *buf, int buflen) */
/*
* Send a message over the network. The send consists of
* Returns zero on success
* Returns non-zero on error
*/
-static int net_send (int sockfd, char *buff, int len)
+static int net_send (int *sockfd, char *buff, int len)
{
- int rc;
- short packet_size;
+ uint16_t packet_size;
+
+ assert (len > 0);
+ assert (*sockfd >= 0);
/* send short containing size of data packet */
- packet_size = htons ((short) len);
+ packet_size = htons ((uint16_t) len);
- rc = write_nbytes (sockfd, &packet_size, sizeof (packet_size));
- if (rc != sizeof (packet_size))
+ if (swrite (*sockfd, (void *) &packet_size, sizeof (packet_size)) != 0)
+ {
+ *sockfd = -1;
return (-1);
+ }
/* send data packet */
- rc = write_nbytes (sockfd, buff, len);
- if (rc != len)
- return (-1);
+ if (swrite (*sockfd, (void *) buff, len) != 0)
+ {
+ *sockfd = -1;
+ return (-2);
+ }
return (0);
}
-<<<<<<< .mine
-/*
- * Get and print status from apcupsd NIS server if APCMAIN is defined.
- * Poplate apcups_detail structure for plugin submit().
- */
-static int do_apc_status(char *host, int port, struct apc_detail_s *apcups_detail)
-=======
/* Get and print status from apcupsd NIS server */
static int apc_query_server (char *host, int port,
struct apc_detail_s *apcups_detail)
->>>>>>> .r743
{
- int sockfd;
int n;
- char recvline[MAXSTRING + 1];
+ char recvline[1024];
char *tokptr;
+ char *toksaveptr;
char *key;
- float value;
+ double value;
+
+ static complain_t compl;
+
#if APCMAIN
# define PRINT_VALUE(name, val) printf(" Found property: name = %s; value = %f;\n", name, val)
#else
# define PRINT_VALUE(name, val) /**/
#endif
-<<<<<<< .mine
- /*
- * TODO: Keep the socket open, if possible.
- * Can open socket in module init, but without a corresponding module
- * uninit there is no place to gracefully close the socket.
- */
-=======
- /* TODO: Keep the socket open, if possible */
->>>>>>> .r743
- if ((sockfd = net_open (host, NULL, port)) < 0)
+ if (global_sockfd < 0)
{
- /*
- * When the integer apcConnStatus rolls over it will print out
- * again, if we haven't connected by then.
- */
- if (apcConnStatus++ == 0)
- syslog (LOG_ERR, "apcups plugin: Connecting to the apcupsd failed: %s",
- net_errmsg);
- return (-1);
- } else apcConnStatus = 0;
+ if ((global_sockfd = net_open (host, NULL, port)) < 0)
+ {
+ plugin_complain (LOG_ERR, &compl, "apcups plugin: "
+ "Connecting to the apcupsd failed.");
+ return (-1);
+ }
+ else
+ {
+ plugin_relief (LOG_NOTICE, &compl, "apcups plugin: "
+ "Connection re-established to the apcupsd.");
+ }
+ }
- if (net_send (sockfd, "status", 6) < 0)
+ if (net_send (&global_sockfd, "status", 6) < 0)
{
- syslog (LOG_ERR, "apcups plugin: sending to the apcupsd failed: %s",
- net_errmsg);
+ ERROR ("apcups plugin: Writing to the socket failed.");
return (-1);
}
-<<<<<<< .mine
-=======
- net_send (sockfd, "status", 6);
-
->>>>>>> .r743
- while ((n = net_recv (sockfd, recvline, sizeof (recvline))) > 0)
+ while ((n = net_recv (&global_sockfd, recvline, sizeof (recvline) - 1)) > 0)
{
- recvline[n-1] = '\0';
+ assert (n < sizeof (recvline));
+ recvline[n] = '\0';
#if APCMAIN
- printf ("net_recv = \"%s\"\n", recvline);
+ printf ("net_recv = `%s';\n", recvline);
#endif /* if APCMAIN */
- tokptr = strtok (recvline, ":");
+ toksaveptr = NULL;
+ tokptr = strtok_r (recvline, " :\t", &toksaveptr);
while (tokptr != NULL)
{
key = tokptr;
- if ((tokptr = strtok (NULL, " \t")) == NULL)
- continue;
+ if ((tokptr = strtok_r (NULL, " :\t", &toksaveptr)) == NULL)
+ continue;
+ value = atof (tokptr);
- if (strncmp ("LINEV", key,5) == 0) {
- value = atof (tokptr);
- PRINT_VALUE (key, value);
+ PRINT_VALUE (key, value);
+
+ if (strcmp ("LINEV", key) == 0)
apcups_detail->linev = value;
- } else if (strncmp ("BATTV", key,5) == 0) {
- value = atof (tokptr);
- PRINT_VALUE (key, value);
+ else if (strcmp ("BATTV", key) == 0)
apcups_detail->battv = value;
- } else if (strncmp ("ITEMP", key,5) == 0) {
- value = atof (tokptr);
- PRINT_VALUE (key, value);
+ else if (strcmp ("ITEMP", key) == 0)
apcups_detail->itemp = value;
- } else if (strncmp ("LOADPCT", key,7) == 0) {
- value = atof (tokptr);
- PRINT_VALUE (key, value);
+ else if (strcmp ("LOADPCT", key) == 0)
apcups_detail->loadpct = value;
- } else if (strncmp ("BCHARGE", key,7) == 0) {
- value = atof (tokptr);
- PRINT_VALUE (key, value);
+ else if (strcmp ("BCHARGE", key) == 0)
apcups_detail->bcharge = value;
- } else if (strncmp ("OUTPUTV", key,7) == 0) {
- value = atof (tokptr);
- PRINT_VALUE (key, value);
+ else if (strcmp ("OUTPUTV", key) == 0)
apcups_detail->outputv = value;
- } else if (strncmp ("LINEFREQ", key,8) == 0) {
- value = atof (tokptr);
- PRINT_VALUE (key, value);
+ else if (strcmp ("LINEFREQ", key) == 0)
apcups_detail->linefreq = value;
- } else if (strncmp ("TIMELEFT", key,8) == 0) {
- value = atof (tokptr);
- PRINT_VALUE (key, value);
+ else if (strcmp ("TIMELEFT", key) == 0)
apcups_detail->timeleft = value;
- }
- tokptr = strtok (NULL, ":");
+ tokptr = strtok_r (NULL, ":", &toksaveptr);
} /* while (tokptr != NULL) */
}
-
-<<<<<<< .mine
- if (n < 0) {
- syslog(LOG_ERR, "apcups plugin: Error recieving data: %s",
- net_errmsg);
- net_errmsg = NULL;
- return(-1);
- }
-=======
- net_close (sockfd);
-
+
if (n < 0)
{
- syslog (LOG_WARNING, "apcups plugin: Error reading from socket");
+ WARNING ("apcups plugin: Error reading from socket");
return (-1);
}
->>>>>>> .r743
-
-<<<<<<< .mine
- /* signal that we did in fact connect. */
- apcups_detail->connected = 1;
- net_close(sockfd);
-
-=======
->>>>>>> .r743
return (0);
}
-#ifdef APCMAIN
-<<<<<<< .mine
-/*
- * This is used for testing apcups in a standalone mode.
- * Usefull for debugging.
- */
-int main(int argc, char **argv)
-=======
-int main (int argc, char **argv)
->>>>>>> .r743
+static int apcups_config (const char *key, const char *value)
{
- /* we are not really going to use this */
- struct apc_detail_s apcups_detail;
-
-<<<<<<< .mine
- openlog("apcups",LOG_PID | LOG_NDELAY | LOG_LOCAL1);
-
- if (!*host || strcmp(host, "0.0.0.0") == 0)
-=======
- if (!*host || strcmp (host, "0.0.0.0") == 0)
->>>>>>> .r743
- host = "localhost";
-
-<<<<<<< .mine
- if(do_apc_status(host, port, &apcups_detail) < 0) {
- printf("apcups: Failed...\n");
- return(-1);
- }
-=======
- apc_query_server (global_host, global_port, &apcups_detail);
->>>>>>> .r743
-
- return 0;
-}
-#else
-static int apcups_config (char *key, char *value)
-{
-<<<<<<< .mine
- static char lhost[126];
-
- if (strcasecmp (key, "host") == 0)
- {
- lhost[0] = '\0';
- strcpy(lhost,key);
- host = lhost;
- }
- else if (strcasecmp (key, "Port") == 0)
- {
- int port_tmp = atoi (value);
- if(port_tmp < 1 || port_tmp > 65535) {
- syslog (LOG_WARNING, "apcups: `port' failed: %s",
- value);
- return (1);
- } else {
- port = port_tmp;
- }
- }
- else
- {
- return (-1);
- }
-
- if (strcmp(host, "0.0.0.0") == 0)
- host = "localhost";
-
- return(0);
-=======
if (strcasecmp (key, "host") == 0)
{
- if (global_host != NULL)
+ if (conf_host != NULL)
{
- free (global_host);
- global_host = NULL;
+ free (conf_host);
+ conf_host = NULL;
}
- if ((global_host = strdup (value)) == NULL)
+ if ((conf_host = strdup (value)) == NULL)
return (1);
}
else if (strcasecmp (key, "Port") == 0)
int port_tmp = atoi (value);
if (port_tmp < 1 || port_tmp > 65535)
{
- syslog (LOG_WARNING, "apcups plugin: Invalid port: %i", port_tmp);
+ WARNING ("apcups plugin: Invalid port: %i", port_tmp);
return (1);
}
- global_port = port_tmp;
+ conf_port = port_tmp;
}
else
{
return (-1);
}
return (0);
->>>>>>> .r743
-}
-
-static void apcups_init (void)
-{
- return;
}
-static void apc_write_voltage (char *host, char *inst, char *val)
+static void apc_submit_generic (char *type, char *type_inst, double value)
{
- char file[512];
- int status;
-
- status = snprintf (file, 512, bvolt_file_template, inst);
- if ((status < 1) || (status >= 512))
- return;
+ value_t values[1];
+ value_list_t vl = VALUE_LIST_INIT;
- rrd_update_file (host, file, val, bvolt_ds_def, bvolt_ds_num);
-}
+ values[0].gauge = value;
-static void apc_write_charge (char *host, char *inst, char *val)
-{
- rrd_update_file (host, charge_file_template, val, charge_ds_def, charge_ds_num);
-}
+ vl.values = values;
+ vl.values_len = 1;
+ vl.time = time (NULL);
+ strcpy (vl.host, hostname_g);
+ strcpy (vl.plugin, "apcups");
+ strcpy (vl.plugin_instance, "");
+ strncpy (vl.type_instance, type_inst, sizeof (vl.type_instance));
-static void apc_write_percent (char *host, char *inst, char *val)
-{
- rrd_update_file (host, load_file_template, val, load_ds_def, load_ds_num);
-}
-
-static void apc_write_timeleft (char *host, char *inst, char *val)
-{
- rrd_update_file (host, time_file_template, val, time_ds_def, time_ds_num);
-}
-
-static void apc_write_temperature (char *host, char *inst, char *val)
-{
- rrd_update_file (host, temp_file_template, val, temp_ds_def, temp_ds_num);
-}
-
-static void apc_write_frequency (char *host, char *inst, char *val)
-{
-<<<<<<< .mine
- struct apc_detail_s apcups_detail;
-
- apcups_detail.linev = 0.0;
- apcups_detail.loadpct = 0.0;
- apcups_detail.bcharge = 0.0;
- apcups_detail.timeleft = 0.0;
- apcups_detail.outputv = 0.0;
- apcups_detail.itemp = 0.0;
- apcups_detail.battv = 0.0;
- apcups_detail.linefreq = 0.0;
- apcups_detail.connected = 0;
-=======
- char file[512];
- int status;
->>>>>>> .r743
-
-<<<<<<< .mine
-
- if (!*host || strcmp(host, "0.0.0.0") == 0)
- host = "localhost";
-
- if(do_apc_status(host, port, &apcups_detail) < 0) return;
-
- /*
- * if we did not connect then do not bother submitting
- * zeros. We want rrd files to have NAN.
- */
- if(!apcups_detail.connected) return;
-=======
- status = snprintf (file, 512, freq_file_template, inst);
- if ((status < 1) || (status >= 512))
- return;
->>>>>>> .r743
-
-<<<<<<< .mine
- apcups_submit (host, &apcups_detail);
- apc_bvolt_submit (host, &apcups_detail);
- apc_load_submit (host, &apcups_detail);
- apc_charge_submit (host, &apcups_detail);
- apc_temp_submit (host, &apcups_detail);
- apc_time_submit (host, &apcups_detail);
- apc_freq_submit (host, &apcups_detail);
-=======
- rrd_update_file (host, file, val, freq_ds_def, freq_ds_num);
->>>>>>> .r743
-}
-
-static void apc_submit_generic (char *type, char *inst,
- double value)
-{
-<<<<<<< .mine
- char file[512];
- int status;
-
- status = snprintf (file, 512, volt_file_template, inst);
- if (status < 1)
- return;
- else if (status >= 512)
- return;
-
- rrd_update_file (host, file, val, volt_ds_def, volt_ds_num);
-}
-=======
- char buf[512];
- int status;
->>>>>>> .r743
-
-<<<<<<< .mine
-static void apc_bvolt_write (char *host, char *inst, char *val)
-{
- char file[512];
- int status;
-
- status = snprintf (file, 512, bvolt_file_template, inst);
- if (status < 1)
- return;
- else if (status >= 512)
- return;
-
- rrd_update_file (host, file, val, bvolt_ds_def, bvolt_ds_num);
-}
-=======
- status = snprintf (buf, 512, "%u:%f",
- (unsigned int) curtime, value);
- if ((status < 1) || (status >= 512))
- return;
->>>>>>> .r743
-
-<<<<<<< .mine
-static void apc_load_write (char *host, char *inst, char *val)
-{
- char file[512];
- int status;
-
- status = snprintf (file, 512, load_file_template, inst);
- if (status < 1)
- return;
- else if (status >= 512)
- return;
-
- rrd_update_file (host, file, val, load_ds_def, load_ds_num);
-=======
- plugin_submit (type, inst, buf);
->>>>>>> .r743
+ plugin_dispatch_values (type, &vl);
}
static void apc_submit (struct apc_detail_s *apcups_detail)
{
-<<<<<<< .mine
- char file[512];
- int status;
-
- status = snprintf (file, 512, charge_file_template, inst);
- if (status < 1)
- return;
- else if (status >= 512)
- return;
-
- rrd_update_file (host, file, val, charge_ds_def, charge_ds_num);
-=======
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_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);
->>>>>>> .r743
}
-static void apcups_read (void)
+static int apcups_read (void)
{
-<<<<<<< .mine
- char file[512];
- int status;
-
- status = snprintf (file, 512, temp_file_template, inst);
- if (status < 1)
- return;
- else if (status >= 512)
- return;
-
- rrd_update_file (host, file, val, temp_ds_def, temp_ds_num);
-}
-=======
struct apc_detail_s apcups_detail;
int status;
->>>>>>> .r743
-<<<<<<< .mine
-static void apc_time_write (char *host, char *inst, char *val)
-{
- char file[512];
- int status;
-=======
- if (global_host == NULL)
- return;
-
apcups_detail.linev = -1.0;
apcups_detail.outputv = -1.0;
apcups_detail.battv = -1.0;
apcups_detail.timeleft = -1.0;
apcups_detail.itemp = -300.0;
apcups_detail.linefreq = -1.0;
->>>>>>> .r743
-<<<<<<< .mine
- status = snprintf (file, 512, time_file_template, inst);
- if (status < 1)
- return;
- else if (status >= 512)
- return;
-
- rrd_update_file (host, file, val, time_ds_def, time_ds_num);
-}
-=======
- status = apc_query_server (global_host, global_port, &apcups_detail);
+ status = apc_query_server (conf_host == NULL
+ ? APCUPS_DEFAULT_HOST
+ : conf_host,
+ conf_port, &apcups_detail);
/*
* if we did not connect then do not bother submitting
* zeros. We want rrd files to have NAN.
*/
if (status != 0)
- return;
->>>>>>> .r743
+ {
+ DEBUG ("apc_query_server (%s, %i) = %i",
+ conf_host == NULL
+ ? APCUPS_DEFAULT_HOST
+ : conf_host,
+ conf_port, status);
+ return (-1);
+ }
-<<<<<<< .mine
-static void apc_freq_write (char *host, char *inst, char *val)
-{
- char file[512];
- int status;
-
- status = snprintf (file, 512, freq_file_template, inst);
- if (status < 1)
- return;
- else if (status >= 512)
- return;
-
- rrd_update_file (host, file, val, freq_ds_def, freq_ds_num);
-}
-=======
apc_submit (&apcups_detail);
+
+ return (0);
} /* apcups_read */
->>>>>>> .r743
void module_register (void)
{
- plugin_register (MODULE_NAME, apcups_init, apcups_read, NULL);
- plugin_register ("apcups_voltage", NULL, NULL, apc_write_voltage);
- plugin_register ("apcups_charge", NULL, NULL, apc_write_charge);
- plugin_register ("apcups_charge_pct", NULL, NULL, apc_write_percent);
- plugin_register ("apcups_timeleft", NULL, NULL, apc_write_timeleft);
- plugin_register ("apcups_temp", NULL, NULL, apc_write_temperature);
- plugin_register ("apcups_frequency", NULL, NULL, apc_write_frequency);
- cf_register (MODULE_NAME, apcups_config, config_keys, config_keys_num);
-}
-
-#endif /* ifdef APCMAIN */
-#undef MODULE_NAME
-#undef MAXSTRING
-#undef NISPORT
+ plugin_register_config ("apcups", apcups_config, config_keys,
+ config_keys_num);
+ plugin_register_read ("apcups", apcups_read);
+ plugin_register_shutdown ("apcups", apcups_shutdown);
+} /* void module_register */
projects / collectd.git / blobdiff