projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src/utils_cache.c: Fix the handling of `Persist'.
[collectd.git]
/
src
/
hddtemp.c
diff --git
a/src/hddtemp.c
b/src/hddtemp.c
index
d60481e
..
651de29
100644
(file)
--- a/
src/hddtemp.c
+++ b/
src/hddtemp.c
@@
-31,17
+31,11
@@
#include "plugin.h"
#include "configfile.h"
#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 */
# 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>
#if HAVE_LINUX_MAJOR_H
# include <linux/major.h>
@@
-50,14
+44,13
@@
#define HDDTEMP_DEF_HOST "127.0.0.1"
#define HDDTEMP_DEF_PORT "7634"
#define HDDTEMP_DEF_HOST "127.0.0.1"
#define HDDTEMP_DEF_PORT "7634"
-#if HDDTEMP_HAVE_READ
static const char *config_keys[] =
{
"Host",
"Port",
static const char *config_keys[] =
{
"Host",
"Port",
- NULL
+ "TranslateDevicename"
};
};
-static int config_keys_num =
2
;
+static int config_keys_num =
STATIC_ARRAY_SIZE (config_keys)
;
typedef struct hddname
{
typedef struct hddname
{
@@
-70,6
+63,7
@@
typedef struct hddname
static hddname_t *first_hddname = NULL;
static char *hddtemp_host = NULL;
static char hddtemp_port[16];
static hddname_t *first_hddname = NULL;
static char *hddtemp_host = NULL;
static char hddtemp_port[16];
+static int translate_devicename = 1;
/*
* NAME
/*
* NAME
@@
-108,7
+102,10
@@
static int hddtemp_query_daemon (char *buffer, int buffer_size)
int ai_return;
memset (&ai_hints, '\0', sizeof (ai_hints));
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;
ai_hints.ai_family = PF_UNSPEC;
ai_hints.ai_socktype = SOCK_STREAM;
ai_hints.ai_protocol = IPPROTO_TCP;
@@
-148,7
+145,7
@@
static int hddtemp_query_daemon (char *buffer, int buffer_size)
if (connect (fd, (struct sockaddr *) ai_ptr->ai_addr, ai_ptr->ai_addrlen))
{
char errbuf[1024];
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: connect (%s, %s): %s", host, port,
sstrerror (errno, errbuf, sizeof (errbuf)));
close (fd);
fd = -1;
sstrerror (errno, errbuf, sizeof (errbuf)));
close (fd);
fd = -1;
@@
-227,6
+224,15
@@
static int hddtemp_config (const char *key, const char *value)
strncpy (hddtemp_port, value, sizeof (hddtemp_port));
hddtemp_port[sizeof (hddtemp_port) - 1] = '\0';
}
strncpy (hddtemp_port, value, sizeof (hddtemp_port));
hddtemp_port[sizeof (hddtemp_port) - 1] = '\0';
}
+ else if (strcasecmp (key, "TranslateDevicename") == 0)
+ {
+ if ((strcasecmp ("true", value) == 0)
+ || (strcasecmp ("yes", value) == 0)
+ || (strcasecmp ("on", value) == 0))
+ translate_devicename = 1;
+ else
+ translate_devicename = 0;
+ }
else
{
return (-1);
else
{
return (-1);
@@
-308,6
+314,7
@@
static int hddtemp_init (void)
case SCSI_DISK5_MAJOR:
case SCSI_DISK6_MAJOR:
case SCSI_DISK7_MAJOR:
case SCSI_DISK5_MAJOR:
case SCSI_DISK6_MAJOR:
case SCSI_DISK7_MAJOR:
+#ifdef SCSI_DISK8_MAJOR
case SCSI_DISK8_MAJOR:
case SCSI_DISK9_MAJOR:
case SCSI_DISK10_MAJOR:
case SCSI_DISK8_MAJOR:
case SCSI_DISK9_MAJOR:
case SCSI_DISK10_MAJOR:
@@
-316,6
+323,7
@@
static int hddtemp_init (void)
case SCSI_DISK13_MAJOR:
case SCSI_DISK14_MAJOR:
case SCSI_DISK15_MAJOR:
case SCSI_DISK13_MAJOR:
case SCSI_DISK14_MAJOR:
case SCSI_DISK15_MAJOR:
+#endif /* SCSI_DISK8_MAJOR */
/* SCSI disks minors are multiples of 16.
* Keep only those. */
if (minor % 16)
/* SCSI disks minors are multiples of 16.
* Keep only those. */
if (minor % 16)
@@
-392,14
+400,14
@@
static int hddtemp_init (void)
} /* int hddtemp_init */
/*
} /* 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.
*/
*
* 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;
{
hddname_t *list;
char *ret;
@@
-474,7
+482,7
@@
static int hddtemp_read (void)
for (i = 0; i < num_disks; i++)
{
for (i = 0; i < num_disks; i++)
{
- char *name, *
submit_name
;
+ char *name, *
major_minor
;
double temperature;
char *mode;
double temperature;
char *mode;
@@
-491,10
+499,11
@@
static int hddtemp_read (void)
if (mode[0] == 'F')
temperature = (temperature - 32.0) * 5.0 / 9.0;
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
{
}
else
{
@@
-504,16
+513,13
@@
static int hddtemp_read (void)
return (0);
} /* int hddtemp_read */
return (0);
} /* int hddtemp_read */
-#endif /* HDDTEMP_HAVE_READ */
/* module_register
Register collectd plugin. */
void module_register (void)
{
/* module_register
Register collectd plugin. */
void module_register (void)
{
-#if HDDTEMP_HAVE_READ
plugin_register_config ("hddtemp", hddtemp_config,
config_keys, config_keys_num);
plugin_register_init ("hddtemp", hddtemp_init);
plugin_register_read ("hddtemp", hddtemp_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 */
}
}