/**
* collectd - src/hddtemp.c
* Copyright (C) 2005,2006 Vincent Stehlé
+ * Copyright (C) 2006-2010 Florian octo Forster
+ * Copyright (C) 2008 Sebastian Harl
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
*
* Authors:
* Vincent Stehlé <vincent.stehle at free.fr>
- * Florian octo Forster <octo at verplant.org>
+ * Florian octo Forster <octo at collectd.org>
+ * Sebastian Harl <sh at tokkee.org>
*
* TODO:
* Do a pass, some day, and spare some memory. We consume too much for now
#include "plugin.h"
#include "configfile.h"
-#if HAVE_NETDB_H && HAVE_SYS_SOCKET_H && HAVE_NETINET_IN_H \
- && HAVE_NETINET_TCP_H && HAVE_LIBGEN_H
# include <netdb.h>
# include <sys/socket.h>
# include <netinet/in.h>
# include <netinet/tcp.h>
# include <libgen.h> /* for basename */
-# define HDDTEMP_HAVE_READ 1
-#else
-# define HDDTEMP_HAVE_READ 0
-#endif
#if HAVE_LINUX_MAJOR_H
# include <linux/major.h>
#define HDDTEMP_DEF_HOST "127.0.0.1"
#define HDDTEMP_DEF_PORT "7634"
-static data_source_t data_source_temperature[1] =
-{
- {"value", DS_TYPE_GAUGE, -273.15, NAN}
-};
-
-static data_set_t temperature_ds =
-{
- "temperature", 1, data_source_temperature
-};
-
-#if HDDTEMP_HAVE_READ
static const char *config_keys[] =
{
"Host",
- "Port",
- NULL
+ "Port"
};
-static int config_keys_num = 2;
-
-typedef struct hddname
-{
- int major;
- int minor;
- char *name;
- struct hddname *next;
-} hddname_t;
+static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
-static hddname_t *first_hddname = NULL;
static char *hddtemp_host = NULL;
-static char *hddtemp_port = NULL;
+static char hddtemp_port[16];
/*
* NAME
int ai_return;
memset (&ai_hints, '\0', sizeof (ai_hints));
- ai_hints.ai_flags = AI_ADDRCONFIG;
+ ai_hints.ai_flags = 0;
+#ifdef AI_ADDRCONFIG
+ ai_hints.ai_flags |= AI_ADDRCONFIG;
+#endif
ai_hints.ai_family = PF_UNSPEC;
ai_hints.ai_socktype = SOCK_STREAM;
ai_hints.ai_protocol = IPPROTO_TCP;
host = HDDTEMP_DEF_HOST;
port = hddtemp_port;
- if (port == NULL)
+ if (strlen (port) == 0)
port = HDDTEMP_DEF_PORT;
if ((ai_return = getaddrinfo (host, port, &ai_hints, &ai_list)) != 0)
{
char errbuf[1024];
- ERROR ("hddtemp: getaddrinfo (%s, %s): %s",
+ ERROR ("hddtemp plugin: getaddrinfo (%s, %s): %s",
host, port,
(ai_return == EAI_SYSTEM)
? sstrerror (errno, errbuf, sizeof (errbuf))
for (ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next)
{
/* create our socket descriptor */
- if ((fd = socket (ai_ptr->ai_family, ai_ptr->ai_socktype, ai_ptr->ai_protocol)) < 0)
+ fd = socket (ai_ptr->ai_family, ai_ptr->ai_socktype,
+ ai_ptr->ai_protocol);
+ if (fd < 0)
{
char errbuf[1024];
- ERROR ("hddtemp: socket: %s",
+ ERROR ("hddtemp plugin: socket: %s",
sstrerror (errno, errbuf, sizeof (errbuf)));
continue;
}
/* connect to the hddtemp daemon */
- if (connect (fd, (struct sockaddr *) ai_ptr->ai_addr, ai_ptr->ai_addrlen))
+ if (connect (fd, (struct sockaddr *) ai_ptr->ai_addr,
+ ai_ptr->ai_addrlen))
{
char errbuf[1024];
- DEBUG ("hddtemp: connect (%s, %s): %s", host, port,
+ INFO ("hddtemp plugin: connect (%s, %s) failed: %s",
+ host, port,
sstrerror (errno, errbuf, sizeof (errbuf)));
close (fd);
fd = -1;
if (fd < 0)
{
- ERROR ("hddtemp: Could not connect to daemon.");
+ ERROR ("hddtemp plugin: Could not connect to daemon.");
return (-1);
}
if ((errno == EAGAIN) || (errno == EINTR))
continue;
- ERROR ("hddtemp: Error reading from socket: %s",
+ ERROR ("hddtemp plugin: Error reading from socket: %s",
sstrerror (errno, errbuf, sizeof (errbuf)));
close (fd);
return (-1);
if (buffer_fill >= buffer_size)
{
buffer[buffer_size - 1] = '\0';
- WARNING ("hddtemp: Message from hddtemp has been truncated.");
+ WARNING ("hddtemp plugin: Message from hddtemp has been "
+ "truncated.");
}
else if (buffer_fill == 0)
{
- WARNING ("hddtemp: Peer has unexpectedly shut down the socket. "
- "Buffer: `%s'", buffer);
+ WARNING ("hddtemp plugin: Peer has unexpectedly shut down "
+ "the socket. Buffer: `%s'", buffer);
close (fd);
return (-1);
}
static int hddtemp_config (const char *key, const char *value)
{
- if (strcasecmp (key, "host") == 0)
+ if (strcasecmp (key, "Host") == 0)
{
if (hddtemp_host != NULL)
free (hddtemp_host);
hddtemp_host = strdup (value);
}
- else if (strcasecmp (key, "port") == 0)
+ else if (strcasecmp (key, "Port") == 0)
{
- if (hddtemp_port != NULL)
- free (hddtemp_port);
- hddtemp_port = strdup (value);
+ int port = (int) (atof (value));
+ if ((port > 0) && (port <= 65535))
+ ssnprintf (hddtemp_port, sizeof (hddtemp_port),
+ "%i", port);
+ else
+ sstrncpy (hddtemp_port, value, sizeof (hddtemp_port));
}
else
{
return (0);
}
-/* In the init-function we initialize the `hddname_t' list used to translate
- * disk-names. Under Linux that's done using `/proc/partitions'. Under other
- * operating-systems, it's not done at all. */
-static int hddtemp_init (void)
-{
-#if KERNEL_LINUX
- FILE *fh;
- char buf[1024];
- int buflen;
-
- char *fields[16];
- int num_fields;
-
- int major;
- int minor;
- char *name;
- hddname_t *next;
- hddname_t *entry;
-
- next = first_hddname;
- while (next != NULL)
- {
- entry = next;
- next = entry->next;
-
- free (entry->name);
- free (entry);
- }
- first_hddname = NULL;
-
- if ((fh = fopen ("/proc/partitions", "r")) != NULL)
- {
- DEBUG ("Looking at /proc/partitions...");
-
- while (fgets (buf, sizeof (buf), fh) != NULL)
- {
- /* Delete trailing newlines */
- buflen = strlen (buf);
-
- while ((buflen > 0) && ((buf[buflen-1] == '\n') || (buf[buflen-1] == '\r')))
- buf[--buflen] = '\0';
-
- /* We want lines of the form:
- *
- * 3 1 77842926 hda1
- *
- * ...so, skip everything else. */
- if (buflen == 0)
- continue;
-
- num_fields = strsplit (buf, fields, 16);
-
- if (num_fields != 4)
- continue;
-
- major = atoi (fields[0]);
- minor = atoi (fields[1]);
-
- /* We try to keep only entries, which may correspond to
- * physical disks and that may have a corresponding
- * entry in the hddtemp daemon. Basically, this means
- * IDE and SCSI. */
- switch (major)
- {
- /* SCSI. */
- case SCSI_DISK0_MAJOR:
- case SCSI_DISK1_MAJOR:
- case SCSI_DISK2_MAJOR:
- case SCSI_DISK3_MAJOR:
- case SCSI_DISK4_MAJOR:
- case SCSI_DISK5_MAJOR:
- case SCSI_DISK6_MAJOR:
- case SCSI_DISK7_MAJOR:
- case SCSI_DISK8_MAJOR:
- case SCSI_DISK9_MAJOR:
- case SCSI_DISK10_MAJOR:
- case SCSI_DISK11_MAJOR:
- case SCSI_DISK12_MAJOR:
- case SCSI_DISK13_MAJOR:
- case SCSI_DISK14_MAJOR:
- case SCSI_DISK15_MAJOR:
- /* SCSI disks minors are multiples of 16.
- * Keep only those. */
- if (minor % 16)
- continue;
- break;
-
- /* IDE. */
- case IDE0_MAJOR:
- case IDE1_MAJOR:
- case IDE2_MAJOR:
- case IDE3_MAJOR:
- case IDE4_MAJOR:
- case IDE5_MAJOR:
- case IDE6_MAJOR:
- case IDE7_MAJOR:
- case IDE8_MAJOR:
- case IDE9_MAJOR:
- /* IDE disks minors can only be 0 or 64.
- * Keep only those. */
- if(minor != 0 && minor != 64)
- continue;
- break;
-
- /* Skip all other majors. */
- default:
- DEBUG ("Skipping unknown major %i", major);
- continue;
- } /* switch (major) */
-
- if ((name = strdup (fields[3])) == NULL)
- {
- ERROR ("hddtemp: strdup(%s) == NULL", fields[3]);
- continue;
- }
-
- if ((entry = (hddname_t *) malloc (sizeof (hddname_t))) == NULL)
- {
- ERROR ("hddtemp: malloc (%u) == NULL",
- (unsigned int) sizeof (hddname_t));
- free (name);
- continue;
- }
-
- DEBUG ("Found disk: %s (%u:%u).", name, major, minor);
-
- entry->major = major;
- entry->minor = minor;
- entry->name = name;
- entry->next = NULL;
-
- if (first_hddname == NULL)
- {
- first_hddname = entry;
- }
- else
- {
- entry->next = first_hddname;
- first_hddname = entry;
- }
- }
- fclose (fh);
- }
-#if COLLECT_DEBUG
- else
- {
- char errbuf[1024];
- DEBUG ("Could not open /proc/partitions: %s",
- sstrerror (errno, errbuf, sizeof (errbuf)));
- }
-#endif /* COLLECT_DEBUG */
-#endif /* KERNEL_LINUX */
-
- return (0);
-} /* int hddtemp_init */
-
-/*
- * hddtemp_get_name
- *
- * Description:
- * Try to "cook" a bit the drive name as returned
- * by the hddtemp daemon. The intend is to transform disk
- * names into <major>-<minor> when possible.
- */
-static char *hddtemp_get_name (char *drive)
-{
- hddname_t *list;
- char *ret;
-
- for (list = first_hddname; list != NULL; list = list->next)
- if (strcmp (drive, list->name) == 0)
- break;
-
- if (list == NULL)
- {
- DEBUG ("Don't know %s, keeping name as-is.", drive);
- return (strdup (drive));
- }
-
- if ((ret = (char *) malloc (128 * sizeof (char))) == NULL)
- return (NULL);
-
- if (snprintf (ret, 128, "%i-%i", list->major, list->minor) >= 128)
- {
- free (ret);
- return (NULL);
- }
-
- return (ret);
-}
-
static void hddtemp_submit (char *type_instance, double value)
{
value_t values[1];
vl.values = values;
vl.values_len = 1;
- vl.time = time (NULL);
- strcpy (vl.host, hostname_g);
- strcpy (vl.plugin, "hddtemp");
- strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
+ sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+ sstrncpy (vl.plugin, "hddtemp", sizeof (vl.plugin));
+ sstrncpy (vl.type, "temperature", sizeof (vl.type));
+ sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
- plugin_dispatch_values ("temperature", &vl);
+ plugin_dispatch_values (&vl);
}
static int hddtemp_read (void)
for (i = 0; i < num_disks; i++)
{
- char *name, *submit_name;
+ char *name;
double temperature;
char *mode;
if (mode[0] == 'F')
temperature = (temperature - 32.0) * 5.0 / 9.0;
- if ((submit_name = hddtemp_get_name (name)) != NULL)
- {
- hddtemp_submit (submit_name, temperature);
- free (submit_name);
- }
- else
- {
- hddtemp_submit (name, temperature);
- }
+ hddtemp_submit (name, temperature);
}
return (0);
} /* int hddtemp_read */
-#endif /* HDDTEMP_HAVE_READ */
/* module_register
Register collectd plugin. */
-void module_register (modreg_e load)
+void module_register (void)
{
- if (load & MR_DATASETS)
- plugin_register_data_set (&temperature_ds);
-
-#if HDDTEMP_HAVE_READ
- if (load & MR_READ)
- {
- plugin_register_config ("hddtemp", hddtemp_config,
- config_keys, config_keys_num);
- plugin_register_init ("hddtemp", hddtemp_init);
- plugin_register_read ("hddtemp", hddtemp_read);
- }
-#endif /* HDDTEMP_HAVE_READ */
+ plugin_register_config ("hddtemp", hddtemp_config,
+ config_keys, config_keys_num);
+ plugin_register_read ("hddtemp", hddtemp_read);
}
projects / collectd.git / blobdiff