Merging upstream version 1.16.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 180 insertions, 4 deletions

diff --git a/tests/backends/prometheus-avg-oldunits.txt b/tests/backends/prometheus-avg-oldunits.txt
index b89c924d4..53ee8ffa9 100644
--- a/tests/backends/prometheus-avg-oldunits.txt
+++ b/tests/backends/prometheus-avg-oldunits.txt
@@ -1,3 +1,20 @@
+nd_apps_cpu_percent_average
+nd_apps_cpu_system_percent_average
+nd_apps_cpu_user_percent_average
+nd_apps_files_open_files_average
+nd_apps_lreads_kilobytes_persec_average
+nd_apps_lwrites_kilobytes_persec_average
+nd_apps_major_faults_page_faults_persec_average
+nd_apps_mem_MB_average
+nd_apps_minor_faults_page_faults_persec_average
+nd_apps_pipes_open_pipes_average
+nd_apps_preads_kilobytes_persec_average
+nd_apps_processes_processes_average
+nd_apps_pwrites_kilobytes_persec_average
+nd_apps_sockets_open_sockets_average
+nd_apps_swap_MB_average
+nd_apps_threads_threads_average
+nd_apps_vmem_MB_average
 nd_cpu_core_throttling_events_persec_average
 nd_cpu_cpu_percent_average
 nd_cpu_interrupts_interrupts_persec_average
@@ -20,6 +37,7 @@ nd_ip_ecnpkts_packets_persec_average
 nd_ip_inerrors_packets_persec_average
 nd_ip_mcast_kilobits_persec_average
 nd_ip_mcastpkts_packets_persec_average
+nd_ip_tcp_accept_queue_packets_persec_average
 nd_ip_tcpconnaborts_connections_persec_average
 nd_ip_tcpofo_packets_persec_average
 nd_ip_tcpreorders_packets_persec_average
@@ -42,7 +60,6 @@ nd_ipv4_udperrors_events_persec_average
 nd_ipv4_udppackets_packets_persec_average
 nd_ipv6_ect_packets_persec_average
 nd_ipv6_errors_packets_persec_average
-nd_ipv6_icmpechos_messages_persec_average
 nd_ipv6_icmperrors_errors_persec_average
 nd_ipv6_icmp_messages_persec_average
 nd_ipv6_icmpmldv2_reports_persec_average
@@ -64,9 +81,46 @@ nd_mem_pgfaults_page_faults_persec_average
 nd_mem_slab_MB_average
 nd_mem_transparent_hugepages_MB_average
 nd_mem_writeback_MB_average
+nd_netdata_apps_children_fix_percent_average
+nd_netdata_apps_cpu_milliseconds_persec_average
+nd_netdata_apps_fix_percent_average
+nd_netdata_apps_sizes_files_persec_average
+nd_netdata_clients_connected_clients_average
+nd_netdata_compression_ratio_percent_average
+nd_netdata_go_plugin_execution_time_ms_average
+nd_netdata_net_kilobits_persec_average
+nd_netdata_plugin_cgroups_cpu_milliseconds_persec_average
+nd_netdata_plugin_diskspace_dt_milliseconds_run_average
+nd_netdata_plugin_diskspace_milliseconds_persec_average
+nd_netdata_plugin_proc_cpu_milliseconds_persec_average
+nd_netdata_plugin_proc_modules_milliseconds_run_average
+nd_netdata_plugin_tc_cpu_milliseconds_persec_average
+nd_netdata_plugin_tc_time_milliseconds_run_average
+nd_netdata_private_charts_charts_average
+nd_netdata_pythond_runtime_ms_average
+nd_netdata_requests_requests_persec_average
+nd_netdata_response_time_milliseconds_request_average
+nd_netdata_server_cpu_milliseconds_persec_average
+nd_netdata_statsd_bytes_kilobits_persec_average
+nd_netdata_statsd_cpu_milliseconds_persec_average
+nd_netdata_statsd_events_events_persec_average
+nd_netdata_statsd_metrics_metrics_average
+nd_netdata_statsd_packets_packets_persec_average
+nd_netdata_statsd_reads_reads_persec_average
+nd_netdata_statsd_useful_metrics_metrics_average
+nd_netdata_tcp_connected_sockets_average
+nd_netdata_tcp_connects_events_average
+nd_netdata_web_cpu_milliseconds_persec_average
 nd_net_drops_drops_persec_average
 nd_net_net_kilobits_persec_average
 nd_net_packets_packets_persec_average
