You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2015/09/10 21:04:23 UTC

[3/5] ambari git commit: AMBARI-13037 AMS - stack advisor should recommend topology smarts alongwith optimistic settings (dsen)

http://git-wip-us.apache.org/repos/asf/ambari/blob/1ec86cd8/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/YARN.txt
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/YARN.txt b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/YARN.txt
new file mode 100644
index 0000000..ce04228
--- /dev/null
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/YARN.txt
@@ -0,0 +1,178 @@
+jvm.JvmMetrics.GcCount
+jvm.JvmMetrics.GcCountPS
+jvm.JvmMetrics.GcTimeMillis
+jvm.JvmMetrics.GcTimeMillisPS
+jvm.JvmMetrics.LogError
+jvm.JvmMetrics.LogFatal
+jvm.JvmMetrics.LogInfo
+jvm.JvmMetrics.LogWarn
+jvm.JvmMetrics.MemHeapCommittedM
+jvm.JvmMetrics.MemHeapMaxM
+jvm.JvmMetrics.MemHeapUsedM
+jvm.JvmMetrics.MemMaxM
+jvm.JvmMetrics.MemNonHeapCommittedM
+jvm.JvmMetrics.MemNonHeapMaxM
+jvm.JvmMetrics.MemNonHeapUsedM
+jvm.JvmMetrics.ThreadsBlocked
+jvm.JvmMetrics.ThreadsNew
+jvm.JvmMetrics.ThreadsRunnable
+jvm.JvmMetrics.ThreadsTerminated
+jvm.JvmMetrics.ThreadsTimedWaiting
+jvm.JvmMetrics.ThreadsWaiting
+mapred.ShuffleMetrics.ShuffleConnections
+mapred.ShuffleMetrics.ShuffleOutputBytes
+mapred.ShuffleMetrics.ShuffleOutputsFailed
+mapred.ShuffleMetrics.ShuffleOutputsOK
+metricssystem.MetricsSystem.DroppedPubAll
+metricssystem.MetricsSystem.NumActiveSinks
+metricssystem.MetricsSystem.NumActiveSources
+metricssystem.MetricsSystem.NumAllSinks
+metricssystem.MetricsSystem.NumAllSources
+metricssystem.MetricsSystem.PublishAvgTime
+metricssystem.MetricsSystem.PublishNumOps
+metricssystem.MetricsSystem.Sink_timelineAvgTime
+metricssystem.MetricsSystem.Sink_timelineDropped
+metricssystem.MetricsSystem.Sink_timelineNumOps
+metricssystem.MetricsSystem.Sink_timelineQsize
+metricssystem.MetricsSystem.SnapshotAvgTime
+metricssystem.MetricsSystem.SnapshotNumOps
+rpc.rpc.CallQueueLength
+rpc.rpc.NumOpenConnections
+rpc.rpc.ReceivedBytes
+rpc.rpc.RpcAuthenticationFailures
+rpc.rpc.RpcAuthenticationSuccesses
+rpc.rpc.RpcAuthorizationFailures
+rpc.rpc.RpcAuthorizationSuccesses
+rpc.rpc.RpcClientBackoff
+rpc.rpc.RpcProcessingTimeAvgTime
+rpc.rpc.RpcProcessingTimeNumOps
+rpc.rpc.RpcQueueTimeAvgTime
+rpc.rpc.RpcQueueTimeNumOps
+rpc.rpc.RpcSlowCalls
+rpc.rpc.SentBytes
+rpcdetailed.rpcdetailed.AllocateAvgTime
+rpcdetailed.rpcdetailed.AllocateNumOps
+rpcdetailed.rpcdetailed.FinishApplicationMasterAvgTime
+rpcdetailed.rpcdetailed.FinishApplicationMasterNumOps
+rpcdetailed.rpcdetailed.GetApplicationReportAvgTime
+rpcdetailed.rpcdetailed.GetApplicationReportNumOps
+rpcdetailed.rpcdetailed.GetClusterMetricsAvgTime
+rpcdetailed.rpcdetailed.GetClusterMetricsNumOps
+rpcdetailed.rpcdetailed.GetClusterNodesAvgTime
+rpcdetailed.rpcdetailed.GetClusterNodesNumOps
+rpcdetailed.rpcdetailed.GetContainerStatusesAvgTime
+rpcdetailed.rpcdetailed.GetContainerStatusesNumOps
+rpcdetailed.rpcdetailed.GetNewApplicationAvgTime
+rpcdetailed.rpcdetailed.GetNewApplicationNumOps
+rpcdetailed.rpcdetailed.GetQueueInfoAvgTime
+rpcdetailed.rpcdetailed.GetQueueInfoNumOps
+rpcdetailed.rpcdetailed.GetQueueUserAclsAvgTime
+rpcdetailed.rpcdetailed.GetQueueUserAclsNumOps
+rpcdetailed.rpcdetailed.HeartbeatAvgTime
+rpcdetailed.rpcdetailed.HeartbeatNumOps
+rpcdetailed.rpcdetailed.NodeHeartbeatAvgTime
+rpcdetailed.rpcdetailed.NodeHeartbeatNumOps
+rpcdetailed.rpcdetailed.RegisterApplicationMasterAvgTime
+rpcdetailed.rpcdetailed.RegisterApplicationMasterNumOps
+rpcdetailed.rpcdetailed.RegisterNodeManagerAvgTime
+rpcdetailed.rpcdetailed.RegisterNodeManagerNumOps
+rpcdetailed.rpcdetailed.StartContainersAvgTime
+rpcdetailed.rpcdetailed.StartContainersNumOps
+rpcdetailed.rpcdetailed.StopContainersAvgTime
+rpcdetailed.rpcdetailed.StopContainersNumOps
+rpcdetailed.rpcdetailed.SubmitApplicationAvgTime
+rpcdetailed.rpcdetailed.SubmitApplicationNumOps
+ugi.UgiMetrics.GetGroupsAvgTime
+ugi.UgiMetrics.GetGroupsNumOps
+ugi.UgiMetrics.LoginFailureAvgTime
+ugi.UgiMetrics.LoginFailureNumOps
+ugi.UgiMetrics.LoginSuccessAvgTime
+ugi.UgiMetrics.LoginSuccessNumOps
+yarn.ClusterMetrics.AMLaunchDelayAvgTime
+yarn.ClusterMetrics.AMLaunchDelayNumOps
+yarn.ClusterMetrics.AMRegisterDelayAvgTime
+yarn.ClusterMetrics.AMRegisterDelayNumOps
+yarn.ClusterMetrics.NumActiveNMs
+yarn.ClusterMetrics.NumDecommissionedNMs
+yarn.ClusterMetrics.NumLostNMs
+yarn.ClusterMetrics.NumRebootedNMs
+yarn.ClusterMetrics.NumUnhealthyNMs
+yarn.NodeManagerMetrics.AllocatedContainers
+yarn.NodeManagerMetrics.AllocatedGB
+yarn.NodeManagerMetrics.AllocatedVCores
+yarn.NodeManagerMetrics.AvailableGB
+yarn.NodeManagerMetrics.AvailableVCores
+yarn.NodeManagerMetrics.BadLocalDirs
+yarn.NodeManagerMetrics.BadLogDirs
+yarn.NodeManagerMetrics.ContainerLaunchDurationAvgTime
+yarn.NodeManagerMetrics.ContainerLaunchDurationNumOps
+yarn.NodeManagerMetrics.ContainersCompleted
+yarn.NodeManagerMetrics.ContainersFailed
+yarn.NodeManagerMetrics.ContainersIniting
+yarn.NodeManagerMetrics.ContainersKilled
+yarn.NodeManagerMetrics.ContainersLaunched
+yarn.NodeManagerMetrics.ContainersRunning
+yarn.NodeManagerMetrics.GoodLocalDirsDiskUtilizationPerc
+yarn.NodeManagerMetrics.GoodLogDirsDiskUtilizationPerc
+yarn.QueueMetrics.Queue=root.AMResourceLimitMB
+yarn.QueueMetrics.Queue=root.AMResourceLimitVCores
+yarn.QueueMetrics.Queue=root.ActiveApplications
+yarn.QueueMetrics.Queue=root.ActiveUsers
+yarn.QueueMetrics.Queue=root.AggregateContainersAllocated
+yarn.QueueMetrics.Queue=root.AggregateContainersReleased
+yarn.QueueMetrics.Queue=root.AllocatedContainers
+yarn.QueueMetrics.Queue=root.AllocatedMB
+yarn.QueueMetrics.Queue=root.AllocatedVCores
+yarn.QueueMetrics.Queue=root.AppAttemptFirstContainerAllocationDelayAvgTime
+yarn.QueueMetrics.Queue=root.AppAttemptFirstContainerAllocationDelayNumOps
+yarn.QueueMetrics.Queue=root.AppsCompleted
+yarn.QueueMetrics.Queue=root.AppsFailed
+yarn.QueueMetrics.Queue=root.AppsKilled
+yarn.QueueMetrics.Queue=root.AppsPending
+yarn.QueueMetrics.Queue=root.AppsRunning
+yarn.QueueMetrics.Queue=root.AppsSubmitted
+yarn.QueueMetrics.Queue=root.AvailableMB
+yarn.QueueMetrics.Queue=root.AvailableVCores
+yarn.QueueMetrics.Queue=root.PendingContainers
+yarn.QueueMetrics.Queue=root.PendingMB
+yarn.QueueMetrics.Queue=root.PendingVCores
+yarn.QueueMetrics.Queue=root.ReservedContainers
+yarn.QueueMetrics.Queue=root.ReservedMB
+yarn.QueueMetrics.Queue=root.ReservedVCores
+yarn.QueueMetrics.Queue=root.UsedAMResourceMB
+yarn.QueueMetrics.Queue=root.UsedAMResourceVCores
+yarn.QueueMetrics.Queue=root.default.AMResourceLimitMB
+yarn.QueueMetrics.Queue=root.default.AMResourceLimitVCores
+yarn.QueueMetrics.Queue=root.default.ActiveApplications
+yarn.QueueMetrics.Queue=root.default.ActiveUsers
+yarn.QueueMetrics.Queue=root.default.AggregateContainersAllocated
+yarn.QueueMetrics.Queue=root.default.AggregateContainersReleased
+yarn.QueueMetrics.Queue=root.default.AllocatedContainers
+yarn.QueueMetrics.Queue=root.default.AllocatedMB
+yarn.QueueMetrics.Queue=root.default.AllocatedVCores
+yarn.QueueMetrics.Queue=root.default.AppAttemptFirstContainerAllocationDelayAvgTime
+yarn.QueueMetrics.Queue=root.default.AppAttemptFirstContainerAllocationDelayNumOps
+yarn.QueueMetrics.Queue=root.default.AppsCompleted
+yarn.QueueMetrics.Queue=root.default.AppsFailed
+yarn.QueueMetrics.Queue=root.default.AppsKilled
+yarn.QueueMetrics.Queue=root.default.AppsPending
+yarn.QueueMetrics.Queue=root.default.AppsRunning
+yarn.QueueMetrics.Queue=root.default.AppsSubmitted
+yarn.QueueMetrics.Queue=root.default.AvailableMB
+yarn.QueueMetrics.Queue=root.default.AvailableVCores
+yarn.QueueMetrics.Queue=root.default.PendingContainers
+yarn.QueueMetrics.Queue=root.default.PendingMB
+yarn.QueueMetrics.Queue=root.default.PendingVCores
+yarn.QueueMetrics.Queue=root.default.ReservedContainers
+yarn.QueueMetrics.Queue=root.default.ReservedMB
+yarn.QueueMetrics.Queue=root.default.ReservedVCores
+yarn.QueueMetrics.Queue=root.default.UsedAMResourceMB
+yarn.QueueMetrics.Queue=root.default.UsedAMResourceVCores
+yarn.QueueMetrics.Queue=root.default.running_0
+yarn.QueueMetrics.Queue=root.default.running_1440
+yarn.QueueMetrics.Queue=root.default.running_300
+yarn.QueueMetrics.Queue=root.default.running_60
+yarn.QueueMetrics.Queue=root.running_0
+yarn.QueueMetrics.Queue=root.running_1440
+yarn.QueueMetrics.Queue=root.running_300
+yarn.QueueMetrics.Queue=root.running_60

