/**
* collectd - src/sensors.c
- * Copyright (C) 2005,2006 Florian octo Forster
+ * Copyright (C) 2005-2007 Florian octo Forster
*
* 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
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
+ * Free Software Foundation; only version 2 of the License is applicable.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* - config IgnoreSelected option
**/
-
-
#include "collectd.h"
#include "common.h"
#include "plugin.h"
#include "configfile.h"
#include "utils_ignorelist.h"
-#include "utils_debug.h"
-
-/*
- * This weird macro cascade forces the glibc to define `NAN'. I don't know
- * another way to solve this, so more intelligent solutions are welcome. -octo
- */
-#ifndef __USE_ISOC99
-# define DISABLE__USE_ISOC99 1
-# define __USE_ISOC99 1
-#endif
-#include <math.h>
-#ifdef DISABLE__USE_ISOC99
-# undef DISABLE__USE_ISOC99
-# undef __USE_ISOC99
-#endif
#if defined(HAVE_SENSORS_SENSORS_H)
# include <sensors/sensors.h>
# define SENSORS_HAVE_READ 0
#endif
-static data_source_t data_source[1] =
-{
- {"value", DS_TYPE_GAUGE, NAN, NAN}
-};
-static data_set_t fanspeed_ds =
-{
- "fanspeed", 1, data_source
-};
-
-static data_set_t temperature_ds =
-{
- "temperature", 1, data_source
-};
-
-static data_set_t voltage_ds =
-{
- "voltage", 1, data_source
-};
-
#if SENSORS_HAVE_READ
#define SENSOR_TYPE_VOLTAGE 0
#define SENSOR_TYPE_FANSPEED 1
{ "3.3V", SENSOR_TYPE_VOLTAGE },
{ "2.5V", SENSOR_TYPE_VOLTAGE },
{ "2.0V", SENSOR_TYPE_VOLTAGE },
- { "12V", SENSOR_TYPE_VOLTAGE },
- { (char *) 0, SENSOR_TYPE_UNKNOWN }
+ { "12V", SENSOR_TYPE_VOLTAGE }
};
+static int known_features_num = STATIC_ARRAY_SIZE (known_features);
/* end new naming */
static const char *config_keys[] =
{
if (ignorelist_add (sensor_list, value))
{
- syslog (LOG_ERR, "sensors plugin: "
+ ERROR ("sensors plugin: "
"Cannot add value to ignorelist.");
return (1);
}
first_feature = NULL;
}
-static void sensors_load_conf (void)
+static int sensors_load_conf (void)
{
FILE *fh;
featurelist_t *last_feature = NULL;
status = stat (conffile, &statbuf);
if (status != 0)
{
- syslog (LOG_ERR, "sensors plugin: stat (%s) failed: %s",
- conffile, strerror (errno));
+ char errbuf[1024];
+ ERROR ("sensors plugin: stat (%s) failed: %s", conffile,
+ sstrerror (errno, errbuf, sizeof (errbuf)));
sensors_config_mtime = 0;
}
if ((sensors_config_mtime != 0)
&& (sensors_config_mtime == statbuf.st_mtime))
- return;
+ return (0);
if (sensors_config_mtime != 0)
{
- syslog (LOG_NOTICE, "sensors plugin: Reloading config from %s",
+ NOTICE ("sensors plugin: Reloading config from %s",
conffile);
sensors_free_features ();
sensors_config_mtime = 0;
fh = fopen (conffile, "r");
if (fh == NULL)
{
- syslog (LOG_ERR, "sensors plugin: fopen(%s) failed: %s",
- conffile, strerror(errno));
- return;
+ char errbuf[1024];
+ ERROR ("sensors plugin: fopen(%s) failed: %s", conffile,
+ sstrerror (errno, errbuf, sizeof (errbuf)));
+ return (-1);
}
status = sensors_init (fh);
fclose (fh);
if (status != 0)
{
- syslog (LOG_ERR, "sensors plugin: Cannot initialize sensors. "
+ ERROR ("sensors plugin: Cannot initialize sensors. "
"Data will not be collected.");
- return;
+ return (-1);
}
sensors_config_mtime = statbuf.st_mtime;
continue;
/* Only known features */
- for (i = 0; known_features[i].type >= 0; i++)
+ for (i = 0; i < known_features_num; i++)
{
if (strcmp (data->name, known_features[i].label) != 0)
continue;
if (sensors_get_ignored (*chip, data->number) == 0)
break;
- DBG ("Adding feature: %s-%s-%s",
+ DEBUG ("Adding feature: %s-%s-%s",
chip->prefix,
- sensor_type_prefix[known_features[i].type],
+ sensor_to_type[known_features[i].type],
data->name);
if ((new_feature = (featurelist_t *) malloc (sizeof (featurelist_t))) == NULL)
{
- DBG ("malloc: %s", strerror (errno));
- syslog (LOG_ERR, "sensors plugin: malloc: %s",
- strerror (errno));
+ char errbuf[1024];
+ ERROR ("sensors plugin: malloc: %s",
+ sstrerror (errno, errbuf, sizeof (errbuf)));
break;
}
if (first_feature == NULL)
{
sensors_cleanup ();
- syslog (LOG_INFO, "sensors plugin: lm_sensors reports no "
+ INFO ("sensors plugin: lm_sensors reports no "
"features. Data will not be collected.");
+ return (-1);
}
-} /* void sensors_load_conf */
+
+ return (0);
+} /* int sensors_load_conf */
static int sensors_shutdown (void)
{
const char *type, const char *type_instance,
double val)
{
+ char match_key[1024];
+ int status;
+
value_t values[1];
value_list_t vl = VALUE_LIST_INIT;
- if (ignorelist_match (sensor_list, type_instance))
+ status = snprintf (match_key, sizeof (match_key), "%s/%s-%s",
+ plugin_instance, type, type_instance);
+ if ((status < 1) || (status >= sizeof (match_key)))
return;
+ match_key[sizeof (match_key) - 1] = '\0';
+
+ if (sensor_list != NULL)
+ {
+ DEBUG ("sensors plugin: Checking ignorelist for `%s'", match_key);
+ if (ignorelist_match (sensor_list, match_key))
+ return;
+ }
values[0].gauge = val;
vl.values = values;
vl.values_len = 1;
vl.time = time (NULL);
- strcpy (vl.host, hostname);
+ strcpy (vl.host, hostname_g);
strcpy (vl.plugin, "sensors");
strcpy (vl.plugin_instance, plugin_instance);
strcpy (vl.type_instance, type_instance);
{
featurelist_t *feature;
double value;
- char chip_fullprefix[512];
char plugin_instance[DATA_MAX_NAME_LEN];
char type_instance[DATA_MAX_NAME_LEN];
- sensors_load_conf ();
+ if (sensors_load_conf () != 0)
+ return (-1);
for (feature = first_feature; feature != NULL; feature = feature->next)
{
strncpy (type_instance, feature->data->name, DATA_MAX_NAME_LEN);
sensors_submit (plugin_instance,
- sensor_to_type[feature->type]
+ sensor_to_type[feature->type],
type_instance,
value);
} /* for feature = first_feature .. NULL */
+
+ return (0);
} /* int sensors_read */
#endif /* SENSORS_HAVE_READ */
void module_register (void)
{
- plugin_register_data_set (&fanspeed_ds);
- plugin_register_data_set (&temperature_ds);
- plugin_register_data_set (&voltage_ds);
-
#if SENSORS_HAVE_READ
plugin_register_config ("sensors", sensors_config,
config_keys, config_keys_num);
projects / collectd.git / blobdiff