From fcd4203e3a5df09f46c39c1b58d6823cb81a19ea Mon Sep 17 00:00:00 2001 From: Bryan Call Date: Tue, 23 Aug 2016 21:01:11 -0700 Subject: [PATCH] TS-2470: Remove PCT metrics --- .../statistics/core/bandwidth.en.rst | 14 -- .../monitoring/statistics/core/cache.en.rst | 27 --- .../monitoring/statistics/core/hostdb.en.rst | 7 - .../statistics/core/http-transaction.en.rst | 56 ------ mgmt/api/APITestCliRemote.cc | 16 -- plugins/experimental/epic/epic.cc | 185 ++++++++---------- proxy/config/metrics.config.default | 98 ---------- 7 files changed, 84 insertions(+), 319 deletions(-) diff --git a/doc/admin-guide/monitoring/statistics/core/bandwidth.en.rst b/doc/admin-guide/monitoring/statistics/core/bandwidth.en.rst index f876758970c..8414a10dc86 100644 --- a/doc/admin-guide/monitoring/statistics/core/bandwidth.en.rst +++ b/doc/admin-guide/monitoring/statistics/core/bandwidth.en.rst @@ -33,20 +33,6 @@ Bandwidth and Transfer Represents the ratio of bytes served to user agents which were satisfied by cache hits, over the previous 10 seconds, -.. ts:stat:: global proxy.node.bandwidth_hit_ratio_avg_10s_int_pct integer - :type: derivative - :unit: percent - - The percentage value of :ts:stat:`proxy.node.bandwidth_hit_ratio_avg_10s` - converted to an integer. - -.. ts:stat:: global proxy.node.bandwidth_hit_ratio_int_pct integer - :type: derivative - :unit: percent - - The percentage vaue of :ts:stat:`proxy.node.bandwidth_hit_ratio` converted - to an integer. - .. ts:stat:: global proxy.node.bandwidth_hit_ratio float :type: derivative :unit: ratio diff --git a/doc/admin-guide/monitoring/statistics/core/cache.en.rst b/doc/admin-guide/monitoring/statistics/core/cache.en.rst index dfc03477198..9784ec4c43b 100644 --- a/doc/admin-guide/monitoring/statistics/core/cache.en.rst +++ b/doc/admin-guide/monitoring/statistics/core/cache.en.rst @@ -52,54 +52,27 @@ Cache Represents the ratio of cache lookups over the previous 10 seconds which have been satisfied by the in-memory cache, thus avoiding disk cache I/O. -.. ts:stat:: global proxy.node.cache_hit_mem_ratio_avg_10s_int_pct integer - :ungathered: - - The value of :ts:stat:`proxy.node.cache_hit_mem_ratio_avg_10s` converted to - an integer percent. - .. ts:stat:: global proxy.node.cache_hit_mem_ratio float Represents the ratio of cache lookups which have been satisfied by the in-memory cache since statistics collection began. -.. ts:stat:: global proxy.node.cache_hit_mem_ratio_int_pct integer - :ungathered: - - The value of :ts:stat:`proxy.node.cache_hit_mem_ratio` converted to an - integer percent. - .. ts:stat:: global proxy.node.cache_hit_ratio_avg_10s float Represents the ratio of cache lookups over the previous 10 seconds which have been satisfied by either the in-memory cache or the disk cache, thus avoiding revalidation or object retrieval from origin servers. -.. ts:stat:: global proxy.node.cache_hit_ratio_avg_10s_int_pct integer - - The value of :ts:stat:`proxy.node.cache_hit_ratio_avg_10s` converted to an - integer percent. - .. ts:stat:: global proxy.node.cache_hit_ratio float Represents the ratio of cache lookups which have been satisfied by either the in-memory cache or the on-disk cache since statistics collection began. -.. ts:stat:: global proxy.node.cache_hit_ratio_int_pct integer - - The value of :ts:stat:`proxy.node.cache_hit_ratio` converted to an integer - percent. - .. ts:stat:: global proxy.node.cache.percent_free float Represents the percentage of allocated cache space which is not occupied by cache objects. -.. ts:stat:: global proxy.node.cache.percent_free_int_pct integer - - The value of :ts:stat:`proxy.node.cache.percent_free` converted to an - integer percent. - .. ts:stat:: global proxy.node.cache_total_hits_avg_10s float .. ts:stat:: global proxy.node.cache_total_hits counter diff --git a/doc/admin-guide/monitoring/statistics/core/hostdb.en.rst b/doc/admin-guide/monitoring/statistics/core/hostdb.en.rst index e2e2b244eb1..ba42fe389af 100644 --- a/doc/admin-guide/monitoring/statistics/core/hostdb.en.rst +++ b/doc/admin-guide/monitoring/statistics/core/hostdb.en.rst @@ -41,13 +41,6 @@ origin servers' hostnames prior to object revalidation or retrieval. Represents the ratio of origin server name resolutions which were satisfied by the HostDB lookup cache since statistics collection began. -.. ts:stat:: global proxy.node.hostdb.hit_ratio_int_pct integer - :type: derivative - :unit: ratio - - The value of :ts:stat:`proxy.node.hostdb.hit_ratio` converted to an integer - percent. - .. ts:stat:: global proxy.node.hostdb.total_hits_avg_10s float :type: derivative diff --git a/doc/admin-guide/monitoring/statistics/core/http-transaction.en.rst b/doc/admin-guide/monitoring/statistics/core/http-transaction.en.rst index d2b0685ee49..bcaf0099609 100644 --- a/doc/admin-guide/monitoring/statistics/core/http-transaction.en.rst +++ b/doc/admin-guide/monitoring/statistics/core/http-transaction.en.rst @@ -67,101 +67,45 @@ HTTP Transaction .. ts:stat:: global proxy.node.http.transaction_frac_avg_10s.errors.aborts float :type: derivative -.. ts:stat:: global proxy.node.http.transaction_frac_avg_10s.errors.aborts_int_pct integer - :type: derivative - :ungathered: - .. ts:stat:: global proxy.node.http.transaction_frac_avg_10s.errors.connect_failed float :type: derivative -.. ts:stat:: global proxy.node.http.transaction_frac_avg_10s.errors.connect_failed_int_pct integer - :type: derivative - :ungathered: - .. ts:stat:: global proxy.node.http.transaction_frac_avg_10s.errors.early_hangups float :type: derivative -.. ts:stat:: global proxy.node.http.transaction_frac_avg_10s.errors.early_hangups_int_pct integer - :type: derivative - :ungathered: - .. ts:stat:: global proxy.node.http.transaction_frac_avg_10s.errors.empty_hangups float :type: derivative -.. ts:stat:: global proxy.node.http.transaction_frac_avg_10s.errors.empty_hangups_int_pct integer - :type: derivative - :ungathered: - .. ts:stat:: global proxy.node.http.transaction_frac_avg_10s.errors.other float :type: derivative -.. ts:stat:: global proxy.node.http.transaction_frac_avg_10s.errors.other_int_pct integer - :type: derivative - :ungathered: - .. ts:stat:: global proxy.node.http.transaction_frac_avg_10s.errors.possible_aborts float :type: derivative -.. ts:stat:: global proxy.node.http.transaction_frac_avg_10s.errors.possible_aborts_int_pct integer - :type: derivative - :ungathered: - .. ts:stat:: global proxy.node.http.transaction_frac_avg_10s.errors.pre_accept_hangups float :type: derivative -.. ts:stat:: global proxy.node.http.transaction_frac_avg_10s.errors.pre_accept_hangups_int_pct integer - :type: derivative - :ungathered: - .. ts:stat:: global proxy.node.http.transaction_frac_avg_10s.hit_fresh float :type: derivative -.. ts:stat:: global proxy.node.http.transaction_frac_avg_10s.hit_fresh_int_pct integer - :type: derivative - :ungathered: - .. ts:stat:: global proxy.node.http.transaction_frac_avg_10s.hit_revalidated float :type: derivative -.. ts:stat:: global proxy.node.http.transaction_frac_avg_10s.hit_revalidated_int_pct integer - :type: derivative - :ungathered: - .. ts:stat:: global proxy.node.http.transaction_frac_avg_10s.miss_changed float :type: derivative -.. ts:stat:: global proxy.node.http.transaction_frac_avg_10s.miss_changed_int_pct integer - :type: derivative - :ungathered: - .. ts:stat:: global proxy.node.http.transaction_frac_avg_10s.miss_client_no_cache float :type: derivative -.. ts:stat:: global proxy.node.http.transaction_frac_avg_10s.miss_client_no_cache_int_pct integer - :type: derivative - :ungathered: - .. ts:stat:: global proxy.node.http.transaction_frac_avg_10s.miss_cold float :type: derivative -.. ts:stat:: global proxy.node.http.transaction_frac_avg_10s.miss_cold_int_pct integer - :type: derivative - :ungathered: - .. ts:stat:: global proxy.node.http.transaction_frac_avg_10s.miss_not_cacheable float :type: derivative -.. ts:stat:: global proxy.node.http.transaction_frac_avg_10s.miss_not_cacheable_int_pct integer - :type: derivative - :ungathered: - .. ts:stat:: global proxy.node.http.transaction_frac_avg_10s.other.unclassified float :type: derivative -.. ts:stat:: global proxy.node.http.transaction_frac_avg_10s.other.unclassified_int_pct integer - :type: derivative - :ungathered: - .. ts:stat:: global proxy.node.http.transaction_msec_avg_10s.errors.aborts integer :type: derivative :unit: milliseconds diff --git a/mgmt/api/APITestCliRemote.cc b/mgmt/api/APITestCliRemote.cc index a82f7862c72..d3d6e61b82c 100644 --- a/mgmt/api/APITestCliRemote.cc +++ b/mgmt/api/APITestCliRemote.cc @@ -2188,12 +2188,7 @@ set_stats() TSRecordSetFloat("proxy.node.http.cache_hit_ims_avg_10s", 100, &action); TSRecordSetFloat("proxy.node.client_throughput_out", 110, &action); - TSRecordSetInt("proxy.node.cache_hit_ratio_int_pct", 110, &action); - TSRecordSetInt("proxy.node.cache_hit_mem_ratio_int_pct", 110, &action); - TSRecordSetInt("proxy.node.bandwidth_hit_ratio_int_pct", 110, &action); - TSRecordSetInt("proxy.node.hostdb.hit_ratio_int_pct", 110, &action); TSRecordSetInt("proxy.node.proxy_running", 110, &action); - TSRecordSetInt("proxy.node.hostdb.hit_ratio_int_pct", 110, &action); TSRecordSetInt("proxy.node.proxy_running", 110, &action); TSRecordSetInt("proxy.node.current_client_connections", 110, &action); TSRecordSetInt("proxy.node.current_cache_connections", 110, &action); @@ -2205,9 +2200,6 @@ set_stats() TSRecordSetFloat("proxy.cluster.cache_hit_ratio", 110, &action); TSRecordSetFloat("proxy.cluster.cache_hit_mem_ratio", 110, &action); - TSRecordSetInt("proxy.cluster.cache_hit_ratio_int_pct", 110, &action); - TSRecordSetInt("proxy.cluster.cache_hit_mem_ratio_int_pct", 110, &action); - TSRecordSetInt("proxy.cluster.bandwidth_hit_ratio_int_pct", 110, &action); TSRecordSetInt("proxy.cluster.cache_total_hits", 110, &action); TSRecordSetInt("proxy.cluster.cache_total_hits_mem", 110, &action); TSRecordSetInt("proxy.cluster.cache_total_misses", 110, &action); @@ -2248,12 +2240,7 @@ print_stats() fprintf(stderr, "NODE stats: \n%f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f\n", f1, f2, f3, f4, f10, f5, f6, f11, f7, f8, f9); - TSRecordGetInt("proxy.node.cache_hit_ratio_int_pct", &i1); - TSRecordGetInt("proxy.node.cache_hit_mem_ratio_int_pct", &i7); - TSRecordGetInt("proxy.node.bandwidth_hit_ratio_int_pct", &i2); - TSRecordGetInt("proxy.node.hostdb.hit_ratio_int_pct", &i3); TSRecordGetInt("proxy.node.proxy_running", &i4); - TSRecordGetInt("proxy.node.hostdb.hit_ratio_int_pct", &i5); TSRecordGetInt("proxy.node.proxy_running", &i6); TSRecordGetInt("proxy.node.current_client_connections", &i8); TSRecordGetInt("proxy.node.current_cache_connections", &i9); @@ -2269,9 +2256,6 @@ print_stats() TSRecordGetFloat("proxy.cluster.cache_hit_ratio", &f5); TSRecordGetFloat("proxy.cluster.cache_hit_mem_ratio", &f6); - TSRecordGetInt("proxy.cluster.cache_hit_ratio_int_pct", &i1); - TSRecordGetInt("proxy.cluster.cache_hit_mem_ratio_int_pct", &i6); - TSRecordGetInt("proxy.cluster.bandwidth_hit_ratio_int_pct", &i2); TSRecordGetInt("proxy.cluster.cache_total_hits", &i3); TSRecordGetInt("proxy.cluster.cache_total_hits_mem", &i7); TSRecordGetInt("proxy.cluster.cache_total_misses", &i4); diff --git a/plugins/experimental/epic/epic.cc b/plugins/experimental/epic/epic.cc index 5470a4c1956..55b115e13cf 100644 --- a/plugins/experimental/epic/epic.cc +++ b/plugins/experimental/epic/epic.cc @@ -50,107 +50,90 @@ static TSHRTime epic_period; static char *epic_prefix; -#define GAUGE_METRIC_NAMES \ - "proxy.node.bandwidth_hit_ratio_avg_10s", "proxy.node.bandwidth_hit_ratio_avg_10s", \ - "proxy.node.bandwidth_hit_ratio_avg_10s_int_pct", "proxy.node.bandwidth_hit_ratio_int_pct", "proxy.node.cache.bytes_free", \ - "proxy.node.cache.bytes_free_mb", "proxy.node.cache.bytes_total", "proxy.node.cache.bytes_total_mb", \ - "proxy.node.cache.bytes_used", "proxy.node.cache.bytes_used_mb", "proxy.node.cache.percent_free", \ - "proxy.node.cache.percent_free_int_pct", "proxy.node.cache_hit_mem_ratio", "proxy.node.cache_hit_mem_ratio_avg_10s", \ - "proxy.node.cache_hit_mem_ratio_avg_10s_int_pct", "proxy.node.cache_hit_mem_ratio_int_pct", "proxy.node.cache_hit_ratio", \ - "proxy.node.cache_hit_ratio_avg_10s", "proxy.node.cache_hit_ratio_avg_10s_int_pct", "proxy.node.cache_hit_ratio_int_pct", \ - "proxy.node.cache_total_hits_avg_10s", "proxy.node.cache_total_hits_mem_avg_10s", "proxy.node.cache_total_misses_avg_10s", \ - "proxy.node.client_throughput_out", "proxy.node.client_throughput_out_kbit", "proxy.node.cluster.nodes", \ - "proxy.node.config.reconfigure_required", "proxy.node.config.reconfigure_time", "proxy.node.config.restart_required.cop", \ - "proxy.node.config.restart_required.manager", "proxy.node.config.restart_required.proxy", \ - "proxy.node.current_cache_connections", "proxy.node.current_client_connections", "proxy.node.current_server_connections", \ - "proxy.node.dns.lookup_avg_time_ms", "proxy.node.dns.lookups_per_second", "proxy.node.hostdb.hit_ratio", \ - "proxy.node.hostdb.hit_ratio_avg_10s", "proxy.node.hostdb.hit_ratio_int_pct", "proxy.node.hostdb.total_hits_avg_10s", \ - "proxy.node.hostdb.total_lookups_avg_10s", "proxy.node.http.cache_current_connections_count", \ - "proxy.node.http.cache_hit_fresh_avg_10s", "proxy.node.http.cache_hit_ims_avg_10s", \ - "proxy.node.http.cache_hit_mem_fresh_avg_10s", "proxy.node.http.cache_hit_revalidated_avg_10s", \ - "proxy.node.http.cache_hit_stale_served_avg_10s", "proxy.node.http.cache_miss_changed_avg_10s", \ - "proxy.node.http.cache_miss_client_no_cache_avg_10s", "proxy.node.http.cache_miss_cold_avg_10s", \ - "proxy.node.http.cache_miss_ims_avg_10s", "proxy.node.http.cache_miss_not_cacheable_avg_10s", \ - "proxy.node.http.cache_read_error_avg_10s", "proxy.node.http.current_parent_proxy_connections", \ - "proxy.node.http.origin_server_current_connections_count", "proxy.node.http.transaction_counts_avg_10s.errors.aborts", \ - "proxy.node.http.transaction_counts_avg_10s.errors.connect_failed", \ - "proxy.node.http.transaction_counts_avg_10s.errors.early_hangups", \ - "proxy.node.http.transaction_counts_avg_10s.errors.empty_hangups", "proxy.node.http.transaction_counts_avg_10s.errors.other", \ - "proxy.node.http.transaction_counts_avg_10s.errors.possible_aborts", \ - "proxy.node.http.transaction_counts_avg_10s.errors.pre_accept_hangups", \ - "proxy.node.http.transaction_counts_avg_10s.hit_fresh", "proxy.node.http.transaction_counts_avg_10s.hit_revalidated", \ - "proxy.node.http.transaction_counts_avg_10s.miss_changed", "proxy.node.http.transaction_counts_avg_10s.miss_client_no_cache", \ - "proxy.node.http.transaction_counts_avg_10s.miss_cold", "proxy.node.http.transaction_counts_avg_10s.miss_not_cacheable", \ - "proxy.node.http.transaction_counts_avg_10s.other.unclassified", "proxy.node.http.transaction_frac_avg_10s.errors.aborts", \ - "proxy.node.http.transaction_frac_avg_10s.errors.aborts_int_pct", \ - "proxy.node.http.transaction_frac_avg_10s.errors.connect_failed", \ - "proxy.node.http.transaction_frac_avg_10s.errors.connect_failed_int_pct", \ - "proxy.node.http.transaction_frac_avg_10s.errors.early_hangups", \ - "proxy.node.http.transaction_frac_avg_10s.errors.early_hangups_int_pct", \ - "proxy.node.http.transaction_frac_avg_10s.errors.empty_hangups", \ - "proxy.node.http.transaction_frac_avg_10s.errors.empty_hangups_int_pct", \ - "proxy.node.http.transaction_frac_avg_10s.errors.other", "proxy.node.http.transaction_frac_avg_10s.errors.other_int_pct", \ - "proxy.node.http.transaction_frac_avg_10s.errors.possible_aborts", \ - "proxy.node.http.transaction_frac_avg_10s.errors.possible_aborts_int_pct", \ - "proxy.node.http.transaction_frac_avg_10s.errors.pre_accept_hangups", \ - "proxy.node.http.transaction_frac_avg_10s.errors.pre_accept_hangups_int_pct", \ - "proxy.node.http.transaction_frac_avg_10s.hit_fresh", "proxy.node.http.transaction_frac_avg_10s.hit_fresh_int_pct", \ - "proxy.node.http.transaction_frac_avg_10s.hit_revalidated", \ - "proxy.node.http.transaction_frac_avg_10s.hit_revalidated_int_pct", "proxy.node.http.transaction_frac_avg_10s.miss_changed", \ - "proxy.node.http.transaction_frac_avg_10s.miss_changed_int_pct", \ - "proxy.node.http.transaction_frac_avg_10s.miss_client_no_cache", \ - "proxy.node.http.transaction_frac_avg_10s.miss_client_no_cache_int_pct", "proxy.node.http.transaction_frac_avg_10s.miss_cold", \ - "proxy.node.http.transaction_frac_avg_10s.miss_cold_int_pct", "proxy.node.http.transaction_frac_avg_10s.miss_not_cacheable", \ - "proxy.node.http.transaction_frac_avg_10s.miss_not_cacheable_int_pct", \ - "proxy.node.http.transaction_frac_avg_10s.other.unclassified", \ - "proxy.node.http.transaction_frac_avg_10s.other.unclassified_int_pct", \ - "proxy.node.http.transaction_msec_avg_10s.errors.aborts", "proxy.node.http.transaction_msec_avg_10s.errors.connect_failed", \ - "proxy.node.http.transaction_msec_avg_10s.errors.early_hangups", \ - "proxy.node.http.transaction_msec_avg_10s.errors.empty_hangups", "proxy.node.http.transaction_msec_avg_10s.errors.other", \ - "proxy.node.http.transaction_msec_avg_10s.errors.possible_aborts", \ - "proxy.node.http.transaction_msec_avg_10s.errors.pre_accept_hangups", "proxy.node.http.transaction_msec_avg_10s.hit_fresh", \ - "proxy.node.http.transaction_msec_avg_10s.hit_revalidated", "proxy.node.http.transaction_msec_avg_10s.miss_changed", \ - "proxy.node.http.transaction_msec_avg_10s.miss_client_no_cache", "proxy.node.http.transaction_msec_avg_10s.miss_cold", \ - "proxy.node.http.transaction_msec_avg_10s.miss_not_cacheable", "proxy.node.http.transaction_msec_avg_10s.other.unclassified", \ - "proxy.node.http.user_agent_current_connections_count", "proxy.node.http.user_agent_xacts_per_second", \ - "proxy.node.log.bytes_received_from_network_avg_10s", "proxy.node.log.bytes_sent_to_network_avg_10s", \ - "proxy.node.num_processes", "proxy.node.origin_server_total_bytes_avg_10s", "proxy.node.proxy_running", \ - "proxy.node.restarts.manager.start_time", "proxy.node.restarts.proxy.cache_ready_time", \ - "proxy.node.restarts.proxy.start_time", "proxy.node.restarts.proxy.stop_time", "proxy.node.user_agent_total_bytes_avg_10s", \ - "proxy.node.user_agent_xacts_per_second", "proxy.node.version.manager.build_time", "proxy.process.cache.KB_read_per_sec", \ - "proxy.process.cache.KB_write_per_sec", "proxy.process.cache.bytes_total", "proxy.process.cache.bytes_used", \ - "proxy.process.cache.direntries.total", "proxy.process.cache.direntries.used", "proxy.process.cache.evacuate.active", \ - "proxy.process.cache.lookup.active", "proxy.process.cache.percent_full", "proxy.process.cache.ram_cache.bytes_total", \ - "proxy.process.cache.ram_cache.bytes_used", "proxy.process.cache.ram_cache.total_bytes", "proxy.process.cache.read.active", \ - "proxy.process.cache.read_per_sec", "proxy.process.cache.remove.active", "proxy.process.cache.scan.active", \ - "proxy.process.cache.update.active", "proxy.process.cache.write.active", "proxy.process.cache.write_per_sec", \ - "proxy.process.cluster.cache_callback_time", "proxy.process.cluster.cache_outstanding", \ - "proxy.process.cluster.cluster_ping_time", "proxy.process.cluster.connections_avg_time", \ - "proxy.process.cluster.connections_open", "proxy.process.cluster.control_messages_avg_receive_time", \ - "proxy.process.cluster.control_messages_avg_send_time", "proxy.process.cluster.lkrmt_cache_callback_time", \ - "proxy.process.cluster.local_connection_time", "proxy.process.cluster.open_delay_time", \ - "proxy.process.cluster.rdmsg_assemble_time", "proxy.process.cluster.remote_connection_time", \ - "proxy.process.cluster.remote_op_reply_timeouts", "proxy.process.cluster.remote_op_timeouts", \ - "proxy.process.cluster.rmt_cache_callback_time", "proxy.process.dns.fail_avg_time", "proxy.process.dns.in_flight", \ - "proxy.process.dns.lookup_avg_time", "proxy.process.dns.success_avg_time", "proxy.process.hostdb.total_entries", \ - "proxy.process.http.avg_transactions_per_client_connection", "proxy.process.http.avg_transactions_per_parent_connection", \ - "proxy.process.http.avg_transactions_per_server_connection", "proxy.process.http.background_fill_current_count", \ - "proxy.process.http.current_active_client_connections", "proxy.process.http.current_cache_connections", \ - "proxy.process.http.current_client_connections", "proxy.process.http.current_client_transactions", \ - "proxy.process.http.current_icp_raw_transactions", "proxy.process.http.current_icp_transactions", \ - "proxy.process.http.current_parent_proxy_connections", "proxy.process.http.current_parent_proxy_raw_transactions", \ - "proxy.process.http.current_parent_proxy_transactions", "proxy.process.http.current_server_connections", \ - "proxy.process.http.current_server_raw_transactions", "proxy.process.http.current_server_transactions", \ - "proxy.process.http.origin_server_speed_bytes_per_sec_100", "proxy.process.http.origin_server_speed_bytes_per_sec_100K", \ - "proxy.process.http.origin_server_speed_bytes_per_sec_100M", "proxy.process.http.origin_server_speed_bytes_per_sec_10K", \ - "proxy.process.http.origin_server_speed_bytes_per_sec_10M", "proxy.process.http.origin_server_speed_bytes_per_sec_1K", \ - "proxy.process.http.origin_server_speed_bytes_per_sec_1M", "proxy.process.http.user_agent_speed_bytes_per_sec_100", \ - "proxy.process.http.user_agent_speed_bytes_per_sec_100K", "proxy.process.http.user_agent_speed_bytes_per_sec_100M", \ - "proxy.process.http.user_agent_speed_bytes_per_sec_10K", "proxy.process.http.user_agent_speed_bytes_per_sec_10M", \ - "proxy.process.http.user_agent_speed_bytes_per_sec_1K", "proxy.process.http.user_agent_speed_bytes_per_sec_1M", \ - "proxy.process.log.log_files_open", "proxy.process.log.log_files_space_used", "proxy.process.net.accepts_currently_open", \ - "proxy.process.net.connections_currently_open", "proxy.process.socks.connections_currently_open", \ - "proxy.process.update.state_machines", "proxy.process.version.server.build_time", \ +#define GAUGE_METRIC_NAMES \ + "proxy.node.bandwidth_hit_ratio_avg_10s", "proxy.node.bandwidth_hit_ratio_avg_10s", "proxy.node.cache.bytes_free", \ + "proxy.node.cache.bytes_free_mb", "proxy.node.cache.bytes_total", "proxy.node.cache.bytes_total_mb", \ + "proxy.node.cache.bytes_used", "proxy.node.cache.bytes_used_mb", "proxy.node.cache.percent_free", \ + "proxy.node.cache_hit_mem_ratio", "proxy.node.cache_hit_mem_ratio_avg_10s", "proxy.node.cache_hit_ratio", \ + "proxy.node.cache_hit_ratio_avg_10s", "proxy.node.cache_total_hits_avg_10s", "proxy.node.cache_total_hits_mem_avg_10s", \ + "proxy.node.cache_total_misses_avg_10s", "proxy.node.client_throughput_out", "proxy.node.client_throughput_out_kbit", \ + "proxy.node.cluster.nodes", "proxy.node.config.reconfigure_required", "proxy.node.config.reconfigure_time", \ + "proxy.node.config.restart_required.cop", "proxy.node.config.restart_required.manager", \ + "proxy.node.config.restart_required.proxy", "proxy.node.current_cache_connections", "proxy.node.current_client_connections", \ + "proxy.node.current_server_connections", "proxy.node.dns.lookup_avg_time_ms", "proxy.node.dns.lookups_per_second", \ + "proxy.node.hostdb.hit_ratio", "proxy.node.hostdb.hit_ratio_avg_10s", "proxy.node.hostdb.total_hits_avg_10s", \ + "proxy.node.hostdb.total_lookups_avg_10s", "proxy.node.http.cache_current_connections_count", \ + "proxy.node.http.cache_hit_fresh_avg_10s", "proxy.node.http.cache_hit_ims_avg_10s", \ + "proxy.node.http.cache_hit_mem_fresh_avg_10s", "proxy.node.http.cache_hit_revalidated_avg_10s", \ + "proxy.node.http.cache_hit_stale_served_avg_10s", "proxy.node.http.cache_miss_changed_avg_10s", \ + "proxy.node.http.cache_miss_client_no_cache_avg_10s", "proxy.node.http.cache_miss_cold_avg_10s", \ + "proxy.node.http.cache_miss_ims_avg_10s", "proxy.node.http.cache_miss_not_cacheable_avg_10s", \ + "proxy.node.http.cache_read_error_avg_10s", "proxy.node.http.current_parent_proxy_connections", \ + "proxy.node.http.origin_server_current_connections_count", "proxy.node.http.transaction_counts_avg_10s.errors.aborts", \ + "proxy.node.http.transaction_counts_avg_10s.errors.connect_failed", \ + "proxy.node.http.transaction_counts_avg_10s.errors.early_hangups", \ + "proxy.node.http.transaction_counts_avg_10s.errors.empty_hangups", "proxy.node.http.transaction_counts_avg_10s.errors.other", \ + "proxy.node.http.transaction_counts_avg_10s.errors.possible_aborts", \ + "proxy.node.http.transaction_counts_avg_10s.errors.pre_accept_hangups", \ + "proxy.node.http.transaction_counts_avg_10s.hit_fresh", "proxy.node.http.transaction_counts_avg_10s.hit_revalidated", \ + "proxy.node.http.transaction_counts_avg_10s.miss_changed", "proxy.node.http.transaction_counts_avg_10s.miss_client_no_cache", \ + "proxy.node.http.transaction_counts_avg_10s.miss_cold", "proxy.node.http.transaction_counts_avg_10s.miss_not_cacheable", \ + "proxy.node.http.transaction_counts_avg_10s.other.unclassified", "proxy.node.http.transaction_frac_avg_10s.errors.aborts", \ + "proxy.node.http.transaction_frac_avg_10s.errors.connect_failed", \ + "proxy.node.http.transaction_frac_avg_10s.errors.early_hangups", \ + "proxy.node.http.transaction_frac_avg_10s.errors.empty_hangups", "proxy.node.http.transaction_frac_avg_10s.errors.other", \ + "proxy.node.http.transaction_frac_avg_10s.errors.possible_aborts", \ + "proxy.node.http.transaction_frac_avg_10s.errors.pre_accept_hangups", "proxy.node.http.transaction_frac_avg_10s.hit_fresh", \ + "proxy.node.http.transaction_frac_avg_10s.hit_revalidated", "proxy.node.http.transaction_frac_avg_10s.miss_changed", \ + "proxy.node.http.transaction_frac_avg_10s.miss_client_no_cache", "proxy.node.http.transaction_frac_avg_10s.miss_cold", \ + "proxy.node.http.transaction_frac_avg_10s.miss_not_cacheable", "proxy.node.http.transaction_frac_avg_10s.other.unclassified", \ + "proxy.node.http.transaction_msec_avg_10s.errors.aborts", "proxy.node.http.transaction_msec_avg_10s.errors.connect_failed", \ + "proxy.node.http.transaction_msec_avg_10s.errors.early_hangups", \ + "proxy.node.http.transaction_msec_avg_10s.errors.empty_hangups", "proxy.node.http.transaction_msec_avg_10s.errors.other", \ + "proxy.node.http.transaction_msec_avg_10s.errors.possible_aborts", \ + "proxy.node.http.transaction_msec_avg_10s.errors.pre_accept_hangups", "proxy.node.http.transaction_msec_avg_10s.hit_fresh", \ + "proxy.node.http.transaction_msec_avg_10s.hit_revalidated", "proxy.node.http.transaction_msec_avg_10s.miss_changed", \ + "proxy.node.http.transaction_msec_avg_10s.miss_client_no_cache", "proxy.node.http.transaction_msec_avg_10s.miss_cold", \ + "proxy.node.http.transaction_msec_avg_10s.miss_not_cacheable", "proxy.node.http.transaction_msec_avg_10s.other.unclassified", \ + "proxy.node.http.user_agent_current_connections_count", "proxy.node.http.user_agent_xacts_per_second", \ + "proxy.node.log.bytes_received_from_network_avg_10s", "proxy.node.log.bytes_sent_to_network_avg_10s", \ + "proxy.node.num_processes", "proxy.node.origin_server_total_bytes_avg_10s", "proxy.node.proxy_running", \ + "proxy.node.restarts.manager.start_time", "proxy.node.restarts.proxy.cache_ready_time", \ + "proxy.node.restarts.proxy.start_time", "proxy.node.restarts.proxy.stop_time", "proxy.node.user_agent_total_bytes_avg_10s", \ + "proxy.node.user_agent_xacts_per_second", "proxy.node.version.manager.build_time", "proxy.process.cache.KB_read_per_sec", \ + "proxy.process.cache.KB_write_per_sec", "proxy.process.cache.bytes_total", "proxy.process.cache.bytes_used", \ + "proxy.process.cache.direntries.total", "proxy.process.cache.direntries.used", "proxy.process.cache.evacuate.active", \ + "proxy.process.cache.lookup.active", "proxy.process.cache.percent_full", "proxy.process.cache.ram_cache.bytes_total", \ + "proxy.process.cache.ram_cache.bytes_used", "proxy.process.cache.ram_cache.total_bytes", "proxy.process.cache.read.active", \ + "proxy.process.cache.read_per_sec", "proxy.process.cache.remove.active", "proxy.process.cache.scan.active", \ + "proxy.process.cache.update.active", "proxy.process.cache.write.active", "proxy.process.cache.write_per_sec", \ + "proxy.process.cluster.cache_callback_time", "proxy.process.cluster.cache_outstanding", \ + "proxy.process.cluster.cluster_ping_time", "proxy.process.cluster.connections_avg_time", \ + "proxy.process.cluster.connections_open", "proxy.process.cluster.control_messages_avg_receive_time", \ + "proxy.process.cluster.control_messages_avg_send_time", "proxy.process.cluster.lkrmt_cache_callback_time", \ + "proxy.process.cluster.local_connection_time", "proxy.process.cluster.open_delay_time", \ + "proxy.process.cluster.rdmsg_assemble_time", "proxy.process.cluster.remote_connection_time", \ + "proxy.process.cluster.remote_op_reply_timeouts", "proxy.process.cluster.remote_op_timeouts", \ + "proxy.process.cluster.rmt_cache_callback_time", "proxy.process.dns.fail_avg_time", "proxy.process.dns.in_flight", \ + "proxy.process.dns.lookup_avg_time", "proxy.process.dns.success_avg_time", "proxy.process.hostdb.total_entries", \ + "proxy.process.http.avg_transactions_per_client_connection", "proxy.process.http.avg_transactions_per_parent_connection", \ + "proxy.process.http.avg_transactions_per_server_connection", "proxy.process.http.background_fill_current_count", \ + "proxy.process.http.current_active_client_connections", "proxy.process.http.current_cache_connections", \ + "proxy.process.http.current_client_connections", "proxy.process.http.current_client_transactions", \ + "proxy.process.http.current_icp_raw_transactions", "proxy.process.http.current_icp_transactions", \ + "proxy.process.http.current_parent_proxy_connections", "proxy.process.http.current_parent_proxy_raw_transactions", \ + "proxy.process.http.current_parent_proxy_transactions", "proxy.process.http.current_server_connections", \ + "proxy.process.http.current_server_raw_transactions", "proxy.process.http.current_server_transactions", \ + "proxy.process.http.origin_server_speed_bytes_per_sec_100", "proxy.process.http.origin_server_speed_bytes_per_sec_100K", \ + "proxy.process.http.origin_server_speed_bytes_per_sec_100M", "proxy.process.http.origin_server_speed_bytes_per_sec_10K", \ + "proxy.process.http.origin_server_speed_bytes_per_sec_10M", "proxy.process.http.origin_server_speed_bytes_per_sec_1K", \ + "proxy.process.http.origin_server_speed_bytes_per_sec_1M", "proxy.process.http.user_agent_speed_bytes_per_sec_100", \ + "proxy.process.http.user_agent_speed_bytes_per_sec_100K", "proxy.process.http.user_agent_speed_bytes_per_sec_100M", \ + "proxy.process.http.user_agent_speed_bytes_per_sec_10K", "proxy.process.http.user_agent_speed_bytes_per_sec_10M", \ + "proxy.process.http.user_agent_speed_bytes_per_sec_1K", "proxy.process.http.user_agent_speed_bytes_per_sec_1M", \ + "proxy.process.log.log_files_open", "proxy.process.log.log_files_space_used", "proxy.process.net.accepts_currently_open", \ + "proxy.process.net.connections_currently_open", "proxy.process.socks.connections_currently_open", \ + "proxy.process.update.state_machines", "proxy.process.version.server.build_time", \ "proxy.process.websocket.current_active_client_connections" // XXX SSL stats (TS-2169) are going to land soon; we will need to update this list ... diff --git a/proxy/config/metrics.config.default b/proxy/config/metrics.config.default index 7d1a9a3f3e8..74623f13157 100644 --- a/proxy/config/metrics.config.default +++ b/proxy/config/metrics.config.default @@ -529,10 +529,6 @@ float 'proxy.cluster.bandwidth_hit_ratio_avg_10s' [[ ) / cluster('proxy.node.user_agent_total_bytes_avg_10s') ]] -integer 'proxy.node.bandwidth_hit_ratio_avg_10s_int_pct' [[ - return proxy.node.bandwidth_hit_ratio_avg_10s * 100 -]] - -- StatAggregation::Ag_Throughput() integer 'proxy.node.http.throughput' [[ local self = ... @@ -704,14 +700,6 @@ float 'proxy.cluster.cache_hit_mem_ratio_avg_10s' [[ ) ]] -integer 'proxy.node.cache_hit_ratio_avg_10s_int_pct' [[ - return proxy.node.cache_hit_ratio_avg_10s * 100 -]] - -integer 'proxy.node.cache_hit_mem_ratio_avg_10s_int_pct' [[ - return proxy.node.cache_hit_mem_ratio_avg_10s * 100 -]] - counter 'proxy.node.cache_total_hits' [[ return proxy.process.http.cache_hit_fresh + proxy.process.http.cache_hit_revalidated + @@ -1093,50 +1081,6 @@ float 'proxy.node.http.transaction_frac_avg_10s.errors.other' [[ end) ]] -integer 'proxy.node.http.transaction_frac_avg_10s.hit_fresh_int_pct' [[ - return proxy.node.http.transaction_frac_avg_10s.hit_fresh * 100 -]] - -integer 'proxy.node.http.transaction_frac_avg_10s.miss_cold_int_pct' [[ - return proxy.node.http.transaction_frac_avg_10s.miss_cold * 100 -]] - -integer 'proxy.node.http.transaction_frac_avg_10s.hit_revalidated_int_pct' [[ - return proxy.node.http.transaction_frac_avg_10s.hit_revalidated * 100 -]] - -integer 'proxy.node.http.transaction_frac_avg_10s.miss_changed_int_pct' [[ - return proxy.node.http.transaction_frac_avg_10s.miss_changed * 100 -]] - -integer 'proxy.node.http.transaction_frac_avg_10s.miss_client_no_cache_int_pct' [[ - return proxy.node.http.transaction_frac_avg_10s.miss_client_no_cache * 100 -]] - -integer 'proxy.node.http.transaction_frac_avg_10s.miss_not_cacheable_int_pct' [[ - return proxy.node.http.transaction_frac_avg_10s.miss_not_cacheable * 100 -]] - -integer 'proxy.node.http.transaction_frac_avg_10s.errors.connect_failed_int_pct' [[ - return proxy.node.http.transaction_frac_avg_10s.errors.connect_failed * 100 -]] - -integer 'proxy.node.http.transaction_frac_avg_10s.errors.aborts_int_pct' [[ - return proxy.node.http.transaction_frac_avg_10s.errors.aborts * 100 -]] - -integer 'proxy.node.http.transaction_frac_avg_10s.errors.possible_aborts_int_pct' [[ - return proxy.node.http.transaction_frac_avg_10s.errors.possible_aborts * 100 -]] - -integer 'proxy.node.http.transaction_frac_avg_10s.errors.pre_accept_hangups_int_pct' [[ - return proxy.node.http.transaction_frac_avg_10s.errors.pre_accept_hangups * 100 -]] - -integer 'proxy.node.http.transaction_frac_avg_10s.errors.other_int_pct' [[ - return proxy.node.http.transaction_frac_avg_10s.errors.other * 100 -]] - integer 'proxy.node.http.transaction_msec_avg_10s.hit_fresh' [[ local self = ... return interval_of_10s(self, function() @@ -1439,48 +1383,6 @@ integer 'proxy.cluster.client_throughput_out_kbit' [[ return cluster('proxy.node.client_throughput_out_kbit') ]] --- If proxy.node.cache_hit_ratio represents 100% as 1.0, this --- represents it as 100. -integer 'proxy.node.cache_hit_ratio_int_pct' [[ - return proxy.node.cache_hit_ratio * 100 -]] - -integer 'proxy.cluster.cache_hit_ratio_int_pct' [[ - return proxy.cluster.cache_hit_ratio * 100 -]] - -integer 'proxy.node.cache_hit_mem_ratio_int_pct' [[ - return proxy.node.cache_hit_mem_ratio * 100 -]] - -integer 'proxy.cluster.cache_hit_mem_ratio_int_pct' [[ - return proxy.node.cache_hit_mem_ratio * 100 -]] - -integer 'proxy.node.bandwidth_hit_ratio_int_pct' [[ - return proxy.node.bandwidth_hit_ratio * 100 -]] - -integer 'proxy.cluster.bandwidth_hit_ratio_int_pct' [[ - return proxy.cluster.bandwidth_hit_ratio * 100 -]] - -integer 'proxy.node.cache.percent_free_int_pct' [[ - return proxy.node.cache.percent_free * 100 -]] - -integer 'proxy.cluster.cache.percent_free_int_pct' [[ - return proxy.cluster.cache.percent_free * 100 -]] - -integer 'proxy.node.hostdb.hit_ratio_int_pct' [[ - return proxy.node.hostdb.hit_ratio * 100 -]] - -integer 'proxy.cluster.hostdb.hit_ratio_int_pct' [[ - return proxy.cluster.hostdb.hit_ratio * 100 -]] - float 'proxy.cluster.hostdb.hit_ratio' [[ return cluster('proxy.node.hostdb.hit_ratio') ]]