http://git-wip-us.apache.org/repos/asf/ambari/blob/1ec86cd8/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
index 245802c..d9e8cba 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
@@ -86,6 +86,8 @@ java_version = int(config['hostLevelParams']['java_version'])
 
 metrics_collector_heapsize = default('/configurations/ams-env/metrics_collector_heapsize', "512m")
 host_sys_prepped = default("/hostLevelParams/host_sys_prepped", False)
+metrics_report_interval = default("/configurations/ams-site/timeline.metrics.sink.report.interval", 60)
+metrics_collection_period = default("/configurations/ams-site/timeline.metrics.sink.collection.period", 60)
 
 hbase_log_dir = config['configurations']['ams-hbase-env']['hbase_log_dir']
 master_heapsize = config['configurations']['ams-hbase-env']['hbase_master_heapsize']

http://git-wip-us.apache.org/repos/asf/ambari/blob/1ec86cd8/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/split_points.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/split_points.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/split_points.py
new file mode 100644
index 0000000..6160712
--- /dev/null
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/split_points.py
@@ -0,0 +1,208 @@
+# !/usr/bin/env python
+"""
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+"""
+
+import os
+import sys
+import re
+import math
+import collections
+import ast
+
+metric_filename_ext = '.txt'
+# 5 regions for higher order aggregate tables
+other_region_static_count = 5
+
+b_bytes = 1
+k_bytes = 1 << 10  # 1024
+m_bytes = 1 << 20  # 1024^2
+g_bytes = 1 << 30  # 1024^3
+t_bytes = 1 << 40  # 1024^4
+p_bytes = 1 << 50  # 1024^5
+
+def to_number(s):
+  try:
+    return int(re.sub("\D", "", s))
+  except ValueError:
+    return None
+
+def format_Xmx_size_to_bytes(value):
+  strvalue = str(value).lower()
+  if len(strvalue) == 0:
+    return 0
+  modifier = strvalue[-1]
+
+  if modifier == ' ' or modifier in "0123456789":
+    modifier = 'b'
+
+  m = {
+    modifier == 'b': b_bytes,
+    modifier == 'k': k_bytes,
+    modifier == 'm': m_bytes,
+    modifier == 'g': g_bytes,
+    modifier == 't': t_bytes,
+    modifier == 'p': p_bytes
+    } [1]
+  return to_number(strvalue) * m
+
+# Class that takes AMS HBase configs as input and determines the Region
+# pre-splits based on selected services also passed as a parameter to the class.
+class FindSplitPointsForAMSRegions():
+
+  def __init__(self, ams_hbase_site, ams_hbase_env, serviceMetricsDir,
+               operation_mode = 'embedded', services = None):
+    self.ams_hbase_site = ams_hbase_site
+    self.ams_hbase_env = ams_hbase_env
+    self.serviceMetricsDir = serviceMetricsDir
+    self.services = services
+    self.mode = operation_mode
+    # Initialize before user
+    self.initialize()
+
+  def initialize(self):
+    # calculate regions based on available memory
+    self.initialize_region_counts()
+    self.initialize_ordered_set_of_metrics()
+
+  def initialize_region_counts(self):
+    try:
+      xmx_master_bytes = format_Xmx_size_to_bytes(self.ams_hbase_env['hbase_master_heapsize'])
+      xmx_region_bytes = 0
+      if "hbase_regionserver_heapsize" in self.ams_hbase_env:
+        xmx_region_bytes = format_Xmx_size_to_bytes(self.ams_hbase_env['hbase_regionserver_heapsize'])
+      xmx_bytes = xmx_master_bytes + xmx_region_bytes
+      if self.mode == 'distributed':
+        xmx_bytes = xmx_region_bytes
+
+      memstore_max_mem = float(self.ams_hbase_site['hbase.regionserver.global.memstore.upperLimit']) * xmx_bytes
+      memstore_flush_size = format_Xmx_size_to_bytes(self.ams_hbase_site['hbase.hregion.memstore.flush.size'])
+
+      max_inmemory_regions = (memstore_max_mem / memstore_flush_size) - other_region_static_count
+      print 'max_inmemory_regions: %s' % max_inmemory_regions
+
+      if max_inmemory_regions > 2:
+        # Lets say total = 12, so we have 7 regions to allocate between
+        # METRIC_RECORD and METRIC_AGGREGATE tables, desired = (5, 2)
+        self.desired_precision_region_count = int(math.floor(0.8 * max_inmemory_regions))
+        self.desired_aggregate_region_count = int(max_inmemory_regions - self.desired_precision_region_count)
+      else:
+        self.desired_precision_region_count = 1
+        self.desired_aggregate_region_count = 1
+
+    except:
+      print('Bad config settings, could not calculate max regions available.')
+    pass
+
+  def initialize_ordered_set_of_metrics(self):
+    onlyServicefiles = [ f for f in os.listdir(self.serviceMetricsDir) if
+                  os.path.isfile(os.path.join(self.serviceMetricsDir, f)) ]
+
+    metrics = set()
+
+    for file in onlyServicefiles:
+      # Process for services selected at deploy time or all services if
+      # services arg is not passed
+      if self.services is None or file.rstrip(metric_filename_ext) in self.services:
+        print 'Processing file: %s' % os.path.join(self.serviceMetricsDir, file)
+        with open(os.path.join(self.serviceMetricsDir, file), 'r') as f:
+          for metric in f:
+            metrics.add(metric.strip())
+      pass
+    pass
+
+    self.metrics = sorted(metrics)
+    print 'metrics length: %s' % len(self.metrics)
+
+  def get_split_points(self):
+    split_points = collections.namedtuple('SplitPoints', [ 'precision', 'aggregate' ])
+    split_points.precision = []
+    split_points.aggregate = []
+
+    metric_list = list(self.metrics)
+    metrics_total = len(metric_list)
+
+    if self.desired_precision_region_count > 1:
+      idx = int(math.ceil(metrics_total / self.desired_precision_region_count))
+      index = idx
+      for i in range(0, self.desired_precision_region_count - 1):
+        if index < metrics_total - 1:
+          split_points.precision.append(metric_list[index])
+          index += idx
+
+    if self.desired_aggregate_region_count > 1:
+      idx = int(math.ceil(metrics_total / self.desired_aggregate_region_count))
+      index = idx
+      for i in range(0, self.desired_aggregate_region_count - 1):
+        if index < metrics_total - 1:
+          split_points.aggregate.append(metric_list[index])
+          index += idx
+
+    return split_points
+  pass
+
+def main(argv = None):
+  scriptDir = os.path.realpath(os.path.dirname(argv[0]))
+  serviceMetricsDir = os.path.join(scriptDir, 'service-metrics')
+  if os.path.exists(serviceMetricsDir):
+    onlyargs = argv[1:]
+    if len(onlyargs) < 3:
+      sys.stderr.write("Usage: dict(ams-hbase-site) dict(ams-hbase-env) list(services)\n")
+      sys.exit(2)
+    pass
+
+    ams_hbase_site = None
+    ams_hbase_env = None
+    services = None
+    try:
+      ams_hbase_site = ast.literal_eval(str(onlyargs[0]))
+      ams_hbase_env = ast.literal_eval(str(onlyargs[1]))
+      services = onlyargs[2]
+      if services:
+        services = str(services).split(',')
+      pass
+    except Exception, ex:
+      sys.stderr.write(str(ex))
+      sys.stderr.write("\nUsage: Expected items not found in input. Found "
+                      " ams-hbase-site => {0}, ams-hbase-env => {1},"
+                      " services => {2}".format(ams_hbase_site, ams_hbase_env, services))
+      sys.exit(2)
+
+    print '--------- AMS Regions Split point finder ---------'
+    print 'Services: %s' % services
+
+    mode = 'distributed' if 'hbase.rootdir' in ams_hbase_site and \
+                            'hdfs' in ams_hbase_site['hbase.rootdir'] else \
+                            'embedded'
+
+    split_point_finder = FindSplitPointsForAMSRegions(
+      ams_hbase_site, ams_hbase_env, serviceMetricsDir, mode, services)
+
+    result = split_point_finder.get_split_points()
+    print 'Split points for precision table : %s' % len(result.precision)
+    print 'precision: %s' % str(result.precision)
+    print 'Split points for aggregate table : %s' % len(result.aggregate)
+    print 'aggregate: %s' % str(result.aggregate)
+
+    return 0
+
+  else:
+    print 'Cannot find service metrics dir in %s' % scriptDir
+
+if __name__ == '__main__':
+  main(sys.argv)

http://git-wip-us.apache.org/repos/asf/ambari/blob/1ec86cd8/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2 b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2
index 3f404eb..f0a14b6 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2
@@ -53,7 +53,8 @@ rpc.collector={{ams_collector_host_single}}:{{metric_collector_port}}
 *.timeline.plugin.urls=file:///usr/lib/ambari-metrics-hadoop-sink/ambari-metrics-hadoop-sink.jar
 *.sink.timeline.slave.host.name={{hostname}}
 hbase.sink.timeline.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
-hbase.sink.timeline.period=60
+hbase.sink.timeline.period={{metrics_collection_period}}
+hbase.sink.timeline.sendInterval={{metrics_report_interval}}000
 hbase.sink.timeline.collector={{ams_collector_host_single}}:{{metric_collector_port}}
 hbase.sink.timeline.serviceName-prefix=ams
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/1ec86cd8/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/metric_monitor.ini.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/metric_monitor.ini.j2 b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/metric_monitor.ini.j2
index 2ee21d4..40b18d7 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/metric_monitor.ini.j2
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/metric_monitor.ini.j2
@@ -23,7 +23,7 @@ enable_time_threshold = false
 enable_value_threshold = false
 
 [emitter]
-send_interval = 60
+send_interval = {{metrics_report_interval}}
 
 [collector]
 collector_sleep_interval = 5

http://git-wip-us.apache.org/repos/asf/ambari/blob/1ec86cd8/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py
index dce73b3..a80ea1e 100644
--- a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py
@@ -92,3 +92,5 @@ if has_metric_collector:
   if metric_collector_port and metric_collector_port.find(':') != -1:
     metric_collector_port = metric_collector_port.split(':')[1]
   pass
+metrics_report_interval = default("/configurations/ams-site/timeline.metrics.sink.report.interval", 60)
+metrics_collection_period = default("/configurations/ams-site/timeline.metrics.sink.collection.period", 60)

