TS-4099: fix a couple of metrics syntax problems
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/62d15eda Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/62d15eda Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/62d15eda Branch: refs/heads/master Commit: 62d15eda3febff41b6cfc81e79fc3f8c6977a720 Parents: b547b65 Author: James Peach <[email protected]> Authored: Thu Dec 31 17:33:05 2015 -0800 Committer: James Peach <[email protected]> Committed: Thu Jan 21 19:21:36 2016 -0800 ---------------------------------------------------------------------- proxy/config/metrics.config.default | 37 ++++++++++++++++---------------- 1 file changed, 19 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/62d15eda/proxy/config/metrics.config.default ---------------------------------------------------------------------- diff --git a/proxy/config/metrics.config.default b/proxy/config/metrics.config.default index f5559d4..4488d63 100644 --- a/proxy/config/metrics.config.default +++ b/proxy/config/metrics.config.default @@ -927,20 +927,21 @@ float 'proxy.node.http.transaction_frac_avg_10s.miss_cold' [[ float 'proxy.node.http.transaction_frac_avg_10s.miss_changed' [[ return interval_of_10s(..., function() - proxy.node.http.transaction_counts_avg_10s.miss_changed / - ( - 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_cold + - 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_not_cacheable + - proxy.node.http.transaction_counts_avg_10s.errors.connect_failed + - proxy.node.http.transaction_counts_avg_10s.errors.aborts + - 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.errors.other - ) + return + proxy.node.http.transaction_counts_avg_10s.miss_changed / + ( + 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_cold + + 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_not_cacheable + + proxy.node.http.transaction_counts_avg_10s.errors.connect_failed + + proxy.node.http.transaction_counts_avg_10s.errors.aborts + + 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.errors.other + ) end) ]] @@ -1182,7 +1183,7 @@ integer 'proxy.node.http.transaction_msec_avg_10s.miss_cold' [[ return sec_to_msec * delta_of(self, function() - proxy.process.http.transaction_totaltime.miss_cold + return proxy.process.http.transaction_totaltime.miss_cold end) / ( proxy.node.http.transaction_counts_avg_10s.hit_fresh + @@ -1253,7 +1254,7 @@ integer 'proxy.node.http.transaction_msec_avg_10s.miss_not_cacheable' [[ return interval_of_10s(self, function() return sec_to_msec * - delta_of)self, function() + delta_of(self, function() return proxy.process.http.transaction_totaltime.miss_not_cacheable end) / ( @@ -1637,6 +1638,6 @@ integer 'proxy.cluster.log.bytes_received_from_network_avg_10s' [[ return cluster('proxy.node.log.bytes_received_from_network_avg_10s') ]] -counter 'proxy.process.ssl.total_success_handshake_count_in' [[ - return proxy.process.ssl.total_success_handshake_count +counter 'proxy.process.ssl.total_success_handshake_count' [[ + return proxy.process.ssl.total_success_handshake_count_in ]]
