Updated Branches: refs/heads/trunk ad26dc34f -> bfd1fb5c5
AMBARI-2942. Remove host-level Nagios Alerts from service pages. (yusaku) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/bfd1fb5c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/bfd1fb5c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/bfd1fb5c Branch: refs/heads/trunk Commit: bfd1fb5c5938ba74df251a9166a97fb074540f89 Parents: ad26dc3 Author: Yusaku Sako <[email protected]> Authored: Sat Aug 17 00:24:01 2013 -0700 Committer: Yusaku Sako <[email protected]> Committed: Sat Aug 17 00:24:05 2013 -0700 ---------------------------------------------------------------------- .../puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb | 2 +- ambari-web/app/models/alert.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/bfd1fb5c/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb b/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb index 4a76f71..ca64fe1 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb +++ b/ambari-agent/src/main/puppet/modules/hdp-nagios/templates/hadoop-services.cfg.erb @@ -464,7 +464,7 @@ define service { define service { hostgroup_name resourcemanager use hadoop-service - service_description RESOURCEMANAGER::ResourceManager process down + service_description RESOURCEMANAGER::ResourceManager process servicegroups YARN check_command check_tcp!<%=scope.function_hdp_template_var("::hdp::rm_port")%>!-w 1 -c 1 normal_check_interval 1 http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/bfd1fb5c/ambari-web/app/models/alert.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/alert.js b/ambari-web/app/models/alert.js index 055177a..f4264ee 100644 --- a/ambari-web/app/models/alert.js +++ b/ambari-web/app/models/alert.js @@ -71,7 +71,7 @@ App.Alert = DS.Model.extend({ * Used to show only required alerts at the service level */ ignoredForServices: function() { - return ['NodeManager unhealthy', 'NodeManager process down', 'Node Manager unhealthy', 'Node Manager process down', 'TaskTracker process down', 'RegionServer process down', 'DataNode process down', 'DataNode storage full', 'ZooKeeper Server process down'].contains(this.get('title')); + return ['NodeManager health', 'NodeManager process', 'TaskTracker process', 'RegionServer process', 'DataNode process', 'DataNode space', 'ZooKeeper Server process'].contains(this.get('title')); }.property('title'), /**
