Repository: ambari Updated Branches: refs/heads/branch-2.5 f0002ede1 -> 1696e3aa0
AMBARI-17596 : Collect & Publish AmbariServer database metrics. (addendum patch) (avijayan) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1696e3aa Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1696e3aa Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1696e3aa Branch: refs/heads/branch-2.5 Commit: 1696e3aa042dd8e4ceabfc02f5d4549aaaf50351 Parents: f0002ed Author: Aravindan Vijayan <[email protected]> Authored: Fri Jan 13 14:24:56 2017 -0800 Committer: Aravindan Vijayan <[email protected]> Committed: Fri Jan 13 14:24:56 2017 -0800 ---------------------------------------------------------------------- ambari-server/conf/unix/metrics.properties | 19 +++++++------------ ambari-server/conf/windows/metrics.properties | 21 ++++++++------------- 2 files changed, 15 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/1696e3aa/ambari-server/conf/unix/metrics.properties ---------------------------------------------------------------------- diff --git a/ambari-server/conf/unix/metrics.properties b/ambari-server/conf/unix/metrics.properties index e0ec718..efbfb04 100644 --- a/ambari-server/conf/unix/metrics.properties +++ b/ambari-server/conf/unix/metrics.properties @@ -19,37 +19,31 @@ #################### Metrics Source Configs ##################### -metric.sources=jvm,database -#Valid Values : jvm,database +#Metric sources : jvm,database +metric.sources=jvm #### JVM Source Configs ### source.jvm.class=org.apache.ambari.server.metrics.system.impl.JvmMetricsSource source.jvm.interval=10 -#### Database Metrics Source Configs ### +#### Database Source Configs ### # Note : To enable Database metrics source completely, add the following property to ambari.properties as well # server.persistence.properties.eclipselink.profiler=org.apache.ambari.server.metrics.system.impl.AmbariPerformanceMonitor source.database.class=org.apache.ambari.server.metrics.system.impl.DatabaseMetricsSource +# Ambari performance monitor granularity : NONE / NORMAL / HEAVY / ALL source.database.performance.monitor.query.weight=HEAVY -#Valid Values : NONE / NORMAL / HEAVY / ALL -#collection interval in milliseconds +# Collection interval in milliseconds source.database.monitor.dumptime=60000 -# Database Metrics Source filter Configs. -# Note : Aggregate Query stats (Across all entities) will be tracked by default - # Include entities to be tracked. source.database.monitor.entities=Cluster(.*)Entity,Host(.*)Entity,ExecutionCommandEntity,ServiceComponentDesiredStateEntity,Alert(.*)Entity,StackEntity,StageEntity # Include some metrics which have the keyword even if they are not part of requested Entities. -source.database.monitor.query.keywords.include=CacheMisses - -# Some examples of keywords that may be useful to include. - +# Examples # Query Types # ReadAllQuery,ReadObjectQuery,UpdateObjectQuery,ReportQuery,InsertObjectQuery,ValueReadQuery,DataModifyQuery,DoesExistQuery @@ -58,6 +52,7 @@ source.database.monitor.query.keywords.include=CacheMisses # Sequences # host_role_command_id_seq,alert_history_id_seq +source.database.monitor.query.keywords.include=CacheMisses ################################################################ http://git-wip-us.apache.org/repos/asf/ambari/blob/1696e3aa/ambari-server/conf/windows/metrics.properties ---------------------------------------------------------------------- diff --git a/ambari-server/conf/windows/metrics.properties b/ambari-server/conf/windows/metrics.properties index 5498858..6ddc68a 100644 --- a/ambari-server/conf/windows/metrics.properties +++ b/ambari-server/conf/windows/metrics.properties @@ -19,45 +19,40 @@ #################### Metrics Source Configs ##################### -metric.sources=jvm,database -#Valid Values : jvm,database +#Metric sources : jvm,database +metric.sources=jvm #### JVM Source Configs ### source.jvm.class=org.apache.ambari.server.metrics.system.impl.JvmMetricsSource source.jvm.interval=10 -#### Database Metrics Source Configs ### +#### Database Source Configs ### # Note : To enable Database metrics source completely, add the following property to ambari.properties as well # server.persistence.properties.eclipselink.profiler=org.apache.ambari.server.metrics.system.impl.AmbariPerformanceMonitor source.database.class=org.apache.ambari.server.metrics.system.impl.DatabaseMetricsSource +# Ambari performance monitor granularity : NONE / NORMAL / HEAVY / ALL source.database.performance.monitor.query.weight=HEAVY -#Valid Values : NONE / NORMAL / HEAVY / ALL -#collection interval in seconds +# Collection interval in milliseconds source.database.monitor.dumptime=60000 -# Database Metrics Source filter Configs. -# Note : Aggregate Query stats (Across all entities) will be tracked by default - # Include entities to be tracked. source.database.monitor.entities=Cluster(.*)Entity,Host(.*)Entity,ExecutionCommandEntity,ServiceComponentDesiredStateEntity,Alert(.*)Entity,StackEntity,StageEntity # Include some metrics which have the keyword even if they are not part of requested Entities. -source.database.monitor.query.keywords.include=CacheMisses - -# Some examples of keywords that may be useful to include. - +# Examples # Query Types # ReadAllQuery,ReadObjectQuery,UpdateObjectQuery,ReportQuery,InsertObjectQuery,ValueReadQuery,DataModifyQuery,DoesExistQuery # Query stages -# ObjectBuilding,QueryPreparation,SqlPrepare,SqlGeneration,StatementExecute,RowFetch,ConnectCalls,UnitOfWorkCommit,ClientSessionReleases,ConnectionManagement,CacheHits +# ObjectBuilding,QueryPreparation,SqlPrepare,SqlGeneration,StatementExecute,RowFetch,ConnectCalls,UnitOfWorkCommit,ClientSessionReleases,ConnectionManagement,CacheHits,CacheMisses # Sequences # host_role_command_id_seq,alert_history_id_seq +source.database.monitor.query.keywords.include=CacheMisses ################################################################
