فهرست منبع

AMBARI-17596 : Collect & Publish AmbariServer database metrics. (addendum patch) (avijayan)

Aravindan Vijayan 8 سال پیش
والد
کامیت
1696e3aa04
2فایلهای تغییر یافته به همراه15 افزوده شده و 25 حذف شده
  1. 7 12
      ambari-server/conf/unix/metrics.properties
  2. 8 13
      ambari-server/conf/windows/metrics.properties

+ 7 - 12
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
 
 ################################################################
 

+ 8 - 13
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
 
 ################################################################