+nd_services_cpu_percent_average
+nd_services_mem_usage_MB_average
+nd_services_swap_usage_MB_average
+nd_services_throttle_io_ops_read_operations_persec_average
+nd_services_throttle_io_ops_write_operations_persec_average
+nd_services_throttle_io_read_kilobytes_persec_average
+nd_services_throttle_io_write_kilobytes_persec_average
 nd_system_active_processes_processes_average
 nd_system_cpu_percent_average
 nd_system_ctxt_context_switches_persec_average
@@ -85,6 +139,8 @@ nd_system_net_kilobits_persec_average
 nd_system_pgpgio_kilobytes_persec_average
 nd_system_processes_processes_average
 nd_system_ram_MB_average
+nd_system_shared_memory_bytes_bytes_average
+nd_system_shared_memory_segments_segments_average
 nd_system_softirqs_softirqs_persec_average
 nd_system_softnet_stat_events_persec_average
 nd_system_swapio_kilobytes_persec_average
diff --git a/tests/backends/prometheus-avg.txt b/tests/backends/prometheus-avg.txt
index eaed4fb7a..1aedff2b5 100644
--- a/tests/backends/prometheus-avg.txt
+++ b/tests/backends/prometheus-avg.txt
@@ -1,3 +1,20 @@
+nd_apps_cpu_percentage_average
+nd_apps_cpu_system_percentage_average
+nd_apps_cpu_user_percentage_average
+nd_apps_files_open_files_average
+nd_apps_lreads_KiB_persec_average
+nd_apps_lwrites_KiB_persec_average
+nd_apps_major_faults_page_faults_persec_average
+nd_apps_mem_MiB_average
+nd_apps_minor_faults_page_faults_persec_average
+nd_apps_pipes_open_pipes_average
+nd_apps_preads_KiB_persec_average
+nd_apps_processes_processes_average
+nd_apps_pwrites_KiB_persec_average
+nd_apps_sockets_open_sockets_average
+nd_apps_swap_MiB_average
+nd_apps_threads_threads_average
+nd_apps_vmem_MiB_average
 nd_cpu_core_throttling_events_persec_average
 nd_cpu_cpu_percentage_average
 nd_cpu_interrupts_interrupts_persec_average
@@ -20,6 +37,7 @@ nd_ip_ecnpkts_packets_persec_average
 nd_ip_inerrors_packets_persec_average
 nd_ip_mcast_kilobits_persec_average
 nd_ip_mcastpkts_packets_persec_average
+nd_ip_tcp_accept_queue_packets_persec_average
 nd_ip_tcpconnaborts_connections_persec_average
 nd_ip_tcpofo_packets_persec_average
 nd_ip_tcpreorders_packets_persec_average
@@ -42,7 +60,6 @@ nd_ipv4_udperrors_events_persec_average
 nd_ipv4_udppackets_packets_persec_average
 nd_ipv6_ect_packets_persec_average
 nd_ipv6_errors_packets_persec_average
-nd_ipv6_icmpechos_messages_persec_average
 nd_ipv6_icmperrors_errors_persec_average
 nd_ipv6_icmp_messages_persec_average
 nd_ipv6_icmpmldv2_reports_persec_average
@@ -64,9 +81,46 @@ nd_mem_pgfaults_faults_persec_average
 nd_mem_slab_MiB_average
 nd_mem_transparent_hugepages_MiB_average
 nd_mem_writeback_MiB_average
