AMBARI-8699 - Alerts: PORT type support for WARN level and thresholds (jonathanhurley)

ambari-agent/src/main/python/ambari_agent/alerts/port_alert.py

@@ -26,6 +26,10 @@ from resource_management.libraries.functions.get_port_from_url import get_port_f
 
 logger = logging.getLogger()
 
+# default timeouts
+DEFAULT_WARNING_TIMEOUT = 1.5
+DEFAULT_CRITICAL_TIMEOUT = 5.0
+
 class PortAlert(BaseAlert):
 
   def __init__(self, alert_meta, alert_source_meta):
@@ -33,6 +37,8 @@ class PortAlert(BaseAlert):
 
     self.uri = None
     self.default_port = None
+    self.warning_timeout = DEFAULT_WARNING_TIMEOUT
+    self.critical_timeout = DEFAULT_CRITICAL_TIMEOUT
 
     # can be parameterized or static
     if 'uri' in alert_source_meta:
@@ -41,7 +47,37 @@ class PortAlert(BaseAlert):
     # always static
     if 'default_port' in alert_source_meta:
       self.default_port = alert_source_meta['default_port']
-    
+
+    if 'reporting' in alert_source_meta:
+      reporting = alert_source_meta['reporting']
+      reporting_state_warning = self.RESULT_WARNING.lower()
+      reporting_state_critical = self.RESULT_CRITICAL.lower()
+
+      if reporting_state_warning in reporting and \
+        'value' in reporting[reporting_state_warning]:
+        self.warning_timeout = reporting[reporting_state_warning]['value']
+
+      if reporting_state_critical in reporting and \
+        'value' in reporting[reporting_state_critical]:
+        self.critical_timeout = reporting[reporting_state_critical]['value']
+
+
+    # check warning threshold for sanity
+    if self.warning_timeout >= 30:
+      logger.warn("The alert warning threshold of {0}s is too large, resetting to {1}s".format(
+        str(self.warning_timeout), str(DEFAULT_WARNING_TIMEOUT)))
+
+      self.warning_timeout = DEFAULT_WARNING_TIMEOUT
+
+
+    # check critical threshold for sanity
+    if self.critical_timeout >= 30:
+      logger.warn("The alert critical threshold of {0}s is too large, resetting to {1}s".format(
+        str(self.critical_timeout), str(DEFAULT_CRITICAL_TIMEOUT)))
+
+      self.critical_timeout = DEFAULT_CRITICAL_TIMEOUT
+
+
   def _collect(self):
     # if not parameterized, this will return the static value
     uri_value = self._lookup_property_value(self.uri)
@@ -75,13 +111,23 @@ class PortAlert(BaseAlert):
     
     try:
       s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-      s.settimeout(1.5)
+      s.settimeout(self.critical_timeout)
 
       t = time.time()
       s.connect((host, port))
-      millis = time.time() - t
+      milliseconds = time.time() - t
+      seconds = milliseconds/1000.0
+
+      # not sure why this happens sometimes, but we don't always get a
+      # socket exception if the connect() is > than the critical threshold
+      if seconds >= self.critical_timeout:
+        return (self.RESULT_CRITICAL, ['Socket Timeout', host, port])
+
+      result = self.RESULT_OK
+      if seconds >= self.warning_timeout:
+        result = self.RESULT_WARNING
 
-      return (self.RESULT_OK, [millis/1000, port])
+      return (result, [seconds, port])
     except Exception as e:
       return (self.RESULT_CRITICAL, [str(e), host, port])
     finally:
