AMBARI-8231. HiveService2 alert for unsecure/secure cluster (ncole)

ambari-common/src/main/python/resource_management/libraries/functions/hive_check.py

@@ -35,7 +35,7 @@ def check_thrift_port_sasl(address, port, hive_auth = "NOSASL", key = None, kini
     url = format("jdbc:hive2://{address}:{port}")
 
   if hive_auth != "NOSASL":
-    cmd = format("! beeline -u '{url}' -e '' ") + "2>&1| awk '{print}'|grep Error"
+    cmd = format("! beeline -u '{url}' -e '' ") + "2>&1| awk '{print}'|grep -i 'Connection refused'"
     Execute(cmd,
             path=["/bin/", "/usr/bin/", "/usr/lib/hive/bin/", "/usr/sbin/"],
             timeout=BEELINE_CHECK_TIMEOUT

ambari-server/src/test/python/stacks/1.3.2/HIVE/test_hive_service_check.py

@@ -33,7 +33,7 @@ class TestServiceCheck(RMFTestCase):
                         command="service_check",
                         config_file="default.json"
     )
-    self.assertResourceCalled('Execute', "! beeline -u 'jdbc:hive2://c6402.ambari.apache.org:10000' -e '' 2>&1| awk '{print}'|grep Error",
+    self.assertResourceCalled('Execute', "! beeline -u 'jdbc:hive2://c6402.ambari.apache.org:10000' -e '' 2>&1| awk '{print}'|grep -i 'Connection refused'",
                               path = ['/bin/', '/usr/bin/', '/usr/lib/hive/bin/', '/usr/sbin/'],
                               timeout = 30,
                               )
@@ -84,7 +84,7 @@ class TestServiceCheck(RMFTestCase):
                         config_file="secured.json"
     )
     self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa; ',)
-    self.assertResourceCalled('Execute', "! beeline -u 'jdbc:hive2://c6402.ambari.apache.org:10000/;principal=hive/_HOST@EXAMPLE.COM' -e '' 2>&1| awk '{print}'|grep Error",
+    self.assertResourceCalled('Execute', "! beeline -u 'jdbc:hive2://c6402.ambari.apache.org:10000/;principal=hive/_HOST@EXAMPLE.COM' -e '' 2>&1| awk '{print}'|grep -i 'Connection refused'",
                               path = ['/bin/', '/usr/bin/', '/usr/lib/hive/bin/', '/usr/sbin/'],
                               timeout = 30,
                               )
@@ -125,4 +125,4 @@ class TestServiceCheck(RMFTestCase):
                               tries = 3,
                               try_sleep = 5,
                               )
-    self.assertNoMoreResources()
+    self.assertNoMoreResources()

ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py

@@ -82,7 +82,7 @@ class TestServiceCheck(RMFTestCase):
                         config_file="secured.json"
     )
     self.assertResourceCalled('Execute', '/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa; ',)
-    self.assertResourceCalled('Execute', "! beeline -u 'jdbc:hive2://c6402.ambari.apache.org:10000/;principal=hive/_HOST@EXAMPLE.COM' -e '' 2>&1| awk '{print}'|grep Error",
+    self.assertResourceCalled('Execute', "! beeline -u 'jdbc:hive2://c6402.ambari.apache.org:10000/;principal=hive/_HOST@EXAMPLE.COM' -e '' 2>&1| awk '{print}'|grep -i 'Connection refused'",
                               path = ['/bin/', '/usr/bin/', '/usr/lib/hive/bin/', '/usr/sbin/'],
                               timeout= 30,
                               )
@@ -125,4 +125,4 @@ class TestServiceCheck(RMFTestCase):
                               tries = 3,
                               try_sleep = 5,
                               )
-    self.assertNoMoreResources()
+    self.assertNoMoreResources()