From 8d9b00298d5dd8c6e4f3315aa2a0ae4d3684f55d Mon Sep 17 00:00:00 2001 From: octo Date: Wed, 15 Mar 2006 11:17:50 +0000 Subject: [PATCH] Replaced all hardcoded heartbeat values (== 25 seconds) with `COLLECTD_HEARTBEAT'. --- src/battery.c | 6 ++-- src/cpu.c | 10 +++---- src/cpufreq.c | 2 +- src/df.c | 4 +-- src/disk.c | 24 +++++++-------- src/hddtemp.c | 2 +- src/load.c | 6 ++-- src/memory.c | 8 ++--- src/mysql.c | 26 ++++++++-------- src/nfs.c | 80 ++++++++++++++++++++++++------------------------- src/ping.c | 2 +- src/processes.c | 12 ++++---- src/sensors.c | 2 +- src/serial.c | 4 +-- src/swap.c | 8 ++--- src/tape.c | 16 +++++----- src/traffic.c | 4 +-- src/users.c | 2 +- src/vserver.c | 54 ++++++++++++++++----------------- src/wireless.c | 6 ++-- 20 files changed, 139 insertions(+), 139 deletions(-) diff --git a/src/battery.c b/src/battery.c index 21b19bb7..201280c9 100644 --- a/src/battery.c +++ b/src/battery.c @@ -41,21 +41,21 @@ static char *battery_charge_file = "battery-%s/charge.rrd"; static char *ds_def_current[] = { - "DS:current:GAUGE:25:U:U", + "DS:current:GAUGE:"COLLECTD_HEARTBEAT":U:U", NULL }; static int ds_num_current = 1; static char *ds_def_voltage[] = { - "DS:voltage:GAUGE:25:U:U", + "DS:voltage:GAUGE:"COLLECTD_HEARTBEAT":U:U", NULL }; static int ds_num_voltage = 1; static char *ds_def_charge[] = { - "DS:charge:GAUGE:25:0:U", + "DS:charge:GAUGE:"COLLECTD_HEARTBEAT":0:U", NULL }; static int ds_num_charge = 1; diff --git a/src/cpu.c b/src/cpu.c index 28e62338..639f4ce2 100644 --- a/src/cpu.c +++ b/src/cpu.c @@ -71,11 +71,11 @@ static char *cpu_filename = "cpu-%s.rrd"; static char *ds_def[] = { - "DS:user:COUNTER:25:0:U", - "DS:nice:COUNTER:25:0:U", - "DS:syst:COUNTER:25:0:U", - "DS:idle:COUNTER:25:0:U", - "DS:wait:COUNTER:25:0:U", + "DS:user:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:nice:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:syst:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:idle:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:wait:COUNTER:"COLLECTD_HEARTBEAT":0:U", NULL }; static int ds_num = 5; diff --git a/src/cpufreq.c b/src/cpufreq.c index 22877b4d..797bee70 100644 --- a/src/cpufreq.c +++ b/src/cpufreq.c @@ -36,7 +36,7 @@ static char *cpufreq_file = "cpufreq-%s.rrd"; static char *ds_def[] = { - "DS:value:GAUGE:25:0:U", + "DS:value:GAUGE:"COLLECTD_HEARTBEAT":0:U", NULL }; static int ds_num = 1; diff --git a/src/df.c b/src/df.c index 6b7df311..3e173c5f 100644 --- a/src/df.c +++ b/src/df.c @@ -51,8 +51,8 @@ static char *filename_template = "df-%s.rrd"; static char *ds_def[] = { - "DS:used:GAUGE:25:0:U", - "DS:free:GAUGE:25:0:U", + "DS:used:GAUGE:"COLLECTD_HEARTBEAT":0:U", + "DS:free:GAUGE:"COLLECTD_HEARTBEAT":0:U", NULL }; static int ds_num = 2; diff --git a/src/disk.c b/src/disk.c index ea497175..992c2d2c 100644 --- a/src/disk.c +++ b/src/disk.c @@ -38,24 +38,24 @@ static char *part_filename_template = "partition-%s.rrd"; /* 104857600 == 100 MB */ static char *disk_ds_def[] = { - "DS:rcount:COUNTER:25:0:U", - "DS:rmerged:COUNTER:25:0:U", - "DS:rbytes:COUNTER:25:0:104857600", - "DS:rtime:COUNTER:25:0:U", - "DS:wcount:COUNTER:25:0:U", - "DS:wmerged:COUNTER:25:0:U", - "DS:wbytes:COUNTER:25:0:104857600", - "DS:wtime:COUNTER:25:0:U", + "DS:rcount:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:rmerged:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:rbytes:COUNTER:"COLLECTD_HEARTBEAT":0:104857600", + "DS:rtime:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:wcount:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:wmerged:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:wbytes:COUNTER:"COLLECTD_HEARTBEAT":0:104857600", + "DS:wtime:COUNTER:"COLLECTD_HEARTBEAT":0:U", NULL }; static int disk_ds_num = 8; static char *part_ds_def[] = { - "DS:rcount:COUNTER:25:0:U", - "DS:rbytes:COUNTER:25:0:104857600", - "DS:wcount:COUNTER:25:0:U", - "DS:wbytes:COUNTER:25:0:104857600", + "DS:rcount:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:rbytes:COUNTER:"COLLECTD_HEARTBEAT":0:104857600", + "DS:wcount:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:wbytes:COUNTER:"COLLECTD_HEARTBEAT":0:104857600", NULL }; static int part_ds_num = 4; diff --git a/src/hddtemp.c b/src/hddtemp.c index 9d272f54..5d79bf41 100644 --- a/src/hddtemp.c +++ b/src/hddtemp.c @@ -45,7 +45,7 @@ static char *filename_format = "hddtemp-%s.rrd"; static char *ds_def[] = { - "DS:value:GAUGE:25:U:U", + "DS:value:GAUGE:"COLLECTD_HEARTBEAT":U:U", NULL }; static int ds_num = 1; diff --git a/src/load.c b/src/load.c index 913eb538..fbe6c4de 100644 --- a/src/load.c +++ b/src/load.c @@ -48,9 +48,9 @@ static char *load_file = "load.rrd"; static char *ds_def[] = { - "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 = 3; diff --git a/src/memory.c b/src/memory.c index 3ab19e65..13ee9501 100644 --- a/src/memory.c +++ b/src/memory.c @@ -37,10 +37,10 @@ static char *memory_file = "memory.rrd"; /* 9223372036854775807 == LLONG_MAX */ static char *ds_def[] = { - "DS:used:GAUGE:25:0:9223372036854775807", - "DS:free:GAUGE:25:0:9223372036854775807", - "DS:buffers:GAUGE:25:0:9223372036854775807", - "DS:cached:GAUGE:25:0:9223372036854775807", + "DS:used:GAUGE:"COLLECTD_HEARTBEAT":0:9223372036854775807", + "DS:free:GAUGE:"COLLECTD_HEARTBEAT":0:9223372036854775807", + "DS:buffers:GAUGE:"COLLECTD_HEARTBEAT":0:9223372036854775807", + "DS:cached:GAUGE:"COLLECTD_HEARTBEAT":0:9223372036854775807", NULL }; static int ds_num = 4; diff --git a/src/mysql.c b/src/mysql.c index ac65f75a..9a139869 100644 --- a/src/mysql.c +++ b/src/mysql.c @@ -60,43 +60,43 @@ static char *traffic_file = "traffic-mysql.rrd"; static char *commands_ds_def[] = { - "DS:value:COUNTER:25:0:U", + "DS:value:COUNTER:"COLLECTD_HEARTBEAT":0:U", NULL }; static int commands_ds_num = 1; static char *handler_ds_def[] = { - "DS:value:COUNTER:25:0:U", + "DS:value:COUNTER:"COLLECTD_HEARTBEAT":0:U", NULL }; static int handler_ds_num = 1; static char *qcache_ds_def[] = { - "DS:hits:COUNTER:25:0:U", - "DS:inserts:COUNTER:25:0:U", - "DS:not_cached:COUNTER:25:0:U", - "DS:lowmem_prunes:COUNTER:25:0:U", - "DS:queries_in_cache:GAUGE:25:0:U", + "DS:hits:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:inserts:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:not_cached:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:lowmem_prunes:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:queries_in_cache:GAUGE:"COLLECTD_HEARTBEAT":0:U", NULL }; static int qcache_ds_num = 5; static char *threads_ds_def[] = { - "DS:running:GAUGE:25:0:U", - "DS:connected:GAUGE:25:0:U", - "DS:cached:GAUGE:25:0:U", - "DS:created:COUNTER:25:0:U", + "DS:running:GAUGE:"COLLECTD_HEARTBEAT":0:U", + "DS:connected:GAUGE:"COLLECTD_HEARTBEAT":0:U", + "DS:cached:GAUGE:"COLLECTD_HEARTBEAT":0:U", + "DS:created:COUNTER:"COLLECTD_HEARTBEAT":0:U", NULL }; static int threads_ds_num = 4; static char *traffic_ds_def[] = { - "DS:incoming:COUNTER:25:0:U", - "DS:outgoing:COUNTER:25:0:U", + "DS:incoming:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:outgoing:COUNTER:"COLLECTD_HEARTBEAT":0:U", NULL }; static int traffic_ds_num = 2; diff --git a/src/nfs.c b/src/nfs.c index 1592c911..3c7b8cf8 100644 --- a/src/nfs.c +++ b/src/nfs.c @@ -83,52 +83,52 @@ Number Procedures Procedures static char *nfs2_procedures_ds_def[] = { - "DS:null:COUNTER:25:0:U", - "DS:getattr:COUNTER:25:0:U", - "DS:setattr:COUNTER:25:0:U", - "DS:root:COUNTER:25:0:U", - "DS:lookup:COUNTER:25:0:U", - "DS:readlink:COUNTER:25:0:U", - "DS:read:COUNTER:25:0:U", - "DS:wrcache:COUNTER:25:0:U", - "DS:write:COUNTER:25:0:U", - "DS:create:COUNTER:25:0:U", - "DS:remove:COUNTER:25:0:U", - "DS:rename:COUNTER:25:0:U", - "DS:link:COUNTER:25:0:U", - "DS:symlink:COUNTER:25:0:U", - "DS:mkdir:COUNTER:25:0:U", - "DS:rmdir:COUNTER:25:0:U", - "DS:readdir:COUNTER:25:0:U", - "DS:fsstat:COUNTER:25:0:U", + "DS:null:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:getattr:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:setattr:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:root:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:lookup:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:readlink:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:read:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:wrcache:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:write:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:create:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:remove:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:rename:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:link:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:symlink:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:mkdir:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:rmdir:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:readdir:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:fsstat:COUNTER:"COLLECTD_HEARTBEAT":0:U", NULL }; static int nfs2_procedures_ds_num = 18; static char *nfs3_procedures_ds_def[] = { - "DS:null:COUNTER:25:0:U", - "DS:getattr:COUNTER:25:0:U", - "DS:setattr:COUNTER:25:0:U", - "DS:lookup:COUNTER:25:0:U", - "DS:access:COUNTER:25:0:U", - "DS:readlink:COUNTER:25:0:U", - "DS:read:COUNTER:25:0:U", - "DS:write:COUNTER:25:0:U", - "DS:create:COUNTER:25:0:U", - "DS:mkdir:COUNTER:25:0:U", - "DS:symlink:COUNTER:25:0:U", - "DS:mknod:COUNTER:25:0:U", - "DS:remove:COUNTER:25:0:U", - "DS:rmdir:COUNTER:25:0:U", - "DS:rename:COUNTER:25:0:U", - "DS:link:COUNTER:25:0:U", - "DS:readdir:COUNTER:25:0:U", - "DS:readdirplus:COUNTER:25:0:U", - "DS:fsstat:COUNTER:25:0:U", - "DS:fsinfo:COUNTER:25:0:U", - "DS:pathconf:COUNTER:25:0:U", - "DS:commit:COUNTER:25:0:U", + "DS:null:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:getattr:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:setattr:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:lookup:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:access:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:readlink:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:read:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:write:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:create:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:mkdir:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:symlink:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:mknod:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:remove:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:rmdir:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:rename:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:link:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:readdir:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:readdirplus:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:fsstat:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:fsinfo:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:pathconf:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:commit:COUNTER:"COLLECTD_HEARTBEAT":0:U", NULL }; static int nfs3_procedures_ds_num = 22; diff --git a/src/ping.c b/src/ping.c index fb2f8c1d..b87abb8c 100644 --- a/src/ping.c +++ b/src/ping.c @@ -37,7 +37,7 @@ static char *file_template = "ping-%s.rrd"; static char *ds_def[] = { - "DS:ping:GAUGE:25:0:65535", + "DS:ping:GAUGE:"COLLECTD_HEARTBEAT":0:65535", NULL }; static int ds_num = 1; diff --git a/src/processes.c b/src/processes.c index 3a731890..a1df6ca2 100644 --- a/src/processes.c +++ b/src/processes.c @@ -39,12 +39,12 @@ static char *ps_file = "processes.rrd"; static char *ds_def[] = { - "DS:running:GAUGE:25:0:65535", - "DS:sleeping:GAUGE:25:0:65535", - "DS:zombies:GAUGE:25:0:65535", - "DS:stopped:GAUGE:25:0:65535", - "DS:paging:GAUGE:25:0:65535", - "DS:blocked:GAUGE:25:0:65535", + "DS:running:GAUGE:"COLLECTD_HEARTBEAT":0:65535", + "DS:sleeping:GAUGE:"COLLECTD_HEARTBEAT":0:65535", + "DS:zombies:GAUGE:"COLLECTD_HEARTBEAT":0:65535", + "DS:stopped:GAUGE:"COLLECTD_HEARTBEAT":0:65535", + "DS:paging:GAUGE:"COLLECTD_HEARTBEAT":0:65535", + "DS:blocked:GAUGE:"COLLECTD_HEARTBEAT":0:65535", NULL }; static int ds_num = 6; diff --git a/src/sensors.c b/src/sensors.c index 75981e84..05973ba3 100644 --- a/src/sensors.c +++ b/src/sensors.c @@ -44,7 +44,7 @@ static char *filename_format = "sensors-%s.rrd"; static char *ds_def[] = { - "DS:value:GAUGE:25:U:U", + "DS:value:GAUGE:"COLLECTD_HEARTBEAT":U:U", NULL }; static int ds_num = 1; diff --git a/src/serial.c b/src/serial.c index 31b6148e..a95eb2d0 100644 --- a/src/serial.c +++ b/src/serial.c @@ -37,8 +37,8 @@ static char *serial_filename_template = "serial-%s.rrd"; static char *ds_def[] = { - "DS:incoming:COUNTER:25:0:U", - "DS:outgoing:COUNTER:25:0:U", + "DS:incoming:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:outgoing:COUNTER:"COLLECTD_HEARTBEAT":0:U", NULL }; static int ds_num = 2; diff --git a/src/swap.c b/src/swap.c index 8ffa4536..a6a4e365 100644 --- a/src/swap.c +++ b/src/swap.c @@ -44,10 +44,10 @@ static char *swap_file = "swap.rrd"; /* 1099511627776 == 1TB ought to be enough for anyone ;) */ static char *ds_def[] = { - "DS:used:GAUGE:25:0:1099511627776", - "DS:free:GAUGE:25:0:1099511627776", - "DS:cached:GAUGE:25:0:1099511627776", - "DS:resv:GAUGE:25:0:1099511627776", + "DS:used:GAUGE:"COLLECTD_HEARTBEAT":0:1099511627776", + "DS:free:GAUGE:"COLLECTD_HEARTBEAT":0:1099511627776", + "DS:cached:GAUGE:"COLLECTD_HEARTBEAT":0:1099511627776", + "DS:resv:GAUGE:"COLLECTD_HEARTBEAT":0:1099511627776", NULL }; static int ds_num = 4; diff --git a/src/tape.c b/src/tape.c index 4671ed46..f6aeb93b 100644 --- a/src/tape.c +++ b/src/tape.c @@ -37,14 +37,14 @@ static char *tape_filename_template = "tape-%s.rrd"; /* 104857600 == 100 MB */ static char *tape_ds_def[] = { - "DS:rcount:COUNTER:25:0:U", - "DS:rmerged:COUNTER:25:0:U", - "DS:rbytes:COUNTER:25:0:U", - "DS:rtime:COUNTER:25:0:U", - "DS:wcount:COUNTER:25:0:U", - "DS:wmerged:COUNTER:25:0:U", - "DS:wbytes:COUNTER:25:0:U", - "DS:wtime:COUNTER:25:0:U", + "DS:rcount:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:rmerged:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:rbytes:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:rtime:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:wcount:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:wmerged:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:wbytes:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:wtime:COUNTER:"COLLECTD_HEARTBEAT":0:U", NULL }; static int tape_ds_num = 8; diff --git a/src/traffic.c b/src/traffic.c index f7a9f8f4..45e4cfee 100644 --- a/src/traffic.c +++ b/src/traffic.c @@ -38,8 +38,8 @@ static char *traffic_filename_template = "traffic-%s.rrd"; static char *ds_def[] = { - "DS:incoming:COUNTER:25:0:U", - "DS:outgoing:COUNTER:25:0:U", + "DS:incoming:COUNTER:"COLLECTD_HEARTBEAT":0:U", + "DS:outgoing:COUNTER:"COLLECTD_HEARTBEAT":0:U", NULL }; static int ds_num = 2; diff --git a/src/users.c b/src/users.c index 5fe1b711..4041a1c8 100644 --- a/src/users.c +++ b/src/users.c @@ -43,7 +43,7 @@ static char *rrd_file = "users.rrd"; static char *ds_def[] = { - "DS:users:GAUGE:25:0:65535", + "DS:users:GAUGE:"COLLECTD_HEARTBEAT":0:65535", NULL }; static int ds_num = 1; diff --git a/src/vserver.c b/src/vserver.c index d428faa6..d4795739 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; diff --git a/src/wireless.c b/src/wireless.c index be366c48..03d124b2 100644 --- a/src/wireless.c +++ b/src/wireless.c @@ -41,9 +41,9 @@ static char *filename_template = "wireless-%s.rrd"; static char *ds_def[] = { - "DS:quality:GAUGE:25:0:U", - "DS:power:GAUGE:25:0:U", - "DS:noise:GAUGE:25:0:U", + "DS:quality:GAUGE:"COLLECTD_HEARTBEAT":0:U", + "DS:power:GAUGE:"COLLECTD_HEARTBEAT":0:U", + "DS:noise:GAUGE:"COLLECTD_HEARTBEAT":0:U", NULL }; static int ds_num = 3; -- 2.30.2