diff --git a/src/load.c b/src/load.c
index 4d43dd45cb7f9a93f391117d2048b70ced049261..491a985e432c1752a504f9f953808741c93ad76a 100644 (file)
--- a/src/load.c
+++ b/src/load.c
*
* 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
- * 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
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
#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:"COLLECTD_HEARTBEAT":0:100",
- "DS:midterm:GAUGE:"COLLECTD_HEARTBEAT":0:100",
- "DS:longterm:GAUGE:"COLLECTD_HEARTBEAT":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;
-
-static void load_init (void)
-{
- return;
-}
-static void load_write (char *host, char *inst, char *val)
+static data_set_t ds =
{
{
- rrd_update_file (host, load_file, val, ds_def, ds_num);
-}
+ "load", 3, dsrc
+};
#if LOAD_HAVE_READ
#if LOAD_HAVE_READ
-#define BUFSIZE 256
static void load_submit (double snum, double mnum, double lnum)
{
static void load_submit (double snum, double mnum, double lnum)
{
- char buf[BUFSIZE];
-
- if (snprintf (buf, BUFSIZE, "%u:%.2f:%.2f:%.2f", (unsigned int) curtime,
- snum, mnum, lnum) >= BUFSIZE)
- return;
-
- plugin_submit (MODULE_NAME, "-", buf);
+ value_t values[3];
+ value_list_t vl = VALUE_LIST_INIT;
+
+ values[0].gauge = snum;
+ values[1].gauge = mnum;
+ values[2].gauge = lnum;
+
+ vl.values = values;
+ vl.values_len = 3;
+ vl.time = time (NULL);
+ strcpy (vl.host, hostname);
+ strcpy (vl.plugin, "load");
+ strcpy (vl.plugin_instance, "");
+ strcpy (vl.type_instance, "");
+
+ plugin_dispatch_values ("load", &vl);
}
}
-#undef BUFSIZE
-static 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);
}
}
-#else
-# define load_read NULL
#endif /* LOAD_HAVE_READ */
void module_register (void)
{
#endif /* LOAD_HAVE_READ */
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