+nd_netdata_apps_children_fix_percentage_average
+nd_netdata_apps_cpu_milliseconds_persec_average
+nd_netdata_apps_fix_percentage_average
+nd_netdata_apps_sizes_files_persec_average
+nd_netdata_clients_connected_clients_average
+nd_netdata_compression_ratio_percentage_average
+nd_netdata_go_plugin_execution_time_ms_average
+nd_netdata_net_kilobits_persec_average
+nd_netdata_plugin_cgroups_cpu_milliseconds_persec_average
+nd_netdata_plugin_diskspace_dt_milliseconds_run_average
+nd_netdata_plugin_diskspace_milliseconds_persec_average
+nd_netdata_plugin_proc_cpu_milliseconds_persec_average
+nd_netdata_plugin_proc_modules_milliseconds_run_average
+nd_netdata_plugin_tc_cpu_milliseconds_persec_average
+nd_netdata_plugin_tc_time_milliseconds_run_average
+nd_netdata_private_charts_charts_average
+nd_netdata_pythond_runtime_ms_average
+nd_netdata_requests_requests_persec_average
+nd_netdata_response_time_milliseconds_request_average
+nd_netdata_server_cpu_milliseconds_persec_average
+nd_netdata_statsd_bytes_kilobits_persec_average
+nd_netdata_statsd_cpu_milliseconds_persec_average
+nd_netdata_statsd_events_events_persec_average
+nd_netdata_statsd_metrics_metrics_average
+nd_netdata_statsd_packets_packets_persec_average
+nd_netdata_statsd_reads_reads_persec_average
+nd_netdata_statsd_useful_metrics_metrics_average
+nd_netdata_tcp_connected_sockets_average
+nd_netdata_tcp_connects_events_average
+nd_netdata_web_cpu_milliseconds_persec_average
 nd_net_drops_drops_persec_average
 nd_net_net_kilobits_persec_average
 nd_net_packets_packets_persec_average
+nd_services_cpu_percentage_average
+nd_services_mem_usage_MiB_average
+nd_services_swap_usage_MiB_average
+nd_services_throttle_io_ops_read_operations_persec_average
+nd_services_throttle_io_ops_write_operations_persec_average
+nd_services_throttle_io_read_KiB_persec_average
+nd_services_throttle_io_write_KiB_persec_average
 nd_system_active_processes_processes_average
 nd_system_cpu_percentage_average
 nd_system_ctxt_context_switches_persec_average
@@ -85,6 +139,8 @@ nd_system_net_kilobits_persec_average
 nd_system_pgpgio_KiB_persec_average
 nd_system_processes_processes_average
 nd_system_ram_MiB_average
+nd_system_shared_memory_bytes_bytes_average
+nd_system_shared_memory_segments_segments_average
 nd_system_softirqs_softirqs_persec_average
 nd_system_softnet_stat_events_persec_average
 nd_system_swapio_KiB_persec_average
diff --git a/tests/backends/prometheus-raw.txt b/tests/backends/prometheus-raw.txt
index 7caffc873..2ac4c2c7a 100644
--- a/tests/backends/prometheus-raw.txt
+++ b/tests/backends/prometheus-raw.txt
@@ -1,3 +1,20 @@
+nd_apps_cpu
+nd_apps_cpu_system
+nd_apps_cpu_user
+nd_apps_files
+nd_apps_lreads
+nd_apps_lwrites
+nd_apps_major_faults
+nd_apps_mem
+nd_apps_minor_faults
+nd_apps_pipes
+nd_apps_preads
+nd_apps_processes
+nd_apps_pwrites
+nd_apps_sockets
+nd_apps_swap
+nd_apps_threads
+nd_apps_vmem
 nd_cpu_core_throttling_total
 nd_cpu_cpu_total
 nd_cpu_interrupts_total
@@ -20,6 +37,7 @@ nd_ip_ecnpkts_total
 nd_ip_inerrors_total
 nd_ip_mcastpkts_total
 nd_ip_mcast_total
+nd_ip_tcp_accept_queue_total
 nd_ip_tcpconnaborts_total
 nd_ip_tcpofo_total
 nd_ip_tcpreorders_total