http://git-wip-us.apache.org/repos/asf/ambari/blob/1ec86cd8/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/templates/flume-metrics2.properties.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/templates/flume-metrics2.properties.j2 b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/templates/flume-metrics2.properties.j2
index bc18043..753aa3f 100644
--- a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/templates/flume-metrics2.properties.j2
+++ b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/templates/flume-metrics2.properties.j2
@@ -18,9 +18,9 @@
 
 collector={{metric_collector_host}}
 port={{metric_collector_port}}
-collectionFrequency=60000
+collectionFrequency={{metrics_collection_period}}000
 maxRowCacheSize=10000
-sendInterval=59000
+sendInterval={{metrics_report_interval}}000
 
 # Metric names having type COUNTER
 counters=EventTakeSuccessCount,EventPutSuccessCount,EventTakeAttemptCount,EventPutAttemptCount

http://git-wip-us.apache.org/repos/asf/ambari/blob/1ec86cd8/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
index 2633640..54bf7e7 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
@@ -134,6 +134,8 @@ if has_metric_collector:
   if metric_collector_port and metric_collector_port.find(':') != -1:
     metric_collector_port = metric_collector_port.split(':')[1]
   pass
+metrics_report_interval = default("/configurations/ams-site/timeline.metrics.sink.report.interval", 60)
+metrics_collection_period = default("/configurations/ams-site/timeline.metrics.sink.collection.period", 60)
 
 # if hbase is selected the hbase_rs_hosts, should not be empty, but still default just in case
 if 'slave_hosts' in config['clusterHostInfo']:

http://git-wip-us.apache.org/repos/asf/ambari/blob/1ec86cd8/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2 b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2
index 78ee5fa..f74ea4c 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2
@@ -52,19 +52,20 @@ hbase.extendedperiod = 3600
 *.timeline.plugin.urls=file:///usr/lib/ambari-metrics-hadoop-sink/ambari-metrics-hadoop-sink.jar
 *.sink.timeline.slave.host.name={{hostname}}
 hbase.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
-hbase.period=10
+hbase.period={{metrics_collection_period}}
 hbase.collector={{metric_collector_host}}:{{metric_collector_port}}
 
 jvm.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
-jvm.period=10
+jvm.period={{metrics_collection_period}}
 jvm.collector={{metric_collector_host}}:{{metric_collector_port}}
 
 rpc.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
-rpc.period=10
+rpc.period={{metrics_collection_period}}
 rpc.collector={{metric_collector_host}}:{{metric_collector_port}}
 
 hbase.sink.timeline.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
-hbase.sink.timeline.period=10
+hbase.sink.timeline.period={{metrics_collection_period}}
+hbase.sink.timeline.sendInterval={{metrics_report_interval}}000
 hbase.sink.timeline.collector={{metric_collector_host}}:{{metric_collector_port}}
 
 {% else %}

http://git-wip-us.apache.org/repos/asf/ambari/blob/1ec86cd8/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2 b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2
index fc46aa4..2df141f 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2
@@ -51,19 +51,20 @@ hbase.extendedperiod = 3600
 *.timeline.plugin.urls=file:///usr/lib/ambari-metrics-hadoop-sink/ambari-metrics-hadoop-sink.jar
 *.sink.timeline.slave.host.name={{hostname}}
 hbase.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
-hbase.period=10
+hbase.period={{metrics_collection_period}}
 hbase.collector={{metric_collector_host}}:{{metric_collector_port}}
 
 jvm.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
-jvm.period=10
+jvm.period={{metrics_collection_period}}
 jvm.collector={{metric_collector_host}}:{{metric_collector_port}}
 
 rpc.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
-rpc.period=10
+rpc.period={{metrics_collection_period}}
 rpc.collector={{metric_collector_host}}:{{metric_collector_port}}
 
 hbase.sink.timeline.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
-hbase.sink.timeline.period=10
+hbase.sink.timeline.period={{metrics_collection_period}}
+hbase.sink.timeline.sendInterval={{metrics_report_interval}}000
 hbase.sink.timeline.collector={{metric_collector_host}}:{{metric_collector_port}}
 
 {% else %}

http://git-wip-us.apache.org/repos/asf/ambari/blob/1ec86cd8/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py
index 3bec0d8..2349a92 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params_linux.py
@@ -164,6 +164,8 @@ if has_metric_collector:
   metric_collector_report_interval = 60
   metric_collector_app_id = "nimbus"
 
+metrics_report_interval = default("/configurations/ams-site/timeline.metrics.sink.report.interval", 60)
+metrics_collection_period = default("/configurations/ams-site/timeline.metrics.sink.collection.period", 60)
 metric_collector_sink_jar = "/usr/lib/storm/lib/ambari-metrics-storm-sink*.jar"
 
 # ranger host

http://git-wip-us.apache.org/repos/asf/ambari/blob/1ec86cd8/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/templates/storm-metrics2.properties.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/templates/storm-metrics2.properties.j2 b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/templates/storm-metrics2.properties.j2
index 4553224..060b4fc 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/templates/storm-metrics2.properties.j2
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/templates/storm-metrics2.properties.j2
@@ -19,4 +19,4 @@
 collector={{metric_collector_host}}
 port=6188
 maxRowCacheSize=10000
-sendInterval=59000
\ No newline at end of file
+sendInterval={{metrics_report_interval}}000
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/1ec86cd8/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
index 0fc87a5..3c4a2e7 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/params.py
@@ -103,6 +103,8 @@ if has_metric_collector:
   if metric_collector_port and metric_collector_port.find(':') != -1:
     metric_collector_port = metric_collector_port.split(':')[1]
   pass
+metrics_report_interval = default("/configurations/ams-site/timeline.metrics.sink.report.interval", 60)
+metrics_collection_period = default("/configurations/ams-site/timeline.metrics.sink.collection.period", 60)
 
 #hadoop params
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/1ec86cd8/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/hadoop-metrics2.properties.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/hadoop-metrics2.properties.j2 b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/hadoop-metrics2.properties.j2
index f75947e..8e729a4 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/hadoop-metrics2.properties.j2
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/templates/hadoop-metrics2.properties.j2
@@ -66,10 +66,11 @@ resourcemanager.sink.ganglia.tagsForPrefix.yarn=Queue
 
 {% if has_metric_collector %}
 
-*.period=60
+*.period={{metrics_collection_period}}
 *.sink.timeline.plugin.urls=file:///usr/lib/ambari-metrics-hadoop-sink/ambari-metrics-hadoop-sink.jar
 *.sink.timeline.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
