Add more metrics to the tests (#6074)
Chris Akritidis committed
May 22, 2019 at 09:23 UTC
880da6db0e1a13b84b88b4126660501763e2517f
4 files changed
+180
-4
tests/backends/prometheus-avg-oldunits.txt
+57
-1
@@ -1,3 +1,20 @@
1
+nd_apps_cpu_percent_average
2
+nd_apps_cpu_system_percent_average
3
+nd_apps_cpu_user_percent_average
4
+nd_apps_files_open_files_average
5
+nd_apps_lreads_kilobytes_persec_average
6
+nd_apps_lwrites_kilobytes_persec_average
7
+nd_apps_major_faults_page_faults_persec_average
8
+nd_apps_mem_MB_average
9
+nd_apps_minor_faults_page_faults_persec_average
10
+nd_apps_pipes_open_pipes_average
11
+nd_apps_preads_kilobytes_persec_average
12
+nd_apps_processes_processes_average
13
+nd_apps_pwrites_kilobytes_persec_average
14
+nd_apps_sockets_open_sockets_average
15
+nd_apps_swap_MB_average
16
+nd_apps_threads_threads_average
17
+nd_apps_vmem_MB_average
18
nd_cpu_core_throttling_events_persec_average
19
nd_cpu_cpu_percent_average
20
nd_cpu_interrupts_interrupts_persec_average
@@ -20,6 +37,7 @@ nd_ip_ecnpkts_packets_persec_average
37
nd_ip_inerrors_packets_persec_average
38
nd_ip_mcast_kilobits_persec_average
39
nd_ip_mcastpkts_packets_persec_average
40
+nd_ip_tcp_accept_queue_packets_persec_average
41
nd_ip_tcpconnaborts_connections_persec_average
42
nd_ip_tcpofo_packets_persec_average
43
nd_ip_tcpreorders_packets_persec_average
@@ -42,7 +60,6 @@ nd_ipv4_udperrors_events_persec_average
60
nd_ipv4_udppackets_packets_persec_average
61
nd_ipv6_ect_packets_persec_average
62
nd_ipv6_errors_packets_persec_average
45
-nd_ipv6_icmpechos_messages_persec_average
63
nd_ipv6_icmperrors_errors_persec_average
64
nd_ipv6_icmp_messages_persec_average
65
nd_ipv6_icmpmldv2_reports_persec_average
@@ -64,9 +81,46 @@ nd_mem_pgfaults_page_faults_persec_average
81
nd_mem_slab_MB_average
82
nd_mem_transparent_hugepages_MB_average
83
nd_mem_writeback_MB_average
84
+nd_netdata_apps_children_fix_percent_average
85
+nd_netdata_apps_cpu_milliseconds_persec_average
86
+nd_netdata_apps_fix_percent_average
87
+nd_netdata_apps_sizes_files_persec_average
88
+nd_netdata_clients_connected_clients_average
89
+nd_netdata_compression_ratio_percent_average
90
+nd_netdata_go_plugin_execution_time_ms_average
91
+nd_netdata_net_kilobits_persec_average
92
+nd_netdata_plugin_cgroups_cpu_milliseconds_persec_average
93
+nd_netdata_plugin_diskspace_dt_milliseconds_run_average
94
+nd_netdata_plugin_diskspace_milliseconds_persec_average
95
+nd_netdata_plugin_proc_cpu_milliseconds_persec_average
96
+nd_netdata_plugin_proc_modules_milliseconds_run_average
97
+nd_netdata_plugin_tc_cpu_milliseconds_persec_average
98
+nd_netdata_plugin_tc_time_milliseconds_run_average
99
+nd_netdata_private_charts_charts_average
100
+nd_netdata_pythond_runtime_ms_average
101
+nd_netdata_requests_requests_persec_average
102
+nd_netdata_response_time_milliseconds_request_average
103
+nd_netdata_server_cpu_milliseconds_persec_average
104
+nd_netdata_statsd_bytes_kilobits_persec_average
105
+nd_netdata_statsd_cpu_milliseconds_persec_average
106
+nd_netdata_statsd_events_events_persec_average
107
+nd_netdata_statsd_metrics_metrics_average
108
+nd_netdata_statsd_packets_packets_persec_average
109
+nd_netdata_statsd_reads_reads_persec_average
110
+nd_netdata_statsd_useful_metrics_metrics_average
111
+nd_netdata_tcp_connected_sockets_average
112
+nd_netdata_tcp_connects_events_average
113
+nd_netdata_web_cpu_milliseconds_persec_average
114
nd_net_drops_drops_persec_average
115
nd_net_net_kilobits_persec_average
116
nd_net_packets_packets_persec_average
117
+nd_services_cpu_percent_average
118
+nd_services_mem_usage_MB_average
119
+nd_services_swap_usage_MB_average
120
+nd_services_throttle_io_ops_read_operations_persec_average
121
+nd_services_throttle_io_ops_write_operations_persec_average
122
+nd_services_throttle_io_read_kilobytes_persec_average
123
+nd_services_throttle_io_write_kilobytes_persec_average
124
nd_system_active_processes_processes_average
125
nd_system_cpu_percent_average
126
nd_system_ctxt_context_switches_persec_average
@@ -85,6 +139,8 @@ nd_system_net_kilobits_persec_average
139
nd_system_pgpgio_kilobytes_persec_average
140
nd_system_processes_processes_average
141
nd_system_ram_MB_average
142
+nd_system_shared_memory_bytes_bytes_average
143
+nd_system_shared_memory_segments_segments_average
144
nd_system_softirqs_softirqs_persec_average
145
nd_system_softnet_stat_events_persec_average
146
nd_system_swapio_kilobytes_persec_average
tests/backends/prometheus-avg.txt
+57
-1
@@ -1,3 +1,20 @@
1
+nd_apps_cpu_percentage_average
2
+nd_apps_cpu_system_percentage_average
3
+nd_apps_cpu_user_percentage_average
4
+nd_apps_files_open_files_average
5
+nd_apps_lreads_KiB_persec_average
6
+nd_apps_lwrites_KiB_persec_average
7
+nd_apps_major_faults_page_faults_persec_average
8
+nd_apps_mem_MiB_average
9
+nd_apps_minor_faults_page_faults_persec_average
10
+nd_apps_pipes_open_pipes_average
11
+nd_apps_preads_KiB_persec_average
12
+nd_apps_processes_processes_average
13
+nd_apps_pwrites_KiB_persec_average
14
+nd_apps_sockets_open_sockets_average
15
+nd_apps_swap_MiB_average
16
+nd_apps_threads_threads_average
17
+nd_apps_vmem_MiB_average
18
nd_cpu_core_throttling_events_persec_average
19
nd_cpu_cpu_percentage_average
20
nd_cpu_interrupts_interrupts_persec_average
@@ -20,6 +37,7 @@ nd_ip_ecnpkts_packets_persec_average
37
nd_ip_inerrors_packets_persec_average
38
nd_ip_mcast_kilobits_persec_average
39
nd_ip_mcastpkts_packets_persec_average
40
+nd_ip_tcp_accept_queue_packets_persec_average
41
nd_ip_tcpconnaborts_connections_persec_average
42
nd_ip_tcpofo_packets_persec_average
43
nd_ip_tcpreorders_packets_persec_average
@@ -42,7 +60,6 @@ nd_ipv4_udperrors_events_persec_average
60
nd_ipv4_udppackets_packets_persec_average
61
nd_ipv6_ect_packets_persec_average
62
nd_ipv6_errors_packets_persec_average
45
-nd_ipv6_icmpechos_messages_persec_average
63
nd_ipv6_icmperrors_errors_persec_average
64
nd_ipv6_icmp_messages_persec_average
65
nd_ipv6_icmpmldv2_reports_persec_average
@@ -64,9 +81,46 @@ nd_mem_pgfaults_faults_persec_average
81
nd_mem_slab_MiB_average
82
nd_mem_transparent_hugepages_MiB_average
83
nd_mem_writeback_MiB_average
84
+nd_netdata_apps_children_fix_percentage_average
85
+nd_netdata_apps_cpu_milliseconds_persec_average
86
+nd_netdata_apps_fix_percentage_average
87
+nd_netdata_apps_sizes_files_persec_average
88
+nd_netdata_clients_connected_clients_average
89
+nd_netdata_compression_ratio_percentage_average
90
+nd_netdata_go_plugin_execution_time_ms_average
91
+nd_netdata_net_kilobits_persec_average
92
+nd_netdata_plugin_cgroups_cpu_milliseconds_persec_average
93
+nd_netdata_plugin_diskspace_dt_milliseconds_run_average
94
+nd_netdata_plugin_diskspace_milliseconds_persec_average
95
+nd_netdata_plugin_proc_cpu_milliseconds_persec_average
96
+nd_netdata_plugin_proc_modules_milliseconds_run_average
97
+nd_netdata_plugin_tc_cpu_milliseconds_persec_average
98
+nd_netdata_plugin_tc_time_milliseconds_run_average
99
+nd_netdata_private_charts_charts_average
100
+nd_netdata_pythond_runtime_ms_average
101
+nd_netdata_requests_requests_persec_average
102
+nd_netdata_response_time_milliseconds_request_average
103
+nd_netdata_server_cpu_milliseconds_persec_average
104
+nd_netdata_statsd_bytes_kilobits_persec_average
105
+nd_netdata_statsd_cpu_milliseconds_persec_average
106
+nd_netdata_statsd_events_events_persec_average
107
+nd_netdata_statsd_metrics_metrics_average
108
+nd_netdata_statsd_packets_packets_persec_average
109
+nd_netdata_statsd_reads_reads_persec_average
110
+nd_netdata_statsd_useful_metrics_metrics_average
111
+nd_netdata_tcp_connected_sockets_average
112
+nd_netdata_tcp_connects_events_average
113
+nd_netdata_web_cpu_milliseconds_persec_average
114
nd_net_drops_drops_persec_average
115
nd_net_net_kilobits_persec_average
116
nd_net_packets_packets_persec_average
117
+nd_services_cpu_percentage_average
118
+nd_services_mem_usage_MiB_average
119
+nd_services_swap_usage_MiB_average
120
+nd_services_throttle_io_ops_read_operations_persec_average
121
+nd_services_throttle_io_ops_write_operations_persec_average
122
+nd_services_throttle_io_read_KiB_persec_average
123
+nd_services_throttle_io_write_KiB_persec_average
124
nd_system_active_processes_processes_average
125
nd_system_cpu_percentage_average
126
nd_system_ctxt_context_switches_persec_average
@@ -85,6 +139,8 @@ nd_system_net_kilobits_persec_average
139
nd_system_pgpgio_KiB_persec_average
140
nd_system_processes_processes_average
141
nd_system_ram_MiB_average
142
+nd_system_shared_memory_bytes_bytes_average
143
+nd_system_shared_memory_segments_segments_average
144
nd_system_softirqs_softirqs_persec_average
145
nd_system_softnet_stat_events_persec_average
146
nd_system_swapio_KiB_persec_average
tests/backends/prometheus-raw.txt
+65
-1
@@ -1,3 +1,20 @@
1
+nd_apps_cpu
2
+nd_apps_cpu_system
3
+nd_apps_cpu_user
4
+nd_apps_files
5
+nd_apps_lreads
6
+nd_apps_lwrites
7
+nd_apps_major_faults
8
+nd_apps_mem
9
+nd_apps_minor_faults
10
+nd_apps_pipes
11
+nd_apps_preads
12
+nd_apps_processes
13
+nd_apps_pwrites
14
+nd_apps_sockets
15
+nd_apps_swap
16
+nd_apps_threads
17
+nd_apps_vmem
18
nd_cpu_core_throttling_total
19
nd_cpu_cpu_total
20
nd_cpu_interrupts_total
@@ -20,6 +37,7 @@ nd_ip_ecnpkts_total
37
nd_ip_inerrors_total
38
nd_ip_mcastpkts_total
39
nd_ip_mcast_total
40
+nd_ip_tcp_accept_queue_total
41
nd_ip_tcpconnaborts_total
42
nd_ip_tcpofo_total
43
nd_ip_tcpreorders_total
@@ -42,7 +60,6 @@ nd_ipv4_udperrors_total
60
nd_ipv4_udppackets_total
61
nd_ipv6_ect_total
62
nd_ipv6_errors_total
45
-nd_ipv6_icmpechos_total
63
nd_ipv6_icmperrors_total
64
nd_ipv6_icmpmldv2_total
65
nd_ipv6_icmpneighbor_total
@@ -64,9 +81,54 @@ nd_mem_pgfaults_total
81
nd_mem_slab
82
nd_mem_transparent_hugepages
83
nd_mem_writeback
84
+nd_netdata_apps_children_fix
85
+nd_netdata_apps_cpu_total
86
+nd_netdata_apps_fix
87
+nd_netdata_apps_sizes_calls_total
88
+nd_netdata_apps_sizes_fds
89
+nd_netdata_apps_sizes_filenames_total
90
+nd_netdata_apps_sizes_files_total
91
+nd_netdata_apps_sizes_inode_changes_total
92
+nd_netdata_apps_sizes_link_changes_total
93
+nd_netdata_apps_sizes_new_pids_total
94
+nd_netdata_apps_sizes_pids
95
+nd_netdata_apps_sizes_targets
96
+nd_netdata_clients
97
+nd_netdata_compression_ratio
98
+nd_netdata_go_plugin_execution_time
99
+nd_netdata_net_total
100
+nd_netdata_plugin_cgroups_cpu_total
101
+nd_netdata_plugin_diskspace_dt
102
+nd_netdata_plugin_diskspace_total
103
+nd_netdata_plugin_proc_cpu_total
104
+nd_netdata_plugin_proc_modules
105
+nd_netdata_plugin_tc_cpu_total
106
+nd_netdata_plugin_tc_time
107
+nd_netdata_private_charts
108
+nd_netdata_pythond_runtime
109
+nd_netdata_requests_total
110
+nd_netdata_response_time
111
+nd_netdata_server_cpu_total
112
+nd_netdata_statsd_bytes_total
113
+nd_netdata_statsd_cpu_total
114
+nd_netdata_statsd_events_total
115
+nd_netdata_statsd_metrics
116
+nd_netdata_statsd_packets_total
117
+nd_netdata_statsd_reads_total
118
+nd_netdata_statsd_useful_metrics
119
+nd_netdata_tcp_connected
120
+nd_netdata_tcp_connects_total
121
+nd_netdata_web_cpu_total
122
nd_net_drops_total
123
nd_net_net_total
124
nd_net_packets_total
125
+nd_services_cpu_total
126
+nd_services_mem_usage
127
+nd_services_swap_usage
128
+nd_services_throttle_io_ops_read_total
129
+nd_services_throttle_io_ops_write_total
130
+nd_services_throttle_io_read_total
131
+nd_services_throttle_io_write_total
132
nd_system_active_processes
133
nd_system_cpu_total
134
nd_system_ctxt_total
@@ -85,6 +147,8 @@ nd_system_net_total
147
nd_system_pgpgio_total
148
nd_system_processes
149
nd_system_ram
150
+nd_system_shared_memory_bytes
151
+nd_system_shared_memory_segments
152
nd_system_softirqs_total
153
nd_system_softnet_stat_total
154
nd_system_swap
tests/backends/prometheus.bats
+1
-1
@@ -5,7 +5,7 @@ validate_metrics() {
5
params="${2}"
6
7
curl -sS "http://localhost:19999/api/v1/allmetrics?format=prometheus&prefix=nd×tamps=no${params}" |
8
- grep -E 'nd_system_|nd_cpu_|nd_system_|nd_net_|nd_disk_|nd_ip_|nd_ipv4_|nd_ipv6_|nd_mem_' |
8
+ 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_' |
9
sed -ne 's/{.*//p' | sort | uniq > tests/backends/new-${fname}
10
diff tests/backends/${fname} tests/backends/new-${fname}
11
rm tests/backends/new-${fname}