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/10/12 18:22:15 UTC

[1/3] ambari git commit: AMBARI-13376 Prioritize point in time queries to JMX endpoints (dsen)

Repository: ambari
Updated Branches:
  refs/heads/trunk 5601b1404 -> 922828e95


http://git-wip-us.apache.org/repos/asf/ambari/blob/922828e9/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/metrics.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/metrics.json b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/metrics.json
index e591970..604e545 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/metrics.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HBASE/metrics.json
@@ -6702,7 +6702,7 @@
             },
             "metrics/master/AssignmentManger/ritCount": {
               "metric":"master.AssignmentManger.ritCount",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/master/AssignmentManger/ritCountOverThreshold": {

http://git-wip-us.apache.org/repos/asf/ambari/blob/922828e9/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
index cf7c8cd..3c8c5a3 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
@@ -27,6 +27,7 @@ import junit.framework.Assert;
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.StackAccessException;
 import org.apache.ambari.server.configuration.Configuration;
+import org.apache.ambari.server.controller.spi.Resource;
 import org.apache.ambari.server.events.publishers.AmbariEventPublisher;
 import org.apache.ambari.server.metadata.ActionMetadata;
 import org.apache.ambari.server.metadata.AmbariServiceAlertDefinitions;
@@ -62,13 +63,14 @@ import org.apache.ambari.server.state.alert.SourceType;
 import org.apache.ambari.server.state.kerberos.KerberosDescriptor;
 import org.apache.ambari.server.state.kerberos.KerberosDescriptorFactory;
 import org.apache.ambari.server.state.kerberos.KerberosServiceDescriptorFactory;
+import org.apache.ambari.server.state.stack.Metric;
 import org.apache.ambari.server.state.stack.MetricDefinition;
 import org.apache.ambari.server.state.stack.OsFamily;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.easymock.Capture;
 import org.easymock.EasyMock;
-import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -80,8 +82,10 @@ import java.io.File;
 import java.io.FileReader;
 import java.lang.reflect.Field;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -106,9 +110,9 @@ public class AmbariMetaInfoTest {
   private static final String EXT_STACK_NAME = "2.0.6";
   private static final String STACK_VERSION_HDP_02 = "0.2";
   private static final String STACK_MINIMAL_VERSION_HDP = "0.0";
-  private static String SERVICE_NAME_HDFS = "HDFS";
-  private static String SERVICE_NAME_MAPRED2 = "MAPREDUCE2";
-  private static String SERVICE_COMPONENT_NAME = "NAMENODE";
+  private static final String SERVICE_NAME_HDFS = "HDFS";
+  private static final String SERVICE_NAME_MAPRED2 = "MAPREDUCE2";
+  private static final String SERVICE_COMPONENT_NAME = "NAMENODE";
   private static final String OS_TYPE = "centos5";
   private static final String HDP_REPO_NAME = "HDP";
   private static final String HDP_REPO_ID = "HDP-2.1.1";
@@ -123,7 +127,7 @@ public class AmbariMetaInfoTest {
   private static final int PROPERTIES_CNT = 62;
   private static final int OS_CNT = 4;
 
-  private AmbariMetaInfo metaInfo = null;
+  private static AmbariMetaInfo metaInfo = null;
   private final static Logger LOG =
       LoggerFactory.getLogger(AmbariMetaInfoTest.class);
   private static final String FILE_NAME = "hbase-site.xml";
@@ -138,15 +142,15 @@ public class AmbariMetaInfoTest {
   @Rule
   public TemporaryFolder tmpFolder = new TemporaryFolder();
 
-  @Before
-  public void before() throws Exception {
+  @BeforeClass
+  public static void beforeClass() throws Exception {
     File stacks = new File("src/test/resources/stacks");
     File version = new File("src/test/resources/version");
     if (System.getProperty("os.name").contains("Windows")) {
       stacks = new File(ClassLoader.getSystemClassLoader().getResource("stacks").getPath());
       version = new File(new File(ClassLoader.getSystemClassLoader().getResource("").getPath()).getParent(), "version");
     }
-    metaInfo = createAmbariMetaInfo(stacks, version, true);
+    metaInfo = createAmbariMetaInfo(stacks, version);
   }
 
   public class MockModule extends AbstractModule {
@@ -192,7 +196,7 @@ public class AmbariMetaInfoTest {
     // Scenario: user has internet and does nothing to repos via api
     // use the latest
     String buildDir = tmpFolder.getRoot().getAbsolutePath();
-    AmbariMetaInfo ambariMetaInfo = setupTempAmbariMetaInfo(buildDir, true);
+    AmbariMetaInfo ambariMetaInfo = setupTempAmbariMetaInfo(buildDir);
     // The current stack already has (HDP, 2.1.1, redhat6) with valid latest
     // url
     ambariMetaInfo.init();
@@ -215,7 +219,7 @@ public class AmbariMetaInfoTest {
     // Scenario: user has no internet and does nothing to repos via api
     // use the default
     String buildDir = tmpFolder.getRoot().getAbsolutePath();
-    AmbariMetaInfo ambariMetaInfo = setupTempAmbariMetaInfo(buildDir, true);
+    AmbariMetaInfo ambariMetaInfo = setupTempAmbariMetaInfo(buildDir);
     // The current stack already has (HDP, 2.1.1, redhat6).
 
     // Deleting the json file referenced by the latestBaseUrl to simulate No
@@ -247,7 +251,7 @@ public class AmbariMetaInfoTest {
     // Scenario: user has internet and but calls to set repos via api
     // use whatever they set
     String buildDir = tmpFolder.getRoot().getAbsolutePath();
-    TestAmbariMetaInfo ambariMetaInfo = setupTempAmbariMetaInfo(buildDir, true);
+    TestAmbariMetaInfo ambariMetaInfo = setupTempAmbariMetaInfo(buildDir);
     // The current stack already has (HDP, 2.1.1, redhat6)
 
     // Updating the baseUrl
@@ -308,7 +312,7 @@ public class AmbariMetaInfoTest {
     // use whatever they set
     String stackVersion = "0.2";
     String buildDir = tmpFolder.getRoot().getAbsolutePath();
-    TestAmbariMetaInfo ambariMetaInfo = setupTempAmbariMetaInfo(buildDir, true);
+    TestAmbariMetaInfo ambariMetaInfo = setupTempAmbariMetaInfo(buildDir);
 
     // Updating the baseUrl
     String newBaseUrl = "http://myprivate-repo-1.hortonworks.com/HDP-Utils/centos6/2.x/updates/2.0.6.0";
@@ -351,7 +355,7 @@ public class AmbariMetaInfoTest {
     // use whatever they set
     String newBaseUrl = "http://myprivate-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0";
     String buildDir = tmpFolder.getRoot().getAbsolutePath();
-    TestAmbariMetaInfo ambariMetaInfo = setupTempAmbariMetaInfo(buildDir, true);
+    TestAmbariMetaInfo ambariMetaInfo = setupTempAmbariMetaInfo(buildDir);
     // The current stack already has (HDP, 2.1.1, redhat6).
 
     // Deleting the json file referenced by the latestBaseUrl to simulate No
@@ -425,7 +429,7 @@ public class AmbariMetaInfoTest {
   @Test
   public void testServiceNameUsingComponentName() throws AmbariException {
     String serviceName = metaInfo.getComponentToService(STACK_NAME_HDP,
-        STACK_VERSION_HDP, "NAMENODE");
+        STACK_VERSION_HDP, SERVICE_COMPONENT_NAME);
     assertEquals("HDFS", serviceName);
   }
 
@@ -552,7 +556,7 @@ public class AmbariMetaInfoTest {
     }
     File stackRootTmp = new File(buildDir + "/ambari-metaInfo"); stackRootTmp.mkdir();
     FileUtils.copyDirectory(stackRoot, stackRootTmp);
-    AmbariMetaInfo ambariMetaInfo = createAmbariMetaInfo(stackRootTmp, version, true);
+    AmbariMetaInfo ambariMetaInfo = createAmbariMetaInfo(stackRootTmp, version);
     //todo
     //ambariMetaInfo.injector = injector;
     File f1, f2, f3;
@@ -850,7 +854,7 @@ public class AmbariMetaInfoTest {
     LOG.info("Stacks file " + stackRoot.getAbsolutePath());
 
 
-    TestAmbariMetaInfo ambariMetaInfo = createAmbariMetaInfo(stackRoot, version, true);
+    TestAmbariMetaInfo ambariMetaInfo = createAmbariMetaInfo(stackRoot, version);
     Assert.assertEquals(1, ambariMetaInfo.getStackManager().getStacks().size());
     Assert.assertEquals(false, ambariMetaInfo.getStackManager().getStack("HDP", "0.1").isValid());
     Assert.assertEquals(2, ambariMetaInfo.getStackManager().getStack("HDP", "0.1").getErrors().size());
@@ -867,23 +871,108 @@ public class AmbariMetaInfoTest {
     Assert.assertNotNull(svc);
     Assert.assertNotNull(svc.getMetricsFile());
 
-    List<MetricDefinition> list = metaInfo.getMetrics(STACK_NAME_HDP, "2.0.5", "HDFS", "NAMENODE", "Component");
+    List<MetricDefinition> list = metaInfo.getMetrics(STACK_NAME_HDP, "2.0.5", "HDFS", SERVICE_COMPONENT_NAME, Resource.Type.Component.name());
     Assert.assertNotNull(list);
 
-    list = metaInfo.getMetrics(STACK_NAME_HDP, "2.0.5", "HDFS", "DATANODE", "Component");
+    list = metaInfo.getMetrics(STACK_NAME_HDP, "2.0.5", "HDFS", "DATANODE", Resource.Type.Component.name());
     Assert.assertNull(list);
 
-    List<MetricDefinition> list0 = metaInfo.getMetrics(STACK_NAME_HDP, "2.0.5", "HDFS", "DATANODE", "Component");
+    List<MetricDefinition> list0 = metaInfo.getMetrics(STACK_NAME_HDP, "2.0.5", "HDFS", "DATANODE", Resource.Type.Component.name());
     Assert.assertNull(list0);
     Assert.assertTrue("Expecting subsequent calls to use a cached value for the definition", list == list0);
 
-
     // not explicitly defined, uses 2.0.5
-    list = metaInfo.getMetrics(STACK_NAME_HDP, "2.0.6", "HDFS", "DATANODE", "Component");
+    list = metaInfo.getMetrics(STACK_NAME_HDP, "2.0.6", "HDFS", "DATANODE", Resource.Type.Component.name());
     Assert.assertNull(list);
   }
 
   @Test
+  public void testCrossCheckJmxToGangliaMetrics() throws Exception {
+
+    File stacks = new File("src/main/resources/stacks");
+    File version = new File("src/test/resources/version");
+    File commonServicesRoot = new File("src/main/resources/common-services");
+    if (System.getProperty("os.name").contains("Windows")) {
+      stacks = new File(ClassLoader.getSystemClassLoader().getResource("stacks").getPath());
+      version = new File(new File(ClassLoader.getSystemClassLoader().getResource("").getPath()).getParent(), "version");
+      commonServicesRoot = new File(ClassLoader.getSystemClassLoader().getResource("common-services").getPath());
+    }
+
+    Properties properties = new Properties();
+    properties.setProperty(Configuration.METADATA_DIR_PATH, stacks.getPath());
+    properties.setProperty(Configuration.COMMON_SERVICES_DIR_PATH, commonServicesRoot.getPath());
+    properties.setProperty(Configuration.SERVER_VERSION_FILE, version.getPath());
+    Configuration configuration = new Configuration(properties);
+
+    TestAmbariMetaInfo ambariMetaInfo = new TestAmbariMetaInfo(configuration);
+    ambariMetaInfo.replayAllMocks();
+
+    try {
+      ambariMetaInfo.init();
+    } catch(Exception e) {
+      LOG.info("Error in metainfo initializing ", e);
+      throw e;
+    }
+    waitForAllReposToBeResolved(ambariMetaInfo);
+    String[] metricsTypes = {
+      Resource.Type.Component.name(),
+      Resource.Type.HostComponent.name()
+    };
+
+    for (StackInfo stackInfo: ambariMetaInfo.getStacks(STACK_NAME_HDP)) {
+      for (ServiceInfo serviceInfo: stackInfo.getServices()) {
+        for (ComponentInfo componentInfo: serviceInfo.getComponents()) {
+          for (String metricType: metricsTypes) {
+            List<MetricDefinition> list =
+              ambariMetaInfo.getMetrics(stackInfo.getName(), stackInfo.getVersion(),
+                serviceInfo.getName(), componentInfo.getName(), metricType);
+            String currentComponentInfo =  stackInfo.getName() + "-" +
+              stackInfo.getVersion() + ", " + serviceInfo.getName() + ", " +
+              componentInfo.getName()+ ", " + metricType;
+            if (list == null) {
+              LOG.info("No metrics found for " + currentComponentInfo);
+              continue;
+            }
+            LOG.info("Cross-checking JMX-to-Ganglia metrics for " + currentComponentInfo);
+
+            Map<String, Metric> jmxMetrics = Collections.emptyMap();
+            for (MetricDefinition metricDefinition : list) {
+
+              if ("jmx".equals(metricDefinition.getType())) {
+                // all jmx should be point-in-time and not temporal
+                jmxMetrics = metricDefinition.getMetrics();
+                for (Metric metric : jmxMetrics.values()) {
+                  Assert.assertTrue(metric.isPointInTime());
+                  Assert.assertFalse(metric.isTemporal());
+                }
+              }
+            }
+            LinkedList<String> failedMetrics = new LinkedList<String>();
+            for (MetricDefinition metricDefinition : list) {
+              if ("ganglia".equals(metricDefinition.getType())) {
+                //all ams metrics should be temporal
+                for (Map.Entry<String, Metric> metricEntry : metricDefinition.getMetrics().entrySet()) {
+                  Assert.assertTrue(metricEntry.getValue().isTemporal());
+                  // some ams metrics may be point-in-time
+                  // if they aren't provided by JMX
+                  if (metricEntry.getValue().isPointInTime() &&
+                    jmxMetrics.containsKey(metricEntry.getKey())) {
+                    failedMetrics.add(metricEntry.getKey());
+                  }
+                }
+
+              }
+            }
+            Assert.assertEquals(failedMetrics.toString() +
+                " metrics defined with pointInTime=true for both jmx and ganglia types.",
+              0, failedMetrics.size());
+          }
+        }
+      }
+    }
+  }
+
+  @Test
   public void testKerberosJson() throws Exception {
     ServiceInfo svc;
 
@@ -1864,7 +1953,7 @@ public class AmbariMetaInfoTest {
   }
 
 
-  private TestAmbariMetaInfo setupTempAmbariMetaInfo(String buildDir, boolean replayMocks) throws Exception {
+  private TestAmbariMetaInfo setupTempAmbariMetaInfo(String buildDir) throws Exception {
     File stackRootTmp = new File(buildDir + "/ambari-metaInfo");
     File stackRoot = new File("src/test/resources/stacks");
     File version = new File("src/test/resources/version");
@@ -1876,34 +1965,35 @@ public class AmbariMetaInfoTest {
 
     stackRootTmp.mkdir();
     FileUtils.copyDirectory(stackRoot, stackRootTmp);
-    TestAmbariMetaInfo ambariMetaInfo = createAmbariMetaInfo(stackRootTmp, version, replayMocks);
+    TestAmbariMetaInfo ambariMetaInfo = createAmbariMetaInfo(stackRootTmp, version);
 
     return ambariMetaInfo;
   }
 
-  private TestAmbariMetaInfo createAmbariMetaInfo(File stackRoot, File versionFile, boolean replayMocks) throws Exception {
+  private static TestAmbariMetaInfo createAmbariMetaInfo(File stackRoot,
+    File versionFile) throws Exception {
+
     Properties properties = new Properties();
-    properties.setProperty(Configuration.METADETA_DIR_PATH, stackRoot.getPath());
+    properties.setProperty(Configuration.METADATA_DIR_PATH, stackRoot.getPath());
     properties.setProperty(Configuration.SERVER_VERSION_FILE, versionFile.getPath());
     Configuration configuration = new Configuration(properties);
 
     TestAmbariMetaInfo metaInfo = new TestAmbariMetaInfo(configuration);
-    if (replayMocks) {
-      metaInfo.replayAllMocks();
-
-      try {
-        metaInfo.init();
-      } catch(Exception e) {
-        LOG.info("Error in initializing ", e);
-        throw e;
-      }
-      waitForAllReposToBeResolved(metaInfo);
+
+    metaInfo.replayAllMocks();
+
+    try {
+      metaInfo.init();
+    } catch(Exception e) {
+      LOG.info("Error in initializing ", e);
+      throw e;
     }
+    waitForAllReposToBeResolved(metaInfo);
 
     return metaInfo;
   }
 
-  private void waitForAllReposToBeResolved(AmbariMetaInfo metaInfo) throws Exception {
+  private static void waitForAllReposToBeResolved(AmbariMetaInfo metaInfo) throws Exception {
     int maxWait = 45000;
     int waitTime = 0;
     StackManager sm = metaInfo.getStackManager();

http://git-wip-us.apache.org/repos/asf/ambari/blob/922828e9/ambari-server/src/test/java/org/apache/ambari/server/api/services/KerberosServiceMetaInfoTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/KerberosServiceMetaInfoTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/KerberosServiceMetaInfoTest.java
index cafbc6f..befd594 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/KerberosServiceMetaInfoTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/KerberosServiceMetaInfoTest.java
@@ -198,7 +198,7 @@ public class KerberosServiceMetaInfoTest {
 
   private TestAmbariMetaInfo createAmbariMetaInfo(File stackRoot, File commonServicesRoot, File versionFile, boolean replayMocks) throws Exception {
     Properties properties = new Properties();
-    properties.setProperty(Configuration.METADETA_DIR_PATH, stackRoot.getPath());
+    properties.setProperty(Configuration.METADATA_DIR_PATH, stackRoot.getPath());
     properties.setProperty(Configuration.COMMON_SERVICES_DIR_PATH, commonServicesRoot.getPath());
     properties.setProperty(Configuration.SERVER_VERSION_FILE, versionFile.getPath());
     Configuration configuration = new Configuration(properties);

http://git-wip-us.apache.org/repos/asf/ambari/blob/922828e9/ambari-server/src/test/java/org/apache/ambari/server/bootstrap/BootStrapTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/bootstrap/BootStrapTest.java b/ambari-server/src/test/java/org/apache/ambari/server/bootstrap/BootStrapTest.java
index 90cb913..5fbad18 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/bootstrap/BootStrapTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/bootstrap/BootStrapTest.java
@@ -74,7 +74,7 @@ public class BootStrapTest extends TestCase {
     properties.setProperty(Configuration.BOOTSTRAP_DIR, bootdir);
     properties.setProperty(Configuration.BOOTSTRAP_SCRIPT, prepareEchoCommand(bootdir));
     properties.setProperty(Configuration.SRVR_KSTR_DIR_KEY, "target" + File.separator + "classes");
-    properties.setProperty(Configuration.METADETA_DIR_PATH, metadetadir);
+    properties.setProperty(Configuration.METADATA_DIR_PATH, metadetadir);
     properties.setProperty(Configuration.SERVER_VERSION_FILE, serverVersionFilePath);
     properties.setProperty(Configuration.SHARED_RESOURCES_DIR_KEY, sharedResourcesDir);
 
@@ -149,7 +149,7 @@ public class BootStrapTest extends TestCase {
     properties.setProperty(Configuration.BOOTSTRAP_DIR, bootdir);
     properties.setProperty(Configuration.BOOTSTRAP_SCRIPT, prepareEchoCommand(bootdir));
     properties.setProperty(Configuration.SRVR_KSTR_DIR_KEY, serverKSTRDir);
-    properties.setProperty(Configuration.METADETA_DIR_PATH, metadetadir);
+    properties.setProperty(Configuration.METADATA_DIR_PATH, metadetadir);
     properties.setProperty(Configuration.SERVER_VERSION_FILE, serverVersionFilePath);
     properties.setProperty(Configuration.SHARED_RESOURCES_DIR_KEY, sharedResourcesDir);
     Configuration conf = new Configuration(properties);

http://git-wip-us.apache.org/repos/asf/ambari/blob/922828e9/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
index aad6b3f..90a76b9 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
@@ -8323,7 +8323,7 @@ public class AmbariManagementControllerTest {
     // verify change with new meta info
     Configuration configuration = injector.getInstance(Configuration.class);
     Properties properties = configuration.getProperties();
-    properties.setProperty(Configuration.METADETA_DIR_PATH, "src/test/resources/stacks");
+    properties.setProperty(Configuration.METADATA_DIR_PATH, "src/test/resources/stacks");
     properties.setProperty(Configuration.SERVER_VERSION_FILE, "src/test/resources/version");
     Configuration newConfiguration = new Configuration(properties);
 
@@ -8864,7 +8864,7 @@ public class AmbariManagementControllerTest {
       protected void configure() {
         Properties properties = new Properties();
         properties.setProperty(Configuration.SERVER_PERSISTENCE_TYPE_KEY, "in-memory");
-        properties.setProperty(Configuration.METADETA_DIR_PATH,"src/test/resources/stacks");
+        properties.setProperty(Configuration.METADATA_DIR_PATH,"src/test/resources/stacks");
         properties.setProperty(Configuration.SERVER_VERSION_FILE,"src/test/resources/version");
         properties.setProperty(Configuration.OS_VERSION_KEY,"centos6");
         properties.setProperty(Configuration.SHARED_RESOURCES_DIR_KEY, "src/test/resources/");
@@ -8937,7 +8937,7 @@ public class AmbariManagementControllerTest {
         Properties properties = new Properties();
         properties.setProperty(Configuration.SERVER_PERSISTENCE_TYPE_KEY, "in-memory");
 
-        properties.setProperty(Configuration.METADETA_DIR_PATH,
+        properties.setProperty(Configuration.METADATA_DIR_PATH,
             "src/test/resources/stacks");
         properties.setProperty(Configuration.SERVER_VERSION_FILE,
             "../version");
@@ -9047,7 +9047,7 @@ public class AmbariManagementControllerTest {
       protected void configure() {
         Properties properties = new Properties();
         properties.setProperty(Configuration.SERVER_PERSISTENCE_TYPE_KEY,"in-memory");
-        properties.setProperty(Configuration.METADETA_DIR_PATH,"src/test/resources/stacks");
+        properties.setProperty(Configuration.METADATA_DIR_PATH,"src/test/resources/stacks");
         properties.setProperty(Configuration.SERVER_VERSION_FILE,"src/test/resources/version");
         properties.setProperty(Configuration.OS_VERSION_KEY,"centos5");
         properties.setProperty(Configuration.SHARED_RESOURCES_DIR_KEY, "src/test/resources/");
@@ -9386,7 +9386,7 @@ public class AmbariManagementControllerTest {
         Properties properties = new Properties();
         properties.setProperty(Configuration.SERVER_PERSISTENCE_TYPE_KEY, "in-memory");
 
-        properties.setProperty(Configuration.METADETA_DIR_PATH,
+        properties.setProperty(Configuration.METADATA_DIR_PATH,
             "src/test/resources/stacks");
         properties.setProperty(Configuration.SERVER_VERSION_FILE,
             "../version");

http://git-wip-us.apache.org/repos/asf/ambari/blob/922828e9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java
index 3ba79ca..415b97b 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java
@@ -138,7 +138,6 @@ public class StackDefinedPropertyProviderTest {
   @Test
   public void testPopulateHostComponentResources() throws Exception {
     JMXPropertyProviderTest.TestJMXHostProvider tj = new JMXPropertyProviderTest.TestJMXHostProvider(true);
-    TestGangliaHostProvider tg = new TestGangliaHostProvider();
     JMXPropertyProviderTest.TestMetricHostProvider tm = new JMXPropertyProviderTest.TestMetricHostProvider();
     TestGangliaServiceProvider serviceProvider = new TestGangliaServiceProvider();
 
@@ -328,7 +327,6 @@ public class StackDefinedPropertyProviderTest {
 
     StreamProvider  streamProvider = new TestStreamProvider();
     JMXPropertyProviderTest.TestJMXHostProvider hostProvider = new JMXPropertyProviderTest.TestJMXHostProvider(true);
-    TestGangliaHostProvider gangliaHostProvider = new TestGangliaHostProvider();
     JMXPropertyProviderTest.TestMetricHostProvider metricsHostProvider = new JMXPropertyProviderTest.TestMetricHostProvider();
     TestGangliaServiceProvider serviceProvider = new TestGangliaServiceProvider();
 
@@ -391,7 +389,6 @@ public class StackDefinedPropertyProviderTest {
   public void testPopulateResources_HDP2_params() throws Exception {
     TestStreamProvider  streamProvider = new TestStreamProvider();
     JMXPropertyProviderTest.TestJMXHostProvider hostProvider = new JMXPropertyProviderTest.TestJMXHostProvider(false);
-    TestGangliaHostProvider gangliaHostProvider = new TestGangliaHostProvider();
     JMXPropertyProviderTest.TestMetricHostProvider metricsHostProvider = new JMXPropertyProviderTest.TestMetricHostProvider();
     TestGangliaServiceProvider serviceProvider = new TestGangliaServiceProvider();
 
@@ -445,7 +442,6 @@ public class StackDefinedPropertyProviderTest {
   public void testPopulateResources_HDP2_params_singleProperty() throws Exception {
     TestStreamProvider  streamProvider = new TestStreamProvider();
     JMXPropertyProviderTest.TestJMXHostProvider hostProvider = new JMXPropertyProviderTest.TestJMXHostProvider(false);
-    TestGangliaHostProvider gangliaHostProvider = new TestGangliaHostProvider();
     JMXPropertyProviderTest.TestMetricHostProvider metricsHostProvider = new JMXPropertyProviderTest.TestMetricHostProvider();
     TestGangliaServiceProvider serviceProvider = new TestGangliaServiceProvider();
 
@@ -484,7 +480,6 @@ public class StackDefinedPropertyProviderTest {
   public void testPopulateResources_HDP2_params_category() throws Exception {
     TestStreamProvider  streamProvider = new TestStreamProvider();
     JMXPropertyProviderTest.TestJMXHostProvider hostProvider = new JMXPropertyProviderTest.TestJMXHostProvider(false);
-    TestGangliaHostProvider gangliaHostProvider = new TestGangliaHostProvider();
     JMXPropertyProviderTest.TestMetricHostProvider metricsHostProvider = new JMXPropertyProviderTest.TestMetricHostProvider();
     TestGangliaServiceProvider serviceProvider = new TestGangliaServiceProvider();
 
@@ -538,7 +533,6 @@ public class StackDefinedPropertyProviderTest {
   public void testPopulateResources_HDP2_params_category2() throws Exception {
     TestStreamProvider  streamProvider = new TestStreamProvider();
     JMXPropertyProviderTest.TestJMXHostProvider hostProvider = new JMXPropertyProviderTest.TestJMXHostProvider(false);
-    TestGangliaHostProvider gangliaHostProvider = new TestGangliaHostProvider();
     JMXPropertyProviderTest.TestMetricHostProvider metricsHostProvider = new JMXPropertyProviderTest.TestMetricHostProvider();
     TestGangliaServiceProvider serviceProvider = new TestGangliaServiceProvider();
 
@@ -598,7 +592,6 @@ public class StackDefinedPropertyProviderTest {
   public void testPopulateResources_jmx_JournalNode() throws Exception {
     TestStreamProvider  streamProvider = new TestStreamProvider();
     JMXPropertyProviderTest.TestJMXHostProvider hostProvider = new JMXPropertyProviderTest.TestJMXHostProvider(false);
-    TestGangliaHostProvider gangliaHostProvider = new TestGangliaHostProvider();
     JMXPropertyProviderTest.TestMetricHostProvider metricsHostProvider = new JMXPropertyProviderTest.TestMetricHostProvider();
     TestGangliaServiceProvider serviceProvider = new TestGangliaServiceProvider();
 
@@ -767,7 +760,6 @@ public class StackDefinedPropertyProviderTest {
   public void testPopulateResources_NoRegionServer() throws Exception {
     TestStreamProvider  streamProvider = new TestStreamProvider();
     JMXPropertyProviderTest.TestJMXHostProvider hostProvider = new JMXPropertyProviderTest.TestJMXHostProvider(false);
-    TestGangliaHostProvider gangliaHostProvider = new TestGangliaHostProvider();
     JMXPropertyProviderTest.TestMetricHostProvider metricsHostProvider = new JMXPropertyProviderTest.TestMetricHostProvider();
     TestGangliaServiceProvider serviceProvider = new TestGangliaServiceProvider();
 
@@ -805,7 +797,6 @@ public class StackDefinedPropertyProviderTest {
   public void testPopulateResources_HBaseMaster2() throws Exception {
     TestStreamProvider  streamProvider = new TestStreamProvider();
     JMXPropertyProviderTest.TestJMXHostProvider hostProvider = new JMXPropertyProviderTest.TestJMXHostProvider(false);
-    TestGangliaHostProvider gangliaHostProvider = new TestGangliaHostProvider();
     JMXPropertyProviderTest.TestMetricHostProvider metricsHostProvider = new JMXPropertyProviderTest.TestMetricHostProvider();
     TestGangliaServiceProvider serviceProvider = new TestGangliaServiceProvider();
 
@@ -1021,7 +1012,6 @@ public class StackDefinedPropertyProviderTest {
         new org.apache.ambari.server.controller.metrics.ganglia.TestStreamProvider("yarn_ganglia_data.txt");
 
     JMXPropertyProviderTest.TestJMXHostProvider jmxHostProvider = new JMXPropertyProviderTest.TestJMXHostProvider(true);
-    JMXPropertyProviderTest.TestMetricHostProvider metricsHostProvider = new JMXPropertyProviderTest.TestMetricHostProvider();
     TestGangliaHostProvider hostProvider = new TestGangliaHostProvider();
     TestGangliaServiceProvider serviceProvider = new TestGangliaServiceProvider();
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/922828e9/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/JMXPropertyProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/JMXPropertyProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/JMXPropertyProviderTest.java
index 18dcea1..afd4752 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/JMXPropertyProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/JMXPropertyProviderTest.java
@@ -109,99 +109,8 @@ public class JMXPropertyProviderTest {
     Assert.assertEquals(21933376, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "NonHeapMemoryUsed")));
 
 
-    // jobtracker
-    resource = new ResourceImpl(Resource.Type.HostComponent);
-
-    resource.setProperty(HOST_COMPONENT_HOST_NAME_PROPERTY_ID, "domu-12-31-39-14-ee-b3.compute-1.internal");
-    resource.setProperty(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID, "JOBTRACKER");
-
     // only ask for specific properties
     Set<String> properties = new HashSet<String>();
-    properties.add(PropertyHelper.getPropertyId("metrics/jvm", "threadsWaiting"));
-    properties.add(PropertyHelper.getPropertyId("metrics/jvm", "HeapMemoryMax"));
-    properties.add(PropertyHelper.getPropertyId("metrics/jvm", "HeapMemoryUsed"));
-    properties.add(PropertyHelper.getPropertyId("metrics/jvm", "NonHeapMemoryMax"));
-    properties.add(PropertyHelper.getPropertyId("metrics/jvm", "NonHeapMemoryUsed"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/jobtracker", "jobs_submitted"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/jobtracker", "jobs_completed"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/jobtracker", "jobs_failed"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/jobtracker", "maps_launched"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/jobtracker", "maps_completed"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/jobtracker", "maps_failed"));
-
-    request = PropertyHelper.getReadRequest(properties);
-
-    propertyProvider.populateResources(Collections.singleton(resource), request, null);
-
-    Assert.assertEquals(propertyProvider.getSpec("http", "domu-12-31-39-14-ee-b3.compute-1.internal", "50030", "/jmx"), streamProvider.getLastSpec());
-
-    // see test/resources/mapreduce_jobtracker_jmx.json for values
-    Assert.assertEquals(13, PropertyHelper.getProperties(resource).size());
-    Assert.assertEquals(59, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "threadsWaiting")));
-    Assert.assertEquals(1052770304, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "HeapMemoryMax")));
-    Assert.assertEquals(43580400, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "HeapMemoryUsed")));
-    Assert.assertEquals(136314880, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "NonHeapMemoryMax")));
-    Assert.assertEquals(29602888, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "NonHeapMemoryUsed")));
-    Assert.assertEquals(2, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/jobtracker", "jobs_submitted")));
-    Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/jobtracker", "jobs_completed")));
-    Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/jobtracker", "jobs_failed")));
-    Assert.assertEquals(2, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/jobtracker", "maps_launched")));
-    Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/jobtracker", "maps_completed")));
-    Assert.assertEquals(0, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/jobtracker", "maps_failed")));
-
-    Assert.assertNull(resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "gcCount")));
-
-    // tasktracker
-    resource = new ResourceImpl(Resource.Type.HostComponent);
-
-    resource.setProperty(HOST_COMPONENT_HOST_NAME_PROPERTY_ID, "domu-12-31-39-14-ee-b3.compute-1.internal");
-    resource.setProperty(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID, "TASKTRACKER");
-
-    // only ask for specific properties
-    properties = new HashSet<String>();
-    properties.add(PropertyHelper.getPropertyId("metrics/jvm", "HeapMemoryMax"));
-    properties.add(PropertyHelper.getPropertyId("metrics/jvm", "HeapMemoryUsed"));
-    properties.add(PropertyHelper.getPropertyId("metrics/jvm", "NonHeapMemoryMax"));
-    properties.add(PropertyHelper.getPropertyId("metrics/jvm", "NonHeapMemoryUsed"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_exceptions_caught"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_failed_outputs"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_output_bytes"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_success_outputs"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "maps_running"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "reduces_running"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "mapTaskSlots"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "reduceTaskSlots"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "failedDirs"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "tasks_completed"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "tasks_failed_timeout"));
-    properties.add(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "tasks_failed_ping"));
-
-    request = PropertyHelper.getReadRequest(properties);
-
-    propertyProvider.populateResources(Collections.singleton(resource), request, null);
-
-    Assert.assertEquals(propertyProvider.getSpec("http", "domu-12-31-39-14-ee-b3.compute-1.internal", "50060", "/jmx"), streamProvider.getLastSpec());
-
-    Assert.assertEquals(18, PropertyHelper.getProperties(resource).size());
-    Assert.assertEquals(954466304, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "HeapMemoryMax")));
-    Assert.assertEquals(18330984, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "HeapMemoryUsed")));
-    Assert.assertEquals(136314880, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "NonHeapMemoryMax")));
-    Assert.assertEquals(24235104, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "NonHeapMemoryUsed")));
-    Assert.assertEquals(0, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_exceptions_caught")));
-    Assert.assertEquals(0, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_failed_outputs")));
-    Assert.assertEquals(1841, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_output_bytes")));
-    Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/shuffleOutput", "shuffle_success_outputs")));
-    Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "maps_running")));
-    Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "reduces_running")));
-    Assert.assertEquals(4, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "mapTaskSlots")));
-    Assert.assertEquals(2, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "reduceTaskSlots")));
-    Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "failedDirs")));
-    Assert.assertEquals(4, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "tasks_completed")));
-    Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "tasks_failed_timeout")));
-    Assert.assertEquals(1, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/mapred/tasktracker", "tasks_failed_ping")));
-
-
-    Assert.assertNull(resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "gcCount")));
 
     // hbase master
     resource = new ResourceImpl(Resource.Type.HostComponent);
@@ -499,10 +408,6 @@ public class JMXPropertyProviderTest {
         return "50070";
       else if (componentName.equals("DATANODE"))
         return "50075";
-      else if (componentName.equals("JOBTRACKER"))
-        return "50030";
-      else if (componentName.equals("TASKTRACKER"))
-        return "50060";
       else if (componentName.equals("HBASE_MASTER"))
         return null == clusterName ? "60010" : "60011";
       else  if (componentName.equals("JOURNALNODE"))

http://git-wip-us.apache.org/repos/asf/ambari/blob/922828e9/ambari-server/src/test/java/org/apache/ambari/server/orm/InMemoryDefaultTestModule.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/InMemoryDefaultTestModule.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/InMemoryDefaultTestModule.java
index 174d489..3ecfe14 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/orm/InMemoryDefaultTestModule.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/InMemoryDefaultTestModule.java
@@ -70,7 +70,7 @@ public class InMemoryDefaultTestModule extends AbstractModule {
     }
 
     properties.setProperty(Configuration.SERVER_PERSISTENCE_TYPE_KEY, "in-memory");
-    properties.setProperty(Configuration.METADETA_DIR_PATH, stacks);
+    properties.setProperty(Configuration.METADATA_DIR_PATH, stacks);
     properties.setProperty(Configuration.SERVER_VERSION_FILE, version);
     properties.setProperty(Configuration.OS_VERSION_KEY, "centos5");
     properties.setProperty(Configuration.SHARED_RESOURCES_DIR_KEY, sharedResourcesDir);

http://git-wip-us.apache.org/repos/asf/ambari/blob/922828e9/ambari-server/src/test/java/org/apache/ambari/server/orm/JdbcPropertyTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/JdbcPropertyTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/JdbcPropertyTest.java
index 0b1f41e..c07382b 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/orm/JdbcPropertyTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/JdbcPropertyTest.java
@@ -39,7 +39,7 @@ public class JdbcPropertyTest {
   public void configure() {
     properties = new Properties();
     properties.setProperty(Configuration.SERVER_PERSISTENCE_TYPE_KEY, "in-memory");
-    properties.setProperty(Configuration.METADETA_DIR_PATH, "src/test/resources/stacks");
+    properties.setProperty(Configuration.METADATA_DIR_PATH, "src/test/resources/stacks");
     properties.setProperty(Configuration.SERVER_VERSION_FILE, "src/test/resources/version");
     properties.setProperty(Configuration.OS_VERSION_KEY, "centos5");
     properties.setProperty(Configuration.SHARED_RESOURCES_DIR_KEY, "src/test/resources/");

http://git-wip-us.apache.org/repos/asf/ambari/blob/922828e9/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AuthorizationTestModule.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AuthorizationTestModule.java b/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AuthorizationTestModule.java
index bdf5a6f..ce4d25b 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AuthorizationTestModule.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AuthorizationTestModule.java
@@ -30,7 +30,7 @@ public class AuthorizationTestModule extends AbstractModule {
     Properties properties = new Properties();
     properties.setProperty(Configuration.CLIENT_SECURITY_KEY, "ldap");
     properties.setProperty(Configuration.SERVER_PERSISTENCE_TYPE_KEY, "in-memory");
-    properties.setProperty(Configuration.METADETA_DIR_PATH,"src/test/resources/stacks");
+    properties.setProperty(Configuration.METADATA_DIR_PATH,"src/test/resources/stacks");
     properties.setProperty(Configuration.SERVER_VERSION_FILE,"src/test/resources/version");
     properties.setProperty(Configuration.OS_VERSION_KEY,"centos5");
     properties.setProperty(Configuration.SHARED_RESOURCES_DIR_KEY, "src/test/resources/");

http://git-wip-us.apache.org/repos/asf/ambari/blob/922828e9/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AuthorizationTestModuleForLdapDNWithSpace.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AuthorizationTestModuleForLdapDNWithSpace.java b/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AuthorizationTestModuleForLdapDNWithSpace.java
index d37513e..0e36930 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AuthorizationTestModuleForLdapDNWithSpace.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AuthorizationTestModuleForLdapDNWithSpace.java
@@ -30,7 +30,7 @@ public class AuthorizationTestModuleForLdapDNWithSpace extends AbstractModule {
     Properties properties = new Properties();
     properties.setProperty(Configuration.CLIENT_SECURITY_KEY, "ldap");
     properties.setProperty(Configuration.SERVER_PERSISTENCE_TYPE_KEY, "in-memory");
-    properties.setProperty(Configuration.METADETA_DIR_PATH,"src/test/resources/stacks");
+    properties.setProperty(Configuration.METADATA_DIR_PATH,"src/test/resources/stacks");
     properties.setProperty(Configuration.SERVER_VERSION_FILE,"src/test/resources/version");
     properties.setProperty(Configuration.OS_VERSION_KEY,"centos5");
     properties.setProperty(Configuration.SHARED_RESOURCES_DIR_KEY, "src/test/resources/");

http://git-wip-us.apache.org/repos/asf/ambari/blob/922828e9/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigHelperTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigHelperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigHelperTest.java
index fced888..57185c7 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigHelperTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigHelperTest.java
@@ -69,17 +69,14 @@ import com.google.inject.persist.PersistService;
 import com.google.inject.persist.Transactional;
 
 
-
 @RunWith(Enclosed.class)
 public class ConfigHelperTest {
   public static class RunWithInMemoryDefaultTestModule {
     private Clusters clusters;
-    private AmbariMetaInfo metaInfo;
     private Injector injector;
     private String clusterName;
     private Cluster cluster;
     private ConfigGroupFactory configGroupFactory;
-    private ConfigFactory configFactory;
     private ConfigHelper configHelper;
     private AmbariManagementController managementController;
 
@@ -88,8 +85,6 @@ public class ConfigHelperTest {
       injector = Guice.createInjector(new InMemoryDefaultTestModule());
       injector.getInstance(GuiceJpaInitializer.class);
       clusters = injector.getInstance(Clusters.class);
-      metaInfo = injector.getInstance(AmbariMetaInfo.class);
-      configFactory = injector.getInstance(ConfigFactory.class);
       configGroupFactory = injector.getInstance(ConfigGroupFactory.class);
       configHelper = injector.getInstance(ConfigHelper.class);
       managementController = injector.getInstance(AmbariManagementController.class);

http://git-wip-us.apache.org/repos/asf/ambari/blob/922828e9/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeTest.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeTest.java
index 405e6f7..a1fd32d 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeTest.java
@@ -22,7 +22,6 @@ import java.io.IOException;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.sql.SQLNonTransientConnectionException;
-import java.sql.SQLSyntaxErrorException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -97,7 +96,7 @@ public class UpgradeTest {
     properties.setProperty(Configuration.SERVER_PERSISTENCE_TYPE_KEY, "remote");
     properties.setProperty(Configuration.SERVER_JDBC_URL_KEY, Configuration.JDBC_IN_MEMORY_URL);
     properties.setProperty(Configuration.SERVER_JDBC_DRIVER_KEY, Configuration.JDBC_IN_MEMROY_DRIVER);
-    properties.setProperty(Configuration.METADETA_DIR_PATH, "src/test/resources/stacks");
+    properties.setProperty(Configuration.METADATA_DIR_PATH, "src/test/resources/stacks");
     properties.setProperty(Configuration.SERVER_VERSION_FILE, "src/test/resources/version");
     properties.setProperty(Configuration.OS_VERSION_KEY, "centos5");
     properties.setProperty(Configuration.SHARED_RESOURCES_DIR_KEY, "src/test/resources/");


[2/3] ambari git commit: AMBARI-13376 Prioritize point in time queries to JMX endpoints (dsen)

Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/ambari/blob/922828e9/ambari-server/src/main/resources/jmx_properties.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/jmx_properties.json b/ambari-server/src/main/resources/jmx_properties.json
index 69b8d75..cb22a29 100644
--- a/ambari-server/src/main/resources/jmx_properties.json
+++ b/ambari-server/src/main/resources/jmx_properties.json
@@ -665,20 +665,9 @@
         "temporal":false
       }
     },
-    "JOBTRACKER":{
-
-      "ServiceComponentInfo/AliveNodes":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerInfo.AliveNodesInfoJson",
-        "pointInTime" : true,
-        "temporal" : false
-      },
-      "ServiceComponentInfo/BlackListedNodes":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerInfo.BlacklistedNodesInfoJson",
-        "pointInTime" : true,
-        "temporal" : false
-      },
-      "ServiceComponentInfo/GrayListedNodes":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerInfo.GraylistedNodesInfoJson",
+    "HBASE_MASTER":{
+      "ServiceComponentInfo/AverageLoad":{
+        "metric" : "hadoop:service=Master,name=Master.AverageLoad",
         "pointInTime" : true,
         "temporal" : false
       },
@@ -702,4344 +691,2712 @@
         "pointInTime" : true,
         "temporal" : false
       },
-      "ServiceComponentInfo/Queue/jobs_completed":{
-        "metric" : "Hadoop:service=JobTracker,name=QueueMetrics,q=default.jobs_completed",
+      "ServiceComponentInfo/MasterActiveTime":{
+        "metric" : "hadoop:service=Master,name=Master.MasterActiveTime",
         "pointInTime" : true,
         "temporal" : false
       },
-      "ServiceComponentInfo/Queue/jobs_submitted":{
-        "metric" : "Hadoop:service=JobTracker,name=QueueMetrics,q=default.jobs_submitted",
+      "ServiceComponentInfo/MasterStartTime":{
+        "metric" : "hadoop:service=Master,name=Master.MasterStartTime",
         "pointInTime" : true,
         "temporal" : false
       },
-      "ServiceComponentInfo/Queue/reserved_map_slots":{
-        "metric" : "Hadoop:service=JobTracker,name=QueueMetrics,q=default.reserved_map_slots",
+      "ServiceComponentInfo/RegionsInTransition":{
+        "metric" : "hadoop:service=Master,name=Master.RegionsInTransition",
         "pointInTime" : true,
         "temporal" : false
       },
-      "ServiceComponentInfo/Queue/reserved_reduce_slots":{
-        "metric" : "Hadoop:service=JobTracker,name=QueueMetrics,q=default.reserved_reduce_slots",
+      "ServiceComponentInfo/Revision":{
+        "metric" : "hadoop:service=HBase,name=Info.revision",
         "pointInTime" : true,
         "temporal" : false
       },
-      "ServiceComponentInfo/Queue/running_0":{
-        "metric" : "Hadoop:service=JobTracker,name=QueueMetrics,q=default.running_0",
+      "ServiceComponentInfo/Version":{
+        "metric" : "hadoop:service=HBase,name=Info.version",
         "pointInTime" : true,
         "temporal" : false
       },
-      "ServiceComponentInfo/Queue/running_1440":{
-        "metric" : "Hadoop:service=JobTracker,name=QueueMetrics,q=default.running_1440",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/hbase/master/ClusterId":{
+        "metric":"hadoop:service=Master,name=Master.ClusterId",
+        "pointInTime":true,
+        "temporal":false
       },
-      "ServiceComponentInfo/Queue/running_300":{
-        "metric" : "Hadoop:service=JobTracker,name=QueueMetrics,q=default.running_300",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/hbase/master/MasterStartTime":{
+        "metric":"hadoop:service=Master,name=Master.MasterStartTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "ServiceComponentInfo/Queue/running_60":{
-        "metric" : "Hadoop:service=JobTracker,name=QueueMetrics,q=default.running_60",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/hbase/master/MasterActiveTime":{
+        "metric":"hadoop:service=Master,name=Master.MasterActiveTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "ServiceComponentInfo/Queue/waiting_maps":{
-        "metric" : "Hadoop:service=JobTracker,name=QueueMetrics,q=default.waiting_maps",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/hbase/master/Coprocessors":{
+        "metric":"hadoop:service=Master,name=Master.Coprocessors",
+        "pointInTime":true,
+        "temporal":false
       },
-      "ServiceComponentInfo/Queue/waiting_reduces":{
-        "metric" : "Hadoop:service=JobTracker,name=QueueMetrics,q=default.waiting_reduces",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/hbase/master/ServerName":{
+        "metric":"hadoop:service=Master,name=Master.ServerName",
+        "pointInTime":true,
+        "temporal":false
       },
-      "ServiceComponentInfo/StartTime":{
-        "metric" : "java.lang:type=Runtime.StartTime",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/hbase/master/AverageLoad":{
+        "metric":"hadoop:service=Master,name=Master.AverageLoad",
+        "pointInTime":true,
+        "temporal":false
       },
-      "ServiceComponentInfo/Version":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerInfo.Version",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/hbase/master/RegionsInTransition":{
+        "metric":"hadoop:service=Master,name=Master.RegionsInTransition",
+        "pointInTime":true,
+        "temporal":false
       },
-      "ServiceComponentInfo/jobs_running":{
-        "metric" : "Hadoop:service=JobTracker,name=QueueMetrics,q=default.jobs_running",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/hbase/master/RegionServers":{
+        "metric":"hadoop:service=Master,name=Master.RegionServers",
+        "pointInTime":true,
+        "temporal":false
       },
-      "ServiceComponentInfo/jobtracker/jobs_completed":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.jobs_completed",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/hbase/master/ZookeeperQuorum":{
+        "metric":"hadoop:service=Master,name=Master.ZookeeperQuorum",
+        "pointInTime":true,
+        "temporal":false
       },
-      "ServiceComponentInfo/jobtracker/jobs_running":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.jobs_running",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/hbase/master/DeadRegionServers":{
+        "metric":"hadoop:service=Master,name=Master.DeadRegionServers",
+        "pointInTime":true,
+        "temporal":false
       },
-      "ServiceComponentInfo/jobtracker/jobs_submitted":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.jobs_submitted",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/hbase/master/IsActiveMaster":{
+        "metric":"hadoop:service=Master,name=Master.IsActiveMaster",
+        "pointInTime":true,
+        "temporal":false
       },
-      "ServiceComponentInfo/jobtracker/occupied_map_slots":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.occupied_map_slots",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/hbase/master/splitTimeNumOps":{
+        "metric":"hadoop:service=Master,name=MasterStatistics.splitTimeNumOps",
+        "pointInTime":true,
+        "temporal":false
       },
-      "ServiceComponentInfo/jobtracker/occupied_reduce_slots":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.occupied_reduce_slots",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/hbase/master/splitTimeAvgTime":{
+        "metric":"hadoop:service=Master,name=MasterStatistics.splitTimeAvgTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "ServiceComponentInfo/jobtracker/reserved_map_slots":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.reserved_map_slots",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/hbase/master/splitTimeMinTime":{
+        "metric":"hadoop:service=Master,name=MasterStatistics.splitTimeMinTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "ServiceComponentInfo/jobtracker/reserved_reduce_slots":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.reserved_reduce_slots",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/hbase/master/splitTimeMaxTime":{
+        "metric":"hadoop:service=Master,name=MasterStatistics.splitTimeMaxTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "ServiceComponentInfo/jobtracker/running_maps":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.running_maps",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/hbase/master/splitSizeNumOps":{
+        "metric":"hadoop:service=Master,name=MasterStatistics.splitSizeNumOps",
+        "pointInTime":true,
+        "temporal":false
       },
-      "ServiceComponentInfo/jobtracker/running_reduces":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.running_reduces",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/hbase/master/splitSizeAvgTime":{
+        "metric":"hadoop:service=Master,name=MasterStatistics.splitSizeAvgTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "ServiceComponentInfo/jobtracker/waiting_maps":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.waiting_maps",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/hbase/master/splitSizeMinTime":{
+        "metric":"hadoop:service=Master,name=MasterStatistics.splitSizeMinTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "ServiceComponentInfo/jobtracker/waiting_reduces":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.waiting_reduces",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/hbase/master/splitSizeMaxTime":{
+        "metric":"hadoop:service=Master,name=MasterStatistics.splitSizeMaxTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/jvm/gcCount":{
-        "metric" : "Hadoop:service=JobTracker,name=jvm.gcCount",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/hbase/master/cluster_requests":{
+        "metric":"hadoop:service=Master,name=MasterStatistics.cluster_requests",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/jvm/gcTimeMillis":{
-        "metric" : "Hadoop:service=JobTracker,name=jvm.gcTimeMillis",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/hbase/master/revision":{
+        "metric":"hadoop:service=HBase,name=Info.revision",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/jvm/logError":{
-        "metric" : "Hadoop:service=JobTracker,name=jvm.logError",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/hbase/master/hdfsUser":{
+        "metric":"hadoop:service=HBase,name=Info.hdfsUser",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/jvm/logFatal":{
-        "metric" : "Hadoop:service=JobTracker,name=jvm.logFatal",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/hbase/master/hdfsDate":{
+        "metric":"hadoop:service=HBase,name=Info.hdfsDate",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/jvm/logInfo":{
-        "metric" : "Hadoop:service=JobTracker,name=jvm.logInfo",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/hbase/master/hdfsUrl":{
+        "metric":"hadoop:service=HBase,name=Info.hdfsUrl",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/jvm/logWarn":{
-        "metric" : "Hadoop:service=JobTracker,name=jvm.logWarn",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/hbase/master/date":{
+        "metric":"hadoop:service=HBase,name=Info.date",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/jvm/memHeapCommittedM":{
-        "metric" : "Hadoop:service=JobTracker,name=jvm.memHeapCommittedM",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/hbase/master/hdfsRevision":{
+        "metric":"hadoop:service=HBase,name=Info.hdfsRevision",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/jvm/memHeapUsedM":{
-        "metric" : "Hadoop:service=JobTracker,name=jvm.memHeapUsedM",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/hbase/master/user":{
+        "metric":"hadoop:service=HBase,name=Info.user",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/jvm/memNonHeapCommittedM":{
-        "metric" : "Hadoop:service=JobTracker,name=jvm.memNonHeapCommittedM",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/hbase/master/hdfsVersion":{
+        "metric":"hadoop:service=HBase,name=Info.hdfsVersion",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/jvm/memNonHeapUsedM":{
-        "metric" : "Hadoop:service=JobTracker,name=jvm.memNonHeapUsedM",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/hbase/master/url":{
+        "metric":"hadoop:service=HBase,name=Info.url",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/jvm/threadsBlocked":{
-        "metric" : "Hadoop:service=JobTracker,name=jvm.threadsBlocked",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/hbase/master/version":{
+        "metric":"hadoop:service=HBase,name=Info.version",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/jvm/threadsNew":{
-        "metric" : "Hadoop:service=JobTracker,name=jvm.threadsNew",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/enableTableNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.enableTableNumOps",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/jvm/threadsRunnable":{
-        "metric" : "Hadoop:service=JobTracker,name=jvm.threadsRunnable",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/enableTableAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.enableTableAvgTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/jvm/threadsTerminated":{
-        "metric" : "Hadoop:service=JobTracker,name=jvm.threadsTerminated",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/enableTableMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.enableTableMinTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/jvm/threadsTimedWaiting":{
-        "metric" : "Hadoop:service=JobTracker,name=jvm.threadsTimedWaiting",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/enableTableMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.enableTableMaxTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/jvm/threadsWaiting":{
-        "metric" : "Hadoop:service=JobTracker,name=jvm.threadsWaiting",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/assignNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.assignNumOps",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/Queue/jobs_completed":{
-        "metric" : "Hadoop:service=JobTracker,name=QueueMetrics,q=default.jobs_completed",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/assignAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.assignAvgTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/Queue/jobs_submitted":{
-        "metric" : "Hadoop:service=JobTracker,name=QueueMetrics,q=default.jobs_submitted",
-        "pointInTime" : true,
-        "temporal" : false
-      },
-      "metrics/mapred/Queue/reserved_map_slots":{
-        "metric" : "Hadoop:service=JobTracker,name=QueueMetrics,q=default.reserved_map_slots",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/assignMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.assignMinTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/Queue/reserved_reduce_slots":{
-        "metric" : "Hadoop:service=JobTracker,name=QueueMetrics,q=default.reserved_reduce_slots",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/assignMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.assignMaxTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/Queue/running_0":{
-        "metric" : "Hadoop:service=JobTracker,name=QueueMetrics,q=default.running_0",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/enableTable.aboveOneSec.NumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.enableTable.aboveOneSec.NumOps",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/Queue/running_1440":{
-        "metric" : "Hadoop:service=JobTracker,name=QueueMetrics,q=default.running_1440",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/enableTable.aboveOneSec.AvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.enableTable.aboveOneSec.AvgTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/Queue/running_300":{
-        "metric" : "Hadoop:service=JobTracker,name=QueueMetrics,q=default.running_300",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/enableTable.aboveOneSec.MinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.enableTable.aboveOneSec.MinTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/Queue/running_60":{
-        "metric" : "Hadoop:service=JobTracker,name=QueueMetrics,q=default.running_60",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/enableTable.aboveOneSec.MaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.enableTable.aboveOneSec.MaxTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/Queue/waiting_maps":{
-        "metric" : "Hadoop:service=JobTracker,name=QueueMetrics,q=default.waiting_maps",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/RpcSlowResponseNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.RpcSlowResponseNumOps",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/Queue/waiting_reduces":{
-        "metric" : "Hadoop:service=JobTracker,name=QueueMetrics,q=default.waiting_reduces",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/RpcSlowResponseAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.RpcSlowResponseAvgTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/Queue/jobs_running":{
-        "metric" : "Hadoop:service=JobTracker,name=QueueMetrics,q=default.jobs_running",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/RpcSlowResponseMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.RpcSlowResponseMinTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/jobs_completed":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.jobs_completed",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/RpcSlowResponseMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.RpcSlowResponseMaxTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/jobs_running":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.jobs_running",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/getStoreFileListNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getStoreFileListNumOps",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/jobs_submitted":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.jobs_submitted",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/getStoreFileListAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getStoreFileListAvgTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/map_slots":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.map_slots",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/getStoreFileListMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getStoreFileListMinTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/reduce_slots":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.reduce_slots",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/getStoreFileListMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getStoreFileListMaxTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/blacklisted_maps":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.blacklisted_maps",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/getProtocolVersion.aboveOneSec.NumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getProtocolVersion.aboveOneSec.NumOps",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/blacklisted_reduces":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.blacklisted_reduces",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/getProtocolVersion.aboveOneSec.AvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getProtocolVersion.aboveOneSec.AvgTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/maps_launched":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.maps_launched",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/getProtocolVersion.aboveOneSec.MinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getProtocolVersion.aboveOneSec.MinTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/maps_completed":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.maps_completed",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/getProtocolVersion.aboveOneSec.MaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getProtocolVersion.aboveOneSec.MaxTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/maps_failed":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.maps_failed",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/getAlterStatus.aboveOneSec.NumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getAlterStatus.aboveOneSec.NumOps",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/reduces_launched":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.reduces_launched",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/getAlterStatus.aboveOneSec.AvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getAlterStatus.aboveOneSec.AvgTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/reduces_completed":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.reduces_completed",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/getAlterStatus.aboveOneSec.MinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getAlterStatus.aboveOneSec.MinTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/reduces_failed":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.reduces_failed",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/getAlterStatus.aboveOneSec.MaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getAlterStatus.aboveOneSec.MaxTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/jobs_failed":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.jobs_failed",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/moveNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.moveNumOps",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/jobs_killed":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.jobs_killed",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/moveAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.moveAvgTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/jobs_preparing":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.jobs_preparing",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/moveMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.moveMinTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/maps_killed":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.maps_killed",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/moveMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.moveMaxTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/reduces_killed":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.reduces_killed",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/openRegionNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.openRegionNumOps",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/trackers":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.trackers",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/openRegionAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.openRegionAvgTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/trackers_blacklisted":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.trackers_blacklisted",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/openRegionMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.openRegionMinTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/trackers_graylisted":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.trackers_graylisted",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/openRegionMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.openRegionMaxTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/trackers_decommissioned":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.trackers_decommissioned",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/incrementNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.incrementNumOps",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/heartbeats":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.heartbeats",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/incrementAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.incrementAvgTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/occupied_map_slots":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.occupied_map_slots",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/incrementMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.incrementMinTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/occupied_reduce_slots":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.occupied_reduce_slots",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/incrementMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.incrementMaxTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/reserved_map_slots":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.reserved_map_slots",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/regionServerStartup.aboveOneSec.NumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.regionServerStartup.aboveOneSec.NumOps",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/reserved_reduce_slots":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.reserved_reduce_slots",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/regionServerStartup.aboveOneSec.AvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.regionServerStartup.aboveOneSec.AvgTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/running_maps":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.running_maps",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/regionServerStartup.aboveOneSec.MinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.regionServerStartup.aboveOneSec.MinTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/running_reduces":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.running_reduces",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/regionServerStartup.aboveOneSec.MaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.regionServerStartup.aboveOneSec.MaxTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/waiting_maps":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.waiting_maps",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/deleteTableNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.deleteTableNumOps",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/waiting_reduces":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerMetrics.waiting_reduces",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/deleteTableAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.deleteTableAvgTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/Hostname":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerInfo.Hostname",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/deleteTableMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.deleteTableMinTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/Version":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerInfo.Version",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/deleteTableMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.deleteTableMaxTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/ConfigVersion":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerInfo.ConfigVersion",
-        "pointInTime" : true,
-        "temporal" : false
-      },
-      "metrics/mapred/jobtracker/ThreadCount":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerInfo.ThreadCount",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/balance.aboveOneSec.NumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.balance.aboveOneSec.NumOps",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/SummaryJson":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerInfo.SummaryJson",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/balance.aboveOneSec.AvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.balance.aboveOneSec.AvgTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/AliveNodesInfoJson":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerInfo.AliveNodesInfoJson",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/balance.aboveOneSec.MinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.balance.aboveOneSec.MinTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/BlacklistedNodesInfoJson":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerInfo.BlacklistedNodesInfoJson",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/balance.aboveOneSec.MaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.balance.aboveOneSec.MaxTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/GraylistedNodesInfoJson":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerInfo.GraylistedNodesInfoJson",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/execCoprocessorNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.execCoprocessorNumOps",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/mapred/jobtracker/QueueInfoJson":{
-        "metric" : "Hadoop:service=JobTracker,name=JobTrackerInfo.QueueInfoJson",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/execCoprocessorAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.execCoprocessorAvgTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/rpc/NumOpenConnections":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcActivity.NumOpenConnections",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/execCoprocessorMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.execCoprocessorMinTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/rpc/ReceivedBytes":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcActivity.ReceivedBytes",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/execCoprocessorMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.execCoprocessorMaxTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/rpc/RpcProcessingTime_avg_time":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcActivity.RpcProcessingTime_avg_time",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/getHTableDescriptorsNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getHTableDescriptorsNumOps",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/rpc/RpcProcessingTime_num_ops":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcActivity.RpcProcessingTime_num_ops",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/getHTableDescriptorsAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getHTableDescriptorsAvgTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/rpc/RpcQueueTime_avg_time":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcActivity.RpcQueueTime_avg_time",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/getHTableDescriptorsMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getHTableDescriptorsMinTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/rpc/RpcQueueTime_num_ops":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcActivity.RpcQueueTime_num_ops",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/getHTableDescriptorsMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getHTableDescriptorsMaxTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/rpc/SentBytes":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcActivity.SentBytes",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/addColumnNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.addColumnNumOps",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/rpc/callQueueLen":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcActivity.callQueueLen",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/addColumnAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.addColumnAvgTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/rpc/rpcAuthenticationFailures":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcActivity.rpcAuthenticationFailures",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/addColumnMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.addColumnMinTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/rpc/rpcAuthenticationSuccesses":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcActivity.rpcAuthenticationSuccesses",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/addColumnMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.addColumnMaxTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/rpc/rpcAuthorizationFailures":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcActivity.rpcAuthorizationFailures",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/offline.aboveOneSec.NumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.offline.aboveOneSec.NumOps",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/rpc/rpcAuthorizationSuccesses":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcActivity.rpcAuthorizationSuccesses",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/offline.aboveOneSec.AvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.offline.aboveOneSec.AvgTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/rpcdetailed/addBlock_avg_time":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcDetailedActivity.addBlock_avg_time",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/offline.aboveOneSec.MinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.offline.aboveOneSec.MinTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/rpcdetailed/addBlock_num_ops":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcDetailedActivity.addBlock_num_ops",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/offline.aboveOneSec.MaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.offline.aboveOneSec.MaxTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/rpcdetailed/blockReceived_avg_time":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcDetailedActivity.blockReceived_avg_time",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/multiNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.multiNumOps",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/rpcdetailed/blockReceived_num_ops":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcDetailedActivity.blockReceived_num_ops",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/multiAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.multiAvgTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/rpcdetailed/blockReport_avg_time":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcDetailedActivity.blockReport_avg_time",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/multiMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.multiMinTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/rpcdetailed/blockReport_num_ops":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcDetailedActivity.blockReport_num_ops",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/multiMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.multiMaxTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/rpcdetailed/complete_avg_time":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcDetailedActivity.complete_avg_time",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/closeRegionNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.closeRegionNumOps",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/rpcdetailed/complete_num_ops":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcDetailedActivity.complete_num_ops",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/closeRegionAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.closeRegionAvgTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/rpcdetailed/create_avg_time":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcDetailedActivity.create_avg_time",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/closeRegionMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.closeRegionMinTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/rpcdetailed/create_num_ops":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcDetailedActivity.create_num_ops",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/closeRegionMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.closeRegionMaxTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/rpcdetailed/fsync_avg_time":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcDetailedActivity.fsync_avg_time",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/disableTableNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.disableTableNumOps",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/rpcdetailed/fsync_num_ops":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcDetailedActivity.fsync_num_ops",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/disableTableAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.disableTableAvgTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/rpcdetailed/getBlockLocations_avg_time":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcDetailedActivity.getBlockLocations_avg_time",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/disableTableMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.disableTableMinTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/rpcdetailed/getBlockLocations_num_ops":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcDetailedActivity.getBlockLocations_num_ops",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/disableTableMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.disableTableMaxTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/rpcdetailed/getEditLogSize_avg_time":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcDetailedActivity.getEditLogSize_avg_time",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/bulkLoadHFilesNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.bulkLoadHFilesNumOps",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/rpcdetailed/getEditLogSize_num_ops":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcDetailedActivity.getEditLogSize_num_ops",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/bulkLoadHFilesAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.bulkLoadHFilesAvgTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/rpcdetailed/getFileInfo_avg_time":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcDetailedActivity.getFileInfo_avg_time",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/bulkLoadHFilesMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.bulkLoadHFilesMinTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/rpcdetailed/getFileInfo_num_ops":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcDetailedActivity.getFileInfo_num_ops",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/bulkLoadHFilesMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.bulkLoadHFilesMaxTime",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/rpcdetailed/getListing_avg_time":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcDetailedActivity.getListing_avg_time",
-        "pointInTime" : true,
-        "temporal" : false
+      "metrics/rpc/putNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.putNumOps",
+        "pointInTime":true,
+        "temporal":false
       },
-      "metrics/rpcdetailed/getListing_num_ops":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcDetailedActivity.getListing_num_ops",
-        "pointInTime" : true,
-        "temporal" : false
-      },
-      "metrics/rpcdetailed/getProtocolVersion_avg_time":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcDetailedActivity.getProtocolVersion_avg_time",
-        "pointInTime" : true,
-        "temporal" : false
-      },
-      "metrics/rpcdetailed/getProtocolVersion_num_ops":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcDetailedActivity.getProtocolVersion_num_ops",
-        "pointInTime" : true,
-        "temporal" : false
-      },
-      "metrics/rpcdetailed/renewLease_avg_time":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcDetailedActivity.renewLease_avg_time",
-        "pointInTime" : true,
-        "temporal" : false
-      },
-      "metrics/rpcdetailed/renewLease_num_ops":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcDetailedActivity.renewLease_num_ops",
-        "pointInTime" : true,
-        "temporal" : false
-      },
-      "metrics/rpcdetailed/rollEditLog_avg_time":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcDetailedActivity.rollEditLog_avg_time",
-        "pointInTime" : true,
-        "temporal" : false
-      },
-      "metrics/rpcdetailed/rollEditLog_num_ops":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcDetailedActivity.rollEditLog_num_ops",
-        "pointInTime" : true,
-        "temporal" : false
-      },
-      "metrics/rpcdetailed/rollFsImage_avg_time":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcDetailedActivity.rollFsImage_avg_time",
-        "pointInTime" : true,
-        "temporal" : false
-      },
-      "metrics/rpcdetailed/rollFsImage_num_ops":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcDetailedActivity.rollFsImage_num_ops",
-        "pointInTime" : true,
-        "temporal" : false
-      },
-      "metrics/rpcdetailed/sendHeartbeat_avg_time":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcDetailedActivity.sendHeartbeat_avg_time",
-        "pointInTime" : true,
-        "temporal" : false
-      },
-      "metrics/rpcdetailed/sendHeartbeat_num_ops":{
-        "metric" : "Hadoop:service=JobTracker,name=RpcDetailedActivity.sendHeartbeat_num_ops",
-        "pointInTime" : true,
-        "temporal" : false
-      },
-      "metrics/ugi/loginFailure_avg_time":{
-        "metric":"Hadoop:service=JobTracker,name=ugi.loginFailure_avg_time",
+      "metrics/rpc/putAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.putAvgTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/ugi/loginFailure_num_ops":{
-        "metric":"Hadoop:service=JobTracker,name=ugi.loginFailure_num_ops",
+      "metrics/rpc/putMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.putMinTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/ugi/loginSuccess_avg_time":{
-        "metric":"Hadoop:service=JobTracker,name=ugi.loginSuccess_avg_time",
+      "metrics/rpc/putMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.putMaxTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/ugi/loginSuccess_num_ops":{
-        "metric":"Hadoop:service=JobTracker,name=ugi.loginSuccess_num_ops",
+      "metrics/rpc/createTableNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.createTableNumOps",
         "pointInTime":true,
         "temporal":false
-      }
-    },
-
-    "HBASE_MASTER":{
-      "ServiceComponentInfo/AverageLoad":{
-        "metric" : "hadoop:service=Master,name=Master.AverageLoad",
-        "pointInTime" : true,
-        "temporal" : false
-      },
-      "ServiceComponentInfo/HeapMemoryMax":{
-        "metric" : "java.lang:type=Memory.HeapMemoryUsage[max]",
-        "pointInTime" : true,
-        "temporal" : false
-      },
-      "ServiceComponentInfo/HeapMemoryUsed":{
-        "metric" : "java.lang:type=Memory.HeapMemoryUsage[used]",
-        "pointInTime" : true,
-        "temporal" : false
-      },
-      "ServiceComponentInfo/NonHeapMemoryMax":{
-        "metric" : "java.lang:type=Memory.NonHeapMemoryUsage[max]",
-        "pointInTime" : true,
-        "temporal" : false
-      },
-      "ServiceComponentInfo/NonHeapMemoryUsed":{
-        "metric" : "java.lang:type=Memory.NonHeapMemoryUsage[used]",
-        "pointInTime" : true,
-        "temporal" : false
-      },
-      "ServiceComponentInfo/MasterActiveTime":{
-        "metric" : "hadoop:service=Master,name=Master.MasterActiveTime",
-        "pointInTime" : true,
-        "temporal" : false
-      },
-      "ServiceComponentInfo/MasterStartTime":{
-        "metric" : "hadoop:service=Master,name=Master.MasterStartTime",
-        "pointInTime" : true,
-        "temporal" : false
-      },
-      "ServiceComponentInfo/RegionsInTransition":{
-        "metric" : "hadoop:service=Master,name=Master.RegionsInTransition",
-        "pointInTime" : true,
-        "temporal" : false
-      },
-      "ServiceComponentInfo/Revision":{
-        "metric" : "hadoop:service=HBase,name=Info.revision",
-        "pointInTime" : true,
-        "temporal" : false
-      },
-      "ServiceComponentInfo/Version":{
-        "metric" : "hadoop:service=HBase,name=Info.version",
-        "pointInTime" : true,
-        "temporal" : false
       },
-      "metrics/hbase/master/ClusterId":{
-        "metric":"hadoop:service=Master,name=Master.ClusterId",
+      "metrics/rpc/createTableAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.createTableAvgTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/hbase/master/MasterStartTime":{
-        "metric":"hadoop:service=Master,name=Master.MasterStartTime",
+      "metrics/rpc/createTableMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.createTableMinTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/hbase/master/MasterActiveTime":{
-        "metric":"hadoop:service=Master,name=Master.MasterActiveTime",
+      "metrics/rpc/createTableMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.createTableMaxTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/hbase/master/Coprocessors":{
-        "metric":"hadoop:service=Master,name=Master.Coprocessors",
+      "metrics/rpc/nextNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.nextNumOps",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/hbase/master/ServerName":{
-        "metric":"hadoop:service=Master,name=Master.ServerName",
+      "metrics/rpc/nextAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.nextAvgTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/hbase/master/AverageLoad":{
-        "metric":"hadoop:service=Master,name=Master.AverageLoad",
+      "metrics/rpc/nextMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.nextMinTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/hbase/master/RegionsInTransition":{
-        "metric":"hadoop:service=Master,name=Master.RegionsInTransition",
+      "metrics/rpc/nextMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.nextMaxTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/hbase/master/RegionServers":{
-        "metric":"hadoop:service=Master,name=Master.RegionServers",
+      "metrics/rpc/unlockRowNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.unlockRowNumOps",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/hbase/master/ZookeeperQuorum":{
-        "metric":"hadoop:service=Master,name=Master.ZookeeperQuorum",
+      "metrics/rpc/unlockRowAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.unlockRowAvgTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/hbase/master/DeadRegionServers":{
-        "metric":"hadoop:service=Master,name=Master.DeadRegionServers",
+      "metrics/rpc/unlockRowMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.unlockRowMinTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/hbase/master/IsActiveMaster":{
-        "metric":"hadoop:service=Master,name=Master.IsActiveMaster",
+      "metrics/rpc/unlockRowMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.unlockRowMaxTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/hbase/master/splitTimeNumOps":{
-        "metric":"hadoop:service=Master,name=MasterStatistics.splitTimeNumOps",
+      "metrics/rpc/reportRSFatalErrorNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.reportRSFatalErrorNumOps",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/hbase/master/splitTimeAvgTime":{
-        "metric":"hadoop:service=Master,name=MasterStatistics.splitTimeAvgTime",
+      "metrics/rpc/reportRSFatalErrorAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.reportRSFatalErrorAvgTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/hbase/master/splitTimeMinTime":{
-        "metric":"hadoop:service=Master,name=MasterStatistics.splitTimeMinTime",
+      "metrics/rpc/reportRSFatalErrorMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.reportRSFatalErrorMinTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/hbase/master/splitTimeMaxTime":{
-        "metric":"hadoop:service=Master,name=MasterStatistics.splitTimeMaxTime",
+      "metrics/rpc/reportRSFatalErrorMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.reportRSFatalErrorMaxTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/hbase/master/splitSizeNumOps":{
-        "metric":"hadoop:service=Master,name=MasterStatistics.splitSizeNumOps",
+      "metrics/rpc/rpcAuthenticationFailures":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.rpcAuthenticationFailures",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/hbase/master/splitSizeAvgTime":{
-        "metric":"hadoop:service=Master,name=MasterStatistics.splitSizeAvgTime",
+      "metrics/rpc/getRegionInfoNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getRegionInfoNumOps",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/hbase/master/splitSizeMinTime":{
-        "metric":"hadoop:service=Master,name=MasterStatistics.splitSizeMinTime",
+      "metrics/rpc/getRegionInfoAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getRegionInfoAvgTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/hbase/master/splitSizeMaxTime":{
-        "metric":"hadoop:service=Master,name=MasterStatistics.splitSizeMaxTime",
+      "metrics/rpc/getRegionInfoMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getRegionInfoMinTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/hbase/master/cluster_requests":{
-        "metric":"hadoop:service=Master,name=MasterStatistics.cluster_requests",
+      "metrics/rpc/getRegionInfoMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getRegionInfoMaxTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/hbase/master/revision":{
-        "metric":"hadoop:service=HBase,name=Info.revision",
+      "metrics/rpc/openScannerNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.openScannerNumOps",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/hbase/master/hdfsUser":{
-        "metric":"hadoop:service=HBase,name=Info.hdfsUser",
+      "metrics/rpc/openScannerAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.openScannerAvgTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/hbase/master/hdfsDate":{
-        "metric":"hadoop:service=HBase,name=Info.hdfsDate",
+      "metrics/rpc/openScannerMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.openScannerMinTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/hbase/master/hdfsUrl":{
-        "metric":"hadoop:service=HBase,name=Info.hdfsUrl",
+      "metrics/rpc/openScannerMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.openScannerMaxTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/hbase/master/date":{
-        "metric":"hadoop:service=HBase,name=Info.date",
+      "metrics/rpc/offlineNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.offlineNumOps",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/hbase/master/hdfsRevision":{
-        "metric":"hadoop:service=HBase,name=Info.hdfsRevision",
+      "metrics/rpc/offlineAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.offlineAvgTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/hbase/master/user":{
-        "metric":"hadoop:service=HBase,name=Info.user",
+      "metrics/rpc/offlineMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.offlineMinTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/hbase/master/hdfsVersion":{
-        "metric":"hadoop:service=HBase,name=Info.hdfsVersion",
+      "metrics/rpc/offlineMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.offlineMaxTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/hbase/master/url":{
-        "metric":"hadoop:service=HBase,name=Info.url",
+      "metrics/rpc/getAlterStatusNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getAlterStatusNumOps",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/hbase/master/version":{
-        "metric":"hadoop:service=HBase,name=Info.version",
+      "metrics/rpc/getAlterStatusAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getAlterStatusAvgTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/enableTableNumOps":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.enableTableNumOps",
+      "metrics/rpc/getAlterStatusMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getAlterStatusMinTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/enableTableAvgTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.enableTableAvgTime",
+      "metrics/rpc/getAlterStatusMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getAlterStatusMaxTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/enableTableMinTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.enableTableMinTime",
+      "metrics/rpc/deleteNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.deleteNumOps",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/enableTableMaxTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.enableTableMaxTime",
+      "metrics/rpc/deleteAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.deleteAvgTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/assignNumOps":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.assignNumOps",
+      "metrics/rpc/deleteMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.deleteMinTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/assignAvgTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.assignAvgTime",
+      "metrics/rpc/deleteMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.deleteMaxTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/assignMinTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.assignMinTime",
+      "metrics/rpc/RpcProcessingTimeNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.RpcProcessingTimeNumOps",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/assignMaxTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.assignMaxTime",
+      "metrics/rpc/RpcProcessingTimeAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.RpcProcessingTimeAvgTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/enableTable.aboveOneSec.NumOps":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.enableTable.aboveOneSec.NumOps",
+      "metrics/rpc/RpcProcessingTimeMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.RpcProcessingTimeMinTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/enableTable.aboveOneSec.AvgTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.enableTable.aboveOneSec.AvgTime",
+      "metrics/rpc/RpcProcessingTimeMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.RpcProcessingTimeMaxTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/enableTable.aboveOneSec.MinTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.enableTable.aboveOneSec.MinTime",
+      "metrics/rpc/move.aboveOneSec.NumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.move.aboveOneSec.NumOps",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/enableTable.aboveOneSec.MaxTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.enableTable.aboveOneSec.MaxTime",
+      "metrics/rpc/move.aboveOneSec.AvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.move.aboveOneSec.AvgTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/RpcSlowResponseNumOps":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.RpcSlowResponseNumOps",
+      "metrics/rpc/move.aboveOneSec.MinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.move.aboveOneSec.MinTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/RpcSlowResponseAvgTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.RpcSlowResponseAvgTime",
+      "metrics/rpc/move.aboveOneSec.MaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.move.aboveOneSec.MaxTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/RpcSlowResponseMinTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.RpcSlowResponseMinTime",
+      "metrics/rpc/getLastFlushTimeNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getLastFlushTimeNumOps",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/RpcSlowResponseMaxTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.RpcSlowResponseMaxTime",
+      "metrics/rpc/getLastFlushTimeAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getLastFlushTimeAvgTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/getStoreFileListNumOps":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.getStoreFileListNumOps",
+      "metrics/rpc/getLastFlushTimeMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getLastFlushTimeMinTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/getStoreFileListAvgTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.getStoreFileListAvgTime",
+      "metrics/rpc/getLastFlushTimeMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getLastFlushTimeMaxTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/getStoreFileListMinTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.getStoreFileListMinTime",
+      "metrics/rpc/shutdownNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.shutdownNumOps",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/getStoreFileListMaxTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.getStoreFileListMaxTime",
+      "metrics/rpc/shutdownAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.shutdownAvgTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/getProtocolVersion.aboveOneSec.NumOps":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.getProtocolVersion.aboveOneSec.NumOps",
+      "metrics/rpc/shutdownMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.shutdownMinTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/getProtocolVersion.aboveOneSec.AvgTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.getProtocolVersion.aboveOneSec.AvgTime",
+      "metrics/rpc/shutdownMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.shutdownMaxTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/getProtocolVersion.aboveOneSec.MinTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.getProtocolVersion.aboveOneSec.MinTime",
+      "metrics/rpc/openRegionsNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.openRegionsNumOps",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/getProtocolVersion.aboveOneSec.MaxTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.getProtocolVersion.aboveOneSec.MaxTime",
+      "metrics/rpc/openRegionsAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.openRegionsAvgTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/getAlterStatus.aboveOneSec.NumOps":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.getAlterStatus.aboveOneSec.NumOps",
+      "metrics/rpc/openRegionsMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.openRegionsMinTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/getAlterStatus.aboveOneSec.AvgTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.getAlterStatus.aboveOneSec.AvgTime",
+      "metrics/rpc/openRegionsMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.openRegionsMaxTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/getAlterStatus.aboveOneSec.MinTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.getAlterStatus.aboveOneSec.MinTime",
+      "metrics/rpc/getClosestRowBeforeNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getClosestRowBeforeNumOps",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/getAlterStatus.aboveOneSec.MaxTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.getAlterStatus.aboveOneSec.MaxTime",
+      "metrics/rpc/getClosestRowBeforeAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getClosestRowBeforeAvgTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/moveNumOps":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.moveNumOps",
+      "metrics/rpc/getClosestRowBeforeMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getClosestRowBeforeMinTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/moveAvgTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.moveAvgTime",
+      "metrics/rpc/getClosestRowBeforeMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getClosestRowBeforeMaxTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/moveMinTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.moveMinTime",
+      "metrics/rpc/getHServerInfoNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getHServerInfoNumOps",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/moveMaxTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.moveMaxTime",
+      "metrics/rpc/getHServerInfoAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getHServerInfoAvgTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/openRegionNumOps":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.openRegionNumOps",
+      "metrics/rpc/getHServerInfoMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getHServerInfoMinTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/openRegionAvgTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.openRegionAvgTime",
+      "metrics/rpc/getHServerInfoMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getHServerInfoMaxTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/openRegionMinTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.openRegionMinTime",
+      "metrics/rpc/getProtocolSignatureNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getProtocolSignatureNumOps",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/openRegionMaxTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.openRegionMaxTime",
+      "metrics/rpc/getProtocolSignatureAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getProtocolSignatureAvgTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/incrementNumOps":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.incrementNumOps",
+      "metrics/rpc/getProtocolSignatureMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getProtocolSignatureMinTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/incrementAvgTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.incrementAvgTime",
+      "metrics/rpc/getProtocolSignatureMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.getProtocolSignatureMaxTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/incrementMinTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.incrementMinTime",
+      "metrics/rpc/replicationCallQueueLen":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.replicationCallQueueLen",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/incrementMaxTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.incrementMaxTime",
+      "metrics/rpc/SentBytes":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.SentBytes",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/regionServerStartup.aboveOneSec.NumOps":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.regionServerStartup.aboveOneSec.NumOps",
+      "metrics/rpc/existsNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.existsNumOps",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/regionServerStartup.aboveOneSec.AvgTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.regionServerStartup.aboveOneSec.AvgTime",
+      "metrics/rpc/existsAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.existsAvgTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/regionServerStartup.aboveOneSec.MinTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.regionServerStartup.aboveOneSec.MinTime",
+      "metrics/rpc/existsMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.existsMinTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/regionServerStartup.aboveOneSec.MaxTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.regionServerStartup.aboveOneSec.MaxTime",
+      "metrics/rpc/existsMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.existsMaxTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/deleteTableNumOps":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.deleteTableNumOps",
+      "metrics/rpc/shutdown.aboveOneSec.NumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.shutdown.aboveOneSec.NumOps",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/deleteTableAvgTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.deleteTableAvgTime",
+      "metrics/rpc/shutdown.aboveOneSec.AvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.shutdown.aboveOneSec.AvgTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/deleteTableMinTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.deleteTableMinTime",
+      "metrics/rpc/shutdown.aboveOneSec.MinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.shutdown.aboveOneSec.MinTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/deleteTableMaxTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.deleteTableMaxTime",
+      "metrics/rpc/shutdown.aboveOneSec.MaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.shutdown.aboveOneSec.MaxTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/balance.aboveOneSec.NumOps":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.balance.aboveOneSec.NumOps",
+      "metrics/rpc/regionServerStartupNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.regionServerStartupNumOps",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/balance.aboveOneSec.AvgTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.balance.aboveOneSec.AvgTime",
+      "metrics/rpc/regionServerStartupAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.regionServerStartupAvgTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/balance.aboveOneSec.MinTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.balance.aboveOneSec.MinTime",
+      "metrics/rpc/regionServerStartupMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.regionServerStartupMinTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/balance.aboveOneSec.MaxTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.balance.aboveOneSec.MaxTime",
+      "metrics/rpc/regionServerStartupMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.regionServerStartupMaxTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/execCoprocessorNumOps":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.execCoprocessorNumOps",
+      "metrics/rpc/compactRegionNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.compactRegionNumOps",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/execCoprocessorAvgTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.execCoprocessorAvgTime",
+      "metrics/rpc/compactRegionAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.compactRegionAvgTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/execCoprocessorMinTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.execCoprocessorMinTime",
+      "metrics/rpc/compactRegionMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.compactRegionMinTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/execCoprocessorMaxTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.execCoprocessorMaxTime",
+      "metrics/rpc/compactRegionMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.compactRegionMaxTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/getHTableDescriptorsNumOps":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.getHTableDescriptorsNumOps",
+      "metrics/rpc/unassign.aboveOneSec.NumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.unassign.aboveOneSec.NumOps",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/getHTableDescriptorsAvgTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.getHTableDescriptorsAvgTime",
+      "metrics/rpc/unassign.aboveOneSec.AvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.unassign.aboveOneSec.AvgTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/getHTableDescriptorsMinTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.getHTableDescriptorsMinTime",
+      "metrics/rpc/unassign.aboveOneSec.MinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.unassign.aboveOneSec.MinTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/getHTableDescriptorsMaxTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.getHTableDescriptorsMaxTime",
+      "metrics/rpc/unassign.aboveOneSec.MaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.unassign.aboveOneSec.MaxTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/addColumnNumOps":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.addColumnNumOps",
+      "metrics/rpc/balanceSwitchNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.balanceSwitchNumOps",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/addColumnAvgTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.addColumnAvgTime",
+      "metrics/rpc/balanceSwitchAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.balanceSwitchAvgTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/addColumnMinTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.addColumnMinTime",
+      "metrics/rpc/balanceSwitchMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.balanceSwitchMinTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/addColumnMaxTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.addColumnMaxTime",
+      "metrics/rpc/balanceSwitchMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.balanceSwitchMaxTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/offline.aboveOneSec.NumOps":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.offline.aboveOneSec.NumOps",
+      "metrics/rpc/rollHLogWriterNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.rollHLogWriterNumOps",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/offline.aboveOneSec.AvgTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.offline.aboveOneSec.AvgTime",
+      "metrics/rpc/rollHLogWriterAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.rollHLogWriterAvgTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/offline.aboveOneSec.MinTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.offline.aboveOneSec.MinTime",
+      "metrics/rpc/rollHLogWriterMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.rollHLogWriterMinTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/offline.aboveOneSec.MaxTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.offline.aboveOneSec.MaxTime",
+      "metrics/rpc/rollHLogWriterMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.rollHLogWriterMaxTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/multiNumOps":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.multiNumOps",
+      "metrics/rpc/splitRegionNumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.splitRegionNumOps",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/multiAvgTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.multiAvgTime",
+      "metrics/rpc/splitRegionAvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.splitRegionAvgTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/multiMinTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.multiMinTime",
+      "metrics/rpc/splitRegionMinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.splitRegionMinTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/multiMaxTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.multiMaxTime",
+      "metrics/rpc/splitRegionMaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.splitRegionMaxTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/closeRegionNumOps":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.closeRegionNumOps",
+      "metrics/rpc/ReceivedBytes":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.ReceivedBytes",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/closeRegionAvgTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.closeRegionAvgTime",
+      "metrics/rpc/isMasterRunning.aboveOneSec.NumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.isMasterRunning.aboveOneSec.NumOps",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/closeRegionMinTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.closeRegionMinTime",
+      "metrics/rpc/isMasterRunning.aboveOneSec.AvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.isMasterRunning.aboveOneSec.AvgTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/closeRegionMaxTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.closeRegionMaxTime",
+      "metrics/rpc/isMasterRunning.aboveOneSec.MinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.isMasterRunning.aboveOneSec.MinTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/disableTableNumOps":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.disableTableNumOps",
+      "metrics/rpc/isMasterRunning.aboveOneSec.MaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.isMasterRunning.aboveOneSec.MaxTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/disableTableAvgTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.disableTableAvgTime",
+      "metrics/rpc/addColumn.aboveOneSec.NumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.addColumn.aboveOneSec.NumOps",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/disableTableMinTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.disableTableMinTime",
+      "metrics/rpc/addColumn.aboveOneSec.AvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.addColumn.aboveOneSec.AvgTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/disableTableMaxTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.disableTableMaxTime",
+      "metrics/rpc/addColumn.aboveOneSec.MinTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.addColumn.aboveOneSec.MinTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/bulkLoadHFilesNumOps":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.bulkLoadHFilesNumOps",
+      "metrics/rpc/addColumn.aboveOneSec.MaxTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.addColumn.aboveOneSec.MaxTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/bulkLoadHFilesAvgTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.bulkLoadHFilesAvgTime",
+      "metrics/rpc/createTable.aboveOneSec.NumOps":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.createTable.aboveOneSec.NumOps",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/bulkLoadHFilesMinTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.bulkLoadHFilesMinTime",
+      "metrics/rpc/createTable.aboveOneSec.AvgTime":{
+        "metric":"hadoop:service=HBase,name=RPCStatistics.createTable.aboveOneSec.AvgTime",
         "pointInTime":true,
         "temporal":false
       },
-      "metrics/rpc/bulkLoadHFilesMaxTime":{
-        "metric":"hadoop:service=HBase,name=RPCStatistics.bulkLoadHFilesMaxTime",
+      "metrics/rpc/createTable.abo

<TRUNCATED>

[3/3] ambari git commit: AMBARI-13376 Prioritize point in time queries to JMX endpoints (dsen)

Posted by ds...@apache.org.
AMBARI-13376 Prioritize point in time queries to JMX endpoints (dsen)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/922828e9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/922828e9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/922828e9

Branch: refs/heads/trunk
Commit: 922828e95be49263741a76fddaa8a2c216db4d87
Parents: 5601b14
Author: Dmytro Sen <ds...@apache.org>
Authored: Mon Oct 12 19:22:05 2015 +0300
Committer: Dmytro Sen <ds...@apache.org>
Committed: Mon Oct 12 19:22:05 2015 +0300

----------------------------------------------------------------------
 .../server/configuration/Configuration.java     |    4 +-
 .../internal/StackDefinedPropertyProvider.java  |   25 -
 .../controller/jmx/JMXPropertyProvider.java     |    2 -
 .../ambari/server/stack/StackManager.java       |    2 +-
 .../ambari/server/state/stack/Metric.java       |   11 +
 .../HBASE/0.96.0.2.0/metrics.json               |    2 +-
 .../common-services/HDFS/2.1.0.2.0/metrics.json |   64 +-
 .../src/main/resources/jmx_properties.json      | 4654 ++++++------------
 .../stacks/HDP/2.3/services/HBASE/metrics.json  |    2 +-
 .../server/api/services/AmbariMetaInfoTest.java |  162 +-
 .../services/KerberosServiceMetaInfoTest.java   |    2 +-
 .../ambari/server/bootstrap/BootStrapTest.java  |    4 +-
 .../AmbariManagementControllerTest.java         |   10 +-
 .../StackDefinedPropertyProviderTest.java       |   10 -
 .../metrics/JMXPropertyProviderTest.java        |   95 -
 .../server/orm/InMemoryDefaultTestModule.java   |    2 +-
 .../ambari/server/orm/JdbcPropertyTest.java     |    2 +-
 .../authorization/AuthorizationTestModule.java  |    2 +-
 ...thorizationTestModuleForLdapDNWithSpace.java |    2 +-
 .../ambari/server/state/ConfigHelperTest.java   |    5 -
 .../ambari/server/upgrade/UpgradeTest.java      |    3 +-
 21 files changed, 1675 insertions(+), 3390 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/922828e9/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index 04c1c19..c653e1b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@ -112,7 +112,7 @@ public class Configuration {
   public static final String SRVR_DISABLED_CIPHERS = "security.server.disabled.ciphers";
   public static final String SRVR_DISABLED_PROTOCOLS = "security.server.disabled.protocols";
   public static final String RESOURCES_DIR_KEY = "resources.dir";
-  public static final String METADETA_DIR_PATH = "metadata.path";
+  public static final String METADATA_DIR_PATH = "metadata.path";
   public static final String COMMON_SERVICES_DIR_PATH = "common.services.path";
   public static final String SERVER_VERSION_FILE = "server.version.file";
   public static final String SERVER_VERSION_KEY = "version";
@@ -981,7 +981,7 @@ public class Configuration {
    * @return String
    */
   public String getMetadataPath() {
-    return properties.getProperty(METADETA_DIR_PATH);
+    return properties.getProperty(METADATA_DIR_PATH);
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/ambari/blob/922828e9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProvider.java
index d0d597e..8b15569 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProvider.java
@@ -67,7 +67,6 @@ public class StackDefinedPropertyProvider implements PropertyProvider {
   @Inject
   private static Injector injector = null;
 
-
   private Resource.Type type = null;
   private String clusterNamePropertyId = null;
   private String hostNamePropertyId = null;
@@ -81,7 +80,6 @@ public class StackDefinedPropertyProvider implements PropertyProvider {
 
   private final MetricHostProvider metricHostProvider;
   private final MetricsServiceProvider metricsServiceProvider;
-  private MetricsService metricsService = MetricsService.GANGLIA;
   private TimelineMetricCacheProvider cacheProvider;
 
   /**
@@ -131,29 +129,6 @@ public class StackDefinedPropertyProvider implements PropertyProvider {
     cacheProvider = injector.getInstance(TimelineMetricCacheProvider.class);
   }
 
-
-  public StackDefinedPropertyProvider(Resource.Type type,
-                                      MetricsService metricsService,
-                                      JMXHostProvider jmxHostProvider,
-                                      MetricHostProvider metricHostProvider,
-                                      MetricsServiceProvider serviceProvider,
-                                      StreamProvider streamProvider,
-                                      String clusterPropertyId,
-                                      String hostPropertyId,
-                                      String componentPropertyId,
-                                      String jmxStatePropertyId,
-                                      PropertyProvider defaultJmxPropertyProvider,
-                                      PropertyProvider defaultGangliaPropertyProvider) {
-
-    this(type, jmxHostProvider, metricHostProvider, serviceProvider,
-      streamProvider, clusterPropertyId, hostPropertyId, componentPropertyId,
-      jmxStatePropertyId, defaultJmxPropertyProvider, defaultGangliaPropertyProvider);
-
-    this.metricsService = metricsService;
-    cacheProvider = injector.getInstance(TimelineMetricCacheProvider.class);
-  }
-
-
   @Override
   public Set<Resource> populateResources(Set<Resource> resources,
       Request request, Predicate predicate) throws SystemException {

http://git-wip-us.apache.org/repos/asf/ambari/blob/922828e9/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java
index eeb0762..2748dd4 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java
@@ -61,8 +61,6 @@ public class JMXPropertyProvider extends ThreadPoolEnabledPropertyProvider {
   static {
     DEFAULT_JMX_PORTS.put("NAMENODE",           "50070");
     DEFAULT_JMX_PORTS.put("DATANODE",           "50075");
-    DEFAULT_JMX_PORTS.put("JOBTRACKER",         "50030");
-    DEFAULT_JMX_PORTS.put("TASKTRACKER",        "50060");
     DEFAULT_JMX_PORTS.put("HBASE_MASTER",       "60010");
     DEFAULT_JMX_PORTS.put("HBASE_REGIONSERVER", "60030");
     DEFAULT_JMX_PORTS.put("RESOURCEMANAGER",     "8088");

http://git-wip-us.apache.org/repos/asf/ambari/blob/922828e9/ambari-server/src/main/java/org/apache/ambari/server/stack/StackManager.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackManager.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackManager.java
index 832370d..2a5e75b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackManager.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackManager.java
@@ -273,7 +273,7 @@ public class StackManager {
     }
 
     if (!stackRoot.isDirectory() && !stackRoot.exists()) {
-      throw new AmbariException("" + Configuration.METADETA_DIR_PATH
+      throw new AmbariException("" + Configuration.METADATA_DIR_PATH
           + " should be a directory with stack"
           + ", stackRoot = " + stackRootAbsPath);
     }

http://git-wip-us.apache.org/repos/asf/ambari/blob/922828e9/ambari-server/src/main/java/org/apache/ambari/server/state/stack/Metric.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/Metric.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/Metric.java
index ef2e7c6..8ea7be2 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/Metric.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/Metric.java
@@ -58,4 +58,15 @@ public class Metric {
   public String getUnit() {
     return unit;
   }
+
+  @Override
+  public String toString() {
+    return "Metric{" +
+      "metric='" + metric + '\'' +
+      ", pointInTime=" + pointInTime +
+      ", temporal=" + temporal +
+      ", amsHostMetric=" + amsHostMetric +
+      ", unit='" + unit + '\'' +
+      '}';
+  }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/922828e9/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metrics.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metrics.json b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metrics.json
index 5e5e775..158f3d7 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metrics.json
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metrics.json
@@ -6752,7 +6752,7 @@
             },
             "metrics/master/AssignmentManger/ritCount": {
               "metric":"master.AssignmentManger.ritCount",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/master/AssignmentManger/ritCountOverThreshold": {

http://git-wip-us.apache.org/repos/asf/ambari/blob/922828e9/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metrics.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metrics.json b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metrics.json
index 7376d82..e71af2c 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metrics.json
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/metrics.json
@@ -236,7 +236,7 @@
             },
             "metrics/rpcdetailed/renewLease_num_ops": {
               "metric": "rpcdetailed.rpcdetailed.RenewLeaseNumOps",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/rpcdetailed/getFileInfo_avg_time": {
@@ -713,7 +713,7 @@
             },
             "metrics/dfs/FSNamesystem/UnderReplicatedBlocks": {
               "metric": "dfs.FSNamesystem.UnderReplicatedBlocks",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/rpcdetailed/sendHeartbeat_avg_time": {
@@ -758,7 +758,7 @@
             },
             "metrics/rpcdetailed/renewLease_avg_time": {
               "metric": "rpcdetailed.rpcdetailed.RenewLeaseAvgTime",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/default/StartupProgress/ElapsedTime": {
@@ -853,67 +853,67 @@
             },
             "metrics/dfs/FSNamesystem/ExpiredHeartbeats": {
               "metric": "dfs.FSNamesystem.ExpiredHeartbeats",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/LastCheckpointTime": {
               "metric": "dfs.FSNamesystem.LastCheckpointTime",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/LastWrittenTransactionId": {
               "metric": "dfs.FSNamesystem.LastWrittenTransactionId",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/MillisSinceLastLoadedEdits": {
               "metric": "dfs.FSNamesystem.MillisSinceLastLoadedEdits",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/MissingReplOneBlocks": {
               "metric": "dfs.FSNamesystem.MissingReplOneBlocks",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/PendingDataNodeMessageCount": {
               "metric": "dfs.FSNamesystem.PendingDataNodeMessageCount",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/PostponedMisreplicatedBlocks": {
               "metric": "dfs.FSNamesystem.PostponedMisreplicatedBlocks",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/Snapshots": {
               "metric": "dfs.FSNamesystem.Snapshots",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/SnapshottableDirectories": {
               "metric": "dfs.FSNamesystem.SnapshottableDirectories",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/StaleDataNodes": {
               "metric": "dfs.FSNamesystem.StaleDataNodes",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/TotalFiles": {
               "metric": "dfs.FSNamesystem.TotalFiles",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/TransactionsSinceLastCheckpoint": {
               "metric": "dfs.FSNamesystem.TransactionsSinceLastCheckpoint",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/TransactionsSinceLastLogRoll": {
               "metric": "dfs.FSNamesystem.TransactionsSinceLastLogRoll",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/namenode/AllowSnapshotOps": {
@@ -1253,7 +1253,7 @@
               "pointInTime": true,
               "temporal": false
             },
-            "metrics/dfs/FSNamesystem/TransactionsSinceLastCheckpointvvvv": {
+            "metrics/dfs/FSNamesystem/TransactionsSinceLastCheckpoint": {
               "metric": "Hadoop:service=NameNode,name=FSNamesystem.TransactionsSinceLastCheckpoint",
               "pointInTime": true,
               "temporal": false
@@ -2240,7 +2240,7 @@
             },
             "metrics/rpcdetailed/renewLease_num_ops": {
               "metric": "rpcdetailed.rpcdetailed.RenewLeaseNumOps",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/rpcdetailed/getFileInfo_avg_time": {
@@ -2777,7 +2777,7 @@
             },
             "metrics/rpcdetailed/renewLease_avg_time": {
               "metric": "rpcdetailed.rpcdetailed.RenewLeaseAvgTime",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/default/StartupProgress/ElapsedTime": {
@@ -2872,67 +2872,67 @@
             },
             "metrics/dfs/FSNamesystem/ExpiredHeartbeats": {
               "metric": "dfs.FSNamesystem.ExpiredHeartbeats",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/LastCheckpointTime": {
               "metric": "dfs.FSNamesystem.LastCheckpointTime",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/LastWrittenTransactionId": {
               "metric": "dfs.FSNamesystem.LastWrittenTransactionId",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/MillisSinceLastLoadedEdits": {
               "metric": "dfs.FSNamesystem.MillisSinceLastLoadedEdits",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/MissingReplOneBlocks": {
               "metric": "dfs.FSNamesystem.MissingReplOneBlocks",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/PendingDataNodeMessageCount": {
               "metric": "dfs.FSNamesystem.PendingDataNodeMessageCount",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/PostponedMisreplicatedBlocks": {
               "metric": "dfs.FSNamesystem.PostponedMisreplicatedBlocks",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/Snapshots": {
               "metric": "dfs.FSNamesystem.Snapshots",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/SnapshottableDirectories": {
               "metric": "dfs.FSNamesystem.SnapshottableDirectories",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/StaleDataNodes": {
               "metric": "dfs.FSNamesystem.StaleDataNodes",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/TotalFiles": {
               "metric": "dfs.FSNamesystem.TotalFiles",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/TransactionsSinceLastCheckpoint": {
               "metric": "dfs.FSNamesystem.TransactionsSinceLastCheckpoint",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/FSNamesystem/TransactionsSinceLastLogRoll": {
               "metric": "dfs.FSNamesystem.TransactionsSinceLastLogRoll",
-              "pointInTime": true,
+              "pointInTime": false,
               "temporal": true
             },
             "metrics/dfs/namenode/AllowSnapshotOps": {