From: Florian Forster Date: Wed, 21 Oct 2009 09:21:30 +0000 (+0200) Subject: processes plugin: Rename the new types and use DERIVE data sources. X-Git-Tag: collectd-4.9.0~45 X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=6be4515194055e3530e2aed9ec445c00bce50c25;p=collectd.git processes plugin: Rename the new types and use DERIVE data sources. This is probably a much safer choice in this case. --- diff --git a/src/processes.c b/src/processes.c index 3d670650..a9cfe60b 100644 --- a/src/processes.c +++ b/src/processes.c @@ -634,7 +634,7 @@ static void ps_submit_proc_list (procstat_t *ps) if ( (ps->io_rchar != -1) && (ps->io_wchar != -1) ) { - sstrncpy (vl.type, "ps_diskbytes", sizeof (vl.type)); + sstrncpy (vl.type, "ps_disk_octets", sizeof (vl.type)); vl.values[0].counter = ps->io_rchar; vl.values[1].counter = ps->io_wchar; vl.values_len = 2; @@ -643,7 +643,7 @@ static void ps_submit_proc_list (procstat_t *ps) if ( (ps->io_syscr != -1) && (ps->io_syscw != -1) ) { - sstrncpy (vl.type, "ps_diskops", sizeof (vl.type)); + sstrncpy (vl.type, "ps_disk_ops", sizeof (vl.type)); vl.values[0].counter = ps->io_syscr; vl.values[1].counter = ps->io_syscw; vl.values_len = 2; diff --git a/src/types.db b/src/types.db index aed5a22e..c8c6b98a 100644 --- a/src/types.db +++ b/src/types.db @@ -123,8 +123,8 @@ protocol_counter value:COUNTER:0:U ps_count processes:GAUGE:0:1000000, threads:GAUGE:0:1000000 ps_cputime user:COUNTER:0:16000000, syst:COUNTER:0:16000000 ps_pagefaults minflt:COUNTER:0:9223372036854775807, majflt:COUNTER:0:9223372036854775807 -ps_diskbytes read:COUNTER:0:16000000, write:COUNTER:0:16000000 -ps_diskops read:COUNTER:0:16000000, write:COUNTER:0:16000000 +ps_disk_octets read:DERIVE:0:U, write:DERIVE:0:U +ps_disk_ops read:DERIVE:0:U, write:DERIVE:0:U ps_rss value:GAUGE:0:9223372036854775807 ps_stacksize value:GAUGE:0:9223372036854775807 ps_state value:GAUGE:0:65535