You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2014/11/11 12:21:14 UTC

ambari git commit: AMBARI-8272 When a host is deleted, nagios server is not restarting (dsen)

Repository: ambari
Updated Branches:
  refs/heads/trunk a4719666b -> 69fe8e404


AMBARI-8272 When a host is deleted, nagios server is not restarting (dsen)


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

Branch: refs/heads/trunk
Commit: 69fe8e4048d2ac9c747dc97d275f4761874007b3
Parents: a471966
Author: Dmytro Sen <ds...@apache.org>
Authored: Tue Nov 11 13:20:52 2014 +0200
Committer: Dmytro Sen <ds...@apache.org>
Committed: Tue Nov 11 13:20:52 2014 +0200

----------------------------------------------------------------------
 .../0.8/services/NAGIOS/package/templates/hadoop-services.cfg.j2   | 2 +-
 .../1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2 | 2 +-
 .../2.0.6/services/NAGIOS/package/templates/hadoop-services.cfg.j2 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/69fe8e40/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/NAGIOS/package/templates/hadoop-services.cfg.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/NAGIOS/package/templates/hadoop-services.cfg.j2 b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/NAGIOS/package/templates/hadoop-services.cfg.j2
index 045e9ad..ac4bd47 100644
--- a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/NAGIOS/package/templates/hadoop-services.cfg.j2
+++ b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/NAGIOS/package/templates/hadoop-services.cfg.j2
@@ -627,7 +627,7 @@ define service {
 }
 {% endif %}
 
-{% if hostgroup_defs['hbasemasters'] %}
+{% if hostgroup_defs['hbasemasters'] and hostgroup_defs['region-servers'] != None %}
 # HBASE::REGIONSERVER Checks
 define service {
         hostgroup_name          region-servers

http://git-wip-us.apache.org/repos/asf/ambari/blob/69fe8e40/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2 b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2
index 48bba18..c4dcba6 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2
@@ -488,7 +488,7 @@ define service {
 }
 {% endif %}
 
-{% if hostgroup_defs['hbasemasters'] %}
+{% if hostgroup_defs['hbasemasters'] and hostgroup_defs['region-servers'] != None %}
 # HBASE::REGIONSERVER Checks
 define service {
         hostgroup_name          region-servers

http://git-wip-us.apache.org/repos/asf/ambari/blob/69fe8e40/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-services.cfg.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-services.cfg.j2 b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-services.cfg.j2
index 0d8b2e8..f07de3a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-services.cfg.j2
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-services.cfg.j2
@@ -661,7 +661,7 @@ define service {
 }
 {% endif %}
 
-{% if hostgroup_defs['hbasemasters'] %}
+{% if hostgroup_defs['hbasemasters'] and hostgroup_defs['region-servers'] != None %}
 # HBASE::REGIONSERVER Checks
 define service {
         hostgroup_name          region-servers