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/24 22:53:17 UTC
[18/37] git commit: AMBARI-7461. webhcat alert not defined for
HDP-2.x stack. (jaimin)
AMBARI-7461. webhcat alert not defined for HDP-2.x stack. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4dec6525
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4dec6525
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4dec6525
Branch: refs/heads/branch-alerts-dev
Commit: 4dec6525a927cf0bfc6ef037920d186997204102
Parents: 464e77f
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Tue Sep 23 15:39:18 2014 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Tue Sep 23 15:39:24 2014 -0700
----------------------------------------------------------------------
.../src/main/resources/stacks/HDP/1.3.2/services/HIVE/metainfo.xml | 2 +-
.../src/main/resources/stacks/HDP/2.0.6/services/HIVE/metainfo.xml | 2 +-
.../HDP/2.0.6/services/NAGIOS/package/files/nagios_alerts.php | 2 +-
ambari-web/app/utils/helper.js | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4dec6525/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/metainfo.xml
index 80459d1..1079cf7 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/metainfo.xml
@@ -157,7 +157,7 @@
</component>
<component>
<name>HCAT</name>
- <displayName>HCat</displayName>
+ <displayName>HCat Client</displayName>
<category>CLIENT</category>
<commandScript>
<script>scripts/hcat_client.py</script>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4dec6525/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/metainfo.xml
index 08b1e74..6fb1500 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/metainfo.xml
@@ -169,7 +169,7 @@
</component>
<component>
<name>HCAT</name>
- <displayName>HCat</displayName>
+ <displayName>HCat Client</displayName>
<category>CLIENT</category>
<commandScript>
<script>scripts/hcat_client.py</script>
http://git-wip-us.apache.org/repos/asf/ambari/blob/4dec6525/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/files/nagios_alerts.php
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/files/nagios_alerts.php b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/files/nagios_alerts.php
index d15b023..0e1e501 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/files/nagios_alerts.php
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/files/nagios_alerts.php
@@ -381,6 +381,7 @@ function hdp_mon_generate_response( $response_data )
break;
case "HIVE-METASTORE":
case "HIVE-SERVER":
+ case "WEBHCAT":
$pieces[0] = "HIVE";
break;
case "ZKSERVERS":
@@ -413,7 +414,6 @@ function hdp_mon_generate_response( $response_data )
case "HBASE":
case "ZOOKEEPER":
case "OOZIE":
- case "WEBHCAT":
case "GANGLIA":
case "STORM":
case "FALCON":
http://git-wip-us.apache.org/repos/asf/ambari/blob/4dec6525/ambari-web/app/utils/helper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/helper.js b/ambari-web/app/utils/helper.js
index a3ebfde..036e03a 100644
--- a/ambari-web/app/utils/helper.js
+++ b/ambari-web/app/utils/helper.js
@@ -325,7 +325,7 @@ App.format = {
'GLUSTERFS': 'GLUSTERFS',
'HBASE': 'HBase',
'HBASE_REGIONSERVER': 'RegionServer',
- 'HCAT': 'HCat',
+ 'HCAT': 'HCat Client',
'HDFS': 'HDFS',
'HISTORYSERVER': 'History Server',
'HIVE_SERVER': 'HiveServer2',