You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2014/09/29 14:14:26 UTC
[14/16] git commit: AMBARI-7532. Slider view: Change additional
ganglia clusters format to host:port
AMBARI-7532. Slider view: Change additional ganglia clusters format to host:port
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4b7bed29
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4b7bed29
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4b7bed29
Branch: refs/heads/branch-alerts-dev
Commit: 4b7bed29592203aec345b42604f1a25cf4a8af25
Parents: 15745f4
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Sat Sep 27 00:30:45 2014 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Sat Sep 27 00:30:45 2014 -0700
----------------------------------------------------------------------
.../HDP/2.0.6/services/GANGLIA/configuration/ganglia-env.xml | 2 +-
.../HDP/2.0.6/services/GANGLIA/package/scripts/params.py | 7 +++----
.../resources/stacks/HDP/2.2/services/SLIDER/metainfo.xml | 5 +----
.../stacks/HDP/2.2/services/SLIDER/package/scripts/params.py | 6 ++++--
4 files changed, 9 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4b7bed29/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/configuration/ganglia-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/configuration/ganglia-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/configuration/ganglia-env.xml
index 59d607a..3328acf 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/configuration/ganglia-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/configuration/ganglia-env.xml
@@ -71,7 +71,7 @@
<property>
<name>additional_clusters</name>
<value> </value>
- <description>Add additional desired Ganglia metrics cluster in the form "name1,port1,name2,port2". Ensure that the names and ports are unique across all cluster and ports are available on ganglia server host. Ambari has reserved ports 8667-8669 within its own pool.</description>
+ <description>Add additional desired Ganglia metrics cluster in the form "name1:port1,name2:port2". Ensure that the names and ports are unique across all cluster and ports are available on ganglia server host. Ambari has reserved ports 8667-8669 within its own pool.</description>
</property>
</configuration>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4b7bed29/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py
index 43ce36f..f8373ac 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py
@@ -38,10 +38,9 @@ if gmond_add_clusters_str and gmond_add_clusters_str.isspace():
gmond_app_strs = [] if gmond_add_clusters_str is None else gmond_add_clusters_str.split(',')
gmond_apps = []
-i = 0
-while i < len(gmond_app_strs):
- gmond_apps.append((gmond_app_strs[i].strip(), gmond_app_strs[i+1].strip()))
- i = i + 2
+for x in gmond_app_strs:
+ a,b = x.strip().split(':')
+ gmond_apps.append((a.strip(),b.strip()))
if System.get_instance().os_family == "ubuntu":
gmond_service_name = "ganglia-monitor"
http://git-wip-us.apache.org/repos/asf/ambari/blob/4b7bed29/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/metainfo.xml
index cfc9891..2119b24 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/metainfo.xml
@@ -22,7 +22,7 @@
<name>SLIDER</name>
<displayName>Slider</displayName>
<comment>Apache Slider is a YARN application to deploy existing distributed applications on YARN, monitor them and make them larger or smaller as desired -even while the application is running.</comment>
- <version>0.51.0</version>
+ <version>0.60.0.2.2.0.0</version>
<components>
<component>
<name>SLIDER</name>
@@ -78,9 +78,6 @@
<configuration-dependencies>
<config-type>slider-log4j</config-type>
<config-type>slider-client</config-type>
- <config-type>hdfs-site</config-type>
- <config-type>yarn-site</config-type>
- <config-type>core-site</config-type>
</configuration-dependencies>
</service>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4b7bed29/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/package/scripts/params.py
index 31ad31d..394ba12 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/package/scripts/params.py
@@ -28,8 +28,10 @@ rpm_version = default("/configurations/hadoop-env/rpm_version", None)
#hadoop params
if rpm_version is not None:
- slider_conf_dir = '/usr/lib/current/slider/conf'
- slider_bin_dir = '/usr/lib/current/slider/bin'
+# slider_conf_dir = '/usr/lib/current/slider/conf'
+# slider_bin_dir = '/usr/lib/current/slider/bin'
+ slider_conf_dir = "/usr/lib/slider/conf"
+ slider_bin_dir = "/usr/lib/slider/bin"
else:
slider_conf_dir = "/usr/lib/slider/conf"
slider_bin_dir = "/usr/lib/slider/bin"