You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by od...@apache.org on 2013/08/12 18:43:31 UTC

git commit: AMBARI-2872. Ganglia monitors are generated for Resource Manager, History Server even if they are not selected. (odiachenko)

Updated Branches:
  refs/heads/trunk 4dceca42c -> f547305d2


AMBARI-2872. Ganglia monitors are generated for Resource Manager, History Server even if they are not selected. (odiachenko)


Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/f547305d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/f547305d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/f547305d

Branch: refs/heads/trunk
Commit: f547305d2acb0cae04a1a3a858097cd9eb9aea6c
Parents: 4dceca4
Author: Oleksandr Diachenko <od...@hortonworks.com>
Authored: Mon Aug 12 19:43:00 2013 +0300
Committer: Oleksandr Diachenko <od...@hortonworks.com>
Committed: Mon Aug 12 19:43:00 2013 +0300

----------------------------------------------------------------------
 .../main/puppet/modules/hdp-ganglia/manifests/server.pp  | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/f547305d/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp b/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp
index d254652..2cbc9be 100644
--- a/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp
+++ b/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp
@@ -71,8 +71,15 @@ class hdp-ganglia::server(
     }
   }
 
-  if (hdp_get_major_stack_version($stack_version) >= 2) {
-    hdp-ganglia::config::generate_server { ['HDPResourceManager', 'HDPHistoryServer']:
+  if ($hdp::params::is_rmnode_master) {
+    hdp-ganglia::config::generate_server { 'HDPResourceManager':
+      ganglia_service => 'gmond',
+      role => 'server'
+    }
+  }
+  
+  if ($hdp::params::is_hsnode_master) {
+    hdp-ganglia::config::generate_server { 'HDPHistoryServer':
       ganglia_service => 'gmond',
       role => 'server'
     }