You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by av...@apache.org on 2016/06/28 17:20:52 UTC
ambari git commit: AMBARI-17149 : Issues in AMS
HadoopTimelineMetricsSink integration with HBase metric system.
Repository: ambari
Updated Branches:
refs/heads/branch-2.4 016d6ec48 -> c2a8ad52a
AMBARI-17149 : Issues in AMS HadoopTimelineMetricsSink integration with HBase metric system.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c2a8ad52
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c2a8ad52
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c2a8ad52
Branch: refs/heads/branch-2.4
Commit: c2a8ad52ab154a3c30c2ef3a1040a358614eaed9
Parents: 016d6ec
Author: Aravindan Vijayan <av...@hortonworks.com>
Authored: Tue Jun 28 10:20:42 2016 -0700
Committer: Aravindan Vijayan <av...@hortonworks.com>
Committed: Tue Jun 28 10:20:42 2016 -0700
----------------------------------------------------------------------
.../HBASE/0.96.0.2.0/package/scripts/params_linux.py | 4 +++-
.../templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2 | 4 +++-
.../templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2 | 4 +++-
3 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c2a8ad52/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
index 5ce2bd5..6d304d4 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
@@ -140,7 +140,9 @@ regionserver_jaas_config_file = format("{hbase_conf_dir}/hbase_regionserver_jaas
queryserver_jaas_config_file = format("{hbase_conf_dir}/hbase_queryserver_jaas.conf")
ganglia_server_hosts = default('/clusterHostInfo/ganglia_server_host', []) # is not passed when ganglia is not present
-ganglia_server_host = '' if len(ganglia_server_hosts) == 0 else ganglia_server_hosts[0]
+has_ganglia_server = not len(ganglia_server_hosts) == 0
+if has_ganglia_server:
+ ganglia_server_host = ganglia_server_hosts[0]
ams_collector_hosts = default("/clusterHostInfo/metrics_collector_hosts", [])
has_metric_collector = not len(ams_collector_hosts) == 0
http://git-wip-us.apache.org/repos/asf/ambari/blob/c2a8ad52/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2 b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2
index 481bafa..7763bdd 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-MASTER.j2
@@ -73,7 +73,9 @@ hbase.sink.timeline.truststore.path = {{metric_truststore_path}}
hbase.sink.timeline.truststore.type = {{metric_truststore_type}}
hbase.sink.timeline.truststore.password = {{metric_truststore_password}}
-{% else %}
+{% endif %}
+
+{% if has_ganglia_server %}
# Configuration of the "hbase" context for ganglia
# Pick one: Ganglia 3.0 (former) or Ganglia 3.1 (latter)
http://git-wip-us.apache.org/repos/asf/ambari/blob/c2a8ad52/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2 b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2
index becfa7a..dcec3d4 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2
@@ -72,7 +72,9 @@ hbase.sink.timeline.truststore.path = {{metric_truststore_path}}
hbase.sink.timeline.truststore.type = {{metric_truststore_type}}
hbase.sink.timeline.truststore.password = {{metric_truststore_password}}
-{% else %}
+{% endif %}
+
+{% if has_ganglia_server %}
# Configuration of the "hbase" context for ganglia
# Pick one: Ganglia 3.0 (former) or Ganglia 3.1 (latter)