http://git-wip-us.apache.org/repos/asf/ambari/blob/de6d54c9/ambari-metrics/ambari-metrics-timelineservice/src/main/resources/metrics_def/RESOURCEMANAGER.dat ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-timelineservice/src/main/resources/metrics_def/RESOURCEMANAGER.dat b/ambari-metrics/ambari-metrics-timelineservice/src/main/resources/metrics_def/RESOURCEMANAGER.dat index ec698db..2e45c22 100644 --- a/ambari-metrics/ambari-metrics-timelineservice/src/main/resources/metrics_def/RESOURCEMANAGER.dat +++ b/ambari-metrics/ambari-metrics-timelineservice/src/main/resources/metrics_def/RESOURCEMANAGER.dat @@ -1,88 +1,159 @@ -jvm.JvmMetrics.GcCount -jvm.JvmMetrics.GcCountPS MarkSweep -jvm.JvmMetrics.GcCountPS Scavenge -jvm.JvmMetrics.GcTimeMillis -jvm.JvmMetrics.GcTimeMillisPS MarkSweep -jvm.JvmMetrics.GcTimeMillisPS Scavenge -jvm.JvmMetrics.LogError -jvm.JvmMetrics.LogFatal -jvm.JvmMetrics.LogInfo -jvm.JvmMetrics.LogWarn -jvm.JvmMetrics.MemHeapCommittedM -jvm.JvmMetrics.MemHeapMaxM -jvm.JvmMetrics.MemHeapUsedM -jvm.JvmMetrics.MemMaxM -jvm.JvmMetrics.MemNonHeapCommittedM -jvm.JvmMetrics.MemNonHeapMaxM -jvm.JvmMetrics.MemNonHeapUsedM -jvm.JvmMetrics.ThreadsBlocked -jvm.JvmMetrics.ThreadsNew -jvm.JvmMetrics.ThreadsRunnable -jvm.JvmMetrics.ThreadsTerminated -jvm.JvmMetrics.ThreadsTimedWaiting -jvm.JvmMetrics.ThreadsWaiting -metricssystem.MetricsSystem.DroppedPubAll -metricssystem.MetricsSystem.NumActiveSinks -metricssystem.MetricsSystem.NumActiveSources -metricssystem.MetricsSystem.NumAllSinks -metricssystem.MetricsSystem.NumAllSources -metricssystem.MetricsSystem.PublishAvgTime -metricssystem.MetricsSystem.PublishNumOps -metricssystem.MetricsSystem.Sink_timelineAvgTime -metricssystem.MetricsSystem.Sink_timelineDropped -metricssystem.MetricsSystem.Sink_timelineNumOps -metricssystem.MetricsSystem.Sink_timelineQsize -metricssystem.MetricsSystem.SnapshotAvgTime -metricssystem.MetricsSystem.SnapshotNumOps -rpc.rpc.CallQueueLength -rpc.rpc.NumOpenConnections -rpc.rpc.ReceivedBytes -rpc.rpc.RpcAuthenticationFailures -rpc.rpc.RpcAuthenticationSuccesses -rpc.rpc.RpcAuthorizationFailures -rpc.rpc.RpcAuthorizationSuccesses -rpc.rpc.RpcProcessingTimeAvgTime -rpc.rpc.RpcProcessingTimeNumOps -rpc.rpc.RpcQueueTimeAvgTime -rpc.rpc.RpcQueueTimeNumOps -rpc.rpc.SentBytes -rpcdetailed.rpcdetailed.NodeHeartbeatAvgTime -rpcdetailed.rpcdetailed.NodeHeartbeatNumOps -rpcdetailed.rpcdetailed.RegisterNodeManagerAvgTime -rpcdetailed.rpcdetailed.RegisterNodeManagerNumOps -ugi.UgiMetrics.GetGroupsAvgTime -ugi.UgiMetrics.GetGroupsNumOps -ugi.UgiMetrics.LoginFailureAvgTime -ugi.UgiMetrics.LoginFailureNumOps -ugi.UgiMetrics.LoginSuccessAvgTime -ugi.UgiMetrics.LoginSuccessNumOps -yarn.ClusterMetrics.NumActiveNMs -yarn.ClusterMetrics.NumDecommissionedNMs -yarn.ClusterMetrics.NumLostNMs -yarn.ClusterMetrics.NumRebootedNMs -yarn.ClusterMetrics.NumUnhealthyNMs -yarn.QueueMetrics.ActiveApplications -yarn.QueueMetrics.ActiveUsers -yarn.QueueMetrics.AggregateContainersAllocated -yarn.QueueMetrics.AggregateContainersReleased -yarn.QueueMetrics.AllocatedContainers -yarn.QueueMetrics.AllocatedMB -yarn.QueueMetrics.AllocatedVCores -yarn.QueueMetrics.AppsCompleted -yarn.QueueMetrics.AppsFailed -yarn.QueueMetrics.AppsKilled -yarn.QueueMetrics.AppsPending -yarn.QueueMetrics.AppsRunning -yarn.QueueMetrics.AppsSubmitted -yarn.QueueMetrics.AvailableMB -yarn.QueueMetrics.AvailableVCores -yarn.QueueMetrics.PendingContainers -yarn.QueueMetrics.PendingMB -yarn.QueueMetrics.PendingVCores -yarn.QueueMetrics.ReservedContainers -yarn.QueueMetrics.ReservedMB -yarn.QueueMetrics.ReservedVCores -yarn.QueueMetrics.running_0 -yarn.QueueMetrics.running_1440 -yarn.QueueMetrics.running_300 -yarn.QueueMetrics.running_60 +vm.JvmMetrics.GcCount +jvm.JvmMetrics.GcCountPS MarkSweep +jvm.JvmMetrics.GcCountPS Scavenge +jvm.JvmMetrics.GcTimeMillis +jvm.JvmMetrics.GcTimeMillisPS MarkSweep +jvm.JvmMetrics.GcTimeMillisPS Scavenge +jvm.JvmMetrics.LogError +jvm.JvmMetrics.LogFatal +jvm.JvmMetrics.LogInfo +jvm.JvmMetrics.LogWarn +jvm.JvmMetrics.MemHeapCommittedM +jvm.JvmMetrics.MemHeapMaxM +jvm.JvmMetrics.MemHeapUsedM +jvm.JvmMetrics.MemMaxM +jvm.JvmMetrics.MemNonHeapCommittedM +jvm.JvmMetrics.MemNonHeapMaxM +jvm.JvmMetrics.MemNonHeapUsedM +jvm.JvmMetrics.ThreadsBlocked +jvm.JvmMetrics.ThreadsNew +jvm.JvmMetrics.ThreadsRunnable +jvm.JvmMetrics.ThreadsTerminated +jvm.JvmMetrics.ThreadsTimedWaiting +jvm.JvmMetrics.ThreadsWaiting +metricssystem.MetricsSystem.DroppedPubAll +metricssystem.MetricsSystem.NumActiveSinks +metricssystem.MetricsSystem.NumActiveSources +metricssystem.MetricsSystem.NumAllSinks +metricssystem.MetricsSystem.NumAllSources +metricssystem.MetricsSystem.PublishAvgTime +metricssystem.MetricsSystem.PublishNumOps +metricssystem.MetricsSystem.Sink_timelineAvgTime +metricssystem.MetricsSystem.Sink_timelineDropped +metricssystem.MetricsSystem.Sink_timelineNumOps +metricssystem.MetricsSystem.Sink_timelineQsize +metricssystem.MetricsSystem.SnapshotAvgTime +metricssystem.MetricsSystem.SnapshotNumOps +rpc.rpc.CallQueueLength +rpc.rpc.NumOpenConnections +rpc.rpc.ReceivedBytes +rpc.rpc.RpcAuthenticationFailures +rpc.rpc.RpcAuthenticationSuccesses +rpc.rpc.RpcAuthorizationFailures +rpc.rpc.RpcAuthorizationSuccesses +rpc.rpc.RpcClientBackoff +rpc.rpc.RpcProcessingTimeAvgTime +rpc.rpc.RpcProcessingTimeNumOps +rpc.rpc.RpcQueueTimeAvgTime +rpc.rpc.RpcQueueTimeNumOps +rpc.rpc.RpcSlowCalls +rpc.rpc.SentBytes +rpcdetailed.rpcdetailed.AllocateAvgTime +rpcdetailed.rpcdetailed.AllocateNumOps +rpcdetailed.rpcdetailed.FinishApplicationMasterAvgTime +rpcdetailed.rpcdetailed.FinishApplicationMasterNumOps +rpcdetailed.rpcdetailed.GetApplicationReportAvgTime +rpcdetailed.rpcdetailed.GetApplicationReportNumOps +rpcdetailed.rpcdetailed.GetClusterMetricsAvgTime +rpcdetailed.rpcdetailed.GetClusterMetricsNumOps +rpcdetailed.rpcdetailed.GetClusterNodesAvgTime +rpcdetailed.rpcdetailed.GetClusterNodesNumOps +rpcdetailed.rpcdetailed.GetNewApplicationAvgTime +rpcdetailed.rpcdetailed.GetNewApplicationNumOps +rpcdetailed.rpcdetailed.GetQueueInfoAvgTime +rpcdetailed.rpcdetailed.GetQueueInfoNumOps +rpcdetailed.rpcdetailed.GetQueueUserAclsAvgTime +rpcdetailed.rpcdetailed.GetQueueUserAclsNumOps +rpcdetailed.rpcdetailed.NodeHeartbeatAvgTime +rpcdetailed.rpcdetailed.NodeHeartbeatNumOps +rpcdetailed.rpcdetailed.RegisterApplicationMasterAvgTime +rpcdetailed.rpcdetailed.RegisterApplicationMasterNumOps +rpcdetailed.rpcdetailed.RegisterNodeManagerAvgTime +rpcdetailed.rpcdetailed.RegisterNodeManagerNumOps +rpcdetailed.rpcdetailed.SubmitApplicationAvgTime +rpcdetailed.rpcdetailed.SubmitApplicationNumOps +ugi.UgiMetrics.GetGroupsAvgTime +ugi.UgiMetrics.GetGroupsNumOps +ugi.UgiMetrics.LoginFailureAvgTime +ugi.UgiMetrics.LoginFailureNumOps +ugi.UgiMetrics.LoginSuccessAvgTime +ugi.UgiMetrics.LoginSuccessNumOps +ugi.UgiMetrics.RenewalFailures +ugi.UgiMetrics.RenewalFailuresTotal +yarn.ClusterMetrics.AMLaunchDelayAvgTime +yarn.ClusterMetrics.AMLaunchDelayNumOps +yarn.ClusterMetrics.AMRegisterDelayAvgTime +yarn.ClusterMetrics.AMRegisterDelayNumOps +yarn.ClusterMetrics.NumActiveNMs +yarn.ClusterMetrics.NumDecommissionedNMs +yarn.ClusterMetrics.NumLostNMs +yarn.ClusterMetrics.NumRebootedNMs +yarn.ClusterMetrics.NumUnhealthyNMs +yarn.QueueMetrics.Queue=root.AMResourceLimitMB +yarn.QueueMetrics.Queue=root.AMResourceLimitVCores +yarn.QueueMetrics.Queue=root.ActiveApplications +yarn.QueueMetrics.Queue=root.ActiveUsers +yarn.QueueMetrics.Queue=root.AggregateContainersAllocated +yarn.QueueMetrics.Queue=root.AggregateContainersReleased +yarn.QueueMetrics.Queue=root.AggregateNodeLocalContainersAllocated +yarn.QueueMetrics.Queue=root.AggregateOffSwitchContainersAllocated +yarn.QueueMetrics.Queue=root.AggregateRackLocalContainersAllocated +yarn.QueueMetrics.Queue=root.AllocatedContainers +yarn.QueueMetrics.Queue=root.AllocatedMB +yarn.QueueMetrics.Queue=root.AllocatedVCores +yarn.QueueMetrics.Queue=root.AppAttemptFirstContainerAllocationDelayAvgTime +yarn.QueueMetrics.Queue=root.AppAttemptFirstContainerAllocationDelayNumOps +yarn.QueueMetrics.Queue=root.AppsCompleted +yarn.QueueMetrics.Queue=root.AppsFailed +yarn.QueueMetrics.Queue=root.AppsKilled +yarn.QueueMetrics.Queue=root.AppsPending +yarn.QueueMetrics.Queue=root.AppsRunning +yarn.QueueMetrics.Queue=root.AppsSubmitted +yarn.QueueMetrics.Queue=root.AvailableMB +yarn.QueueMetrics.Queue=root.AvailableVCores +yarn.QueueMetrics.Queue=root.PendingContainers +yarn.QueueMetrics.Queue=root.PendingMB +yarn.QueueMetrics.Queue=root.PendingVCores +yarn.QueueMetrics.Queue=root.ReservedContainers +yarn.QueueMetrics.Queue=root.ReservedMB +yarn.QueueMetrics.Queue=root.ReservedVCores +yarn.QueueMetrics.Queue=root.UsedAMResourceMB +yarn.QueueMetrics.Queue=root.UsedAMResourceVCores +yarn.QueueMetrics.Queue=root.default.AMResourceLimitMB +yarn.QueueMetrics.Queue=root.default.AMResourceLimitVCores +yarn.QueueMetrics.Queue=root.default.ActiveApplications +yarn.QueueMetrics.Queue=root.default.ActiveUsers +yarn.QueueMetrics.Queue=root.default.AggregateContainersAllocated +yarn.QueueMetrics.Queue=root.default.AggregateContainersReleased +yarn.QueueMetrics.Queue=root.default.AggregateNodeLocalContainersAllocated +yarn.QueueMetrics.Queue=root.default.AggregateOffSwitchContainersAllocated +yarn.QueueMetrics.Queue=root.default.AggregateRackLocalContainersAllocated +yarn.QueueMetrics.Queue=root.default.AllocatedContainers +yarn.QueueMetrics.Queue=root.default.AllocatedMB +yarn.QueueMetrics.Queue=root.default.AllocatedVCores +yarn.QueueMetrics.Queue=root.default.AppAttemptFirstContainerAllocationDelayAvgTime +yarn.QueueMetrics.Queue=root.default.AppAttemptFirstContainerAllocationDelayNumOps +yarn.QueueMetrics.Queue=root.default.AppsCompleted +yarn.QueueMetrics.Queue=root.default.AppsFailed +yarn.QueueMetrics.Queue=root.default.AppsKilled +yarn.QueueMetrics.Queue=root.default.AppsPending +yarn.QueueMetrics.Queue=root.default.AppsRunning +yarn.QueueMetrics.Queue=root.default.AppsSubmitted +yarn.QueueMetrics.Queue=root.default.AvailableMB +yarn.QueueMetrics.Queue=root.default.AvailableVCores +yarn.QueueMetrics.Queue=root.default.PendingContainers +yarn.QueueMetrics.Queue=root.default.PendingMB +yarn.QueueMetrics.Queue=root.default.PendingVCores +yarn.QueueMetrics.Queue=root.default.ReservedContainers +yarn.QueueMetrics.Queue=root.default.ReservedMB +yarn.QueueMetrics.Queue=root.default.ReservedVCores +yarn.QueueMetrics.Queue=root.default.UsedAMResourceMB +yarn.QueueMetrics.Queue=root.default.UsedAMResourceVCores +yarn.QueueMetrics.Queue=root.default.running_0 +yarn.QueueMetrics.Queue=root.default.running_1440 +yarn.QueueMetrics.Queue=root.default.running_300 +yarn.QueueMetrics.Queue=root.default.running_60 +yarn.QueueMetrics.Queue=root.running_0 +yarn.QueueMetrics.Queue=root.running_1440 +yarn.QueueMetrics.Queue=root.running_300 +yarn.QueueMetrics.Queue=root.running_60 \ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/de6d54c9/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/loadsimulator/jmetertest/jmetertest/AMSJMeterLoadTest.java ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/loadsimulator/jmetertest/jmetertest/AMSJMeterLoadTest.java b/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/loadsimulator/jmetertest/jmetertest/AMSJMeterLoadTest.java index c34ac20..7f168f2 100644 --- a/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/loadsimulator/jmetertest/jmetertest/AMSJMeterLoadTest.java +++ b/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/loadsimulator/jmetertest/jmetertest/AMSJMeterLoadTest.java @@ -45,8 +45,10 @@ public class AMSJMeterLoadTest { private List<AppGetMetric> appGetMetrics; private Properties amsJmeterProperties = null; - public AMSJMeterLoadTest(String testType, String userDefinedPropertiesFile) { + public AMSJMeterLoadTest(Map<String, String> args) { + String testType = args.get("type"); + String userDefinedPropertiesFile = args.get("amsJmeterPropertiesFile"); if (null == userDefinedPropertiesFile || userDefinedPropertiesFile.isEmpty()) { this.amsJmeterProperties = readProperties(PROPERTIES_FILE); } else { @@ -60,12 +62,14 @@ public class AMSJMeterLoadTest { this.runTest(numInstances); } else { //PUT Metrics simulator Map<String, String> mapArgs = new HashMap<String, String>(); - mapArgs.put("hostName", amsJmeterProperties.getProperty("host-prefix")); - mapArgs.put("numberOfHosts", amsJmeterProperties.getProperty("num-hosts")); - mapArgs.put("metricsHostName", amsJmeterProperties.getProperty("ams-host-port")); - mapArgs.put("collectInterval", amsJmeterProperties.getProperty("collection-interval")); - mapArgs.put("sendInterval", amsJmeterProperties.getProperty("send-interval")); - mapArgs.put("master", amsJmeterProperties.getProperty("create-master")); + mapArgs.put("hostName", (args.get("host-prefix") != null) ? args.get("host-prefix") : amsJmeterProperties.getProperty("host-prefix")); + mapArgs.put("minHostIndex", (args.get("min-host-index") != null) ? args.get("min-host-index") : amsJmeterProperties.getProperty("min-host-index")); + mapArgs.put("numberOfHosts", (args.get("num-hosts") != null) ? args.get("num-hosts") : amsJmeterProperties.getProperty("num-hosts")); + mapArgs.put("metricsHostName", (args.get("ams-host-port") != null) ? args.get("ams-host-port") : amsJmeterProperties.getProperty("ams-host-port")); + mapArgs.put("collectInterval", (args.get("collection-interval") != null) ? args.get("collection-interval") : amsJmeterProperties.getProperty("collection-interval")); + mapArgs.put("sendInterval", (args.get("send-interval") != null) ? args.get("send-interval") : amsJmeterProperties.getProperty("send-interval")); + mapArgs.put("master", (args.get("create-master") != null) ? args.get("create-master") : amsJmeterProperties.getProperty("create-master")); + System.out.println("AMS Load Simulation Parameters : " + mapArgs); MetricsLoadSimulator.startTest(mapArgs); } } @@ -165,9 +169,7 @@ public class AMSJMeterLoadTest { */ public static void main(String[] args) { Map<String, String> mapArgs = parseArgs(args); - String testType = mapArgs.get("type"); - String amsJmeterPropertiesFile = mapArgs.get("amsJmeterPropertiesFile"); - new AMSJMeterLoadTest(testType, amsJmeterPropertiesFile); + new AMSJMeterLoadTest(mapArgs); } private static Map<String, String> parseArgs(String[] args) { @@ -178,14 +180,7 @@ public class AMSJMeterLoadTest { } else { for (int i = 0; i < args.length; i += 2) { String arg = args[i]; - if (arg.equals("-t")) { - mapProps.put("type", args[i + 1]); - } else if (arg.equals("-p")) { - mapProps.put("amsJmeterPropertiesFile", args[i + 1]); - } else { - printUsage(); - throw new IllegalArgumentException("Unexpected argument, See usage message."); - } + mapProps.put(arg.substring(1), args[i+1]); } } return mapProps; @@ -194,7 +189,8 @@ public class AMSJMeterLoadTest { public static void printUsage() { System.err.println("Usage: java AMSJmeterLoadTest [OPTIONS]"); System.err.println("Options: "); - System.err.println("[-t type (S=>Sink/U=>UI)] [-p amsJmeterPropertiesFile (Optional)]"); + System.err.println("[--t type (S=>Sink/U=>UI)] [-ams-host-port localhost:6188] [-min-host-index 2] [-host-prefix TestHost.] [-num-hosts 2] " + + "[-create-master true] [-collection-interval 10000 ] [-send-interval 60000 ] [-p amsJmeterPropertiesFile (Optional)]"); } } http://git-wip-us.apache.org/repos/asf/ambari/blob/de6d54c9/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TimelineMetricsFilterTest.java ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TimelineMetricsFilterTest.java b/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TimelineMetricsFilterTest.java index 73c66fe..81da5c8 100644 --- a/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TimelineMetricsFilterTest.java +++ b/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TimelineMetricsFilterTest.java @@ -147,4 +147,74 @@ public class TimelineMetricsFilterTest { Assert.assertTrue(TimelineMetricsFilter.acceptMetric(timelineMetric)); } + @Test + public void testHybridFilter() throws Exception { + + // Whitelist Apps - namenode, nimbus + // Blacklist Apps - datanode, kafka_broker + // Accept ams-hbase whitelisting. + // Reject non whitelisted metrics from non whitelisted Apps (Say hbase) + + TimelineMetricConfiguration configuration = EasyMock.createNiceMock(TimelineMetricConfiguration.class); + + Configuration metricsConf = new Configuration(); + metricsConf.set("timeline.metrics.apps.whitelist", "namenode,nimbus"); + metricsConf.set("timeline.metrics.apps.blacklist", "datanode,kafka_broker"); + URL fileUrl = ClassLoader.getSystemResource("test_data/metric_whitelist.dat"); + metricsConf.set("timeline.metrics.whitelist.file", fileUrl.getPath()); + expect(configuration.getMetricsConf()).andReturn(metricsConf).once(); + + Set<String> whitelist = new HashSet(); + whitelist.add("regionserver.Server.Delete_99th_percentile"); + whitelist.add("regionserver.Server.Delete_max"); + whitelist.add("regionserver.Server.Delete_mean"); + expect(configuration.getAmshbaseWhitelist()).andReturn(whitelist).once(); + + replay(configuration); + + TimelineMetricsFilter.initializeMetricFilter(configuration); + + TimelineMetric timelineMetric = new TimelineMetric(); + + //Test App Whitelisting + timelineMetric.setMetricName("metric.a.b.c"); + timelineMetric.setAppId("namenode"); + Assert.assertTrue(TimelineMetricsFilter.acceptMetric(timelineMetric)); + + timelineMetric.setMetricName("metric.d.e.f"); + timelineMetric.setAppId("nimbus"); + Assert.assertTrue(TimelineMetricsFilter.acceptMetric(timelineMetric)); + + //Test App Blacklisting + timelineMetric.setMetricName("metric.d.e.f"); + timelineMetric.setAppId("datanode"); + Assert.assertFalse(TimelineMetricsFilter.acceptMetric(timelineMetric)); + + timelineMetric.setMetricName("metric.d.e.f"); + timelineMetric.setAppId("kafka_broker"); + Assert.assertFalse(TimelineMetricsFilter.acceptMetric(timelineMetric)); + + + //Test ams-hbase Whitelisting + timelineMetric.setMetricName("regionserver.Server.Delete_max"); + timelineMetric.setAppId("ams-hbase"); + Assert.assertTrue(TimelineMetricsFilter.acceptMetric(timelineMetric)); + + timelineMetric.setMetricName("regionserver.Server.Delete_min3333"); + timelineMetric.setAppId("ams-hbase"); + Assert.assertFalse(TimelineMetricsFilter.acceptMetric(timelineMetric)); + + timelineMetric.setMetricName("regionserver.Server.Delete_mean"); + timelineMetric.setAppId("ams-hbase"); + Assert.assertTrue(TimelineMetricsFilter.acceptMetric(timelineMetric)); + + //Test Metric Whitelisting + timelineMetric.setMetricName("regionserver.WAL.SyncTime_max"); + timelineMetric.setAppId("hbase"); + Assert.assertTrue(TimelineMetricsFilter.acceptMetric(timelineMetric)); + + timelineMetric.setMetricName("regionserver.WAL.metric.not.needed"); + timelineMetric.setAppId("hbase"); + Assert.assertFalse(TimelineMetricsFilter.acceptMetric(timelineMetric)); + } } http://git-wip-us.apache.org/repos/asf/ambari/blob/de6d54c9/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/loadsimulator/README ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/loadsimulator/README b/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/loadsimulator/README index 39e5365..eec3e5d 100644 --- a/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/loadsimulator/README +++ b/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/loadsimulator/README @@ -41,7 +41,7 @@ 2. Build the ambari-metrics-timelineservice jar. 3. Invoke the test using the command as follows. - java -cp lib/*:ambari-metrics-timelineservice-<version>.jar org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.loadsimulator.jmeter.AMSJMeterLoadTest -t <S/U> + java -cp lib/*:ambari-metrics-timelineservice-<version>.jar org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.loadsimulator.jmetertest.jmetertest.AMSJMeterLoadTest -t <S/U> lib/* -> All the dependency JARs generated for the ambari-metrics-timelineservice JAR. -t option => S-Sink simulator or U-UI simulator http://git-wip-us.apache.org/repos/asf/ambari/blob/de6d54c9/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/loadsimulator/ams-jmeter.properties ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/loadsimulator/ams-jmeter.properties b/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/loadsimulator/ams-jmeter.properties index 2c44d89..04293df 100644 --- a/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/loadsimulator/ams-jmeter.properties +++ b/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/loadsimulator/ams-jmeter.properties @@ -17,13 +17,13 @@ # limitations under the License. #AMS information -ams-host-port=c6402.ambari.apache.org:6188 +ams-host-port=localhost:6188 ams-path=/ws/v1/timeline/metrics # Host Information, using the host-prefix, num-hosts and <MASTER>-host # Hosts in this case will be TestHost0, TestHost1 # For example NAMENODE, NIMBUS,HBASE MASTER,RESOURCEMANAGER host will be TestHost0 -host-prefix=TestHost +host-prefix=TestHost. host-suffix= min-host-index=0 num-hosts=2 @@ -33,8 +33,8 @@ HBASE-host=0 RESOURCEMANAGER-host=0 # PUT Metric / Sinks config -collection-interval=1000 -send-interval=3000 +collection-interval=10000 +send-interval=60000 create-master=true # GET Metric / Client Apps config http://git-wip-us.apache.org/repos/asf/ambari/blob/de6d54c9/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/test_data/metric_whitelist.dat ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/test_data/metric_whitelist.dat b/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/test_data/metric_whitelist.dat index 9f5e25c..2c36031 100644 --- a/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/test_data/metric_whitelist.dat +++ b/ambari-metrics/ambari-metrics-timelineservice/src/test/resources/test_data/metric_whitelist.dat @@ -2,5 +2,7 @@ cpu_system cpu_user mem_cached mem_free +regionserver.WAL.SyncTime_max +regionserver.WAL.SyncTime_mean ._p_dfs.FSNamesystem.* ._p_jvm.JvmMetrics* \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/de6d54c9/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/FLUME.txt ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/FLUME.txt b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/FLUME.txt index b3bfec3..376490a 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/FLUME.txt +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/FLUME.txt @@ -1,17 +1,17 @@ BatchCompleteCount +BatchEmptyCount BatchUnderflowCount -EventTakeSuccessCount +ChannelCapacity +ChannelFillPercentage +ChannelSize ConnectionClosedCount ConnectionCreatedCount -ChannelCapacity ConnectionFailedCount EventDrainAttemptCount -ChannelFillPercentage EventDrainSuccessCount -BatchEmptyCount EventPutAttemptCount -ChannelSize EventPutSuccessCount -StartTime -StopTime +EventTakeSuccessCount EventTakeAttemptCount +StartTime +StopTime \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/de6d54c9/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/HDFS.txt ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/HDFS.txt b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/HDFS.txt index 84576e9..14956ca 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/HDFS.txt +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/HDFS.txt @@ -48,6 +48,7 @@ dfs.FSNamesystem.MissingBlocks dfs.FSNamesystem.MissingReplOneBlocks dfs.FSNamesystem.NumActiveClients dfs.FSNamesystem.NumFilesUnderConstruction +dfs.FSNamesystem.NumTimedOutPendingReplications dfs.FSNamesystem.PendingDataNodeMessageCount dfs.FSNamesystem.PendingDeletionBlocks dfs.FSNamesystem.PendingReplicationBlocks @@ -62,6 +63,23 @@ dfs.FSNamesystem.TotalSyncCount dfs.FSNamesystem.TransactionsSinceLastCheckpoint dfs.FSNamesystem.TransactionsSinceLastLogRoll dfs.FSNamesystem.UnderReplicatedBlocks +dfs.FsVolume.DataFileIoRateAvgTime +dfs.FsVolume.DataFileIoRateNumOps +dfs.FsVolume.FileIoErrorRateAvgTime +dfs.FsVolume.FileIoErrorRateNumOps +dfs.FsVolume.FlushIoRateAvgTime +dfs.FsVolume.FlushIoRateNumOps +dfs.FsVolume.MetadataOperationRateAvgTime +dfs.FsVolume.MetadataOperationRateNumOps +dfs.FsVolume.ReadIoRateAvgTime +dfs.FsVolume.ReadIoRateNumOps +dfs.FsVolume.SyncIoRateAvgTime +dfs.FsVolume.SyncIoRateNumOps +dfs.FsVolume.TotalDataFileIos +dfs.FsVolume.TotalFileIoErrors +dfs.FsVolume.TotalMetadataOperations +dfs.FsVolume.WriteIoRateAvgTime +dfs.FsVolume.WriteIoRateNumOps dfs.datanode.BlockChecksumOpAvgTime dfs.datanode.BlockChecksumOpNumOps dfs.datanode.BlockReportsAvgTime @@ -81,6 +99,7 @@ dfs.datanode.CacheReportsAvgTime dfs.datanode.CacheReportsNumOps dfs.datanode.CopyBlockOpAvgTime dfs.datanode.CopyBlockOpNumOps +dfs.datanode.DataNodeActiveXceiversCount dfs.datanode.DatanodeNetworkErrors dfs.datanode.FlushNanosAvgTime dfs.datanode.FlushNanosNumOps @@ -89,8 +108,12 @@ dfs.datanode.FsyncNanosAvgTime dfs.datanode.FsyncNanosNumOps dfs.datanode.HeartbeatsAvgTime dfs.datanode.HeartbeatsNumOps +dfs.datanode.HeartbeatsTotalAvgTime +dfs.datanode.HeartbeatsTotalNumOps dfs.datanode.IncrementalBlockReportsAvgTime dfs.datanode.IncrementalBlockReportsNumOps +dfs.datanode.LifelinesAvgTime +dfs.datanode.LifelinesNumOps dfs.datanode.PacketAckRoundTripTimeNanosAvgTime dfs.datanode.PacketAckRoundTripTimeNanosNumOps dfs.datanode.RamDiskBlocksDeletedBeforeLazyPersisted @@ -127,6 +150,8 @@ dfs.datanode.WritesFromLocalClient dfs.datanode.WritesFromRemoteClient dfs.namenode.AddBlockOps dfs.namenode.AllowSnapshotOps +dfs.namenode.BlockOpsBatched +dfs.namenode.BlockOpsQueued dfs.namenode.BlockReceivedAndDeletedOps dfs.namenode.BlockReportAvgTime dfs.namenode.BlockReportNumOps @@ -223,55 +248,95 @@ rpc.rpc.RpcQueueTimeAvgTime rpc.rpc.RpcQueueTimeNumOps rpc.rpc.RpcSlowCalls rpc.rpc.SentBytes -rpcdetailed.rpcdetailed.AddBlockAvgTime -rpcdetailed.rpcdetailed.AddBlockNumOps -rpcdetailed.rpcdetailed.BlockReceivedAndDeletedAvgTime -rpcdetailed.rpcdetailed.BlockReceivedAndDeletedNumOps -rpcdetailed.rpcdetailed.BlockReportAvgTime -rpcdetailed.rpcdetailed.BlockReportNumOps -rpcdetailed.rpcdetailed.CompleteAvgTime -rpcdetailed.rpcdetailed.CompleteNumOps -rpcdetailed.rpcdetailed.CreateAvgTime -rpcdetailed.rpcdetailed.CreateNumOps -rpcdetailed.rpcdetailed.DeleteAvgTime -rpcdetailed.rpcdetailed.DeleteNumOps -rpcdetailed.rpcdetailed.FsyncAvgTime -rpcdetailed.rpcdetailed.FsyncNumOps -rpcdetailed.rpcdetailed.GetBlockLocationsAvgTime -rpcdetailed.rpcdetailed.GetBlockLocationsNumOps -rpcdetailed.rpcdetailed.GetFileInfoAvgTime -rpcdetailed.rpcdetailed.GetFileInfoNumOps -rpcdetailed.rpcdetailed.GetListingAvgTime -rpcdetailed.rpcdetailed.GetListingNumOps -rpcdetailed.rpcdetailed.GetServerDefaultsAvgTime -rpcdetailed.rpcdetailed.GetServerDefaultsNumOps -rpcdetailed.rpcdetailed.GetTransactionIdAvgTime -rpcdetailed.rpcdetailed.GetTransactionIdNumOps -rpcdetailed.rpcdetailed.MkdirsAvgTime -rpcdetailed.rpcdetailed.MkdirsNumOps -rpcdetailed.rpcdetailed.RegisterDatanodeAvgTime -rpcdetailed.rpcdetailed.RegisterDatanodeNumOps -rpcdetailed.rpcdetailed.Rename2AvgTime -rpcdetailed.rpcdetailed.Rename2NumOps -rpcdetailed.rpcdetailed.RenameAvgTime -rpcdetailed.rpcdetailed.RenameNumOps -rpcdetailed.rpcdetailed.RenewLeaseAvgTime -rpcdetailed.rpcdetailed.RenewLeaseNumOps -rpcdetailed.rpcdetailed.SendHeartbeatAvgTime -rpcdetailed.rpcdetailed.SendHeartbeatNumOps -rpcdetailed.rpcdetailed.SetPermissionAvgTime -rpcdetailed.rpcdetailed.SetPermissionNumOps -rpcdetailed.rpcdetailed.SetReplicationAvgTime -rpcdetailed.rpcdetailed.SetReplicationNumOps -rpcdetailed.rpcdetailed.SetSafeModeAvgTime -rpcdetailed.rpcdetailed.SetSafeModeNumOps -rpcdetailed.rpcdetailed.SetTimesAvgTime -rpcdetailed.rpcdetailed.SetTimesNumOps -rpcdetailed.rpcdetailed.VersionRequestAvgTime -rpcdetailed.rpcdetailed.VersionRequestNumOps +rpc.rpc.client.CallQueueLength +rpc.rpc.client.NumOpenConnections +rpc.rpc.client.ReceivedBytes +rpc.rpc.client.RpcAuthenticationFailures +rpc.rpc.client.RpcAuthenticationSuccesses +rpc.rpc.client.RpcAuthorizationFailures +rpc.rpc.client.RpcAuthorizationSuccesses +rpc.rpc.client.RpcClientBackoff +rpc.rpc.client.RpcProcessingTimeAvgTime +rpc.rpc.client.RpcProcessingTimeNumOps +rpc.rpc.client.RpcQueueTimeAvgTime +rpc.rpc.client.RpcQueueTimeNumOps +rpc.rpc.client.RpcSlowCalls +rpc.rpc.client.SentBytes +rpcdetailed.rpcdetailed.InitReplicaRecoveryAvgTime +rpcdetailed.rpcdetailed.InitReplicaRecoveryNumOps +rpcdetailed.rpcdetailed.UpdateReplicaUnderRecoveryAvgTime +rpcdetailed.rpcdetailed.UpdateReplicaUnderRecoveryNumOps +rpcdetailed.rpcdetailed.client.AddBlockAvgTime +rpcdetailed.rpcdetailed.client.AddBlockNumOps +rpcdetailed.rpcdetailed.client.BlockReceivedAndDeletedAvgTime +rpcdetailed.rpcdetailed.client.BlockReceivedAndDeletedNumOps +rpcdetailed.rpcdetailed.client.BlockReportAvgTime +rpcdetailed.rpcdetailed.client.BlockReportNumOps +rpcdetailed.rpcdetailed.client.CheckAccessAvgTime +rpcdetailed.rpcdetailed.client.CheckAccessNumOps +rpcdetailed.rpcdetailed.client.CommitBlockSynchronizationAvgTime +rpcdetailed.rpcdetailed.client.CommitBlockSynchronizationNumOps +rpcdetailed.rpcdetailed.client.CompleteAvgTime +rpcdetailed.rpcdetailed.client.CompleteNumOps +rpcdetailed.rpcdetailed.client.CreateAvgTime +rpcdetailed.rpcdetailed.client.CreateNumOps +rpcdetailed.rpcdetailed.client.DeleteAvgTime +rpcdetailed.rpcdetailed.client.DeleteNumOps +rpcdetailed.rpcdetailed.client.FsyncAvgTime +rpcdetailed.rpcdetailed.client.FsyncNumOps +rpcdetailed.rpcdetailed.client.GetBlockLocationsAvgTime +rpcdetailed.rpcdetailed.client.GetBlockLocationsNumOps +rpcdetailed.rpcdetailed.client.GetEditLogManifestAvgTime +rpcdetailed.rpcdetailed.client.GetEditLogManifestNumOps +rpcdetailed.rpcdetailed.client.GetFileInfoAvgTime +rpcdetailed.rpcdetailed.client.GetFileInfoNumOps +rpcdetailed.rpcdetailed.client.GetListingAvgTime +rpcdetailed.rpcdetailed.client.GetListingNumOps +rpcdetailed.rpcdetailed.client.GetServerDefaultsAvgTime +rpcdetailed.rpcdetailed.client.GetServerDefaultsNumOps +rpcdetailed.rpcdetailed.client.GetTransactionIdAvgTime +rpcdetailed.rpcdetailed.client.GetTransactionIdNumOps +rpcdetailed.rpcdetailed.client.IsRollingUpgradeAvgTime +rpcdetailed.rpcdetailed.client.IsRollingUpgradeNumOps +rpcdetailed.rpcdetailed.client.ListEncryptionZonesAvgTime +rpcdetailed.rpcdetailed.client.ListEncryptionZonesNumOps +rpcdetailed.rpcdetailed.client.MkdirsAvgTime +rpcdetailed.rpcdetailed.client.MkdirsNumOps +rpcdetailed.rpcdetailed.client.PathIsNotEmptyDirectoryExceptionAvgTime +rpcdetailed.rpcdetailed.client.PathIsNotEmptyDirectoryExceptionNumOps +rpcdetailed.rpcdetailed.client.RecoverLeaseAvgTime +rpcdetailed.rpcdetailed.client.RecoverLeaseNumOps +rpcdetailed.rpcdetailed.client.RegisterDatanodeAvgTime +rpcdetailed.rpcdetailed.client.RegisterDatanodeNumOps +rpcdetailed.rpcdetailed.client.Rename2AvgTime +rpcdetailed.rpcdetailed.client.Rename2NumOps +rpcdetailed.rpcdetailed.client.RenameAvgTime +rpcdetailed.rpcdetailed.client.RenameNumOps +rpcdetailed.rpcdetailed.client.RenewLeaseAvgTime +rpcdetailed.rpcdetailed.client.RenewLeaseNumOps +rpcdetailed.rpcdetailed.client.RetriableExceptionAvgTime +rpcdetailed.rpcdetailed.client.RetriableExceptionNumOps +rpcdetailed.rpcdetailed.client.RollEditLogAvgTime +rpcdetailed.rpcdetailed.client.RollEditLogNumOps +rpcdetailed.rpcdetailed.client.SafeModeExceptionAvgTime +rpcdetailed.rpcdetailed.client.SafeModeExceptionNumOps +rpcdetailed.rpcdetailed.client.SendHeartbeatAvgTime +rpcdetailed.rpcdetailed.client.SendHeartbeatNumOps +rpcdetailed.rpcdetailed.client.SetPermissionAvgTime +rpcdetailed.rpcdetailed.client.SetPermissionNumOps +rpcdetailed.rpcdetailed.client.SetReplicationAvgTime +rpcdetailed.rpcdetailed.client.SetReplicationNumOps +rpcdetailed.rpcdetailed.client.SetSafeModeAvgTime +rpcdetailed.rpcdetailed.client.SetSafeModeNumOps +rpcdetailed.rpcdetailed.client.SetTimesAvgTime +rpcdetailed.rpcdetailed.client.SetTimesNumOps +rpcdetailed.rpcdetailed.client.VersionRequestAvgTime +rpcdetailed.rpcdetailed.client.VersionRequestNumOps ugi.UgiMetrics.GetGroupsAvgTime ugi.UgiMetrics.GetGroupsNumOps ugi.UgiMetrics.LoginFailureAvgTime ugi.UgiMetrics.LoginFailureNumOps ugi.UgiMetrics.LoginSuccessAvgTime ugi.UgiMetrics.LoginSuccessNumOps +ugi.UgiMetrics.RenewalFailures +ugi.UgiMetrics.RenewalFailuresTotal http://git-wip-us.apache.org/repos/asf/ambari/blob/de6d54c9/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/HIVE.txt ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/HIVE.txt b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/HIVE.txt new file mode 100644 index 0000000..8b7a893 --- /dev/null +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/HIVE.txt @@ -0,0 +1,181 @@ +default.General.active_calls_api_create_table +default.General.active_calls_api_drop_table +default.General.active_calls_api_get_all_databases +default.General.active_calls_api_get_database +default.General.active_calls_api_get_functions +default.General.active_calls_api_get_table +default.General.active_calls_api_get_tables +default.General.api_create_table_15min_rate +default.General.api_create_table_1min_rate +default.General.api_create_table_5min_rate +default.General.api_create_table_75thpercentile +default.General.api_create_table_95thpercentile +default.General.api_create_table_98thpercentile +default.General.api_create_table_999thpercentile +default.General.api_create_table_99thpercentile +default.General.api_create_table_count +default.General.api_create_table_max +default.General.api_create_table_mean +default.General.api_create_table_mean_rate +default.General.api_create_table_median +default.General.api_create_table_min +default.General.api_create_table_stddev +default.General.api_drop_table_15min_rate +default.General.api_drop_table_1min_rate +default.General.api_drop_table_5min_rate +default.General.api_drop_table_75thpercentile +default.General.api_drop_table_95thpercentile +default.General.api_drop_table_98thpercentile +default.General.api_drop_table_999thpercentile +default.General.api_drop_table_99thpercentile +default.General.api_drop_table_count +default.General.api_drop_table_max +default.General.api_drop_table_mean +default.General.api_drop_table_mean_rate +default.General.api_drop_table_median +default.General.api_drop_table_min +default.General.api_drop_table_stddev +default.General.api_get_all_databases_15min_rate +default.General.api_get_all_databases_1min_rate +default.General.api_get_all_databases_5min_rate +default.General.api_get_all_databases_75thpercentile +default.General.api_get_all_databases_95thpercentile +default.General.api_get_all_databases_98thpercentile +default.General.api_get_all_databases_999thpercentile +default.General.api_get_all_databases_99thpercentile +default.General.api_get_all_databases_count +default.General.api_get_all_databases_max +default.General.api_get_all_databases_mean +default.General.api_get_all_databases_mean_rate +default.General.api_get_all_databases_median +default.General.api_get_all_databases_min +default.General.api_get_all_databases_stddev +default.General.api_get_database_15min_rate +default.General.api_get_database_1min_rate +default.General.api_get_database_5min_rate +default.General.api_get_database_75thpercentile +default.General.api_get_database_95thpercentile +default.General.api_get_database_98thpercentile +default.General.api_get_database_999thpercentile +default.General.api_get_database_99thpercentile +default.General.api_get_database_count +default.General.api_get_database_max +default.General.api_get_database_mean +default.General.api_get_database_mean_rate +default.General.api_get_database_median +default.General.api_get_database_min +default.General.api_get_database_stddev +default.General.api_get_functions_15min_rate +default.General.api_get_functions_1min_rate +default.General.api_get_functions_5min_rate +default.General.api_get_functions_75thpercentile +default.General.api_get_functions_95thpercentile +default.General.api_get_functions_98thpercentile +default.General.api_get_functions_999thpercentile +default.General.api_get_functions_99thpercentile +default.General.api_get_functions_count +default.General.api_get_functions_max +default.General.api_get_functions_mean +default.General.api_get_functions_mean_rate +default.General.api_get_functions_median +default.General.api_get_functions_min +default.General.api_get_functions_stddev +default.General.api_get_table_15min_rate +default.General.api_get_table_1min_rate +default.General.api_get_table_5min_rate +default.General.api_get_table_75thpercentile +default.General.api_get_table_95thpercentile +default.General.api_get_table_98thpercentile +default.General.api_get_table_999thpercentile +default.General.api_get_table_99thpercentile +default.General.api_get_table_count +default.General.api_get_table_max +default.General.api_get_table_mean +default.General.api_get_table_mean_rate +default.General.api_get_table_median +default.General.api_get_table_min +default.General.api_get_table_stddev +default.General.api_get_tables_15min_rate +default.General.api_get_tables_1min_rate +default.General.api_get_tables_5min_rate +default.General.api_get_tables_75thpercentile +default.General.api_get_tables_95thpercentile +default.General.api_get_tables_98thpercentile +default.General.api_get_tables_999thpercentile +default.General.api_get_tables_99thpercentile +default.General.api_get_tables_count +default.General.api_get_tables_max +default.General.api_get_tables_mean +default.General.api_get_tables_mean_rate +default.General.api_get_tables_median +default.General.api_get_tables_min +default.General.api_get_tables_stddev +default.General.buffers.direct.capacity +default.General.buffers.direct.count +default.General.buffers.direct.used +default.General.buffers.mapped.capacity +default.General.buffers.mapped.count +default.General.buffers.mapped.used +default.General.classLoading.loaded +default.General.classLoading.unloaded +default.General.create_total_count_tables +default.General.delete_total_count_tables +default.General.gc.PS-MarkSweep.count +default.General.gc.PS-MarkSweep.time +default.General.gc.PS-Scavenge.count +default.General.gc.PS-Scavenge.time +default.General.init_total_count_dbs +default.General.init_total_count_partitions +default.General.init_total_count_tables +default.General.jvm.pause.extraSleepTime +default.General.memory.heap.committed +default.General.memory.heap.init +default.General.memory.heap.max +default.General.memory.heap.usage +default.General.memory.heap.used +default.General.memory.non-heap.committed +default.General.memory.non-heap.init +default.General.memory.non-heap.max +default.General.memory.non-heap.usage +default.General.memory.non-heap.used +default.General.memory.pools.Code-Cache.usage +default.General.memory.pools.Compressed-Class-Space.usage +default.General.memory.pools.Metaspace.usage +default.General.memory.pools.PS-Eden-Space.usage +default.General.memory.pools.PS-Old-Gen.usage +default.General.memory.pools.PS-Survivor-Space.usage +default.General.memory.total.committed +default.General.memory.total.init +default.General.memory.total.max +default.General.memory.total.used +default.General.open_connections +default.General.threads.blocked.count +default.General.threads.count +default.General.threads.daemon.count +default.General.threads.deadlock.count +default.General.threads.new.count +default.General.threads.runnable.count +default.General.threads.terminated.count +default.General.threads.timed_waiting.count +default.General.threads.waiting.count +metricssystem.MetricsSystem.DroppedPubAll +metricssystem.MetricsSystem.NumActiveSinks +metricssystem.MetricsSystem.NumActiveSources +metricssystem.MetricsSystem.NumAllSinks +metricssystem.MetricsSystem.NumAllSources +metricssystem.MetricsSystem.PublishAvgTime +metricssystem.MetricsSystem.PublishNumOps +metricssystem.MetricsSystem.Sink_timelineAvgTime +metricssystem.MetricsSystem.Sink_timelineDropped +metricssystem.MetricsSystem.Sink_timelineNumOps +metricssystem.MetricsSystem.Sink_timelineQsize +metricssystem.MetricsSystem.SnapshotAvgTime +metricssystem.MetricsSystem.SnapshotNumOps +ugi.UgiMetrics.GetGroupsAvgTime +ugi.UgiMetrics.GetGroupsNumOps +ugi.UgiMetrics.LoginFailureAvgTime +ugi.UgiMetrics.LoginFailureNumOps +ugi.UgiMetrics.LoginSuccessAvgTime +ugi.UgiMetrics.LoginSuccessNumOps +ugi.UgiMetrics.RenewalFailures +ugi.UgiMetrics.RenewalFailuresTotal \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/de6d54c9/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/HOST.txt ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/HOST.txt b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/HOST.txt index 4b759c6..3758140 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/HOST.txt +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/service-metrics/HOST.txt @@ -1,8 +1,4 @@ -swap_free -write_bps -write_bytes -write_count -write_time +boottime bytes_in bytes_out cpu_idle @@ -13,20 +9,21 @@ cpu_sintr cpu_steal cpu_system cpu_user -load_fifteen -load_five -load_one cpu_wio disk_free +disk_num disk_percent disk_total +disk_used +load_fifteen +load_five +load_one mem_buffered mem_cached mem_free mem_shared mem_total mem_used -disk_used pkts_in pkts_out proc_run @@ -35,3 +32,24 @@ read_bps read_bytes read_count read_time +sdisk_vda1_read_bytes +sdisk_vda1_read_count +sdisk_vda1_read_time +sdisk_vda1_write_bytes +sdisk_vda1_write_count +sdisk_vda1_write_time +sdisk_vdb_read_bytes +sdisk_vdb_read_count +sdisk_vdb_read_time +sdisk_vdb_write_bytes +sdisk_vdb_write_count +sdisk_vdb_write_time +swap_free +swap_in +swap_out +swap_total +swap_used +write_bps +write_bytes +write_count +write_time
