AMBARI-8594. Push AMS Hbase metrics with its own appid. (swagle)

ambari-metrics/ambari-metrics-hadoop-sink/src/main/java/org/apache/hadoop/metrics2/sink/timeline/HadoopTimelineMetricsSink.java

@@ -42,6 +42,7 @@ public class HadoopTimelineMetricsSink extends AbstractTimelineMetricsSink imple
   private String serviceName = "";
   private List<? extends SocketAddress> metricsServers;
   private String collectorUri;
+  private static final String SERVICE_NAME_PREFIX = "serviceName-prefix";
 
   @Override
   public void init(SubsetConfiguration conf) {
@@ -61,7 +62,7 @@ public class HadoopTimelineMetricsSink extends AbstractTimelineMetricsSink imple
       }
     }
 
-    serviceName = getFirstConfigPrefix(conf);
+    serviceName = getServiceName(conf);
 
     // Load collector configs
     metricsServers = Servers.parse(conf.getString(COLLECTOR_HOST_PROPERTY), 8188);
@@ -106,6 +107,12 @@ public class HadoopTimelineMetricsSink extends AbstractTimelineMetricsSink imple
     }
   }
 
+  private String getServiceName(SubsetConfiguration conf) {
+    String serviceNamePrefix = conf.getString(SERVICE_NAME_PREFIX, "");
+    return serviceNamePrefix.isEmpty() ? getFirstConfigPrefix(conf) :
+      serviceNamePrefix + "-" + getFirstConfigPrefix(conf);
+  }
+
   private String getFirstConfigPrefix(SubsetConfiguration conf) {
     while (conf.getParent() instanceof SubsetConfiguration) {
       conf = (SubsetConfiguration) conf.getParent();

ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSComponentPropertyProvider.java

@@ -46,8 +46,8 @@ public class AMSComponentPropertyProvider extends AMSPropertyProvider {
   protected String getComponentName(Resource resource) {
     String componentName = (String) resource.getPropertyValue(componentNamePropertyId);
 
-    if (TIMLINE_APPID_MAP.containsKey(componentName)) {
-      componentName = TIMLINE_APPID_MAP.get(componentName);
+    if (TIMELINE_APPID_MAP.containsKey(componentName)) {
+      componentName = TIMELINE_APPID_MAP.get(componentName);
     }
 
     return componentName;

ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSHostComponentPropertyProvider.java

@@ -47,8 +47,8 @@ public class AMSHostComponentPropertyProvider extends AMSPropertyProvider {
   protected String getComponentName(Resource resource) {
     String componentName = (String) resource.getPropertyValue(componentNamePropertyId);
 
-    if (TIMLINE_APPID_MAP.containsKey(componentName)) {
-      componentName = TIMLINE_APPID_MAP.get(componentName);
+    if (TIMELINE_APPID_MAP.containsKey(componentName)) {
+      componentName = TIMELINE_APPID_MAP.get(componentName);
     }
 
     return componentName;

ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProvider.java

@@ -51,7 +51,7 @@ import static org.apache.ambari.server.controller.metrics.MetricsServiceProvider
 import static org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
 
 public abstract class AMSPropertyProvider extends MetricsPropertyProvider {
-  static final Map<String, String> TIMLINE_APPID_MAP = new HashMap<String, String>();
+  static final Map<String, String> TIMELINE_APPID_MAP = new HashMap<String, String>();
   private static ObjectMapper mapper;
   //private final HttpClient httpClient = new HttpClient();
   private final static ObjectReader timelineObjectReader;
@@ -60,8 +60,10 @@ public abstract class AMSPropertyProvider extends MetricsPropertyProvider {
   private static final Set<String> PERCENTAGE_METRIC;
 
   static {
-    TIMLINE_APPID_MAP.put("HBASE_MASTER", "HBASE");
-    TIMLINE_APPID_MAP.put("HBASE_REGIONSERVER", "HBASE");
+    TIMELINE_APPID_MAP.put("HBASE_MASTER", "HBASE");
+    TIMELINE_APPID_MAP.put("HBASE_REGIONSERVER", "HBASE");
+    TIMELINE_APPID_MAP.put("METRIC_COLLECTOR", "AMS-HBASE");
+
     mapper = new ObjectMapper();
     AnnotationIntrospector introspector = new JaxbAnnotationIntrospector();
     mapper.setAnnotationIntrospector(introspector);
@@ -171,8 +173,8 @@ public abstract class AMSPropertyProvider extends MetricsPropertyProvider {
 
           String componentName = getComponentName(resource);
           if (componentName != null && !componentName.isEmpty()) {
-            if (TIMLINE_APPID_MAP.containsKey(componentName)) {
-              componentName = TIMLINE_APPID_MAP.get(componentName);
+            if (TIMELINE_APPID_MAP.containsKey(componentName)) {
+              componentName = TIMELINE_APPID_MAP.get(componentName);
             }
             uriBuilder.setParameter("appId", componentName);
           }

ambari-server/src/main/resources/stacks/HDP/2.2/services/AMS/package/templates/hadoop-metrics2-hbase.properties.j2

@@ -53,3 +53,4 @@ rpc.collector={{ams_collector_host_single}}:8188
 hbase.sink.timeline.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
 hbase.sink.timeline.period=10
 hbase.sink.timeline.collector={{ams_collector_host_single}}:8188
+hbase.sink.timeline.serviceName-prefix=ams