-*.sink.timeline.period=10
+*.sink.timeline.period={{metrics_collection_period}}
+*.sink.timeline.sendInterval={{metrics_report_interval}}000
 *.sink.timeline.slave.host.name = {{hostname}}
 
 datanode.sink.timeline.collector={{metric_collector_host}}:{{metric_collector_port}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/1ec86cd8/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/AMBARI_METRICS/service-metrics/AMBARI_METRICS.txt
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/AMBARI_METRICS/service-metrics/AMBARI_METRICS.txt b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/AMBARI_METRICS/service-metrics/AMBARI_METRICS.txt
deleted file mode 100644
index 6693503..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/AMBARI_METRICS/service-metrics/AMBARI_METRICS.txt
+++ /dev/null
@@ -1,245 +0,0 @@
-regionserver.WAL.SyncTime_min
-regionserver.WAL.SyncTime_num_ops
-regionserver.WAL.appendCount
-regionserver.WAL.slowAppendCount
-jvm.JvmMetrics.GcTimeMillis
-jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep
-jvm.JvmMetrics.GcTimeMillisParNew
-ugi.UgiMetrics.GetGroupsAvgTime
-ugi.UgiMetrics.GetGroupsNumOps
-ugi.UgiMetrics.LoginFailureNumOps
-ugi.UgiMetrics.LoginSuccessAvgTime
-ugi.UgiMetrics.LoginSuccessNumOps
-ugi.UgiMetrics.LoginFailureAvgTime
-jvm.JvmMetrics.LogError
-jvm.JvmMetrics.LogFatal
-jvm.JvmMetrics.LogInfo
-jvm.JvmMetrics.LogWarn
-jvm.JvmMetrics.MemHeapCommittedM
-jvm.JvmMetrics.MemHeapMaxM
-jvm.JvmMetrics.MemHeapUsedM
-jvm.JvmMetrics.MemMaxM
-jvm.JvmMetrics.MemNonHeapCommittedM
-jvm.JvmMetrics.MemNonHeapMaxM
-jvm.JvmMetrics.MemNonHeapUsedM
-jvm.JvmMetrics.ThreadsBlocked
-jvm.JvmMetrics.ThreadsNew
-jvm.JvmMetrics.ThreadsRunnable
-jvm.JvmMetrics.ThreadsTerminated
-jvm.JvmMetrics.ThreadsTimedWaiting
-master.AssignmentManger.Assign_75th_percentile
-master.AssignmentManger.Assign_95th_percentile
-master.AssignmentManger.Assign_99th_percentile
-master.AssignmentManger.Assign_max
-master.AssignmentManger.Assign_mean
-master.AssignmentManger.Assign_median
-master.AssignmentManger.Assign_min
-jvm.JvmMetrics.ThreadsWaiting
-master.AssignmentManger.Assign_num_ops
-master.AssignmentManger.BulkAssign_75th_percentile
-master.AssignmentManger.BulkAssign_95th_percentile
-master.AssignmentManger.BulkAssign_99th_percentile
-master.AssignmentManger.BulkAssign_max
-master.AssignmentManger.BulkAssign_mean
-master.AssignmentManger.BulkAssign_median
-master.AssignmentManger.BulkAssign_min
-master.AssignmentManger.BulkAssign_num_ops
-master.AssignmentManger.ritCount
-master.AssignmentManger.ritCountOverThreshold
-master.AssignmentManger.ritOldestAge
-master.Balancer.BalancerCluster_75th_percentile
-master.Balancer.BalancerCluster_95th_percentile
-master.Balancer.BalancerCluster_99th_percentile
-master.Balancer.BalancerCluster_max
-master.Balancer.BalancerCluster_mean
-master.Balancer.BalancerCluster_median
-master.Balancer.BalancerCluster_min
-master.Balancer.BalancerCluster_num_ops
-master.Balancer.miscInvocationCount
-master.FileSystem.HlogSplitSize_75th_percentile
-master.FileSystem.HlogSplitSize_95th_percentile
-master.FileSystem.HlogSplitSize_99th_percentile
-master.FileSystem.HlogSplitSize_max
-master.FileSystem.HlogSplitSize_mean
-master.FileSystem.HlogSplitSize_median
-master.FileSystem.HlogSplitSize_min
-master.FileSystem.HlogSplitSize_num_ops
-master.FileSystem.HlogSplitTime_75th_percentile
-master.FileSystem.HlogSplitTime_95th_percentile
-master.FileSystem.HlogSplitTime_99th_percentile
-master.FileSystem.HlogSplitTime_max
-master.FileSystem.HlogSplitTime_mean
-master.FileSystem.HlogSplitTime_median
-master.FileSystem.HlogSplitTime_min
-master.FileSystem.HlogSplitTime_num_ops
-master.FileSystem.MetaHlogSplitSize_75th_percentile
-master.FileSystem.MetaHlogSplitSize_95th_percentile
-master.FileSystem.MetaHlogSplitSize_99th_percentile
-master.FileSystem.MetaHlogSplitSize_max
-master.FileSystem.MetaHlogSplitSize_mean
-master.FileSystem.MetaHlogSplitSize_median
-master.FileSystem.MetaHlogSplitSize_min
-master.FileSystem.MetaHlogSplitSize_num_ops
-master.FileSystem.MetaHlogSplitTime_75th_percentile
-master.FileSystem.MetaHlogSplitTime_95th_percentile
-master.FileSystem.MetaHlogSplitTime_99th_percentile
-master.FileSystem.MetaHlogSplitTime_max
-master.FileSystem.MetaHlogSplitTime_mean
-master.FileSystem.MetaHlogSplitTime_median
-master.FileSystem.MetaHlogSplitTime_min
-master.FileSystem.MetaHlogSplitTime_num_ops
-master.Server.averageLoad
-master.Server.clusterRequests
-master.Server.masterActiveTime
-master.Server.masterStartTime
-master.Server.numDeadRegionServers
-master.Server.numRegionServers
-metricssystem.MetricsSystem.DroppedPubAll
-metricssystem.MetricsSystem.NumActiveSinks
-ipc.IPC.ProcessCallTime_75th_percentile
-ipc.IPC.ProcessCallTime_95th_percentile
-metricssystem.MetricsSystem.NumActiveSources
-metricssystem.MetricsSystem.NumAllSinks
-ipc.IPC.ProcessCallTime_99th_percentile
-metricssystem.MetricsSystem.NumAllSources
-metricssystem.MetricsSystem.PublishAvgTime
-metricssystem.MetricsSystem.PublishNumOps
-ipc.IPC.ProcessCallTime_max
-ipc.IPC.ProcessCallTime_mean
-metricssystem.MetricsSystem.Sink_timelineAvgTime
-ipc.IPC.ProcessCallTime_median
-metricssystem.MetricsSystem.Sink_timelineDropped
-metricssystem.MetricsSystem.Sink_timelineNumOps
-ipc.IPC.ProcessCallTime_num_ops
-metricssystem.MetricsSystem.Sink_timelineQsize
-metricssystem.MetricsSystem.SnapshotAvgTime
-ipc.IPC.QueueCallTime_95th_percentile
-metricssystem.MetricsSystem.SnapshotNumOps
-ipc.IPC.ProcessCallTime_min
-ipc.IPC.QueueCallTime_75th_percentile
-ipc.IPC.QueueCallTime_99th_percentile
-ipc.IPC.QueueCallTime_max
-ipc.IPC.QueueCallTime_mean
-ipc.IPC.QueueCallTime_median
-ipc.IPC.QueueCallTime_min
-regionserver.Server.Append_75th_percentile
-regionserver.Server.Append_95th_percentile
-ipc.IPC.QueueCallTime_num_ops
-ipc.IPC.authenticationFailures
-regionserver.Server.Append_99th_percentile
-regionserver.Server.Append_max
-ipc.IPC.authenticationSuccesses
-regionserver.Server.Append_mean
-regionserver.Server.Append_median
-regionserver.Server.Append_min
-regionserver.Server.Append_num_ops
-regionserver.Server.Delete_75th_percentile
-regionserver.Server.Delete_95th_percentile
-ipc.IPC.authorizationFailures
-regionserver.Server.Delete_99th_percentile
-regionserver.Server.Delete_max
-regionserver.Server.Delete_mean
-regionserver.Server.Delete_median
-regionserver.Server.Delete_min
-regionserver.Server.Delete_num_ops
-ipc.IPC.authorizationSuccesses
-ipc.IPC.numActiveHandler
-ipc.IPC.numCallsInGeneralQueue
-regionserver.Server.Get_75th_percentile
-regionserver.Server.Get_95th_percentile
-regionserver.Server.Get_99th_percentile
-regionserver.Server.Get_max
-regionserver.Server.Get_mean
-regionserver.Server.Get_median
-ipc.IPC.numCallsInPriorityQueue
-regionserver.Server.Get_min
-regionserver.Server.Get_num_ops
-regionserver.Server.Increment_75th_percentile
-regionserver.Server.Increment_95th_percentile
-regionserver.Server.Increment_99th_percentile
-regionserver.Server.Increment_max
-regionserver.Server.Increment_mean
-regionserver.Server.Increment_median
-ipc.IPC.numCallsInReplicationQueue
-ipc.IPC.numOpenConnections
-regionserver.Server.Increment_min
-regionserver.Server.Increment_num_ops
-ipc.IPC.queueSize
-regionserver.Server.Mutate_75th_percentile
-regionserver.Server.Mutate_95th_percentile
-regionserver.Server.Mutate_99th_percentile
-regionserver.Server.Mutate_max
-regionserver.Server.Mutate_mean
-regionserver.Server.Mutate_median
-ipc.IPC.receivedBytes
-regionserver.Server.Mutate_min
-regionserver.Server.Mutate_num_ops
-regionserver.Server.Replay_75th_percentile
-regionserver.Server.Replay_95th_percentile
-regionserver.Server.Replay_99th_percentile
-regionserver.Server.Replay_max
-regionserver.Server.Replay_mean
-regionserver.Server.Replay_median
-ipc.IPC.sentBytes
-jvm.JvmMetrics.GcCount
-regionserver.Server.Replay_min
-regionserver.Server.Replay_num_ops
-regionserver.Server.blockCacheCount
-regionserver.Server.blockCacheEvictionCount
-regionserver.Server.blockCacheExpressHitPercent
-regionserver.Server.blockCacheFreeSize
-regionserver.Server.blockCacheHitCount
-regionserver.Server.blockCacheMissCount
-regionserver.Server.blockCacheSize
-regionserver.Server.blockCountHitPercent
-regionserver.Server.checkMutateFailedCount
-regionserver.Server.checkMutatePassedCount
-regionserver.Server.compactionQueueLength
-regionserver.Server.flushQueueLength
-jvm.JvmMetrics.GcCountConcurrentMarkSweep
-regionserver.Server.hlogFileCount
-regionserver.Server.hlogFileSize
-regionserver.Server.memStoreSize
-regionserver.Server.mutationsWithoutWALCount
-regionserver.Server.mutationsWithoutWALSize
-regionserver.Server.percentFilesLocal
-regionserver.Server.readRequestCount
-regionserver.Server.regionCount
-regionserver.Server.regionServerStartTime
-regionserver.Server.slowAppendCount
-regionserver.Server.slowDeleteCount
-regionserver.Server.slowGetCount
-regionserver.Server.slowIncrementCount
-regionserver.Server.slowPutCount
-regionserver.Server.staticBloomSize
-regionserver.Server.staticIndexSize
-regionserver.Server.storeCount
-regionserver.Server.storeFileCount
-regionserver.Server.storeFileIndexSize
-regionserver.Server.storeFileSize
-regionserver.Server.totalRequestCount
-regionserver.Server.updatesBlockedTime
-regionserver.Server.writeRequestCount
-regionserver.WAL.AppendSize_75th_percentile
-regionserver.WAL.AppendSize_95th_percentile
-regionserver.WAL.AppendSize_99th_percentile
-regionserver.WAL.AppendSize_max
-regionserver.WAL.AppendSize_mean
-regionserver.WAL.AppendSize_median
-regionserver.WAL.SyncTime_median
-jvm.JvmMetrics.GcCountParNew
-regionserver.WAL.AppendSize_min
-regionserver.WAL.AppendSize_num_ops
-regionserver.WAL.SyncTime_max
-regionserver.WAL.AppendTime_75th_percentile
-regionserver.WAL.AppendTime_95th_percentile
-regionserver.WAL.AppendTime_99th_percentile
-regionserver.WAL.AppendTime_max
-regionserver.WAL.SyncTime_95th_percentile
-regionserver.WAL.AppendTime_mean
-regionserver.WAL.AppendTime_median
-regionserver.WAL.AppendTime_min
-regionserver.WAL.AppendTime_num_ops
-regionserver.WAL.SyncTime_75th_percentile
-regionserver.WAL.SyncTime_99th_percentile
-regionserver.WAL.SyncTime_mean

http://git-wip-us.apache.org/repos/asf/ambari/blob/1ec86cd8/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/AMBARI_METRICS/service-metrics/FLUME.txt
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/AMBARI_METRICS/service-metrics/FLUME.txt b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/AMBARI_METRICS/service-metrics/FLUME.txt
deleted file mode 100644
index b3bfec3..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/AMBARI_METRICS/service-metrics/FLUME.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-BatchCompleteCount
-BatchUnderflowCount
-EventTakeSuccessCount
-ConnectionClosedCount
-ConnectionCreatedCount
-ChannelCapacity
-ConnectionFailedCount
-EventDrainAttemptCount
-ChannelFillPercentage
-EventDrainSuccessCount
-BatchEmptyCount
-EventPutAttemptCount
-ChannelSize
-EventPutSuccessCount
-StartTime
-StopTime
-EventTakeAttemptCount

http://git-wip-us.apache.org/repos/asf/ambari/blob/1ec86cd8/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/AMBARI_METRICS/service-metrics/HBASE.txt
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/AMBARI_METRICS/service-metrics/HBASE.txt b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/AMBARI_METRICS/service-metrics/HBASE.txt
deleted file mode 100644
index 0067403..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/AMBARI_METRICS/service-metrics/HBASE.txt
+++ /dev/null
@@ -1,588 +0,0 @@
-regionserver.WAL.SyncTime_min
-regionserver.WAL.SyncTime_num_ops
-regionserver.WAL.appendCount
-regionserver.WAL.slowAppendCount
-jvm.JvmMetrics.GcTimeMillis
-jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep
-jvm.JvmMetrics.GcTimeMillisParNew
-ugi.UgiMetrics.GetGroupsAvgTime
-ugi.UgiMetrics.GetGroupsNumOps
-ugi.UgiMetrics.LoginFailureNumOps
-ugi.UgiMetrics.LoginSuccessAvgTime
-ugi.UgiMetrics.LoginSuccessNumOps
-ugi.UgiMetrics.LoginFailureAvgTime
-jvm.JvmMetrics.LogError
-jvm.JvmMetrics.LogFatal
-jvm.JvmMetrics.LogInfo
-jvm.JvmMetrics.LogWarn
-jvm.JvmMetrics.MemHeapCommittedM
-jvm.JvmMetrics.MemHeapMaxM
-jvm.JvmMetrics.MemHeapUsedM
-jvm.JvmMetrics.MemMaxM
-jvm.JvmMetrics.MemNonHeapCommittedM
-jvm.JvmMetrics.MemNonHeapMaxM
-jvm.JvmMetrics.MemNonHeapUsedM
-jvm.JvmMetrics.ThreadsBlocked
-jvm.JvmMetrics.ThreadsNew
-jvm.JvmMetrics.ThreadsRunnable
-jvm.JvmMetrics.ThreadsTerminated
-jvm.JvmMetrics.ThreadsTimedWaiting
-master.AssignmentManger.Assign_75th_percentile
-master.AssignmentManger.Assign_95th_percentile
-master.AssignmentManger.Assign_99th_percentile
-master.AssignmentManger.Assign_max
-master.AssignmentManger.Assign_mean
-master.AssignmentManger.Assign_median
-master.AssignmentManger.Assign_min
-jvm.JvmMetrics.ThreadsWaiting
-master.AssignmentManger.Assign_num_ops
-master.AssignmentManger.BulkAssign_75th_percentile
-master.AssignmentManger.BulkAssign_95th_percentile
-master.AssignmentManger.BulkAssign_99th_percentile
-master.AssignmentManger.BulkAssign_max
-master.AssignmentManger.BulkAssign_mean
-master.AssignmentManger.BulkAssign_median
-master.AssignmentManger.BulkAssign_min
-master.AssignmentManger.BulkAssign_num_ops
-master.AssignmentManger.ritCount
-master.AssignmentManger.ritCountOverThreshold
-master.AssignmentManger.ritOldestAge
-master.Balancer.BalancerCluster_75th_percentile
-master.Balancer.BalancerCluster_95th_percentile
-master.Balancer.BalancerCluster_99th_percentile
-master.Balancer.BalancerCluster_max
-master.Balancer.BalancerCluster_mean
-master.Balancer.BalancerCluster_median
-master.Balancer.BalancerCluster_min
-master.Balancer.BalancerCluster_num_ops
-master.Balancer.miscInvocationCount
-master.FileSystem.HlogSplitSize_75th_percentile
-master.FileSystem.HlogSplitSize_95th_percentile
-master.FileSystem.HlogSplitSize_99th_percentile
-master.FileSystem.HlogSplitSize_max
-master.FileSystem.HlogSplitSize_mean
-master.FileSystem.HlogSplitSize_median
-master.FileSystem.HlogSplitSize_min
-master.FileSystem.HlogSplitSize_num_ops
-master.FileSystem.HlogSplitTime_75th_percentile
-master.FileSystem.HlogSplitTime_95th_percentile
-master.FileSystem.HlogSplitTime_99th_percentile
-master.FileSystem.HlogSplitTime_max
-master.FileSystem.HlogSplitTime_mean
-master.FileSystem.HlogSplitTime_median
-master.FileSystem.HlogSplitTime_min
-master.FileSystem.HlogSplitTime_num_ops
-master.FileSystem.MetaHlogSplitSize_75th_percentile
-master.FileSystem.MetaHlogSplitSize_95th_percentile
-master.FileSystem.MetaHlogSplitSize_99th_percentile
-master.FileSystem.MetaHlogSplitSize_max
-master.FileSystem.MetaHlogSplitSize_mean
-master.FileSystem.MetaHlogSplitSize_median
-master.FileSystem.MetaHlogSplitSize_min
-master.FileSystem.MetaHlogSplitSize_num_ops
-master.FileSystem.MetaHlogSplitTime_75th_percentile
-master.FileSystem.MetaHlogSplitTime_95th_percentile
-master.FileSystem.MetaHlogSplitTime_99th_percentile
-master.FileSystem.MetaHlogSplitTime_max
-master.FileSystem.MetaHlogSplitTime_mean
-master.FileSystem.MetaHlogSplitTime_median
-master.FileSystem.MetaHlogSplitTime_min
-master.FileSystem.MetaHlogSplitTime_num_ops
-master.Server.averageLoad
-master.Server.clusterRequests
-master.Server.masterActiveTime
-master.Server.masterStartTime
-master.Server.numDeadRegionServers
-master.Server.numRegionServers
-metricssystem.MetricsSystem.DroppedPubAll
-metricssystem.MetricsSystem.NumActiveSinks
-ipc.IPC.ProcessCallTime_75th_percentile
-ipc.IPC.ProcessCallTime_95th_percentile
-metricssystem.MetricsSystem.NumActiveSources
-metricssystem.MetricsSystem.NumAllSinks
-ipc.IPC.ProcessCallTime_99th_percentile
-metricssystem.MetricsSystem.NumAllSources
-metricssystem.MetricsSystem.PublishAvgTime
-metricssystem.MetricsSystem.PublishNumOps
-ipc.IPC.ProcessCallTime_max
-ipc.IPC.ProcessCallTime_mean
-metricssystem.MetricsSystem.Sink_timelineAvgTime
-ipc.IPC.ProcessCallTime_median
-metricssystem.MetricsSystem.Sink_timelineDropped
-metricssystem.MetricsSystem.Sink_timelineNumOps
-ipc.IPC.ProcessCallTime_num_ops
-metricssystem.MetricsSystem.Sink_timelineQsize
-metricssystem.MetricsSystem.SnapshotAvgTime
-ipc.IPC.QueueCallTime_95th_percentile
-metricssystem.MetricsSystem.SnapshotNumOps
-ipc.IPC.ProcessCallTime_min
-ipc.IPC.QueueCallTime_75th_percentile
-ipc.IPC.QueueCallTime_99th_percentile
-ipc.IPC.QueueCallTime_max
-ipc.IPC.QueueCallTime_mean
-ipc.IPC.QueueCallTime_median
-ipc.IPC.QueueCallTime_min
-regionserver.Server.Append_75th_percentile
-regionserver.Server.Append_95th_percentile
-ipc.IPC.QueueCallTime_num_ops
-ipc.IPC.authenticationFailures
-regionserver.Server.Append_99th_percentile
-regionserver.Server.Append_max
-ipc.IPC.authenticationSuccesses
-regionserver.Server.Append_mean
-regionserver.Server.Append_median
-regionserver.Server.Append_min
-regionserver.Server.Append_num_ops
-regionserver.Server.Delete_75th_percentile
-regionserver.Server.Delete_95th_percentile
-ipc.IPC.authorizationFailures
-regionserver.Server.Delete_99th_percentile
-regionserver.Server.Delete_max
-regionserver.Server.Delete_mean
-regionserver.Server.Delete_median
-regionserver.Server.Delete_min
-regionserver.Server.Delete_num_ops
-ipc.IPC.authorizationSuccesses
-ipc.IPC.numActiveHandler
-ipc.IPC.numCallsInGeneralQueue
-regionserver.Server.Get_75th_percentile
-regionserver.Server.Get_95th_percentile
-regionserver.Server.Get_99th_percentile
-regionserver.Server.Get_max
-regionserver.Server.Get_mean
-regionserver.Server.Get_median
-ipc.IPC.numCallsInPriorityQueue
-regionserver.Server.Get_min
-regionserver.Server.Get_num_ops
-regionserver.Server.Increment_75th_percentile
-regionserver.Server.Increment_95th_percentile
-regionserver.Server.Increment_99th_percentile
-regionserver.Server.Increment_max
-regionserver.Server.Increment_mean
-regionserver.Server.Increment_median
-ipc.IPC.numCallsInReplicationQueue
-ipc.IPC.numOpenConnections
-regionserver.Server.Increment_min
-regionserver.Server.Increment_num_ops
-ipc.IPC.queueSize
-regionserver.Server.Mutate_75th_percentile
-regionserver.Server.Mutate_95th_percentile
-regionserver.Server.Mutate_99th_percentile
-regionserver.Server.Mutate_max
-regionserver.Server.Mutate_mean
-regionserver.Server.Mutate_median
-ipc.IPC.receivedBytes
-regionserver.Server.Mutate_min
-regionserver.Server.Mutate_num_ops
-regionserver.Server.Replay_75th_percentile
-regionserver.Server.Replay_95th_percentile
-regionserver.Server.Replay_99th_percentile
-regionserver.Server.Replay_max
-regionserver.Server.Replay_mean
-regionserver.Server.Replay_median
-ipc.IPC.sentBytes
-jvm.JvmMetrics.GcCount
-regionserver.Server.Replay_min
-regionserver.Server.Replay_num_ops
-regionserver.Server.blockCacheCount
-regionserver.Server.blockCacheEvictionCount
-regionserver.Server.blockCacheExpressHitPercent
-regionserver.Server.blockCacheFreeSize
-regionserver.Server.blockCacheHitCount
-regionserver.Server.blockCacheMissCount
-regionserver.Server.blockCacheSize
-regionserver.Server.blockCountHitPercent
-regionserver.Server.checkMutateFailedCount
-regionserver.Server.checkMutatePassedCount
-regionserver.Server.compactionQueueLength
-regionserver.Server.flushQueueLength
-jvm.JvmMetrics.GcCountConcurrentMarkSweep
-regionserver.Server.hlogFileCount
-regionserver.Server.hlogFileSize
-regionserver.Server.memStoreSize
-regionserver.Server.mutationsWithoutWALCount
-regionserver.Server.mutationsWithoutWALSize
-regionserver.Server.percentFilesLocal
-regionserver.Server.readRequestCount
-regionserver.Server.regionCount
-regionserver.Server.regionServerStartTime
-regionserver.Server.slowAppendCount
-regionserver.Server.slowDeleteCount
-regionserver.Server.slowGetCount
-regionserver.Server.slowIncrementCount
-regionserver.Server.slowPutCount
-regionserver.Server.staticBloomSize
-regionserver.Server.staticIndexSize
-regionserver.Server.storeCount
-regionserver.Server.storeFileCount
-regionserver.Server.storeFileIndexSize
-regionserver.Server.storeFileSize
-regionserver.Server.totalRequestCount
-regionserver.Server.updatesBlockedTime
-regionserver.Server.writeRequestCount
-regionserver.WAL.AppendSize_75th_percentile
-regionserver.WAL.AppendSize_95th_percentile
-regionserver.WAL.AppendSize_99th_percentile
-regionserver.WAL.AppendSize_max
-regionserver.WAL.AppendSize_mean
-regionserver.WAL.AppendSize_median
-regionserver.WAL.SyncTime_median
-jvm.JvmMetrics.GcCountParNew
-regionserver.WAL.AppendSize_min
-regionserver.WAL.AppendSize_num_ops
-regionserver.WAL.SyncTime_max
-regionserver.WAL.AppendTime_75th_percentile
-regionserver.WAL.AppendTime_95th_percentile
-regionserver.WAL.AppendTime_99th_percentile
-regionserver.WAL.AppendTime_max
-regionserver.WAL.SyncTime_95th_percentile
-regionserver.WAL.AppendTime_mean
-regionserver.WAL.AppendTime_median
-regionserver.WAL.AppendTime_min
-regionserver.WAL.AppendTime_num_ops
-regionserver.WAL.SyncTime_75th_percentile
-regionserver.WAL.SyncTime_99th_percentile
-regionserver.WAL.SyncTime_mean
-regionserver.WAL.SyncTime_median
-regionserver.WAL.SyncTime_min
-regionserver.WAL.SyncTime_num_ops
-regionserver.WAL.appendCount
-regionserver.Server.majorCompactedCellsSize
-regionserver.WAL.rollRequest
-regionserver.WAL.AppendTime_99th_percentile
-regionserver.WAL.slowAppendCount
-regionserver.WAL.AppendTime_num_ops
-regionserver.WAL.SyncTime_95th_percentile
-regionserver.Server.Mutate_median
-regionserver.WAL.AppendTime_75th_percentile
-regionserver.WAL.AppendSize_num_ops
-regionserver.Server.Mutate_max
-regionserver.WAL.AppendSize_min
-regionserver.WAL.AppendTime_min
-regionserver.WAL.SyncTime_99th_percentile
-regionserver.Server.Mutate_95th_percentile
-regionserver.WAL.AppendSize_mean
-regionserver.WAL.SyncTime_mean
-regionserver.WAL.AppendSize_99th_percentile
-jvm.JvmMetrics.GcTimeMillis
-regionserver.WAL.AppendSize_75th_percentile
-jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep
-regionserver.WAL.SyncTime_max
-regionserver.Server.Increment_median
-regionserver.Server.updatesBlockedTime
-regionserver.Server.Increment_max
-ugi.UgiMetrics.GetGroupsAvgTime
-regionserver.WAL.lowReplicaRollRequest
-ugi.UgiMetrics.GetGroupsNumOps
-regionserver.Server.storeFileSize
-regionserver.Server.Increment_95th_percentile
-jvm.JvmMetrics.GcTimeMillisParNew
-ugi.UgiMetrics.LoginFailureAvgTime
-ugi.UgiMetrics.LoginFailureNumOps
-regionserver.Server.storeFileCount
-ugi.UgiMetrics.LoginSuccessNumOps
-regionserver.Server.staticIndexSize
-jvm.JvmMetrics.LogError
-regionserver.Server.splitQueueLength
-regionserver.Server.Get_median
-regionserver.Server.slowPutCount
-regionserver.Server.Get_max
-jvm.JvmMetrics.LogFatal
-regionserver.Server.slowGetCount
-jvm.JvmMetrics.LogInfo
-regionserver.Server.slowAppendCount
-regionserver.Server.Get_95th_percentile
-jvm.JvmMetrics.LogWarn
-regionserver.Server.regionCount
-regionserver.Server.FlushTime_num_ops
-regionserver.Server.FlushTime_min
-regionserver.Server.readRequestCount
-jvm.JvmMetrics.MemHeapCommittedM
-regionserver.Server.percentFilesLocalSecondaryRegions
-regionserver.Server.percentFilesLocal
-regionserver.Server.FlushTime_max
-regionserver.Server.FlushTime_99th_percentile
-regionserver.Server.FlushTime_95th_percentile
-regionserver.Server.Delete_num_ops
-jvm.JvmMetrics.MemHeapMaxM
-regionserver.Server.mutationsWithoutWALCount
-jvm.JvmMetrics.MemHeapUsedM
-regionserver.Server.Delete_median
-regionserver.Server.ScanNext_max
-regionserver.Server.ScanNext_99th_percentile
-regionserver.Server.majorCompactedCellsCount
-regionserver.Server.hlogFileSize
-regionserver.Server.flushedCellsCount
-jvm.JvmMetrics.MemMaxM
-regionserver.Server.hlogFileCount
-regionserver.Server.Delete_95th_percentile
-jvm.JvmMetrics.MemNonHeapCommittedM
-jvm.JvmMetrics.MemNonHeapMaxM
-jvm.JvmMetrics.MemNonHeapUsedM
-regionserver.Server.Append_num_ops
-regionserver.Server.flushQueueLength
-jvm.JvmMetrics.ThreadsBlocked
-regionserver.Server.Append_median
-jvm.JvmMetrics.ThreadsNew
-regionserver.Server.checkMutatePassedCount
-regionserver.Server.compactedCellsSize
-jvm.JvmMetrics.ThreadsRunnable
-jvm.JvmMetrics.ThreadsTerminated
-jvm.JvmMetrics.ThreadsTimedWaiting
-master.AssignmentManger.Assign_75th_percentile
-master.AssignmentManger.Assign_95th_percentile
-master.AssignmentManger.Assign_99th_percentile
-master.AssignmentManger.Assign_max
-regionserver.Server.Append_95th_percentile
-master.AssignmentManger.Assign_mean
-master.AssignmentManger.Assign_median
-regionserver.Replication.sink.appliedOps
-regionserver.Replication.sink.appliedBatches
-regionserver.Replication.sink.ageOfLastAppliedOp
-regionserver.WAL.SyncTime_75th_percentile
-regionserver.RegionServer.receivedBytes
-regionserver.RegionServer.queueSize
-regionserver.RegionServer.numOpenConnections
-regionserver.RegionServer.numCallsInPriorityQueue
-regionserver.Server.Replay_num_ops
-master.AssignmentManger.Assign_min
-master.AssignmentManger.Assign_num_ops
-regionserver.Server.checkMutateFailedCount
-regionserver.RegionServer.exceptions.RegionTooBusyException
-regionserver.RegionServer.exceptions.RegionMovedException
-regionserver.RegionServer.exceptions.OutOfOrderScannerNextException
-master.AssignmentManger.BulkAssign_75th_percentile
-master.AssignmentManger.BulkAssign_95th_percentile
-regionserver.RegionServer.exceptions.FailedSanityCheckException
-regionserver.RegionServer.exceptions
-regionserver.RegionServer.authorizationSuccesses
-regionserver.RegionServer.authenticationSuccesses
-regionserver.RegionServer.authenticationFailures
-regionserver.RegionServer.TotalCallTime_num_ops
-master.AssignmentManger.BulkAssign_99th_percentile
-jvm.JvmMetrics.ThreadsWaiting
-regionserver.RegionServer.TotalCallTime_median
-regionserver.RegionServer.TotalCallTime_mean
-master.AssignmentManger.BulkAssign_max
-regionserver.RegionServer.TotalCallTime_95th_percentile
-regionserver.RegionServer.TotalCallTime_75th_percentile
-regionserver.RegionServer.QueueCallTime_num_ops
-master.AssignmentManger.BulkAssign_mean
-master.AssignmentManger.BulkAssign_median
-regionserver.RegionServer.QueueCallTime_median
-regionserver.RegionServer.QueueCallTime_mean
-regionserver.RegionServer.QueueCallTime_max
-regionserver.RegionServer.QueueCallTime_95th_percentile
-regionserver.RegionServer.QueueCallTime_75th_percentile
-regionserver.RegionServer.ProcessCallTime_num_ops
-regionserver.RegionServer.ProcessCallTime_median
-regionserver.RegionServer.ProcessCallTime_mean
-regionserver.Server.ScanNext_num_ops
-master.AssignmentManger.BulkAssign_num_ops
-master.AssignmentManger.BulkAssign_min
-regionserver.RegionServer.ProcessCallTime_95th_percentile
-master.AssignmentManger.ritCount
-master.AssignmentManger.ritCountOverThreshold
-master.AssignmentManger.ritOldestAge
-master.Balancer.BalancerCluster_75th_percentile
-master.Balancer.BalancerCluster_95th_percentile
-master.Balancer.BalancerCluster_99th_percentile
-ugi.UgiMetrics.LoginSuccessAvgTime
-master.Balancer.BalancerCluster_max
-master.Balancer.BalancerCluster_mean
-master.Balancer.BalancerCluster_median
-master.Balancer.BalancerCluster_min
-regionserver.Server.ScanNext_median
-master.Balancer.BalancerCluster_num_ops
-master.Balancer.miscInvocationCount
-master.FileSystem.HlogSplitSize_75th_percentile
-master.FileSystem.HlogSplitSize_95th_percentile
-master.FileSystem.HlogSplitSize_max
-master.FileSystem.HlogSplitSize_99th_percentile
-master.FileSystem.HlogSplitSize_mean
-master.FileSystem.HlogSplitSize_median
-master.FileSystem.HlogSplitSize_min
-master.FileSystem.HlogSplitSize_num_ops
-master.FileSystem.HlogSplitTime_75th_percentile
-master.FileSystem.HlogSplitTime_95th_percentile
-regionserver.Server.SplitTime_median
-master.FileSystem.HlogSplitTime_max
-master.FileSystem.HlogSplitTime_99th_percentile
-master.FileSystem.HlogSplitTime_mean
-master.FileSystem.HlogSplitTime_median
-master.FileSystem.HlogSplitTime_min
-master.FileSystem.HlogSplitTime_num_ops
-master.FileSystem.MetaHlogSplitSize_75th_percentile
-master.FileSystem.MetaHlogSplitSize_95th_percentile
-master.FileSystem.MetaHlogSplitSize_max
-master.FileSystem.MetaHlogSplitSize_99th_percentile
-master.FileSystem.MetaHlogSplitSize_mean
-master.FileSystem.MetaHlogSplitSize_median
-master.FileSystem.MetaHlogSplitSize_min
-master.FileSystem.MetaHlogSplitSize_num_ops
-master.FileSystem.MetaHlogSplitTime_75th_percentile
-master.FileSystem.MetaHlogSplitTime_95th_percentile
-master.FileSystem.MetaHlogSplitTime_max
-master.FileSystem.MetaHlogSplitTime_99th_percentile
-master.FileSystem.MetaHlogSplitTime_mean
-master.FileSystem.MetaHlogSplitTime_median
-master.FileSystem.MetaHlogSplitTime_min
-master.FileSystem.MetaHlogSplitTime_num_ops
-master.Master.ProcessCallTime_75th_percentile
-master.Master.ProcessCallTime_95th_percentile
-master.Master.ProcessCallTime_99th_percentile
-master.Master.ProcessCallTime_max
-master.Master.ProcessCallTime_mean
-master.Master.ProcessCallTime_median
-master.Master.ProcessCallTime_min
-master.Master.ProcessCallTime_num_ops
-master.Master.QueueCallTime_75th_percentile
-master.Master.QueueCallTime_95th_percentile
-master.Master.QueueCallTime_99th_percentile
-master.Master.QueueCallTime_max
-master.Master.QueueCallTime_mean
-regionserver.Server.blockCacheCountHitPercent
-master.Master.QueueCallTime_median
-master.Master.QueueCallTime_min
-master.Master.QueueCallTime_num_ops
-master.Master.TotalCallTime_75th_percentile
-master.Master.TotalCallTime_95th_percentile
-master.Master.TotalCallTime_99th_percentile
-master.Master.TotalCallTime_max
-master.Master.TotalCallTime_mean
-master.Master.TotalCallTime_median
-master.Master.TotalCallTime_min
-master.Master.TotalCallTime_num_ops
-master.Master.authenticationFailures
-master.Master.authenticationSuccesses
-master.Master.authorizationFailures
-master.Master.authorizationSuccesses
-master.Master.exceptions
-master.Master.exceptions.FailedSanityCheckException
-master.Master.exceptions.NotServingRegionException
-master.Master.exceptions.OutOfOrderScannerNextException
-master.Master.exceptions.RegionMovedException
-master.Master.exceptions.RegionTooBusyException
-master.Master.exceptions.UnknownScannerException
-master.Master.numActiveHandler
-master.Master.numCallsInGeneralQueue
-master.Master.numCallsInPriorityQueue
-master.Master.numCallsInReplicationQueue
-regionserver.Server.blockCacheSize
-master.Master.numOpenConnections
-master.Master.queueSize
-master.Master.receivedBytes
-master.Master.sentBytes
-master.Server.averageLoad
-master.Server.clusterRequests
-master.Server.masterActiveTime
-master.Server.numDeadRegionServers
-master.Server.masterStartTime
-master.Server.numRegionServers
-metricssystem.MetricsSystem.DroppedPubAll
-regionserver.Server.SplitTime_min
-regionserver.Server.blockCacheHitCount
-metricssystem.MetricsSystem.NumActiveSinks
-metricssystem.MetricsSystem.NumActiveSources
-metricssystem.MetricsSystem.NumAllSinks
-metricssystem.MetricsSystem.NumAllSources
-regionserver.Server.blockCacheExpressHitPercent
-metricssystem.MetricsSystem.PublishAvgTime
-metricssystem.MetricsSystem.PublishNumOps
-metricssystem.MetricsSystem.Sink_timelineAvgTime
-regionserver.Server.SplitTime_num_ops
-metricssystem.MetricsSystem.Sink_timelineDropped
-metricssystem.MetricsSystem.Sink_timelineNumOps
-regionserver.Server.SplitTime_max
-regionserver.Server.ScanNext_min
-metricssystem.MetricsSystem.Sink_timelineQsize
-metricssystem.MetricsSystem.SnapshotAvgTime
-metricssystem.MetricsSystem.SnapshotNumOps
-regionserver.Server.SplitTime_95th_percentile
-regionserver.Server.SplitTime_99th_percentile
-regionserver.RegionServer.ProcessCallTime_75th_percentile
-regionserver.RegionServer.ProcessCallTime_99th_percentile
-regionserver.RegionServer.ProcessCallTime_max
-regionserver.RegionServer.ProcessCallTime_min
-regionserver.RegionServer.QueueCallTime_99th_percentile
-regionserver.RegionServer.QueueCallTime_min
-regionserver.RegionServer.TotalCallTime_99th_percentile
-regionserver.RegionServer.TotalCallTime_max
-regionserver.RegionServer.TotalCallTime_min
-regionserver.RegionServer.authorizationFailures
-regionserver.RegionServer.exceptions.NotServingRegionException
-regionserver.RegionServer.exceptions.UnknownScannerException
-regionserver.RegionServer.numActiveHandler
-regionserver.RegionServer.numCallsInGeneralQueue
-regionserver.Server.ScanNext_95th_percentile
-regionserver.RegionServer.numCallsInReplicationQueue
-regionserver.RegionServer.sentBytes
-regionserver.Server.Append_75th_percentile
-regionserver.Server.Append_99th_percentile
-regionserver.Server.Append_max
-regionserver.Server.Append_mean
-regionserver.Server.Append_min
-regionserver.Server.Delete_75th_percentile
-regionserver.Server.Delete_99th_percentile
-regionserver.Server.Delete_max
-regionserver.Server.Delete_mean
-regionserver.Server.Delete_min
-regionserver.Server.FlushTime_75th_percentile
-regionserver.Server.FlushTime_mean
-regionserver.Server.FlushTime_median
-regionserver.Server.Get_75th_percentile
-regionserver.Server.Get_99th_percentile
-regionserver.Server.Get_mean
-regionserver.Server.Get_min
-regionserver.Server.Get_num_ops
-regionserver.Server.Increment_75th_percentile
-regionserver.Server.Increment_99th_percentile
-regionserver.Server.Increment_mean
-regionserver.Server.Increment_min
-regionserver.Server.Increment_num_ops
-regionserver.Server.Mutate_75th_percentile
-regionserver.Server.Mutate_99th_percentile
-regionserver.Server.Mutate_mean
-regionserver.Server.Mutate_min
-regionserver.Server.Mutate_num_ops
-regionserver.Server.Replay_75th_percentile
-regionserver.Server.Replay_99th_percentile
-regionserver.Server.Replay_mean
-regionserver.Server.Replay_min
-regionserver.Server.ScanNext_75th_percentile
-regionserver.Server.ScanNext_mean
-regionserver.Server.SplitTime_75th_percentile
-jvm.JvmMetrics.GcCount
-regionserver.Server.SplitTime_mean
-regionserver.Server.Replay_max
-regionserver.Server.blockCacheCount
-regionserver.Server.blockCacheEvictionCount
-regionserver.Server.blockCacheFreeSize
-regionserver.Server.blockCacheMissCount
-regionserver.Server.Replay_median
-regionserver.Server.blockedRequestCount
-regionserver.Server.compactedCellsCount
-regionserver.Server.compactionQueueLength
-regionserver.Server.flushedCellsSize
-regionserver.Server.memStoreSize
-regionserver.Server.mutationsWithoutWALSize
-jvm.JvmMetrics.GcCountConcurrentMarkSweep
-regionserver.Server.regionServerStartTime
-regionserver.Server.slowDeleteCount
-regionserver.Server.slowIncrementCount
-regionserver.Server.splitRequestCount
-regionserver.Server.splitSuccessCount
-regionserver.Server.staticBloomSize
-regionserver.Server.storeCount
-regionserver.Server.storeFileIndexSize
-regionserver.Server.totalRequestCount
-regionserver.Server.writeRequestCount
-regionserver.WAL.AppendSize_95th_percentile
-regionserver.WAL.AppendSize_max
-regionserver.WAL.AppendSize_median
-regionserver.Server.Replay_95th_percentile
-regionserver.WAL.AppendTime_95th_percentile
-regionserver.WAL.AppendTime_median
-regionserver.WAL.AppendTime_max
-jvm.JvmMetrics.GcCountParNew
-regionserver.WAL.AppendTime_mean

http://git-wip-us.apache.org/repos/asf/ambari/blob/1ec86cd8/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/AMBARI_METRICS/service-metrics/HDFS.txt
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/AMBARI_METRICS/service-metrics/HDFS.txt b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/AMBARI_METRICS/service-metrics/HDFS.txt
deleted file mode 100644
index 84576e9..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/AMBARI_METRICS/service-metrics/HDFS.txt
+++ /dev/null
@@ -1,277 +0,0 @@
-FSDatasetState.org.apache.hadoop.hdfs.server.datanode.fsdataset.impl.FsDatasetImpl.CacheCapacity
-FSDatasetState.org.apache.hadoop.hdfs.server.datanode.fsdataset.impl.FsDatasetImpl.CacheUsed
-FSDatasetState.org.apache.hadoop.hdfs.server.datanode.fsdataset.impl.FsDatasetImpl.Capacity
-FSDatasetState.org.apache.hadoop.hdfs.server.datanode.fsdataset.impl.FsDatasetImpl.DfsUsed
-FSDatasetState.org.apache.hadoop.hdfs.server.datanode.fsdataset.impl.FsDatasetImpl.EstimatedCapacityLostTotal
-FSDatasetState.org.apache.hadoop.hdfs.server.datanode.fsdataset.impl.FsDatasetImpl.LastVolumeFailureDate
-FSDatasetState.org.apache.hadoop.hdfs.server.datanode.fsdataset.impl.FsDatasetImpl.NumBlocksCached
-FSDatasetState.org.apache.hadoop.hdfs.server.datanode.fsdataset.impl.FsDatasetImpl.NumBlocksFailedToCache
-FSDatasetState.org.apache.hadoop.hdfs.server.datanode.fsdataset.impl.FsDatasetImpl.NumBlocksFailedToUnCache
-FSDatasetState.org.apache.hadoop.hdfs.server.datanode.fsdataset.impl.FsDatasetImpl.NumFailedVolumes
-FSDatasetState.org.apache.hadoop.hdfs.server.datanode.fsdataset.impl.FsDatasetImpl.Remaining
-default.StartupProgress.ElapsedTime
-default.StartupProgress.LoadingEditsCount
-default.StartupProgress.LoadingEditsElapsedTime
-default.StartupProgress.LoadingEditsPercentComplete
-default.StartupProgress.LoadingEditsTotal
-default.StartupProgress.LoadingFsImageCount
-default.StartupProgress.LoadingFsImageElapsedTime
-default.StartupProgress.LoadingFsImagePercentComplete
-default.StartupProgress.LoadingFsImageTotal
-default.StartupProgress.PercentComplete
-default.StartupProgress.SafeModeCount
-default.StartupProgress.SafeModeElapsedTime
-default.StartupProgress.SafeModePercentComplete
-default.StartupProgress.SafeModeTotal
-default.StartupProgress.SavingCheckpointCount
-default.StartupProgress.SavingCheckpointElapsedTime
-default.StartupProgress.SavingCheckpointPercentComplete
-default.StartupProgress.SavingCheckpointTotal
-dfs.FSNamesystem.BlockCapacity
-dfs.FSNamesystem.BlocksTotal
-dfs.FSNamesystem.CapacityRemaining
-dfs.FSNamesystem.CapacityRemainingGB
-dfs.FSNamesystem.CapacityTotal
-dfs.FSNamesystem.CapacityTotalGB
-dfs.FSNamesystem.CapacityUsed
-dfs.FSNamesystem.CapacityUsedGB
-dfs.FSNamesystem.CapacityUsedNonDFS
-dfs.FSNamesystem.CorruptBlocks
-dfs.FSNamesystem.ExcessBlocks
-dfs.FSNamesystem.ExpiredHeartbeats
-dfs.FSNamesystem.FilesTotal
-dfs.FSNamesystem.LastCheckpointTime
-dfs.FSNamesystem.LastWrittenTransactionId
-dfs.FSNamesystem.LockQueueLength
-dfs.FSNamesystem.MillisSinceLastLoadedEdits
-dfs.FSNamesystem.MissingBlocks
-dfs.FSNamesystem.MissingReplOneBlocks
-dfs.FSNamesystem.NumActiveClients
-dfs.FSNamesystem.NumFilesUnderConstruction
-dfs.FSNamesystem.PendingDataNodeMessageCount
-dfs.FSNamesystem.PendingDeletionBlocks
-dfs.FSNamesystem.PendingReplicationBlocks
-dfs.FSNamesystem.PostponedMisreplicatedBlocks
-dfs.FSNamesystem.ScheduledReplicationBlocks
-dfs.FSNamesystem.Snapshots
-dfs.FSNamesystem.SnapshottableDirectories
-dfs.FSNamesystem.StaleDataNodes
-dfs.FSNamesystem.TotalFiles
-dfs.FSNamesystem.TotalLoad
-dfs.FSNamesystem.TotalSyncCount
-dfs.FSNamesystem.TransactionsSinceLastCheckpoint
-dfs.FSNamesystem.TransactionsSinceLastLogRoll
-dfs.FSNamesystem.UnderReplicatedBlocks
-dfs.datanode.BlockChecksumOpAvgTime
-dfs.datanode.BlockChecksumOpNumOps
-dfs.datanode.BlockReportsAvgTime
-dfs.datanode.BlockReportsNumOps
-dfs.datanode.BlockVerificationFailures
-dfs.datanode.BlocksCached
-dfs.datanode.BlocksGetLocalPathInfo
-dfs.datanode.BlocksRead
-dfs.datanode.BlocksRemoved
-dfs.datanode.BlocksReplicated
-dfs.datanode.BlocksUncached
-dfs.datanode.BlocksVerified
-dfs.datanode.BlocksWritten
-dfs.datanode.BytesRead
-dfs.datanode.BytesWritten
-dfs.datanode.CacheReportsAvgTime
-dfs.datanode.CacheReportsNumOps
-dfs.datanode.CopyBlockOpAvgTime
-dfs.datanode.CopyBlockOpNumOps
-dfs.datanode.DatanodeNetworkErrors
-dfs.datanode.FlushNanosAvgTime
-dfs.datanode.FlushNanosNumOps
-dfs.datanode.FsyncCount
-dfs.datanode.FsyncNanosAvgTime
-dfs.datanode.FsyncNanosNumOps
-dfs.datanode.HeartbeatsAvgTime
-dfs.datanode.HeartbeatsNumOps
-dfs.datanode.IncrementalBlockReportsAvgTime
-dfs.datanode.IncrementalBlockReportsNumOps
-dfs.datanode.PacketAckRoundTripTimeNanosAvgTime
-dfs.datanode.PacketAckRoundTripTimeNanosNumOps
-dfs.datanode.RamDiskBlocksDeletedBeforeLazyPersisted
-dfs.datanode.RamDiskBlocksEvicted
-dfs.datanode.RamDiskBlocksEvictedWithoutRead
-dfs.datanode.RamDiskBlocksEvictionWindowMsAvgTime
-dfs.datanode.RamDiskBlocksEvictionWindowMsNumOps
-dfs.datanode.RamDiskBlocksLazyPersistWindowMsAvgTime
-dfs.datanode.RamDiskBlocksLazyPersistWindowMsNumOps
-dfs.datanode.RamDiskBlocksLazyPersisted
-dfs.datanode.RamDiskBlocksReadHits
-dfs.datanode.RamDiskBlocksWrite
-dfs.datanode.RamDiskBlocksWriteFallback
-dfs.datanode.RamDiskBytesLazyPersisted
-dfs.datanode.RamDiskBytesWrite
-dfs.datanode.ReadBlockOpAvgTime
-dfs.datanode.ReadBlockOpNumOps
-dfs.datanode.ReadsFromLocalClient
-dfs.datanode.ReadsFromRemoteClient
-dfs.datanode.RemoteBytesRead
-dfs.datanode.RemoteBytesWritten
-dfs.datanode.ReplaceBlockOpAvgTime
-dfs.datanode.ReplaceBlockOpNumOps
-dfs.datanode.SendDataPacketBlockedOnNetworkNanosAvgTime
-dfs.datanode.SendDataPacketBlockedOnNetworkNanosNumOps
-dfs.datanode.SendDataPacketTransferNanosAvgTime
-dfs.datanode.SendDataPacketTransferNanosNumOps
-dfs.datanode.TotalReadTime
-dfs.datanode.TotalWriteTime
-dfs.datanode.VolumeFailures
-dfs.datanode.WriteBlockOpAvgTime
-dfs.datanode.WriteBlockOpNumOps
-dfs.datanode.WritesFromLocalClient
-dfs.datanode.WritesFromRemoteClient
-dfs.namenode.AddBlockOps
-dfs.namenode.AllowSnapshotOps
-dfs.namenode.BlockReceivedAndDeletedOps
-dfs.namenode.BlockReportAvgTime
-dfs.namenode.BlockReportNumOps
-dfs.namenode.CacheReportAvgTime
-dfs.namenode.CacheReportNumOps
-dfs.namenode.CreateFileOps
-dfs.namenode.CreateSnapshotOps
-dfs.namenode.CreateSymlinkOps
-dfs.namenode.DeleteFileOps
-dfs.namenode.DeleteSnapshotOps
-dfs.namenode.DisallowSnapshotOps
-dfs.namenode.FileInfoOps
-dfs.namenode.FilesAppended
-dfs.namenode.FilesCreated
-dfs.namenode.FilesDeleted
-dfs.namenode.FilesInGetListingOps
-dfs.namenode.FilesRenamed
-dfs.namenode.FilesTruncated
-dfs.namenode.FsImageLoadTime
-dfs.namenode.GetAdditionalDatanodeOps
-dfs.namenode.GetBlockLocations
-dfs.namenode.GetEditAvgTime
-dfs.namenode.GetEditNumOps
-dfs.namenode.GetImageAvgTime
-dfs.namenode.GetImageNumOps
-dfs.namenode.GetLinkTargetOps
-dfs.namenode.GetListingOps
-dfs.namenode.ListSnapshottableDirOps
-dfs.namenode.PutImageAvgTime
-dfs.namenode.PutImageNumOps
-dfs.namenode.RenameSnapshotOps
-dfs.namenode.SafeModeTime
-dfs.namenode.SnapshotDiffReportOps
-dfs.namenode.StorageBlockReportOps
-dfs.namenode.SyncsAvgTime
-dfs.namenode.SyncsNumOps
-dfs.namenode.TotalFileOps
-dfs.namenode.TransactionsAvgTime
-dfs.namenode.TransactionsBatchedInSync
-dfs.namenode.TransactionsNumOps
-jvm.JvmMetrics.GcCount
-jvm.JvmMetrics.GcCountConcurrentMarkSweep
-jvm.JvmMetrics.GcCountParNew
-jvm.JvmMetrics.GcNumInfoThresholdExceeded
-jvm.JvmMetrics.GcNumWarnThresholdExceeded
-jvm.JvmMetrics.GcTimeMillis
-jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep
-jvm.JvmMetrics.GcTimeMillisParNew
-jvm.JvmMetrics.GcTotalExtraSleepTime
-jvm.JvmMetrics.LogError
-jvm.JvmMetrics.LogFatal
-jvm.JvmMetrics.LogInfo
-jvm.JvmMetrics.LogWarn
-jvm.JvmMetrics.MemHeapCommittedM
-jvm.JvmMetrics.MemHeapMaxM
-jvm.JvmMetrics.MemHeapUsedM
-jvm.JvmMetrics.MemMaxM
-jvm.JvmMetrics.MemNonHeapCommittedM
-jvm.JvmMetrics.MemNonHeapMaxM
-jvm.JvmMetrics.MemNonHeapUsedM
-jvm.JvmMetrics.ThreadsBlocked
-jvm.JvmMetrics.ThreadsNew
-jvm.JvmMetrics.ThreadsRunnable
-jvm.JvmMetrics.ThreadsTerminated
-jvm.JvmMetrics.ThreadsTimedWaiting
-jvm.JvmMetrics.ThreadsWaiting
-metricssystem.MetricsSystem.DroppedPubAll
-metricssystem.MetricsSystem.NumActiveSinks
-metricssystem.MetricsSystem.NumActiveSources
-metricssystem.MetricsSystem.NumAllSinks
-metricssystem.MetricsSystem.NumAllSources
-metricssystem.MetricsSystem.PublishAvgTime
-metricssystem.MetricsSystem.PublishNumOps
-metricssystem.MetricsSystem.Sink_timelineAvgTime
-metricssystem.MetricsSystem.Sink_timelineDropped
-metricssystem.MetricsSystem.Sink_timelineNumOps
-metricssystem.MetricsSystem.Sink_timelineQsize
-metricssystem.MetricsSystem.SnapshotAvgTime
-metricssystem.MetricsSystem.SnapshotNumOps
-rpc.RetryCache.NameNodeRetryCache.CacheCleared
-rpc.RetryCache.NameNodeRetryCache.CacheHit
-rpc.RetryCache.NameNodeRetryCache.CacheUpdated
-rpc.rpc.CallQueueLength
-rpc.rpc.NumOpenConnections
-rpc.rpc.ReceivedBytes
-rpc.rpc.RpcAuthenticationFailures
-rpc.rpc.RpcAuthenticationSuccesses
-rpc.rpc.RpcAuthorizationFailures
-rpc.rpc.RpcAuthorizationSuccesses
-rpc.rpc.RpcClientBackoff
-rpc.rpc.RpcProcessingTimeAvgTime
-rpc.rpc.RpcProcessingTimeNumOps
-rpc.rpc.RpcQueueTimeAvgTime
-rpc.rpc.RpcQueueTimeNumOps
-rpc.rpc.RpcSlowCalls
-rpc.rpc.SentBytes
-rpcdetailed.rpcdetailed.AddBlockAvgTime
-rpcdetailed.rpcdetailed.AddBlockNumOps
-rpcdetailed.rpcdetailed.BlockReceivedAndDeletedAvgTime
-rpcdetailed.rpcdetailed.BlockReceivedAndDeletedNumOps
-rpcdetailed.rpcdetailed.BlockReportAvgTime
-rpcdetailed.rpcdetailed.BlockReportNumOps
-rpcdetailed.rpcdetailed.CompleteAvgTime
-rpcdetailed.rpcdetailed.CompleteNumOps
-rpcdetailed.rpcdetailed.CreateAvgTime
-rpcdetailed.rpcdetailed.CreateNumOps
-rpcdetailed.rpcdetailed.DeleteAvgTime
-rpcdetailed.rpcdetailed.DeleteNumOps
-rpcdetailed.rpcdetailed.FsyncAvgTime
-rpcdetailed.rpcdetailed.FsyncNumOps
-rpcdetailed.rpcdetailed.GetBlockLocationsAvgTime
-rpcdetailed.rpcdetailed.GetBlockLocationsNumOps
-rpcdetailed.rpcdetailed.GetFileInfoAvgTime
-rpcdetailed.rpcdetailed.GetFileInfoNumOps
-rpcdetailed.rpcdetailed.GetListingAvgTime
-rpcdetailed.rpcdetailed.GetListingNumOps
-rpcdetailed.rpcdetailed.GetServerDefaultsAvgTime
-rpcdetailed.rpcdetailed.GetServerDefaultsNumOps
-rpcdetailed.rpcdetailed.GetTransactionIdAvgTime
-rpcdetailed.rpcdetailed.GetTransactionIdNumOps
-rpcdetailed.rpcdetailed.MkdirsAvgTime
-rpcdetailed.rpcdetailed.MkdirsNumOps
-rpcdetailed.rpcdetailed.RegisterDatanodeAvgTime
-rpcdetailed.rpcdetailed.RegisterDatanodeNumOps
-rpcdetailed.rpcdetailed.Rename2AvgTime
-rpcdetailed.rpcdetailed.Rename2NumOps
-rpcdetailed.rpcdetailed.RenameAvgTime
-rpcdetailed.rpcdetailed.RenameNumOps
-rpcdetailed.rpcdetailed.RenewLeaseAvgTime
-rpcdetailed.rpcdetailed.RenewLeaseNumOps
-rpcdetailed.rpcdetailed.SendHeartbeatAvgTime
-rpcdetailed.rpcdetailed.SendHeartbeatNumOps
-rpcdetailed.rpcdetailed.SetPermissionAvgTime
-rpcdetailed.rpcdetailed.SetPermissionNumOps
-rpcdetailed.rpcdetailed.SetReplicationAvgTime
-rpcdetailed.rpcdetailed.SetReplicationNumOps
-rpcdetailed.rpcdetailed.SetSafeModeAvgTime
-rpcdetailed.rpcdetailed.SetSafeModeNumOps
-rpcdetailed.rpcdetailed.SetTimesAvgTime
-rpcdetailed.rpcdetailed.SetTimesNumOps
-rpcdetailed.rpcdetailed.VersionRequestAvgTime
-rpcdetailed.rpcdetailed.VersionRequestNumOps
-ugi.UgiMetrics.GetGroupsAvgTime
-ugi.UgiMetrics.GetGroupsNumOps
-ugi.UgiMetrics.LoginFailureAvgTime
-ugi.UgiMetrics.LoginFailureNumOps
-ugi.UgiMetrics.LoginSuccessAvgTime
-ugi.UgiMetrics.LoginSuccessNumOps

http://git-wip-us.apache.org/repos/asf/ambari/blob/1ec86cd8/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/AMBARI_METRICS/service-metrics/HOST.txt
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/AMBARI_METRICS/service-metrics/HOST.txt b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/AMBARI_METRICS/service-metrics/HOST.txt
deleted file mode 100644
index 4b759c6..0000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/AMBARI_METRICS/service-metrics/HOST.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-swap_free
-write_bps
-write_bytes
-write_count
-write_time
-bytes_in
-bytes_out
-cpu_idle
-cpu_intr
-cpu_nice
-cpu_num
-cpu_sintr
-cpu_steal
-cpu_system
-cpu_user
-load_fifteen
-load_five
-load_one
-cpu_wio
-disk_free
-disk_percent
-disk_total
-mem_buffered
-mem_cached
-mem_free
-mem_shared
-mem_total
-mem_used
-disk_used
-pkts_in
-pkts_out
-proc_run
-proc_total
-read_bps
-read_bytes
-read_count
-read_time