diff --git a/src/load.c b/src/load.c
index d082816aee1a2598d8167819ba21f203c57e132a..bff629dcb06cb9ad6a1c2255c02d2fff65a9fd0a 100644 (file)
--- a/src/load.c
+++ b/src/load.c
/**
* collectd - src/load.c
/**
* collectd - src/load.c
- * Copyright (C) 2005 Florian octo Forster
+ * Copyright (C) 2005,2006 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
*
* 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
* Florian octo Forster <octo at verplant.org>
**/
* Florian octo Forster <octo at verplant.org>
**/
-#include "load.h"
+#include "collectd.h"
+#include "common.h"
+#include "plugin.h"
-#if COLLECT_LOAD
#define MODULE_NAME "load"
#define MODULE_NAME "load"
-#include "plugin.h"
-#include "common.h"
+#if defined(HAVE_GETLOADAVG) || defined(KERNEL_LINUX) || defined(HAVE_LIBSTATGRAB)
+# define LOAD_HAVE_READ 1
+#else
+# define LOAD_HAVE_READ 0
+#endif
#ifdef HAVE_SYS_LOADAVG_H
#include <sys/loadavg.h>
#ifdef HAVE_SYS_LOADAVG_H
#include <sys/loadavg.h>
#endif
#endif /* defined(HAVE_GETLOADAVG) */
#endif
#endif /* defined(HAVE_GETLOADAVG) */
-static char *load_file = "load.rrd";
-
-static char *ds_def[] =
+static data_source_t dsrc[3] =
{
{
- "DS:shortterm:GAUGE:25:0:100",
- "DS:midterm:GAUGE:25:0:100",
- "DS:longterm:GAUGE:25:0:100",
- NULL
+ {"shortterm", DS_TYPE_GAUGE, 0.0, 100.0},
+ {"midterm", DS_TYPE_GAUGE, 0.0, 100.0},
+ {"longterm", DS_TYPE_GAUGE, 0.0, 100.0}
};
};
-static int ds_num = 3;
-void load_init (void)
+static data_set_t ds =
{
{
- return;
-}
+ "load", 3, dsrc
+};
-void load_write (char *host, char *inst, char *val)
+#if LOAD_HAVE_READ
+static void load_submit (double snum, double mnum, double lnum)
{
{
- rrd_update_file (host, load_file, val, ds_def, ds_num);
-}
+ value_t values[3];
+ value_list_t vl;
-#define BUFSIZE 256
-void load_submit (double snum, double mnum, double lnum)
-{
- char buf[BUFSIZE];
+ values[0].gauge = snum;
+ values[1].gauge = mnum;
+ values[2].gauge = lnum;
- if (snprintf (buf, BUFSIZE, "%u:%.2f:%.2f:%.2f", (unsigned int) curtime,
- snum, mnum, lnum) >= BUFSIZE)
- return;
+ vl.values = values;
+ vl.values_len = 3;
+ strcpy (vl.host, "localhost"); /* FIXME */
+ strcpy (vl.plugin, "load");
+ strcpy (vl.plugin_instance, "");
+ strcpy (vl.type_instance, "");
- plugin_submit (MODULE_NAME, "-", buf);
+ plugin_dispatch_values ("load", &vl);
}
}
-#undef BUFSIZE
-void load_read (void)
+static int load_read (void)
{
#if defined(HAVE_GETLOADAVG)
double load[3];
{
#if defined(HAVE_GETLOADAVG)
double load[3];
if (fgets (buffer, 16, loadavg) == NULL)
{
syslog (LOG_WARNING, "load: fgets: %s", strerror (errno));
if (fgets (buffer, 16, loadavg) == NULL)
{
syslog (LOG_WARNING, "load: fgets: %s", strerror (errno));
+ fclose (loadavg);
return;
}
return;
}
load_submit (snum, mnum, lnum);
#endif /* HAVE_LIBSTATGRAB */
load_submit (snum, mnum, lnum);
#endif /* HAVE_LIBSTATGRAB */
+
+ return (0);
}
}
+#endif /* LOAD_HAVE_READ */
void module_register (void)
{
void module_register (void)
{
- plugin_register (MODULE_NAME, load_init, load_read, load_write);
+ plugin_register_data_set (&ds);
+#if LOAD_HAVE_READ
+ plugin_register_read ("load", load_read);
+#endif
}
#undef MODULE_NAME
}
#undef MODULE_NAME
-#endif /* COLLECT_LOAD */