You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2010/09/17 18:58:42 UTC
svn commit: r998201 [2/4] - in /trafficserver/traffic/trunk:
contrib/perl/AdminClient/lib/Apache/TS/ doc/man/ librecords/ proxy/
proxy/api/ts/ proxy/config/ proxy/logging/ proxy/mgmt2/ proxy/mgmt2/api2/
proxy/mgmt2/api2/include/ proxy/mgmt2/api2/remote...
Modified: trafficserver/traffic/trunk/proxy/config/stats.config.xml
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/config/stats.config.xml?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/config/stats.config.xml (original)
+++ trafficserver/traffic/trunk/proxy/config/stats.config.xml Fri Sep 17 16:58:40 2010
@@ -64,394 +64,6 @@
</expression>
</statistics>
- <!-- RNI -->
- <statistics
- minimum="0">
- <destination>proxy.node.rni.user_agents_total_documents_served</destination>
- <destination scope="cluster">proxy.cluster.rni.user_agents_total_documents_served</destination>
- <expression>
- proxy.process.rni.downstream_requests
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0">
- <destination>proxy.node.rni.current_client_connections</destination>
- <destination scope="cluster">proxy.cluster.rni.current_client_connections</destination>
- <expression>
- proxy.process.rni.current_client_connections
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0">
- <destination>proxy.node.rni.current_server_connections</destination>
- <destination scope="cluster">proxy.cluster.rni.current_server_connections</destination>
- <expression>
- proxy.process.rni.current_server_connections
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0">
- <destination>proxy.node.rni.current_cache_connections</destination>
- <destination scope="cluster">proxy.cluster.rni.current_cache_connections</destination>
- <expression>
- proxy.process.rni.current_cache_connections
- </expression>
- </statistics>
-
-
- <!-- WMT -->
- <statistics
- minimum="0">
- <destination>proxy.node.wmt.user_agents_total_documents_served</destination>
- <destination scope="cluster">proxy.cluster.wmt.user_agents_total_documents_served</destination>
- <expression>
- proxy.process.wmt.unique_streams_mmst_ondemand +
- proxy.process.wmt.unique_streams_mmsu_ondemand +
- proxy.process.wmt.unique_streams_http_ondemand +
- proxy.process.wmt.unique_streams_mcast_ondemand +
- proxy.process.wmt.unique_streams_mmst_live +
- proxy.process.wmt.unique_streams_mmsu_live +
- proxy.process.wmt.unique_streams_http_live +
- proxy.process.wmt.unique_streams_mcast_live
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0">
- <destination>proxy.node.wmt.current_client_connections</destination>
- <destination scope="cluster">proxy.cluster.wmt.current_client_connections</destination>
- <expression>
- proxy.process.wmt.current_unique_streams_mmst_ondemand +
- proxy.process.wmt.current_unique_streams_mmsu_ondemand +
- proxy.process.wmt.current_unique_streams_http_ondemand +
- proxy.process.wmt.current_unique_streams_mcast_ondemand +
- proxy.process.wmt.current_unique_streams_mmst_live +
- proxy.process.wmt.current_unique_streams_mmsu_live +
- proxy.process.wmt.current_unique_streams_http_live +
- proxy.process.wmt.current_unique_streams_mcast_live
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0">
- <destination>proxy.node.wmt.current_server_connections</destination>
- <destination scope="cluster">proxy.cluster.wmt.current_server_connections</destination>
- <expression>
- proxy.process.wmt.current_server_connections_mmst_ondemand +
- proxy.process.wmt.current_server_connections_mmst_live
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0">
- <destination>proxy.node.wmt.current_cache_connections</destination>
- <destination scope="cluster">proxy.cluster.wmt.current_cache_connections</destination>
- <expression>
- proxy.process.wmt.current_cache_connections
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0">
- <destination>proxy.node.wmt.total_current_unique_streams_ondemand</destination>
- <destination scope="cluster">proxy.cluster.wmt.total_current_unique_streams_ondemand</destination>
- <expression>
- proxy.process.wmt.current_unique_streams_mmst_ondemand +
- proxy.process.wmt.current_unique_streams_mmsu_ondemand +
- proxy.process.wmt.current_unique_streams_http_ondemand +
- proxy.process.wmt.current_unique_streams_mcast_ondemand
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0">
- <destination>proxy.node.wmt.total_unique_streams_ondemand</destination>
- <destination scope="cluster">proxy.cluster.wmt.total_unique_streams_ondemand</destination>
- <expression>
- proxy.process.wmt.unique_streams_mmst_ondemand +
- proxy.process.wmt.unique_streams_mmsu_ondemand +
- proxy.process.wmt.unique_streams_http_ondemand +
- proxy.process.wmt.unique_streams_mcast_ondemand
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0">
- <destination>proxy.node.wmt.total_unique_streams_ondemand</destination>
- <destination scope="cluster">proxy.cluster.wmt.total_unique_streams_ondemand</destination>
- <expression>
- proxy.process.wmt.unique_streams_mmst_ondemand +
- proxy.process.wmt.unique_streams_mmsu_ondemand +
- proxy.process.wmt.unique_streams_http_ondemand +
- proxy.process.wmt.unique_streams_mcast_ondemand
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0">
- <destination>proxy.node.wmt.downstream.total_request_bytes_ondemand</destination>
- <destination scope="cluster">proxy.cluster.wmt.downstream.total_request_bytes_ondemand</destination>
- <expression>
- proxy.process.wmt.downstream.request_bytes_mmsu_ondemand +
- proxy.process.wmt.downstream.request_bytes_mmst_ondemand +
- proxy.process.wmt.downstream.request_bytes_http_ondemand
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0">
- <destination>proxy.node.wmt.downstream.total_response_bytes_ondemand</destination>
- <destination scope="cluster">proxy.cluster.wmt.downstream.total_response_bytes_ondemand</destination>
- <expression>
- proxy.process.wmt.downstream.response_bytes_mmsu_ondemand +
- proxy.process.wmt.downstream.response_bytes_mmst_ondemand +
- proxy.process.wmt.downstream.response_bytes_http_ondemand
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0">
- <destination>proxy.node.wmt.total_current_unique_streams_live</destination>
- <destination scope="cluster">proxy.cluster.wmt.total_current_unique_streams_live</destination>
- <expression>
- proxy.process.wmt.current_unique_streams_mmst_live +
- proxy.process.wmt.current_unique_streams_mmsu_live +
- proxy.process.wmt.current_unique_streams_http_live +
- proxy.process.wmt.current_unique_streams_mcast_live
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0">
- <destination>proxy.node.wmt.total_unique_streams_live</destination>
- <destination scope="cluster">proxy.cluster.wmt.total_unique_streams_live</destination>
- <expression>
- proxy.process.wmt.unique_streams_mmst_live +
- proxy.process.wmt.unique_streams_mmsu_live +
- proxy.process.wmt.unique_streams_http_live +
- proxy.process.wmt.unique_streams_mcast_live
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0">
- <destination>proxy.node.wmt.downstream.total_request_bytes_live</destination>
- <destination scope="cluster">proxy.cluster.wmt.downstream.total_request_bytes_live</destination>
- <expression>
- proxy.process.wmt.downstream.request_bytes_mmsu_live +
- proxy.process.wmt.downstream.request_bytes_mmst_live +
- proxy.process.wmt.downstream.request_bytes_http_live
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0">
- <destination>proxy.node.wmt.downstream.total_response_bytes_live</destination>
- <destination scope="cluster">proxy.cluster.wmt.downstream.total_response_bytes_live</destination>
- <expression>
- proxy.process.wmt.downstream.response_bytes_mmsu_live +
- proxy.process.wmt.downstream.response_bytes_mmst_live +
- proxy.process.wmt.downstream.response_bytes_http_live
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0">
- <destination>proxy.node.wmt.current_server_connections_mmst</destination>
- <destination scope="cluster">proxy.cluster.wmt.current_server_connections_mmst</destination>
- <expression>
- proxy.process.wmt.current_server_connections_mmst_ondemand +
- proxy.process.wmt.current_server_connections_mmst_live
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0">
- <destination>proxy.node.wmt.server_connections_mmst</destination>
- <destination scope="cluster">proxy.cluster.wmt.server_connections_mmst</destination>
- <expression>
- proxy.process.wmt.server_connections_mmst_ondemand +
- proxy.process.wmt.server_connections_mmst_live
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0"
- maximum="1">
- <destination>proxy.node.wmt.ondemand.byte_hit_ratio</destination>
- <destination scope="cluster">proxy.cluster.wmt.ondemand.byte_hit_ratio</destination>
- <expression>
- proxy.process.wmt.byte_hit_count /
- proxy.node.wmt.downstream.total_response_bytes_ondemand
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0"
- maximum="1">
- <destination>proxy.node.wmt.total.byte_hit_ratio</destination>
- <destination scope="cluster">proxy.cluster.wmt.total.byte_hit_ratio</destination>
- <expression>
- proxy.process.wmt.byte_hit_count /
- ( proxy.node.wmt.downstream.total_response_bytes_ondemand +
- proxy.node.wmt.downstream.total_response_bytes_live )
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0"
- maximum="1"
- interval="10">
- <destination>proxy.node.wmt.ondemand.byte_hit_ratio_avg_10s</destination>
- <destination scope="cluster">proxy.cluster.wmt.ondemand.byte_hit_ratio_avg_10s</destination>
- <expression>
- #proxy.process.wmt.byte_hit_count /
- #proxy.node.wmt.downstream.total_response_bytes_ondemand
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0"
- maximum="1"
- interval="10">
- <destination>proxy.node.wmt.total.byte_hit_ratio_avg_10s</destination>
- <destination scope="cluster">proxy.cluster.wmt.total.byte_hit_ratio_avg_10s></destination>
- <expression>
- #proxy.process.wmt.byte_hit_count /
- ( #proxy.node.wmt.downstream.total_response_bytes_ondemand +
- #proxy.node.wmt.downstream.total_response_bytes_live )
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0">
- <destination>proxy.node.wmt.upstream.response_bytes_mmst</destination>
- <destination scope="cluster">proxy.cluster.wmt.upstream.response_bytes_mmst</destination>
- <expression>
- proxy.process.wmt.upstream.response_bytes_mmst_ondemand +
- proxy.process.wmt.upstream.response_bytes_mmst_live
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0">
- <destination>proxy.node.wmt.upstream.request_bytes_mmst</destination>
- <destination scope="cluster">proxy.cluster.wmt.upstream.request_bytes_mmst</destination>
- <expression>
- proxy.process.wmt.upstream.request_bytes_mmst_ondemand +
- proxy.process.wmt.upstream.request_bytes_mmst_live
- </expression>
- </statistics>
-
-
- <!-- QT -->
- <statistics
- minimum="0">
- <destination>proxy.node.qt.user_agents_total_documents_served</destination>
- <destination scope="cluster">proxy.cluster.qt.user_agents_total_documents_served</destination>
- <expression>
- proxy.process.qt.downstream_requests
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0">
- <destination>proxy.node.qt.current_client_connections</destination>
- <destination scope="cluster">proxy.cluster.qt.current_client_connections</destination>
- <expression>
- proxy.process.qt.current_client_connections
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0">
- <destination>proxy.node.qt.current_server_connections</destination>
- <destination scope="cluster">proxy.cluster.qt.current_server_connections</destination>
- <expression>
- proxy.process.qt.current_server_connections
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0">
- <destination>proxy.node.qt.current_cache_connections</destination>
- <destination scope="cluster">proxy.cluster.qt.current_cache_connections</destination>
- <expression>
- proxy.process.qt.current_cache_connections
- </expression>
- </statistics>
-
-
- <!-- MPEG4 -->
- <statistics
- minimum="0">
- <destination>proxy.node.mpeg4.user_agents_total_documents_served</destination>
- <destination scope="cluster">proxy.cluster.mpeg4.user_agents_total_documents_served</destination>
- <expression>
- proxy.process.mpeg4.downstream_requests
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0">
- <destination>proxy.node.mpeg4.current_client_connections</destination>
- <destination scope="cluster">proxy.cluster.mpeg4.current_client_connections</destination>
- <expression>
- proxy.process.mpeg4.current_client_connections
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0">
- <destination>proxy.node.mpeg4.current_server_connections</destination>
- <destination scope="cluster">proxy.cluster.mpeg4.current_server_connections</destination>
- <expression>
- proxy.process.mpeg4.current_server_connections
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0">
- <destination>proxy.node.mpeg4.current_cache_connections</destination>
- <destination scope="cluster">proxy.cluster.mpeg4.current_cache_connections</destination>
- <expression>
- proxy.process.mpeg4.current_cache_connections
- </expression>
- </statistics>
-
-
<!-- Cache -->
<statistics
minimum="0">
@@ -504,7 +116,6 @@
<!-- ########################################################################### -->
<!-- StatAggregation::Ag_XactsPerSecond() -->
- <!-- QT adn WMT Transaction? -->
<statistics
interval="10"
minimum="0">
@@ -517,57 +128,6 @@
</expression>
</statistics>
- <statistics
- interval="10"
- minimum="0">
- <destination>proxy.node.rni.user_agent_xacts_per_second</destination>
- <destination scope="cluster">proxy.cluster.rni.user_agent_xacts_per_second</destination>
- <expression>
- #proxy.process.rni.downstream_requests *
- $HRTIME_SECOND /
- _DIFFTIME
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0"
- interval="10">
- <destination>proxy.node.wmt.user_agent_xacts_per_second</destination>
- <destination scope="cluster">proxy.cluster.wmt.user_agent_xacts_per_second</destination>
- <expression>
- #proxy.node.wmt.user_agents_total_documents_served *
- $HRTIME_SECOND /
- _DIFFTIME
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0"
- interval="10">
- <destination>proxy.node.qt.user_agent_xacts_per_second</destination>
- <destination scope="cluster">proxy.cluster.qt.user_agent_xacts_per_second</destination>
- <expression>
- #proxy.process.qt.downstream_requests *
- $HRTIME_SECOND /
- _DIFFTIME
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0"
- interval="10">
- <destination>proxy.node.mpeg4.user_agent_xacts_per_second</destination>
- <destination scope="cluster">proxy.cluster.mpeg4.user_agent_xacts_per_second</destination>
- <expression>
- #proxy.process.mpeg4.downstream_requests *
- $HRTIME_SECOND /
- _DIFFTIME
- </expression>
- </statistics>
-
<statistics
minimum="0"
@@ -575,27 +135,18 @@
<destination>proxy.node.user_agent_xacts_per_second</destination>
<destination scope="cluster">proxy.cluster.user_agent_xacts_per_second</destination>
<expression>
- proxy.node.http.user_agent_xacts_per_second +
- proxy.node.rni.user_agent_xacts_per_second +
- proxy.node.wmt.user_agent_xacts_per_second +
- proxy.node.qt.user_agent_xacts_per_second +
- proxy.node.mpeg4.user_agent_xacts_per_second
+ proxy.node.http.user_agent_xacts_per_second
</expression>
</statistics>
<!-- ########################################################################### -->
<!-- StatAggregation::Ag_TotalDocumentsServed() -->
- <!-- QT adn WMT Total Documents Served -->
<statistics
minimum="0">
<destination>proxy.node.user_agents_total_documents_served</destination>
<expression>
- proxy.node.http.user_agents_total_documents_served +
- proxy.node.rni.user_agents_total_documents_served +
- proxy.node.wmt.user_agents_total_documents_served +
- proxy.node.qt.user_agents_total_documents_served +
- proxy.node.mpeg4.user_agents_total_documents_served
+ proxy.node.http.user_agents_total_documents_served
</expression>
</statistics>
@@ -688,72 +239,6 @@
<statistics
minimum="0">
- <destination>proxy.node.rni.downstream_total_bytes</destination>
- <destination scope="cluster">proxy.cluster.rni.downstream_total_bytes</destination>
- <expression>
- proxy.process.rni.downstream.request_bytes +
- proxy.process.rni.downstream.response_bytes
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0">
- <destination>proxy.node.wmt.downstream_request_bytes</destination>
- <destination scope="cluster">proxy.cluster.wmt.downstream_request_bytes</destination>
- <expression>
- proxy.node.wmt.downstream.total_request_bytes_ondemand +
- proxy.node.wmt.downstream.total_request_bytes_live
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0">
- <destination>proxy.node.wmt.downstream_response_bytes</destination>
- <destination scope="cluster">proxy.cluster.wmt.downstream_response_bytes</destination>
- <expression>
- proxy.node.wmt.downstream.total_response_bytes_ondemand +
- proxy.node.wmt.downstream.total_response_bytes_live
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0">
- <destination>proxy.node.wmt.downstream_total_bytes</destination>
- <destination scope="cluster">proxy.cluster.wmt.downstream_total_bytes</destination>
- <expression>
- proxy.node.wmt.downstream_request_bytes +
- proxy.node.wmt.downstream_response_bytes
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0">
- <destination>proxy.node.qt.downstream_total_bytes</destination>
- <destination scope="cluster">proxy.cluster.qt.downstream_total_bytes</destination>
- <expression>
- proxy.process.qt.downstream.request_bytes +
- proxy.process.qt.downstream.response_bytes
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0">
- <destination>proxy.node.mpeg4.downstream_total_bytes</destination>
- <destination scope="cluster">proxy.cluster.mpeg4.downstream_total_bytes</destination>
- <expression>
- proxy.process.mpeg4.downstream.request_bytes +
- proxy.process.mpeg4.downstream.response_bytes
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0">
<destination>proxy.node.http.origin_server_total_request_bytes</destination>
<destination scope="cluster">proxy.cluster.http.origin_server_total_request_bytes</destination>
<expression>
@@ -774,62 +259,13 @@
</statistics>
- <statistics
- minimum="0">
- <destination>proxy.node.rni.upstream_total_bytes</destination>
- <destination scope="cluster">proxy.cluster.rni.upstream_total_bytes</destination>
- <expression>
- proxy.process.rni.upstream.request_bytes +
- proxy.process.rni.upstream.response_bytes
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0">
- <destination>proxy.node.wmt.upstream_total_bytes</destination>
- <destination scope="cluster">proxy.cluster.wmt.upstream_total_bytes</destination>
- <expression>
- proxy.node.wmt.upstream.request_bytes_mmst +
- proxy.node.wmt.upstream.response_bytes_mmst
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0">
- <destination>proxy.node.qt.upstream_total_bytes</destination>
- <destination scope="cluster">proxy.cluster.qt.upstream_total_bytes</destination>
- <expression>
- proxy.process.qt.upstream.request_bytes +
- proxy.process.qt.upstream.response_bytes
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0">
- <destination>proxy.node.mpeg4.upstream_total_bytes</destination>
- <destination scope="cluster">proxy.cluster.mpeg4.upstream_total_bytes</destination>
- <expression>
- proxy.process.mpeg4.upstream.request_bytes +
- proxy.process.mpeg4.upstream.response_bytes
- </expression>
- </statistics>
-
-
-
<!-- add up the downstream (client<=>proxy) traffic volume -->
<statistics
minimum="0">
<destination>proxy.node.user_agent_total_bytes</destination>
<expression>
proxy.node.http.user_agent_total_request_bytes +
- proxy.node.http.user_agent_total_response_bytes +
- proxy.node.rni.downstream_total_bytes +
- proxy.node.wmt.downstream_total_bytes +
- proxy.node.qt.downstream_total_bytes +
- proxy.node.mpeg4.downstream_total_bytes
+ proxy.node.http.user_agent_total_response_bytes
</expression>
</statistics>
@@ -842,11 +278,7 @@
proxy.node.http.origin_server_total_request_bytes +
proxy.node.http.origin_server_total_response_bytes +
proxy.node.http.parent_proxy_total_request_bytes +
- proxy.node.http.parent_proxy_total_response_bytes +
- proxy.node.rni.upstream_total_bytes +
- proxy.node.wmt.upstream_total_bytes +
- proxy.node.qt.upstream_total_bytes +
- proxy.node.mpeg4.upstream_total_bytes
+ proxy.node.http.parent_proxy_total_response_bytes
</expression>
</statistics>
@@ -935,11 +367,7 @@
<destination scope="cluster">proxy.cluster.http.throughput</destination>
<expression>
(
- #proxy.node.http.user_agent_total_response_bytes +
- #proxy.node.rni.downstream_total_bytes +
- #proxy.node.wmt.downstream_total_bytes +
- #proxy.node.qt.downstream_total_bytes +
- #proxy.node.mpeg4.downstream_total_bytes
+ #proxy.node.http.user_agent_total_response_bytes
) *
$HRTIME_SECOND /
_DIFFTIME
@@ -1003,46 +431,6 @@
<statistics
minimum="0"
interval="10">
- <destination>proxy.node.rni.block_hit_count_avg_10s</destination>
- <expression>
- #proxy.process.rni.block_hit_count
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0"
- interval="10">
- <destination>proxy.node.wmt.block_hit_count_avg_10s</destination>
- <expression>
- #proxy.process.wmt.block_hit_count
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0"
- interval="10">
- <destination>proxy.node.qt.block_hit_count_avg_10s</destination>
- <expression>
- #proxy.process.qt.block_hit_count
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0"
- interval="10">
- <destination>proxy.node.mpeg4.block_hit_count_avg_10s</destination>
- <expression>
- #proxy.process.mpeg4.block_hit_count
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0"
- interval="10">
<destination>proxy.node.http.cache_miss_cold_avg_10s</destination>
<expression>
#proxy.process.http.cache_miss_cold
@@ -1103,57 +491,13 @@
<statistics
minimum="0"
interval="10">
- <destination>proxy.node.rni.block_miss_count_avg_10s</destination>
- <expression>
- #proxy.process.rni.block_miss_count
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0"
- interval="10">
- <destination>proxy.node.wmt.block_miss_count_avg_10s</destination>
- <expression>
- #proxy.process.wmt.block_miss_count
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0"
- interval="10">
- <destination>proxy.node.qt.block_miss_count_avg_10s</destination>
- <expression>
- #proxy.process.qt.block_miss_count
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0"
- interval="10">
- <destination>proxy.node.mpeg4.block_miss_count_avg_10s</destination>
- <expression>
- #proxy.process.mpeg4.block_miss_count
- </expression>
- </statistics>
-
-
- <statistics
- minimum="0"
- interval="10">
<destination>proxy.node.cache_total_hits_avg_10s</destination>
<destination scope="cluster">proxy.cluster.cache_total_hits_avg_10s</destination>
<expression>
proxy.node.http.cache_hit_fresh_avg_10s +
proxy.node.http.cache_hit_revalidated_avg_10s +
proxy.node.http.cache_hit_ims_avg_10s +
- proxy.node.http.cache_hit_stale_served_avg_10s +
- proxy.node.rni.block_hit_count_avg_10s +
- proxy.node.wmt.block_hit_count_avg_10s +
- proxy.node.qt.block_hit_count_avg_10s +
- proxy.node.mpeg4.block_hit_count_avg_10s
+ proxy.node.http.cache_hit_stale_served_avg_10s
</expression>
</statistics>
@@ -1169,11 +513,7 @@
proxy.node.http.cache_miss_not_cacheable_avg_10s +
proxy.node.http.cache_miss_client_no_cache_avg_10s +
proxy.node.http.cache_miss_ims_avg_10s +
- proxy.node.http.cache_read_error_avg_10s +
- proxy.node.rni.block_miss_count_avg_10s +
- proxy.node.wmt.block_miss_count_avg_10s +
- proxy.node.qt.block_miss_count_avg_10s +
- proxy.node.mpeg4.block_miss_count_avg_10s
+ proxy.node.http.cache_read_error_avg_10s
</expression>
</statistics>
@@ -1214,11 +554,7 @@
proxy.process.http.cache_hit_fresh +
proxy.process.http.cache_hit_revalidated +
proxy.process.http.cache_hit_ims +
- proxy.process.http.cache_hit_stale_served +
- proxy.process.rni.block_hit_count +
- proxy.process.wmt.block_hit_count +
- proxy.process.qt.block_hit_count +
- proxy.process.mpeg4.block_hit_count
+ proxy.process.http.cache_hit_stale_served
</expression>
</statistics>
@@ -1233,11 +569,7 @@
proxy.process.http.cache_miss_not_cacheable +
proxy.process.http.cache_miss_client_no_cache +
proxy.process.http.cache_miss_ims +
- proxy.process.http.cache_read_error +
- proxy.process.rni.block_miss_count +
- proxy.process.wmt.block_miss_count +
- proxy.process.qt.block_miss_count +
- proxy.process.mpeg4.block_miss_count
+ proxy.process.http.cache_read_error
</expression>
</statistics>
@@ -2243,11 +1575,7 @@
<destination>proxy.node.current_client_connections</destination>
<destination scope="cluster">proxy.cluster.current_client_connections</destination>
<expression>
- proxy.node.http.user_agent_current_connections_count +
- proxy.node.rni.current_client_connections +
- proxy.node.wmt.current_client_connections +
- proxy.node.qt.current_client_connections +
- proxy.node.mpeg4.current_client_connections
+ proxy.node.http.user_agent_current_connections_count
</expression>
</statistics>
@@ -2258,11 +1586,7 @@
<destination scope="cluster">proxy.cluster.current_server_connections</destination>
<expression>
proxy.node.http.origin_server_current_connections_count +
- proxy.node.http.current_parent_proxy_connections +
- proxy.node.rni.current_server_connections +
- proxy.node.wmt.current_server_connections +
- proxy.node.qt.current_server_connections +
- proxy.node.mpeg4.current_server_connections
+ proxy.node.http.current_parent_proxy_connections
</expression>
</statistics>
@@ -2272,11 +1596,7 @@
<destination>proxy.node.current_cache_connections</destination>
<destination scope="cluster">proxy.cluster.current_cache_connections</destination>
<expression>
- proxy.node.http.cache_current_connections_count +
- proxy.node.rni.current_cache_connections +
- proxy.node.wmt.current_cache_connections +
- proxy.node.qt.current_cache_connections +
- proxy.node.mpeg4.current_cache_connections
+ proxy.node.http.cache_current_connections_count
</expression>
</statistics>
@@ -2436,106 +1756,6 @@
</expression>
</statistics>
-
-<!--
-
- Remap WMT variables
-
- -->
- <statistics
- minimum="0">
- <destination>proxy.process.wmt.current_client_connections</destination>
- <expression>
- proxy.node.wmt.total_current_unique_streams_ondemand
- </expression>
- </statistics>
-
- <statistics
- minimum="0">
- <destination>proxy.process.wmt.downstream_requests</destination>
- <expression>
- proxy.node.wmt.total_unique_streams_ondemand
- </expression>
- </statistics>
-
- <statistics
- minimum="0">
- <destination>proxy.process.wmt.downstream.request_bytes</destination>
- <expression>
- proxy.node.wmt.downstream.total_request_bytes_ondemand
- </expression>
- </statistics>
-
- <statistics
- minimum="0">
- <destination>proxy.process.wmt.downstream.response_bytes</destination>
- <expression>
- proxy.node.wmt.downstream.total_response_bytes_ondemand
- </expression>
- </statistics>
-
- <statistics
- minimum="0">
- <destination>proxy.process.wmt.current_server_connections</destination>
- <expression>
- proxy.process.wmt.current_server_connections_mmst_ondemand
- </expression>
- </statistics>
-
- <statistics
- minimum="0">
- <destination>proxy.process.wmt.upstream_requests</destination>
- <expression>
- proxy.process.wmt.server_connections_mmst_ondemand
- </expression>
- </statistics>
-
- <statistics
- minimum="0">
- <destination>proxy.process.wmt.upstream.request_bytes</destination>
- <expression>
- proxy.process.wmt.upstream.request_bytes_mmst_ondemand
- </expression>
- </statistics>
-
- <statistics
- minimum="0">
- <destination>proxy.process.wmt.upstream.response_bytes</destination>
- <expression>
- proxy.process.wmt.upstream.response_bytes_mmst_ondemand
- </expression>
- </statistics>
-
-<!-- UNIT TESTING
- <statistics
- debug="1">
- <destination>proxy.node.stats.test1</destination>
- <expression>
- proxy.node.stats.test2
- </expression>
- </statistics>
-
-
- <statistics
- interval="10"
- debug="1">
- <destination>proxy.node.stats.test3</destination>
- <expression>
- _DIFFTIME / $HRTIME_SECOND
- </expression>
- </statistics>
-
-
- <statistics
- interval="10"
- debug="1">
- <destination>proxy.node.stats.test4</destination>
- <expression>
- #proxy.node.stats.test4 * 10
- </expression>
- </statistics>
--->
-
</ink:statistics>
Modified: trafficserver/traffic/trunk/proxy/logging/LogConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/LogConfig.cc?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/LogConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/logging/LogConfig.cc Fri Sep 17 16:58:40 2010
@@ -119,7 +119,6 @@ LogConfig::setup_default_values()
logfile_dir = xstrdup(".");
separate_icp_logs = 1;
- separate_mixt_logs = -1;
separate_host_logs = FALSE;
squid_log_enabled = TRUE;
@@ -421,18 +420,13 @@ LogConfig::read_configuration_variables(
// SPLITTING
// 0 means no splitting
// 1 means splitting
- // for icp and mixt
+ // for icp
// -1 means filter out (do not log and do not create split file)
val = (int) LOG_ConfigReadInteger("proxy.config.log2.separate_icp_logs");
if (val == 0 || val == 1 || val == -1) {
separate_icp_logs = val;
};
- val = (int) LOG_ConfigReadInteger("proxy.config.log2.separate_mixt_logs");
- if (val == 0 || val == 1 || val == -1) {
- separate_mixt_logs = val;
- };
-
val = (int) LOG_ConfigReadInteger("proxy.config.log2.separate_host_logs");
if (val == 0 || val == 1) {
separate_host_logs = val;
@@ -861,7 +855,6 @@ LogConfig::display(FILE * fd)
fprintf(fd, " extended2_log_name = %s\n", extended2_log_name);
fprintf(fd, " extended2_log_header = %s\n", extended2_log_header ? extended2_log_header : "<no header defined>");
fprintf(fd, " separate_icp_logs = %d\n", separate_icp_logs);
- fprintf(fd, " separate_mixt_logs = %d\n", separate_mixt_logs);
fprintf(fd, " separate_host_logs = %d\n", separate_host_logs);
fprintf(fd, " collation_mode = %d\n", collation_mode);
fprintf(fd, " collation_host = %s\n", collation_host);
@@ -1052,20 +1045,19 @@ LogConfig::create_pre_defined_objects_wi
LogFilter *
LogConfig::split_by_protocol(const PreDefinedFormatInfoList & pre_def_info_list)
{
- if (!(separate_icp_logs || separate_mixt_logs)) {
+ if (!separate_icp_logs) {
return NULL;
}
// http MUST be last entry
enum { icp=0,
- mixt,
http
};
int64 value[] = { LOG_ENTRY_ICP,
- LOG_ENTRY_MIXT, LOG_ENTRY_HTTP
+ LOG_ENTRY_HTTP
};
- const char *name[] = { "icp", "mixt", "http" };
- const char *filter_name[] = { "__icp__", "__mixt__", "__http__" };
+ const char *name[] = { "icp", "http" };
+ const char *filter_name[] = { "__icp__", "__http__" };
int64 filter_val[http]; // protocols to reject
size_t n = 0;
@@ -1082,15 +1074,6 @@ LogConfig::split_by_protocol(const PreDe
filter_val[n++] = value[icp];
}
- if (separate_mixt_logs) {
- if (separate_mixt_logs == 1) {
- filter[0] = NEW(new LogFilterInt(filter_name[mixt],
- etype_field, LogFilter::ACCEPT, LogFilter::MATCH, value[mixt]));
- create_pre_defined_objects_with_filter(pre_def_info_list, 1, filter, name[mixt]);
- delete filter[0];
- }
- filter_val[n++] = value[mixt];
- }
// At this point, separate objects for all protocols except http
// have been created if requested. We now add to the argument list
// the filters needed to reject the protocols that have already
@@ -1378,8 +1361,6 @@ LogConfig::register_configs()
RecRegisterConfigInt(RECT_CONFIG, "proxy.config.log2.separate_icp_logs", 0, RECU_DYNAMIC, RECC_NULL, NULL);
- RecRegisterConfigInt(RECT_CONFIG, "proxy.config.log2.separate_mixt_logs", 0, RECU_DYNAMIC, RECC_NULL, NULL);
-
RecRegisterConfigInt(RECT_CONFIG, "proxy.config.log2.separate_host_logs", 0, RECU_DYNAMIC, RECC_NULL, NULL);
RecRegisterConfigString(RECT_CONFIG,
@@ -1492,8 +1473,6 @@ LogConfig::register_config_callbacks()
// SPLITTING
LOG_RegisterConfigUpdateFunc("proxy.config.log2.separate_icp_logs", &LogConfig::reconfigure, NULL);
-// LOG_RegisterConfigUpdateFunc ("proxy.config.log2.separate_mixt_logs",
-// &LogConfig::reconfigure, NULL);
LOG_RegisterConfigUpdateFunc("proxy.config.log2.separate_host_logs", &LogConfig::reconfigure, NULL);
// COLLATION
@@ -2586,8 +2565,6 @@ LogConfig::read_xml_log_config(int from_
while (t = tok.getNext(), t != NULL) {
if (strcasecmp(t, "icp") == 0) {
val_array[numValid++] = LOG_ENTRY_ICP;
- } else if (strcasecmp(t, "mixt") == 0) {
- val_array[numValid++] = LOG_ENTRY_MIXT;
} else if (strcasecmp(t, "http") == 0) {
val_array[numValid++] = LOG_ENTRY_HTTP;
}
Modified: trafficserver/traffic/trunk/proxy/logging/LogConfig.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/LogConfig.h?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/LogConfig.h (original)
+++ trafficserver/traffic/trunk/proxy/logging/LogConfig.h Fri Sep 17 16:58:40 2010
@@ -220,7 +220,6 @@ public:
int extended2_log_enabled;
int extended2_log_is_ascii;
int separate_icp_logs;
- int separate_mixt_logs;
int separate_host_logs;
int collation_mode;
int collation_port;
Modified: trafficserver/traffic/trunk/proxy/mgmt2/Alarms.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/Alarms.cc?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/Alarms.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/Alarms.cc Fri Sep 17 16:58:40 2010
@@ -230,7 +230,6 @@ Alarms::signalAlarm(alarm_t a, const cha
case MGMT_ALARM_WDA_BILLING_CONNECTION_DIED:
case MGMT_ALARM_WDA_BILLING_CORRUPTED_DATA:
case MGMT_ALARM_WDA_XF_ENGINE_DOWN:
- case MGMT_ALARM_WDA_RADIUS_CORRUPTED_PACKETS:
priority = 2;
break;
default:
@@ -246,7 +245,7 @@ Alarms::signalAlarm(alarm_t a, const cha
/* INKqa11884: repeated wireless alarms always signalled */
if (a != MGMT_ALARM_WDA_BILLING_CONNECTION_DIED &&
a != MGMT_ALARM_WDA_BILLING_CORRUPTED_DATA &&
- a != MGMT_ALARM_WDA_XF_ENGINE_DOWN && a != MGMT_ALARM_WDA_RADIUS_CORRUPTED_PACKETS) {
+ a != MGMT_ALARM_WDA_XF_ENGINE_DOWN) {
time_t time_delta = time(0) - last_sent;
if (time_delta < 900) {
@@ -292,7 +291,7 @@ Alarms::signalAlarm(alarm_t a, const cha
// update desc with new timestamp and skip to actions part
if (a == MGMT_ALARM_WDA_BILLING_CONNECTION_DIED ||
a == MGMT_ALARM_WDA_BILLING_CORRUPTED_DATA ||
- a == MGMT_ALARM_WDA_XF_ENGINE_DOWN || a == MGMT_ALARM_WDA_RADIUS_CORRUPTED_PACKETS) {
+ a == MGMT_ALARM_WDA_XF_ENGINE_DOWN) {
Debug("alarm", "[signalAlarm] wireless alarm already active");
atmp = (Alarm *) hash_value;
goto ALARM_REPEAT;
@@ -313,7 +312,7 @@ Alarms::signalAlarm(alarm_t a, const cha
// update desc with new timstamp and skip to actions part
if (a == MGMT_ALARM_WDA_BILLING_CONNECTION_DIED ||
a == MGMT_ALARM_WDA_BILLING_CORRUPTED_DATA ||
- a == MGMT_ALARM_WDA_XF_ENGINE_DOWN || a == MGMT_ALARM_WDA_RADIUS_CORRUPTED_PACKETS) {
+ a == MGMT_ALARM_WDA_XF_ENGINE_DOWN) {
Debug("alarm", "[Alarms::signalAlarm] wireless alarm already active");
goto ALARM_REPEAT;
} else {
@@ -705,8 +704,6 @@ Alarms::getAlarmText(alarm_t id)
const char *wda_corr_data =
"Could not read user profile or URL list from the billing system. The data received doesn't have the expected format.";
const char *wda_xf_down = "The XF engine heartbeat could not be properly detected. It appears dead.";
- const char *wda_corr_packets =
- "Could not find the expected data in the radius packet. Happened multi-times (configurable) consecutively.";
switch (id) {
case MGMT_ALARM_WDA_BILLING_CONNECTION_DIED:
@@ -715,8 +712,6 @@ Alarms::getAlarmText(alarm_t id)
return wda_corr_data;
case MGMT_ALARM_WDA_XF_ENGINE_DOWN:
return wda_xf_down;
- case MGMT_ALARM_WDA_RADIUS_CORRUPTED_PACKETS:
- return wda_corr_packets;
default:
if (id < alarmTextNum)
return alarmText[id];
Modified: trafficserver/traffic/trunk/proxy/mgmt2/Alarms.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/Alarms.h?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/Alarms.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/Alarms.h Fri Sep 17 16:58:40 2010
@@ -80,7 +80,6 @@
#define MGMT_ALARM_WDA_BILLING_CONNECTION_DIED 100
#define MGMT_ALARM_WDA_BILLING_CORRUPTED_DATA 101
#define MGMT_ALARM_WDA_XF_ENGINE_DOWN 102
-#define MGMT_ALARM_WDA_RADIUS_CORRUPTED_PACKETS 103
#define MGMT_ALARM_SAC_SERVER_DOWN 400
Modified: trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc Fri Sep 17 16:58:40 2010
@@ -283,21 +283,6 @@ BaseManager(), run_proxy(proxy_on), reco
pnum++;
}
}
- // Check to see if we are running QT
- RecInt qt_enabled = REC_readInteger("proxy.config.qt.enabled", &found);
- ink_assert(found);
- RecInt rni_enabled = REC_readInteger("proxy.config.rni.enabled", &found);
- ink_assert(found);
- if (qt_enabled || rni_enabled) {
- // Get the QT port
- RecInt qt_port = REC_readInteger("proxy.config.mixt.rtsp_proxy_port", &found);
- ink_assert(found);
- if (found) {
- proxy_server_port[pnum] = qt_port;
- ink_strncpy((char *) proxy_server_port_attributes[pnum], "Q", sizeof(proxy_server_port_attributes[pnum]));
- pnum++;
- }
- }
// Check to see if we are running SSL term
RecInt ssl_term_enabled = REC_readInteger("proxy.config.ssl.enabled", &found);
@@ -799,9 +784,6 @@ LocalManager::handleMgmtMsgFromProcesses
case INK_MGMT_SIGNAL_WDA_XF_ENGINE_DOWN:
alarm_keeper->signalAlarm(MGMT_ALARM_WDA_XF_ENGINE_DOWN, data_raw);
break;
- case INK_MGMT_SIGNAL_WDA_RADIUS_CORRUPTED_PACKETS:
- alarm_keeper->signalAlarm(MGMT_ALARM_WDA_RADIUS_CORRUPTED_PACKETS, data_raw);
- break;
// Wireless plugin signal - end
case INK_MGMT_SIGNAL_SAC_SERVER_DOWN:
alarm_keeper->signalAlarm(MGMT_ALARM_SAC_SERVER_DOWN, data_raw);
Modified: trafficserver/traffic/trunk/proxy/mgmt2/Main.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/Main.cc?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/Main.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/Main.cc Fri Sep 17 16:58:40 2010
@@ -1371,9 +1371,6 @@ fileUpdated(char *fname)
// INKqa10113
- } else if (strcmp(fname, "ldapsrvr.config") == 0) {
- mgmt_log(stderr, "[fileUpdated] ldapsrvr.config file has been modified\n");
-
} else if (strcmp(fname, "splitdns.config") == 0) {
mgmt_log(stderr, "[fileUpdated] splitdns.config file has been modified\n");