Browse Source

AMBARI-7532. Slider view: Change additional ganglia clusters format to host:port

Sumit Mohanty 10 years ago
parent
commit
4b7bed2959

+ 1 - 1
ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/configuration/ganglia-env.xml

@@ -71,7 +71,7 @@
   <property>
   <property>
     <name>additional_clusters</name>
     <name>additional_clusters</name>
     <value> </value>
     <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>
   </property>
 
 
 </configuration>
 </configuration>

+ 3 - 4
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_app_strs = [] if gmond_add_clusters_str is None else gmond_add_clusters_str.split(',')
 gmond_apps = []
 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":
 if System.get_instance().os_family == "ubuntu":
   gmond_service_name = "ganglia-monitor"
   gmond_service_name = "ganglia-monitor"

+ 1 - 4
ambari-server/src/main/resources/stacks/HDP/2.2/services/SLIDER/metainfo.xml

@@ -22,7 +22,7 @@
       <name>SLIDER</name>
       <name>SLIDER</name>
       <displayName>Slider</displayName>
       <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>
       <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>
       <components>
         <component>
         <component>
           <name>SLIDER</name>
           <name>SLIDER</name>
@@ -78,9 +78,6 @@
       <configuration-dependencies>
       <configuration-dependencies>
         <config-type>slider-log4j</config-type>
         <config-type>slider-log4j</config-type>
         <config-type>slider-client</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>
       </configuration-dependencies>
 
 
     </service>
     </service>

+ 4 - 2
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
 #hadoop params
 if rpm_version is not None:
 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:
 else:
   slider_conf_dir = "/usr/lib/slider/conf"
   slider_conf_dir = "/usr/lib/slider/conf"
   slider_bin_dir = "/usr/lib/slider/bin"
   slider_bin_dir = "/usr/lib/slider/bin"