Improved collectd example.

 * similiar behavior to influxd example
 * gauges and counters are now handled properly

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>

1 files changed, 68 insertions, 43 deletions

diff --git a/test/results/stats/default/dns_long_domainname.pcap.out b/test/results/stats/default/dns_long_domainname.pcap.out
index 496040135..6fe110166 100644
--- a/test/results/stats/default/dns_long_domainname.pcap.out
+++ b/test/results/stats/default/dns_long_domainname.pcap.out
@@ -1,25 +1,42 @@
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_lines" interval=60 N:9
-PUTVAL "localhost/exec-nDPIsrvd/gauge-json_bytes" interval=60 N:7402
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_new_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_end_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_idle_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_update_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_analyse_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detection_update_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_src_total_bytes" interval=60 N:61
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_dst_total_bytes" interval=60 N:117
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risky_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-packet_flow_count" interval=60 N:2
-PUTVAL "localhost/exec-nDPIsrvd/gauge-init_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-reconnect_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-shutdown_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_lines" interval=60 N:9
+PUTVAL "localhost/exec-nDPIsrvd/counter-json_bytes" interval=60 N:7402
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_new_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_end_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_idle_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_update_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_analyse_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_detection_update_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_not_detected_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_src_total_bytes" interval=60 N:61
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_dst_total_bytes" interval=60 N:117
+PUTVAL "localhost/exec-nDPIsrvd/counter-flow_risky_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-packet_flow_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/counter-init_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-reconnect_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-shutdown_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-status_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unknown_l3_protocol" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_unsupported_datalink" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_type_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_packet_header_invalid" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip4_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_size_smaller_than_header" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_ip6_l4_payload_detection" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_tcp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_udp_packet_too_short" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_capture_size_smaller_than_packet" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_max_flows_to_track" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/counter-error_flow_memory_alloc" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_safe_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_acceptable_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_fun_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unsafe_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_potentially_dangerous_count" interval=60 N:0
@@ -27,6 +44,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_tracker_ads_count" interval=60
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_dangerous_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unrated_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_breed_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unspecified_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_media_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_vpn_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_email_count" interval=60 N:0
@@ -40,7 +58,7 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_voip_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_database_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_remote_access_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cloud_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:2
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_network_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_collaborative_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_rpc_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_streaming_count" interval=60 N:0
@@ -51,6 +69,11 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_video_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_shopping_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_productivity_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_file_sharing_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_conn_check_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_iot_scada_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_virt_assistant_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_cybersecurity_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_adult_content_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_mining_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_malware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_advertisment_count" interval=60 N:0
@@ -59,7 +82,24 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_site_unavail_count" interval
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_allowed_site_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_antimalware_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_crypto_currency_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_gambling_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_category_unknown_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_port" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_partial_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_cache" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_nbpf" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_by_ip" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_dpi_aggressive" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_confidence_unknown" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_low" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_medium" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_high" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_severe" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_critical" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_emergency" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_severity_unknown" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip4_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_ip6_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l3_other_count" interval=60 N:0
@@ -68,25 +108,10 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_udp_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_icmp_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_l4_other_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_unknown_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_count_sum" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_0_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_1_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_2_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_3_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_4_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_5_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_6_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_7_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_8_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_9_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_10_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_11_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_12_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_13_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_14_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_15_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-error_16_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_active_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_detected_count" interval=60 N:1
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_guessed_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_not_detected_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_1_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_2_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_3_count" interval=60 N:0
@@ -129,8 +154,8 @@ PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_39_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_40_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_41_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_42_count" interval=60 N:0
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:1
-PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_43_count" interval=60 N:0
+PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_44_count" interval=60 N:1
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_45_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_46_count" interval=60 N:0
 PUTVAL "localhost/exec-nDPIsrvd/gauge-flow_risk_47_count" interval=60 N:0