@@ -42,7 +60,6 @@ nd_ipv4_udperrors_total
 nd_ipv4_udppackets_total
 nd_ipv6_ect_total
 nd_ipv6_errors_total
-nd_ipv6_icmpechos_total
 nd_ipv6_icmperrors_total
 nd_ipv6_icmpmldv2_total
 nd_ipv6_icmpneighbor_total
@@ -64,9 +81,54 @@ nd_mem_pgfaults_total
 nd_mem_slab
 nd_mem_transparent_hugepages
 nd_mem_writeback
+nd_netdata_apps_children_fix
+nd_netdata_apps_cpu_total
+nd_netdata_apps_fix
+nd_netdata_apps_sizes_calls_total
+nd_netdata_apps_sizes_fds
+nd_netdata_apps_sizes_filenames_total
+nd_netdata_apps_sizes_files_total
+nd_netdata_apps_sizes_inode_changes_total
+nd_netdata_apps_sizes_link_changes_total
+nd_netdata_apps_sizes_new_pids_total
+nd_netdata_apps_sizes_pids
+nd_netdata_apps_sizes_targets
+nd_netdata_clients
+nd_netdata_compression_ratio
+nd_netdata_go_plugin_execution_time
+nd_netdata_net_total
+nd_netdata_plugin_cgroups_cpu_total
+nd_netdata_plugin_diskspace_dt
+nd_netdata_plugin_diskspace_total
+nd_netdata_plugin_proc_cpu_total
+nd_netdata_plugin_proc_modules
+nd_netdata_plugin_tc_cpu_total
+nd_netdata_plugin_tc_time
+nd_netdata_private_charts
+nd_netdata_pythond_runtime
+nd_netdata_requests_total
+nd_netdata_response_time
+nd_netdata_server_cpu_total
+nd_netdata_statsd_bytes_total
+nd_netdata_statsd_cpu_total
+nd_netdata_statsd_events_total
+nd_netdata_statsd_metrics
+nd_netdata_statsd_packets_total
+nd_netdata_statsd_reads_total
+nd_netdata_statsd_useful_metrics
+nd_netdata_tcp_connected
+nd_netdata_tcp_connects_total
+nd_netdata_web_cpu_total
 nd_net_drops_total
 nd_net_net_total
 nd_net_packets_total
+nd_services_cpu_total
+nd_services_mem_usage
+nd_services_swap_usage
+nd_services_throttle_io_ops_read_total
+nd_services_throttle_io_ops_write_total
+nd_services_throttle_io_read_total
+nd_services_throttle_io_write_total
 nd_system_active_processes
 nd_system_cpu_total
 nd_system_ctxt_total
@@ -85,6 +147,8 @@ nd_system_net_total
 nd_system_pgpgio_total
 nd_system_processes
 nd_system_ram
+nd_system_shared_memory_bytes
+nd_system_shared_memory_segments
 nd_system_softirqs_total
 nd_system_softnet_stat_total
 nd_system_swap
diff --git a/tests/backends/prometheus.bats b/tests/backends/prometheus.bats
index d6ffa8d78..d52f39d54 100755
--- a/tests/backends/prometheus.bats
+++ b/tests/backends/prometheus.bats
@@ -5,7 +5,7 @@ validate_metrics() {
 	params="${2}"
 
 	curl -sS "http://localhost:19999/api/v1/allmetrics?format=prometheus&prefix=nd&timestamps=no${params}" |
-	grep -E 'nd_system_|nd_cpu_|nd_system_|nd_net_|nd_disk_|nd_ip_|nd_ipv4_|nd_ipv6_|nd_mem_' |
+	grep -E 'nd_system_|nd_cpu_|nd_system_|nd_net_|nd_disk_|nd_ip_|nd_ipv4_|nd_ipv6_|nd_mem_|nd_netdata_|nd_apps_|nd_services_' |
 	sed -ne 's/{.*//p' | sort | uniq > tests/backends/new-${fname}
 	diff tests/backends/${fname} tests/backends/new-${fname}
 	rm tests/backends/new-${fname}