Repository: incubator-slider Updated Branches: refs/heads/develop 44b3bc0fb -> 922439e58
SLIDER-772 SLIDER-319 add sample slider-server.xml with metrics configuration Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/c9b99e59 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/c9b99e59 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/c9b99e59 Branch: refs/heads/develop Commit: c9b99e59179c8c38b7b67b05ecaca1c1cde70f57 Parents: 7e8903e Author: Steve Loughran <[email protected]> Authored: Thu Jan 29 19:32:19 2015 +0000 Committer: Steve Loughran <[email protected]> Committed: Thu Jan 29 19:32:19 2015 +0000 ---------------------------------------------------------------------- slider-assembly/src/conf/slider-server.xml | 76 ++++++++++++++++++++ .../management/MetricsBindingService.java | 2 +- .../appmaster/management/MetricsKeys.java | 15 ++-- 3 files changed, 84 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c9b99e59/slider-assembly/src/conf/slider-server.xml ---------------------------------------------------------------------- diff --git a/slider-assembly/src/conf/slider-server.xml b/slider-assembly/src/conf/slider-server.xml new file mode 100644 index 0000000..05a4592 --- /dev/null +++ b/slider-assembly/src/conf/slider-server.xml @@ -0,0 +1,76 @@ +<?xml version="1.0"?> +<?xml-stylesheet type="text/xsl" href="configuration.xsl"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<!-- + This is an optional configuration file. + + Properties set here are picked up in the slider Application Master, + supplementing configuration options in core-site.xml and yarn-site.xml. + + These options are NOT read in the client +--> +<configuration> + + + <!-- + <property> + <name>slider.metrics.ganglia.enabled</name> + <value>true</value> + <description>Boolean to enable Ganglia metrics reporting</description> + </property> + + <property> + <name>slider.metrics.ganglia.host</name> + <value>localhost</value> + <description>Ganglia hostname</description> + </property> + + <property> + <name>slider.metrics.ganglia.port</name> + <value>8649</value> + <description>Ganglia port</description> + </property> + + <property> + <name>slider.metrics.ganglia.version-31</name> + <value>true</value> + <description>protocol version true=v3.1, false=v3.0</description> + </property> + --> + + <!-- + Options to enable metrics to slf4j + + <property> + <name>slider.metrics.logging.enabled</name> + <value>true</value> + <description>Boolean to enable SL4J metrics reporting at + scheduled intervals</description> + </property> + + + <property> + <name>slider.metrics.logging.log.name</name> + <value>org.apache.slider.metrics.log</value> + <description>name of log</description> + </property> + + --> + +</configuration> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c9b99e59/slider-core/src/main/java/org/apache/slider/server/appmaster/management/MetricsBindingService.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/management/MetricsBindingService.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/management/MetricsBindingService.java index e591716..fb1dbd2 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/management/MetricsBindingService.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/management/MetricsBindingService.java @@ -125,7 +125,7 @@ public class MetricsBindingService extends CompositeService .outputTo(LoggerFactory.getLogger(logName)) .convertDurationsTo(TimeUnit.MILLISECONDS) .build(); - reporter.start(interval, TimeUnit.SECONDS); + reporter.start(interval, TimeUnit.MINUTES); addService(new ClosingService<ScheduledReporter>(reporter)); summary.append(String.format(", SLF4J to log %s interval=%d", logName, interval)); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/c9b99e59/slider-core/src/main/java/org/apache/slider/server/appmaster/management/MetricsKeys.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/management/MetricsKeys.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/management/MetricsKeys.java index 8a4b075..13b3b6b 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/management/MetricsKeys.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/management/MetricsKeys.java @@ -23,7 +23,7 @@ public interface MetricsKeys { /** * Prefix for metrics configuration options: {@value} */ - String METRICS_PREFIX = "metrics.codahale."; + String METRICS_PREFIX = "slider.metrics."; /** * Boolean to enable Ganglia metrics reporting @@ -42,7 +42,7 @@ public interface MetricsKeys { /** * {@value} */ - String METRICS_GANGLIA_VERSION_31 = METRICS_PREFIX + "ganglia.version.31"; + String METRICS_GANGLIA_VERSION_31 = METRICS_PREFIX + "ganglia.version-31"; /** * {@value} */ @@ -65,12 +65,13 @@ public interface MetricsKeys { * {@value} */ String METRICS_LOGGING_LOG = - METRICS_PREFIX + "logging.log"; + METRICS_PREFIX + "logging.log.name"; /** * Default log name: {@value} */ - String METRICS_DEFAULT_LOG = "org.apache.hadoop.metrics.log"; + String METRICS_DEFAULT_LOG = + "org.apache.slider.metrics.log"; /** @@ -78,7 +79,7 @@ public interface MetricsKeys { * {@value} */ String METRICS_LOGGING_LOG_INTERVAL = - METRICS_PREFIX + "logging.interval"; + METRICS_PREFIX + "logging.interval.minutes"; /** @@ -86,8 +87,6 @@ public interface MetricsKeys { * This is a big interval as in a long lived service, log overflows are easy * to create. */ - int METRICS_DEFAULT_LOG_INTERVAL = 60 * 10; - - + int METRICS_DEFAULT_LOG_INTERVAL = 60; }