@@ -99,7 +145,7 @@ class PortAlert(BaseAlert):
     :param state: the state of the alert in uppercase (such as OK, WARNING, etc)
     :return:  the parameterized text
     '''
-    if state == self.RESULT_OK:
+    if state == self.RESULT_OK or state == self.RESULT_WARNING:
       return 'TCP OK - {0:.4f} response on port {1}'
 
     return 'Connection failed: {0} to {1}:{2}'

ambari-agent/src/test/python/ambari_agent/TestAlerts.py

@@ -57,8 +57,15 @@ class TestAlerts(TestCase):
     self.assertTrue(aps_add_interval_job_mock.called)
     self.assertTrue(aps_start_mock.called)
 
+  @patch('time.time')
+  @patch.object(socket.socket,"connect")
+  def test_port_alert(self, socket_connect_mock, time_mock):
+    # called 3x with 3 calls per alert
+    # - 900ms and then a time.time() for the date from base_alert
+    # - 2000ms and then a time.time() for the date from base_alert
+    # - socket.timeout to simulate a timeout and then a time.time() for the date from base_alert
+    time_mock.side_effect = [0,900,336283200000,0,2000,336283200000,socket.timeout,336283200000]
 
-  def test_port_alert(self):
     json = { "name": "namenode_process",
       "service": "HDFS",
       "component": "NAMENODE",
@@ -75,8 +82,13 @@ class TestAlerts(TestCase):
           "ok": {
             "text": "(Unit Tests) TCP OK - {0:.4f} response time on port {1}"
           },
+          "warning": {
+            "text": "(Unit Tests) TCP WARN - {0:.4f} response time on port {1}",
+            "value": 1.5
+          },
           "critical": {
-            "text": "(Unit Tests) Could not load process info: {0}"
+            "text": "(Unit Tests) Could not load process info: {0}",
+            "value": 5.0
           }
         }
       }
@@ -87,7 +99,24 @@ class TestAlerts(TestCase):
     pa = PortAlert(json, json['source'])
     pa.set_helpers(collector, {'hdfs-site/my-key': 'value1'})
     self.assertEquals(6, pa.interval())
+
+    # 900ms is OK
+    pa.collect()
+    alerts = collector.alerts()
+    self.assertEquals(0, len(collector.alerts()))
+    self.assertEquals('OK', alerts[0]['state'])
+
+    # 2000ms is WARNING
     pa.collect()
+    alerts = collector.alerts()
+    self.assertEquals(0, len(collector.alerts()))
+    self.assertEquals('WARNING', alerts[0]['state'])
+
+    # throws a socket.timeout exception, causes a CRITICAL
+    pa.collect()
+    alerts = collector.alerts()
+    self.assertEquals(0, len(collector.alerts()))
+    self.assertEquals('CRITICAL', alerts[0]['state'])
 
 
   @patch.object(socket.socket,"connect")
@@ -657,7 +686,7 @@ class TestAlerts(TestCase):
     json['source']['type'] = 'PORT'
     alert = PortAlert(json, json['source'])
     self.assertEquals(alert._get_reporting_text(alert.RESULT_OK), 'TCP OK - {0:.4f} response on port {1}')
-    self.assertEquals(alert._get_reporting_text(alert.RESULT_WARNING), 'Connection failed: {0} to {1}:{2}')
+    self.assertEquals(alert._get_reporting_text(alert.RESULT_WARNING), 'TCP OK - {0:.4f} response on port {1}')
     self.assertEquals(alert._get_reporting_text(alert.RESULT_CRITICAL), 'Connection failed: {0} to {1}:{2}')
 
     json['source']['type'] = 'WEB'

ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/GANGLIA/alerts.json

@@ -15,12 +15,17 @@
           "default_port": 8651,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       },
       {
@@ -36,12 +41,17 @@
           "default_port": 8661,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       },
       {
@@ -57,12 +67,17 @@
           "default_port": 8663,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       },
       {
@@ -78,12 +93,17 @@
           "default_port": 8664,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       },
       {
@@ -99,12 +119,17 @@
           "default_port": 8666,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       }
     ]

ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HBASE/alerts.json

@@ -40,12 +40,17 @@
           "default_port": 60000,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       },
       {
@@ -100,12 +105,17 @@
           "default_port": 60030,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       }
     ]

ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/alerts.json

@@ -303,12 +303,17 @@
           "default_port": 50070,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       },
       {
@@ -351,12 +356,17 @@
           "default_port": 50071,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       }
     ],
@@ -374,12 +384,17 @@
           "default_port": 8480,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       }
     ],      
@@ -397,12 +412,17 @@
           "default_port": 50010,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       },
       {
@@ -485,10 +505,15 @@
           "default_port": 2181,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} on host {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
           }
         }

ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HIVE/alerts.json

@@ -14,12 +14,17 @@
           "default_port": 9083,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       }
     ],

ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/YARN/alerts.json

@@ -116,10 +116,15 @@
           "default_port": 19888,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
           }
         }

ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/ZOOKEEPER/alerts.json

@@ -40,12 +40,17 @@
           "default_port": 2181,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       }
     ]

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/GANGLIA/alerts.json

@@ -15,12 +15,17 @@
           "default_port": 8651,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       },
       {
@@ -36,12 +41,17 @@
           "default_port": 8661,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       },
       {
@@ -57,12 +67,17 @@
           "default_port": 8663,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       },
       {
@@ -78,12 +93,17 @@
           "default_port": 8662,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       },
       {
@@ -99,12 +119,17 @@
           "default_port": 8666,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       }
     ]

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/alerts.json

@@ -40,12 +40,17 @@
           "default_port": 60000,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       },
       {
@@ -100,12 +105,17 @@
           "default_port": 60030,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       }
     ]

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/alerts.json

@@ -303,12 +303,17 @@
           "default_port": 50070,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       }
     ],
@@ -326,12 +331,17 @@
           "default_port": 50090,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       }
     ],
@@ -349,12 +359,17 @@
           "default_port": 8480,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       }
     ],      
@@ -372,12 +387,17 @@
           "default_port": 50010,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       },
       {

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/alerts.json

@@ -14,12 +14,17 @@
           "default_port": 9083,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       }
     ],

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/alerts.json

@@ -134,12 +134,17 @@
           "default_port": 50030,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       }
     ],
@@ -157,12 +162,17 @@
           "default_port": 50060,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       },
       {

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/ZOOKEEPER/alerts.json

@@ -40,12 +40,17 @@
           "default_port": 2181,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       }
     ]

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/alerts.json

@@ -15,12 +15,17 @@
           "default_port": 8651,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       },
       {
@@ -36,12 +41,17 @@
           "default_port": 8661,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       },
       {
@@ -57,12 +67,17 @@
           "default_port": 8663,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       },
       {
@@ -78,12 +93,17 @@
           "default_port": 8664,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       },
       {
@@ -99,12 +119,17 @@
           "default_port": 8666,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       }
     ]

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/alerts.json

@@ -40,12 +40,17 @@
           "default_port": 60000,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       },
       {
@@ -100,12 +105,17 @@
           "default_port": 60030,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       }
     ]

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/alerts.json

@@ -303,12 +303,17 @@
           "default_port": 50070,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       },
       {
@@ -351,12 +356,17 @@
           "default_port": 50071,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       }
     ],
@@ -374,12 +384,17 @@
           "default_port": 8480,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       }
     ],      
@@ -397,12 +412,17 @@
           "default_port": 50010,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       },
       {
@@ -485,10 +505,15 @@
           "default_port": 2181,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} on host {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
           }
         }

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/alerts.json

@@ -14,12 +14,17 @@
           "default_port": 9083,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       }
     ],

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/alerts.json

@@ -116,10 +116,15 @@
           "default_port": 19888,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
           }
         }

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/ZOOKEEPER/alerts.json

@@ -40,12 +40,17 @@
           "default_port": 2181,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       }
     ]

ambari-server/src/main/resources/stacks/HDP/2.1/services/FALCON/alerts.json

@@ -14,12 +14,17 @@
           "default_port": 15000,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       },
       {

ambari-server/src/main/resources/stacks/HDP/2.1/services/STORM/alerts.json

@@ -39,10 +39,15 @@
           "default_port": 8744,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
           }
         }
@@ -85,10 +90,15 @@
           "default_port": 6627,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
           }
         }
@@ -107,10 +117,15 @@
           "default_port": 3772,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
           }
         }
@@ -129,10 +144,15 @@
           "default_port": 8745,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
           }
         }
@@ -151,10 +171,15 @@
           "default_port": 56431,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
           }
         }

ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KAFKA/alerts.json

@@ -13,12 +13,17 @@
           "default_port": 6667,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       }
     ]

ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/KNOX/alerts.json

@@ -13,10 +13,15 @@
           "default_port": 8443,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
           }
         }

ambari-server/src/main/resources/stacks/HDP/2.2/services/AMS/alerts.json

@@ -39,10 +39,15 @@
           "default_port": 8188,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
           }
         }
@@ -58,10 +63,15 @@
           "default_port": 61310,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
           }
         }
@@ -114,10 +124,15 @@
           "default_port": 61181,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
           }
         }

ambari-server/src/main/resources/stacks/HDP/2.2/services/KAFKA/alerts.json

@@ -14,12 +14,17 @@
           "default_port": 6667,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
-          }        
+          }
         }
       }
     ]

ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/alerts.json

@@ -14,10 +14,15 @@
           "default_port": 8443,
           "reporting": {
             "ok": {
-              "text": "TCP OK - {0:.4f} response on port {1}"
+              "text": "TCP OK - {0:.3f}s response on port {1}"
+            },
+            "warning": {
+              "text": "TCP OK - {0:.3f}s response on port {1}",
+              "value": 1.5
             },
             "critical": {
-              "text": "Connection failed: {0} to {1}:{2}"
+              "text": "Connection failed: {0} to {1}:{2}",
+              "value": 5.0
             }
           }
         }