diff --git a/src/vserver.c b/src/vserver.c
index d428faa602fd840cb5f58cb1f03a432938d3c89a..3a77961bbb3089ff6bb259593c671f46f81a1592 100644 (file)
--- a/src/vserver.c
+++ b/src/vserver.c
static char *rrd_other = "vserver-%s/traffic-other.rrd";
static char *rrd_unspec = "vserver-%s/traffic-unspec.rrd";
static char *rrd_other = "vserver-%s/traffic-other.rrd";
static char *rrd_unspec = "vserver-%s/traffic-unspec.rrd";
-static char *rrd_thread = "vserver-%s/threads.rrd";
+static char *rrd_thread = "vserver-%s/vs_threads.rrd";
static char *rrd_load = "vserver-%s/load.rrd";
static char *rrd_load = "vserver-%s/load.rrd";
/* bytes transferred */
static char *ds_def_unix[] =
{
/* bytes transferred */
static char *ds_def_unix[] =
{
- "DS:incoming:COUNTER:25:0:9223372036854775807",
- "DS:outgoing:COUNTER:25:0:9223372036854775807",
- "DS:failed:COUNTER:25:0:9223372036854775807",
+ "DS:incoming:COUNTER:"COLLECTD_HEARTBEAT":0:9223372036854775807",
+ "DS:outgoing:COUNTER:"COLLECTD_HEARTBEAT":0:9223372036854775807",
+ "DS:failed:COUNTER:"COLLECTD_HEARTBEAT":0:9223372036854775807",
NULL
};
static int ds_num_unix = 3;
static char *ds_def_inet[] =
{
NULL
};
static int ds_num_unix = 3;
static char *ds_def_inet[] =
{
- "DS:incoming:COUNTER:25:0:9223372036854775807",
- "DS:outgoing:COUNTER:25:0:9223372036854775807",
- "DS:failed:COUNTER:25:0:9223372036854775807",
+ "DS:incoming:COUNTER:"COLLECTD_HEARTBEAT":0:9223372036854775807",
+ "DS:outgoing:COUNTER:"COLLECTD_HEARTBEAT":0:9223372036854775807",
+ "DS:failed:COUNTER:"COLLECTD_HEARTBEAT":0:9223372036854775807",
NULL
};
static int ds_num_inet = 3;
static char *ds_def_inet6[] =
{
NULL
};
static int ds_num_inet = 3;
static char *ds_def_inet6[] =
{
- "DS:incoming:COUNTER:25:0:9223372036854775807",
- "DS:outgoing:COUNTER:25:0:9223372036854775807",
- "DS:failed:COUNTER:25:0:9223372036854775807",
+ "DS:incoming:COUNTER:"COLLECTD_HEARTBEAT":0:9223372036854775807",
+ "DS:outgoing:COUNTER:"COLLECTD_HEARTBEAT":0:9223372036854775807",
+ "DS:failed:COUNTER:"COLLECTD_HEARTBEAT":0:9223372036854775807",
NULL
};
static int ds_num_inet6 = 3;
static char *ds_def_other[] =
{
NULL
};
static int ds_num_inet6 = 3;
static char *ds_def_other[] =
{
- "DS:incoming:COUNTER:25:0:9223372036854775807",
- "DS:outgoing:COUNTER:25:0:9223372036854775807",
- "DS:failed:COUNTER:25:0:9223372036854775807",
+ "DS:incoming:COUNTER:"COLLECTD_HEARTBEAT":0:9223372036854775807",
+ "DS:outgoing:COUNTER:"COLLECTD_HEARTBEAT":0:9223372036854775807",
+ "DS:failed:COUNTER:"COLLECTD_HEARTBEAT":0:9223372036854775807",
NULL
};
static int ds_num_other = 3;
static char *ds_def_unspec[] =
{
NULL
};
static int ds_num_other = 3;
static char *ds_def_unspec[] =
{
- "DS:incoming:COUNTER:25:0:9223372036854775807",
- "DS:outgoing:COUNTER:25:0:9223372036854775807",
- "DS:failed:COUNTER:25:0:9223372036854775807",
+ "DS:incoming:COUNTER:"COLLECTD_HEARTBEAT":0:9223372036854775807",
+ "DS:outgoing:COUNTER:"COLLECTD_HEARTBEAT":0:9223372036854775807",
+ "DS:failed:COUNTER:"COLLECTD_HEARTBEAT":0:9223372036854775807",
NULL
};
static int ds_num_unspec = 3;
static char *ds_def_threads[] =
{
NULL
};
static int ds_num_unspec = 3;
static char *ds_def_threads[] =
{
- "DS:total:GAUGE:25:0:65535",
- "DS:running:GAUGE:25:0:65535",
- "DS:uninterruptible:GAUGE:25:0:65535",
- "DS:onhold:GAUGE:25:0:65535",
+ "DS:total:GAUGE:"COLLECTD_HEARTBEAT":0:65535",
+ "DS:running:GAUGE:"COLLECTD_HEARTBEAT":0:65535",
+ "DS:uninterruptible:GAUGE:"COLLECTD_HEARTBEAT":0:65535",
+ "DS:onhold:GAUGE:"COLLECTD_HEARTBEAT":0:65535",
NULL
};
static int ds_num_threads = 4;
static char *ds_def_load[] =
{
NULL
};
static int ds_num_threads = 4;
static char *ds_def_load[] =
{
- "DS:shortterm:GAUGE:25:0:100",
- "DS:midterm:GAUGE:25:0:100",
- "DS:longterm:GAUGE:25:0:100",
+ "DS:shortterm:GAUGE:"COLLECTD_HEARTBEAT":0:100",
+ "DS:midterm:GAUGE:"COLLECTD_HEARTBEAT":0:100",
+ "DS:longterm:GAUGE:"COLLECTD_HEARTBEAT":0:100",
NULL
};
static int ds_num_load = 3;
static char *ds_def_procs[] =
{
NULL
};
static int ds_num_load = 3;
static char *ds_def_procs[] =
{
- "DS:total:GAUGE:25:0:65535",
+ "DS:total:GAUGE:"COLLECTD_HEARTBEAT":0:65535",
NULL
};
static int ds_num_procs = 1;
NULL
};
static int ds_num_procs = 1;
/* bytes */
static char *ds_def_memory[] =
{
/* bytes */
static char *ds_def_memory[] =
{
- "DS:vm:GAUGE:25:0:9223372036854775807",
- "DS:vml:GAUGE:25:0:9223372036854775807",
- "DS:rss:GAUGE:25:0:9223372036854775807",
- "DS:anon:GAUGE:25:0:9223372036854775807",
+ "DS:vm:GAUGE:"COLLECTD_HEARTBEAT":0:9223372036854775807",
+ "DS:vml:GAUGE:"COLLECTD_HEARTBEAT":0:9223372036854775807",
+ "DS:rss:GAUGE:"COLLECTD_HEARTBEAT":0:9223372036854775807",
+ "DS:anon:GAUGE:"COLLECTD_HEARTBEAT":0:9223372036854775807",
NULL
};
static int ds_num_memory = 4;
NULL
};
static int ds_num_memory = 4;
DIR *proc;
struct dirent *dent; /* 42 */
DIR *proc;
struct dirent *dent; /* 42 */
+ static complain_t complain_obj;
+
errno = 0;
errno = 0;
- if (NULL == (proc = opendir (PROCDIR))) {
- syslog (LOG_ERR, "Cannot open '%s': %s", PROCDIR, strerror (errno));
+ if (NULL == (proc = opendir (PROCDIR)))
+ {
+ plugin_complain (LOG_ERR, &complain_obj, "vserver plugin: "
+ "fopen (%s) failed: %s", PROCDIR, strerror (errno));
return;
}
return;
}
+ plugin_relief (LOG_NOTICE, &complain_obj, "vserver plugin: "
+ "fopen (%s) succeeded.", PROCDIR);
while (NULL != (dent = readdir (proc))) {
int len;
while (NULL != (dent = readdir (proc))) {
int len;