AMBARI-19970 : AMS graphs are not present on cluster with SSL. (avijayan)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6eac0f57 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6eac0f57 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6eac0f57 Branch: refs/heads/branch-feature-AMBARI-12556 Commit: 6eac0f57a61da4e76b175f0de43ab315a665b9c2 Parents: d510063 Author: Aravindan Vijayan <[email protected]> Authored: Sun Feb 12 08:34:41 2017 -0800 Committer: Aravindan Vijayan <[email protected]> Committed: Sun Feb 12 08:34:58 2017 -0800 ---------------------------------------------------------------------- .../conf/hadoop-metrics2-hbase.properties.j2 | 49 ----------------- .../src/main/conf/hadoop-metrics2.properties.j2 | 58 -------------------- .../hadoop-metrics2-hbase.properties.j2 | 4 ++ 3 files changed, 4 insertions(+), 107 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/6eac0f57/ambari-metrics/ambari-metrics-hadoop-sink/src/main/conf/hadoop-metrics2-hbase.properties.j2 ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-hadoop-sink/src/main/conf/hadoop-metrics2-hbase.properties.j2 b/ambari-metrics/ambari-metrics-hadoop-sink/src/main/conf/hadoop-metrics2-hbase.properties.j2 deleted file mode 100644 index c819301..0000000 --- a/ambari-metrics/ambari-metrics-hadoop-sink/src/main/conf/hadoop-metrics2-hbase.properties.j2 +++ /dev/null @@ -1,49 +0,0 @@ -# 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. - -# See http://wiki.apache.org/hadoop/GangliaMetrics -# -# Make sure you know whether you are using ganglia 3.0 or 3.1. -# If 3.1, you will have to patch your hadoop instance with HADOOP-4675 -# And, yes, this file is named hadoop-metrics.properties rather than -# hbase-metrics.properties because we're leveraging the hadoop metrics -# package and hadoop-metrics.properties is an hardcoded-name, at least -# for the moment. -# -# See also http://hadoop.apache.org/hbase/docs/current/metrics.html - -# HBase-specific configuration to reset long-running stats (e.g. compactions) -# If this variable is left out, then the default is no expiration. -hbase.extendedperiod = 3600 - -# Configuration of the "hbase" context for timeline metrics service -hbase.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink -hbase.period=10 -hbase.collector={{timeline_server_hosts}}:6188 - -# Configuration of the "jvm" context for timeline metrics service -jvm.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink -jvm.period=10 -jvm.collector={{timeline_server_hosts}}:6188 - -# Configuration of the "rpc" context for timeline metrics service -rpc.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink -rpc.period=10 -rpc.collector={{timeline_server_hosts}}:6188 - -# Following hadoop example -hbase.sink.timeline.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink -hbase.sink.timeline.period=10 -hbase.sink.timeline.collector=http://{{timeline_server_hosts}}:6188 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/6eac0f57/ambari-metrics/ambari-metrics-hadoop-sink/src/main/conf/hadoop-metrics2.properties.j2 ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-hadoop-sink/src/main/conf/hadoop-metrics2.properties.j2 b/ambari-metrics/ambari-metrics-hadoop-sink/src/main/conf/hadoop-metrics2.properties.j2 deleted file mode 100644 index ec1377d..0000000 --- a/ambari-metrics/ambari-metrics-hadoop-sink/src/main/conf/hadoop-metrics2.properties.j2 +++ /dev/null @@ -1,58 +0,0 @@ -{# -# 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. -#} - -# 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. - -# syntax: [prefix].[source|sink|jmx].[instance].[options] -# See package.html for org.apache.hadoop.metrics2 for details - -{% if has_ganglia_server %} -*.period=60 - -*.sink.timeline.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink -*.sink.timeline.period=10 - - -# Hook up to the server -datanode.sink.timeline.collector=http://localhost:6188 -namenode.sink.timeline.collector=http://localhost:6188 -resourcemanager.sink.timeline.collector=http://localhost:6188 -nodemanager.sink.timeline.collector=http://localhost:6188 -historyserver.sink.timeline.collector=http://localhost:6188 -journalnode.sink.timeline.collector=http://localhost:6188 -nimbus.sink.timeline.collector=http://localhost:6188 -supervisor.sink.timeline.collector=http://localhost:6188 -maptask.sink.timeline.collector=http://localhost:6188 -reducetask.sink.timeline.collector=http://localhost:6188 - -resourcemanager.sink.ganglia.tagsForPrefix.yarn=Queue - -{% endif %} http://git-wip-us.apache.org/repos/asf/ambari/blob/6eac0f57/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2 b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2 index 8c20f2b..8c6f86f 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2 +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2 @@ -42,16 +42,19 @@ hbase.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink hbase.period=30 hbase.collector.hosts={{ams_collector_hosts}} hbase.port={{metric_collector_port}} +hbase.protocol={{metric_collector_protocol}} jvm.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink jvm.period=30 jvm.collector.hosts={{ams_collector_hosts}} jvm.port={{metric_collector_port}} +jvm.protocol={{metric_collector_protocol}} rpc.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink rpc.period=30 rpc.collector.hosts={{ams_collector_hosts}} rpc.port={{metric_collector_port}} +rpc.protocol={{metric_collector_protocol}} *.timeline.plugin.urls=file:///usr/lib/ambari-metrics-hadoop-sink/ambari-metrics-hadoop-sink.jar *.sink.timeline.slave.host.name={{hostname}} @@ -60,6 +63,7 @@ hbase.sink.timeline.period={{metrics_collection_period}} hbase.sink.timeline.sendInterval={{metrics_report_interval}}000 hbase.sink.timeline.collector.hosts={{ams_collector_hosts}} hbase.sink.timeline.port={{metric_collector_port}} +hbase.sink.timeline.protocol={{metric_collector_protocol}} hbase.sink.timeline.serviceName-prefix=ams # HTTPS properties
