Repository: incubator-slider Updated Branches: refs/heads/develop cdda804a5 -> 9a7bedf29
SLIDER-769 Modify Slider app packages for seamless integration with AMS provider (Ambari Metrics Service) Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/9a7bedf2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/9a7bedf2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/9a7bedf2 Branch: refs/heads/develop Commit: 9a7bedf294d3db554bd3ec9fe8a93ffd6d28f83d Parents: cdda804 Author: Gour Saha <[email protected]> Authored: Tue Mar 10 14:01:22 2015 -0700 Committer: Gour Saha <[email protected]> Committed: Tue Mar 10 14:01:22 2015 -0700 ---------------------------------------------------------------------- .../package/templates/hadoop-metrics2-accumulo.properties.j2 | 2 +- .../templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2 | 2 +- .../templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9a7bedf2/app-packages/accumulo/package/templates/hadoop-metrics2-accumulo.properties.j2 ---------------------------------------------------------------------- diff --git a/app-packages/accumulo/package/templates/hadoop-metrics2-accumulo.properties.j2 b/app-packages/accumulo/package/templates/hadoop-metrics2-accumulo.properties.j2 index 900a507..8b31ef5 100644 --- a/app-packages/accumulo/package/templates/hadoop-metrics2-accumulo.properties.j2 +++ b/app-packages/accumulo/package/templates/hadoop-metrics2-accumulo.properties.j2 @@ -34,7 +34,7 @@ rpc.collector={{metric_collector_host}}:{{metric_collector_port}} accumulo.sink.timeline.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink accumulo.sink.timeline.period=10 accumulo.sink.timeline.collector={{metric_collector_host}}:{{metric_collector_port}} -accumulo.sink.timeline.serviceName-prefix={{app_name}} +accumulo.sink.timeline.serviceName={{app_name}} {% else %} http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9a7bedf2/app-packages/hbase/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2 ---------------------------------------------------------------------- diff --git a/app-packages/hbase/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2 b/app-packages/hbase/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2 index 65816a2..f56b211 100644 --- a/app-packages/hbase/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2 +++ b/app-packages/hbase/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2 @@ -46,7 +46,7 @@ rpc.collector={{metric_collector_host}}:{{metric_collector_port}} hbase.sink.timeline.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink hbase.sink.timeline.period=10 hbase.sink.timeline.collector={{metric_collector_host}}:{{metric_collector_port}} -hbase.sink.timeline.serviceName-prefix={{app_name}} +hbase.sink.timeline.serviceName={{app_name}} {% else %} http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9a7bedf2/app-packages/hbase/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2 ---------------------------------------------------------------------- diff --git a/app-packages/hbase/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2 b/app-packages/hbase/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2 index 65816a2..f56b211 100644 --- a/app-packages/hbase/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2 +++ b/app-packages/hbase/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2 @@ -46,7 +46,7 @@ rpc.collector={{metric_collector_host}}:{{metric_collector_port}} hbase.sink.timeline.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink hbase.sink.timeline.period=10 hbase.sink.timeline.collector={{metric_collector_host}}:{{metric_collector_port}} -hbase.sink.timeline.serviceName-prefix={{app_name}} +hbase.sink.timeline.serviceName={{app_name}} {% else %}
