/**
* collectd - src/hddtemp.c
* Copyright (C) 2005,2006 Vincent Stehlé
+ * Copyright (C) 2006,2007 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>
+ * Sebastian Harl <sh at tokkee.org>
*
* TODO:
* Do a pass, some day, and spare some memory. We consume too much for now
{
"Host",
"Port",
- NULL
+ "TranslateDevicename"
};
-static int config_keys_num = 2;
+static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
typedef struct hddname
{
static hddname_t *first_hddname = NULL;
static char *hddtemp_host = NULL;
static char hddtemp_port[16];
+static int translate_devicename = 1;
/*
* NAME
{
int port = (int) (atof (value));
if ((port > 0) && (port <= 65535))
- snprintf (hddtemp_port, sizeof (hddtemp_port),
+ ssnprintf (hddtemp_port, sizeof (hddtemp_port),
"%i", port);
else
- strncpy (hddtemp_port, value, sizeof (hddtemp_port));
- hddtemp_port[sizeof (hddtemp_port) - 1] = '\0';
+ sstrncpy (hddtemp_port, value, sizeof (hddtemp_port));
+ }
+ else if (strcasecmp (key, "TranslateDevicename") == 0)
+ {
+ if (IS_TRUE (value))
+ translate_devicename = 1;
+ else
+ translate_devicename = 0;
}
else
{
} /* int hddtemp_init */
/*
- * hddtemp_get_name
+ * hddtemp_get_major_minor
*
* 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)
+static char *hddtemp_get_major_minor (char *drive)
{
hddname_t *list;
char *ret;
if ((ret = (char *) malloc (128 * sizeof (char))) == NULL)
return (NULL);
- if (snprintf (ret, 128, "%i-%i", list->major, list->minor) >= 128)
+ if (ssnprintf (ret, 128, "%i-%i", list->major, list->minor) >= 128)
{
free (ret);
return (NULL);
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, *major_minor;
double temperature;
char *mode;
if (mode[0] == 'F')
temperature = (temperature - 32.0) * 5.0 / 9.0;
- if ((submit_name = hddtemp_get_name (name)) != NULL)
+ if (translate_devicename
+ && (major_minor = hddtemp_get_major_minor (name)) != NULL)
{
- hddtemp_submit (submit_name, temperature);
- free (submit_name);
+ hddtemp_submit (major_minor, temperature);
+ free (major_minor);
}
else
{