From caf1a5281f9e974ba73ceded3a782db3d0142c5f Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 26 Apr 2019 18:22:55 +0200 Subject: Merging upstream version 1.14.0. Signed-off-by: Daniel Baumann --- tests/backends/prometheus-avg-oldunits.txt | 92 ------------------------------ tests/backends/prometheus-avg.txt | 92 ------------------------------ tests/backends/prometheus-raw.txt | 92 ------------------------------ tests/backends/prometheus.bats | 31 ---------- 4 files changed, 307 deletions(-) delete mode 100644 tests/backends/prometheus-avg-oldunits.txt delete mode 100644 tests/backends/prometheus-avg.txt delete mode 100644 tests/backends/prometheus-raw.txt delete mode 100755 tests/backends/prometheus.bats (limited to 'tests/backends') diff --git a/tests/backends/prometheus-avg-oldunits.txt b/tests/backends/prometheus-avg-oldunits.txt deleted file mode 100644 index b89c924d4..000000000 --- a/tests/backends/prometheus-avg-oldunits.txt +++ /dev/null @@ -1,92 +0,0 @@ -nd_cpu_core_throttling_events_persec_average -nd_cpu_cpu_percent_average -nd_cpu_interrupts_interrupts_persec_average -nd_cpu_softirqs_softirqs_persec_average -nd_cpu_softnet_stat_events_persec_average -nd_disk_avgsz_kilobytes_per_operation_average -nd_disk_await_ms_per_operation_average -nd_disk_backlog_milliseconds_average -nd_disk_inodes_Inodes_average -nd_disk_io_kilobytes_persec_average -nd_disk_iotime_milliseconds_persec_average -nd_disk_mops_merged_operations_persec_average -nd_disk_ops_operations_persec_average -nd_disk_space_GB_average -nd_disk_svctm_ms_per_operation_average -nd_disk_util___of_time_working_average -nd_ip_bcast_kilobits_persec_average -nd_ip_bcastpkts_packets_persec_average -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_tcpconnaborts_connections_persec_average -nd_ip_tcpofo_packets_persec_average -nd_ip_tcpreorders_packets_persec_average -nd_ipv4_errors_packets_persec_average -nd_ipv4_icmp_errors_packets_persec_average -nd_ipv4_icmpmsg_packets_persec_average -nd_ipv4_icmp_packets_persec_average -nd_ipv4_packets_packets_persec_average -nd_ipv4_sockstat_sockets_sockets_average -nd_ipv4_sockstat_tcp_mem_KB_average -nd_ipv4_sockstat_tcp_sockets_sockets_average -nd_ipv4_sockstat_udp_mem_KB_average -nd_ipv4_sockstat_udp_sockets_sockets_average -nd_ipv4_tcperrors_packets_persec_average -nd_ipv4_tcphandshake_events_persec_average -nd_ipv4_tcpopens_connections_persec_average -nd_ipv4_tcppackets_packets_persec_average -nd_ipv4_tcpsock_active_connections_average -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 -nd_ipv6_icmpneighbor_messages_persec_average -nd_ipv6_icmprouter_messages_persec_average -nd_ipv6_icmptypes_messages_persec_average -nd_ipv6_mcast_kilobits_persec_average -nd_ipv6_mcastpkts_packets_persec_average -nd_ipv6_packets_packets_persec_average -nd_ipv6_sockstat6_raw_sockets_sockets_average -nd_ipv6_sockstat6_tcp_sockets_sockets_average -nd_ipv6_sockstat6_udp_sockets_sockets_average -nd_ipv6_udperrors_events_persec_average -nd_ipv6_udppackets_packets_persec_average -nd_mem_available_MB_average -nd_mem_committed_MB_average -nd_mem_kernel_MB_average -nd_mem_pgfaults_page_faults_persec_average -nd_mem_slab_MB_average -nd_mem_transparent_hugepages_MB_average -nd_mem_writeback_MB_average -nd_net_drops_drops_persec_average -nd_net_net_kilobits_persec_average -nd_net_packets_packets_persec_average -nd_system_active_processes_processes_average -nd_system_cpu_percent_average -nd_system_ctxt_context_switches_persec_average -nd_system_entropy_entropy_average -nd_system_forks_processes_persec_average -nd_system_idlejitter_microseconds_lost_persec_average -nd_system_interrupts_interrupts_persec_average -nd_system_intr_interrupts_persec_average -nd_system_io_kilobytes_persec_average -nd_system_ipc_semaphore_arrays_arrays_average -nd_system_ipc_semaphores_semaphores_average -nd_system_ip_kilobits_persec_average -nd_system_ipv6_kilobits_persec_average -nd_system_load_load_average -nd_system_net_kilobits_persec_average -nd_system_pgpgio_kilobytes_persec_average -nd_system_processes_processes_average -nd_system_ram_MB_average -nd_system_softirqs_softirqs_persec_average -nd_system_softnet_stat_events_persec_average -nd_system_swapio_kilobytes_persec_average -nd_system_swap_MB_average -nd_system_uptime_seconds_average diff --git a/tests/backends/prometheus-avg.txt b/tests/backends/prometheus-avg.txt deleted file mode 100644 index eaed4fb7a..000000000 --- a/tests/backends/prometheus-avg.txt +++ /dev/null @@ -1,92 +0,0 @@ -nd_cpu_core_throttling_events_persec_average -nd_cpu_cpu_percentage_average -nd_cpu_interrupts_interrupts_persec_average -nd_cpu_softirqs_softirqs_persec_average -nd_cpu_softnet_stat_events_persec_average -nd_disk_avgsz_KiB_operation_average -nd_disk_await_milliseconds_operation_average -nd_disk_backlog_milliseconds_average -nd_disk_inodes_inodes_average -nd_disk_io_KiB_persec_average -nd_disk_iotime_milliseconds_persec_average -nd_disk_mops_merged_operations_persec_average -nd_disk_ops_operations_persec_average -nd_disk_space_GiB_average -nd_disk_svctm_milliseconds_operation_average -nd_disk_util___of_time_working_average -nd_ip_bcast_kilobits_persec_average -nd_ip_bcastpkts_packets_persec_average -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_tcpconnaborts_connections_persec_average -nd_ip_tcpofo_packets_persec_average -nd_ip_tcpreorders_packets_persec_average -nd_ipv4_errors_packets_persec_average -nd_ipv4_icmp_errors_packets_persec_average -nd_ipv4_icmpmsg_packets_persec_average -nd_ipv4_icmp_packets_persec_average -nd_ipv4_packets_packets_persec_average -nd_ipv4_sockstat_sockets_sockets_average -nd_ipv4_sockstat_tcp_mem_KiB_average -nd_ipv4_sockstat_tcp_sockets_sockets_average -nd_ipv4_sockstat_udp_mem_KiB_average -nd_ipv4_sockstat_udp_sockets_sockets_average -nd_ipv4_tcperrors_packets_persec_average -nd_ipv4_tcphandshake_events_persec_average -nd_ipv4_tcpopens_connections_persec_average -nd_ipv4_tcppackets_packets_persec_average -nd_ipv4_tcpsock_active_connections_average -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 -nd_ipv6_icmpneighbor_messages_persec_average -nd_ipv6_icmprouter_messages_persec_average -nd_ipv6_icmptypes_messages_persec_average -nd_ipv6_mcast_kilobits_persec_average -nd_ipv6_mcastpkts_packets_persec_average -nd_ipv6_packets_packets_persec_average -nd_ipv6_sockstat6_raw_sockets_sockets_average -nd_ipv6_sockstat6_tcp_sockets_sockets_average -nd_ipv6_sockstat6_udp_sockets_sockets_average -nd_ipv6_udperrors_events_persec_average -nd_ipv6_udppackets_packets_persec_average -nd_mem_available_MiB_average -nd_mem_committed_MiB_average -nd_mem_kernel_MiB_average -nd_mem_pgfaults_faults_persec_average -nd_mem_slab_MiB_average -nd_mem_transparent_hugepages_MiB_average -nd_mem_writeback_MiB_average -nd_net_drops_drops_persec_average -nd_net_net_kilobits_persec_average -nd_net_packets_packets_persec_average -nd_system_active_processes_processes_average -nd_system_cpu_percentage_average -nd_system_ctxt_context_switches_persec_average -nd_system_entropy_entropy_average -nd_system_forks_processes_persec_average -nd_system_idlejitter_microseconds_lost_persec_average -nd_system_interrupts_interrupts_persec_average -nd_system_intr_interrupts_persec_average -nd_system_io_KiB_persec_average -nd_system_ipc_semaphore_arrays_arrays_average -nd_system_ipc_semaphores_semaphores_average -nd_system_ip_kilobits_persec_average -nd_system_ipv6_kilobits_persec_average -nd_system_load_load_average -nd_system_net_kilobits_persec_average -nd_system_pgpgio_KiB_persec_average -nd_system_processes_processes_average -nd_system_ram_MiB_average -nd_system_softirqs_softirqs_persec_average -nd_system_softnet_stat_events_persec_average -nd_system_swapio_KiB_persec_average -nd_system_swap_MiB_average -nd_system_uptime_seconds_average diff --git a/tests/backends/prometheus-raw.txt b/tests/backends/prometheus-raw.txt deleted file mode 100644 index 7caffc873..000000000 --- a/tests/backends/prometheus-raw.txt +++ /dev/null @@ -1,92 +0,0 @@ -nd_cpu_core_throttling_total -nd_cpu_cpu_total -nd_cpu_interrupts_total -nd_cpu_softirqs_total -nd_cpu_softnet_stat_total -nd_disk_avgsz -nd_disk_await -nd_disk_backlog_total -nd_disk_inodes -nd_disk_iotime_total -nd_disk_io_total -nd_disk_mops_total -nd_disk_ops_total -nd_disk_space -nd_disk_svctm -nd_disk_util_total -nd_ip_bcastpkts_total -nd_ip_bcast_total -nd_ip_ecnpkts_total -nd_ip_inerrors_total -nd_ip_mcastpkts_total -nd_ip_mcast_total -nd_ip_tcpconnaborts_total -nd_ip_tcpofo_total -nd_ip_tcpreorders_total -nd_ipv4_errors_total -nd_ipv4_icmp_errors_total -nd_ipv4_icmpmsg_total -nd_ipv4_icmp_total -nd_ipv4_packets_total -nd_ipv4_sockstat_sockets -nd_ipv4_sockstat_tcp_mem -nd_ipv4_sockstat_tcp_sockets -nd_ipv4_sockstat_udp_mem -nd_ipv4_sockstat_udp_sockets -nd_ipv4_tcperrors_total -nd_ipv4_tcphandshake_total -nd_ipv4_tcpopens_total -nd_ipv4_tcppackets_total -nd_ipv4_tcpsock -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 -nd_ipv6_icmprouter_total -nd_ipv6_icmp_total -nd_ipv6_icmptypes_total -nd_ipv6_mcastpkts_total -nd_ipv6_mcast_total -nd_ipv6_packets_total -nd_ipv6_sockstat6_raw_sockets -nd_ipv6_sockstat6_tcp_sockets -nd_ipv6_sockstat6_udp_sockets -nd_ipv6_udperrors_total -nd_ipv6_udppackets_total -nd_mem_available -nd_mem_committed -nd_mem_kernel -nd_mem_pgfaults_total -nd_mem_slab -nd_mem_transparent_hugepages -nd_mem_writeback -nd_net_drops_total -nd_net_net_total -nd_net_packets_total -nd_system_active_processes -nd_system_cpu_total -nd_system_ctxt_total -nd_system_entropy -nd_system_forks_total -nd_system_idlejitter -nd_system_interrupts_total -nd_system_intr_total -nd_system_io_total -nd_system_ipc_semaphore_arrays -nd_system_ipc_semaphores -nd_system_ip_total -nd_system_ipv6_total -nd_system_load -nd_system_net_total -nd_system_pgpgio_total -nd_system_processes -nd_system_ram -nd_system_softirqs_total -nd_system_softnet_stat_total -nd_system_swap -nd_system_swapio_total -nd_system_uptime diff --git a/tests/backends/prometheus.bats b/tests/backends/prometheus.bats deleted file mode 100755 index d6ffa8d78..000000000 --- a/tests/backends/prometheus.bats +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env bats - -validate_metrics() { - fname="${1}" - params="${2}" - - curl -sS "http://localhost:19999/api/v1/allmetrics?format=prometheus&prefix=nd×tamps=no${params}" | - grep -E 'nd_system_|nd_cpu_|nd_system_|nd_net_|nd_disk_|nd_ip_|nd_ipv4_|nd_ipv6_|nd_mem_' | - sed -ne 's/{.*//p' | sort | uniq > tests/backends/new-${fname} - diff tests/backends/${fname} tests/backends/new-${fname} - rm tests/backends/new-${fname} -} - - -if [ ! -f .gitignore ]; then - echo "Need to run as ./tests/backends/$(basename "$0") from top level directory of git repository" >&2 - exit 1 -fi - - -@test "prometheus raw" { - validate_metrics prometheus-raw.txt "&data=raw" -} - -@test "prometheus avg" { - validate_metrics prometheus-avg.txt "" -} - -@test "prometheus avg oldunits" { - validate_metrics prometheus-avg-oldunits.txt "&oldunits=yes" -} -- cgit v1.2.3