teamspeak2 plugin: Introduce and use the `io_octets' and `io_packets' types.

diff --git a/src/teamspeak2.c b/src/teamspeak2.c
index d0d85fff5b3e987561e652f8d438e4c3edd9049e..23a04d61d81b845c5ce25c13c3ce496f62e3be3d 100644 (file)
--- a/src/teamspeak2.c
+++ b/src/teamspeak2.c
@@ -488,10 +488,10 @@ static int tss2_read_vserver (vserver_list_t *vserver)
                tss2_submit_gauge (plugin_instance, "users", users);
 
        if ((valid & 0x06) == 0x06)
-               tss2_submit_io (plugin_instance, "if_octets", rx_octets, tx_octets);
+               tss2_submit_io (plugin_instance, "io_octets", rx_octets, tx_octets);
 
        if ((valid & 0x18) == 0x18)
-               tss2_submit_io (plugin_instance, "if_packets", rx_packets, tx_packets);
+               tss2_submit_io (plugin_instance, "io_packets", rx_packets, tx_packets);
 
        if (valid == 0)
                return (-1);

diff --git a/src/types.db b/src/types.db
index 942c7ba139b91e4527865fcc8b0494962c1cde50..58d3b3a7bd9d64a7bcc92274a080baa1209a6bb1 100644 (file)
--- a/src/types.db
+++ b/src/types.db
@@ -40,6 +40,8 @@ if_octets             rx:COUNTER:0:4294967295, tx:COUNTER:0:4294967295
 if_packets             rx:COUNTER:0:4294967295, tx:COUNTER:0:4294967295
 if_rx_errors           value:COUNTER:0:4294967295
 if_tx_errors           value:COUNTER:0:4294967295
+io_octets              rx:COUNTER:0:4294967295, tx:COUNTER:0:4294967295
+io_packets             rx:COUNTER:0:4294967295, tx:COUNTER:0:4294967295
 ipt_bytes              value:COUNTER:0:134217728
 ipt_packets            value:COUNTER:0:134217728
 irq                    value:COUNTER:U:65535
@@ -79,15 +81,13 @@ temperature         value:GAUGE:-273.15:U
 time_dispersion                seconds:GAUGE:-1000000:1000000
 timeleft               timeleft:GAUGE:0:3600
 time_offset            seconds:GAUGE:-1000000:1000000
-octets                 send:COUNTER:0:4294967295, received:COUNTER:0:4294967295
-packets                        send:COUNTER:0:4294967295, received:COUNTER:0:4294967295
 users                  users:GAUGE:0:65535
 virt_cpu_total         ns:COUNTER:0:256000000000
 virt_vcpu              ns:COUNTER:0:1000000000
 vmpage_action          value:COUNTER:0:4294967295
-vmpage_number          value:GAUGE:0:4294967295
 vmpage_faults          minflt:COUNTER:0:9223372036854775807, majflt:COUNTER:0:9223372036854775807
 vmpage_io              in:COUNTER:0:4294967295, out:COUNTER:0:4294967295
+vmpage_number          value:GAUGE:0:4294967295
 voltage_threshold      value:GAUGE:U:U, threshold:GAUGE:U:U
 voltage                        value:GAUGE:U:U
 vs_memory              value:GAUGE:0:9223372036854775807