X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fvserver.c;h=694b6d02b44bf0ab51e4a6fd75ac40b2146e7469;hb=ee1113650b0b565776fc3d62162d84741e234f05;hp=42577652697046059896b6d9a67746ad5333bc3c;hpb=74bd2f2ef7a0ed27367d22df961a73332f5830e6;p=collectd.git

diff --git a/src/vserver.c b/src/vserver.c
index 42577652..694b6d02 100644
--- a/src/vserver.c
+++ b/src/vserver.c
@@ -60,71 +60,71 @@ static char *rrd_memory	= "vserver-%s/vs_memory.rrd";
 /* 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[] =
 {
-	"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[] =
 {
-	"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[] =
 {
-	"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[] =
 {
-	"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[] =
 {
-	"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[] =
 {
-	"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[] =
 {
-	"DS:total:GAUGE:25:0:65535",
+	"DS:total:GAUGE:"COLLECTD_HEARTBEAT":0:65535",
 	NULL
 };
 static int ds_num_procs = 1;
@@ -133,10 +133,10 @@ static int ds_num_procs = 1;
 /* 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;