You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by zh...@apache.org on 2016/04/15 19:16:54 UTC

ambari git commit: AMBARI-15903 Script + Server alert display, descriptions and ui (zhewang)

Repository: ambari
Updated Branches:
  refs/heads/trunk f39a799f3 -> f2cf51706


AMBARI-15903 Script + Server alert display, descriptions and ui (zhewang)


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

Branch: refs/heads/trunk
Commit: f2cf51706dd200a7b0091b20f58d63f9b7b565c9
Parents: f39a799
Author: Zhe (Joe) Wang <zh...@apache.org>
Authored: Fri Apr 15 10:16:24 2016 -0700
Committer: Zhe (Joe) Wang <zh...@apache.org>
Committed: Fri Apr 15 10:16:24 2016 -0700

----------------------------------------------------------------------
 ambari-server/src/main/resources/alerts.json    |  14 +-
 .../common-services/HDFS/2.1.0.2.0/alerts.json  | 174 ++++++++++++-------
 .../common-services/HIVE/0.12.0.2.0/alerts.json |  30 ++--
 .../alerts/definition_configs_controller.js     |  19 --
 .../app/models/alerts/alert_definition.js       |   2 +-
 5 files changed, 136 insertions(+), 103 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/f2cf5170/ambari-server/src/main/resources/alerts.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/alerts.json b/ambari-server/src/main/resources/alerts.json
index ccc0580..f55211f 100644
--- a/ambari-server/src/main/resources/alerts.json
+++ b/ambari-server/src/main/resources/alerts.json
@@ -31,7 +31,7 @@
       {
         "name": "ambari_server_performance",
         "label": "Ambari Server Performance",
-        "description": "This alert is triggered if the server detects that there is a potential performance problem with Ambari. This type of issue can arise for many reasons, but is typically attributed to slow database queries and host resource exhaustion.",
+        "description": "This alert is triggered if the Ambari Server detects that there is a potential performance problem with Ambari. This type of issue can arise for many reasons, but is typically attributed to slow database queries and host resource exhaustion.",
         "interval": 5,
         "scope": "SERVICE",
         "enabled": true,
@@ -41,7 +41,7 @@
           "parameters": [
             {
               "name": "request.by.status.warning.threshold",
-              "display_name": "Warning Request Time",
+              "display_name": "Get Request Progress",
               "value": 3000,
               "type": "NUMERIC",
               "description": "The time to find requests in progress before a warning alert is triggered.",
@@ -50,7 +50,7 @@
             },
             {
               "name": "request.by.status.critical.threshold",
-              "display_name": "Critical Request Time",
+              "display_name": "Get Request Progress",
               "value": 5000,
               "type": "NUMERIC",
               "description": "The time to find requests in progress before a critical alert is triggered.",
@@ -59,7 +59,7 @@
             },
             {
               "name": "task.status.aggregation.warning.threshold",
-              "display_name": "Warning Process Time",
+              "display_name": "Get Request Status",
               "value": 3000,
               "type": "NUMERIC",
               "description": "The time to calculate a request's status from its tasks before a warning alert is triggered.",
@@ -68,7 +68,7 @@
             },
             {
               "name": "task.status.aggregation.critical.threshold",
-              "display_name": "Critical Process Time",
+              "display_name": "Get Request Status",
               "value": 5000,
               "type": "NUMERIC",
               "description": "The time to calculate a request's status from its tasks before a critical alert is triggered.",
@@ -77,7 +77,7 @@
             },
             {
               "name": "rest.api.cluster.warning.threshold",
-              "display_name": "Warning Response Time",
+              "display_name": "Get Cluster",
               "value": 5000,
               "type": "NUMERIC",
               "description": "The time to get a cluster via the REST API before a warning alert is triggered.",
@@ -86,7 +86,7 @@
             },
             {
               "name": "rest.api.cluster.critical.threshold",
-              "display_name": "Critical Response Time",
+              "display_name": "Get Cluster",
               "value": 7000,
               "type": "NUMERIC",
               "description": "The time to get a cluster via the REST API before a critical alert is triggered.",

http://git-wip-us.apache.org/repos/asf/ambari/blob/f2cf5170/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/alerts.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/alerts.json b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/alerts.json
index 4dc52a2..019fa60 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/alerts.json
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/alerts.json
@@ -467,7 +467,7 @@
       {
         "name": "namenode_free_heap_size_deviation_percentage",
         "label": "NameNode Heap Usage (Hourly)",
-        "description": "This service-level alert is triggered if the NN heap usage deviation has grown beyond the specified threshold within a given time interval.",
+        "description": "This service-level alert is triggered if the NameNode heap usage deviation has grown beyond the specified threshold within an hour period.",
         "interval": 1,
         "scope": "SERVICE",
         "enabled": false,
@@ -617,7 +617,7 @@
       {
         "name": "namenode_service_rpc_queue_latency_hourly",
         "label": "NameNode Service RPC Queue Latency (Hourly)",
-        "description": "This service-level alert is triggered if the deviation of RPC queue latency on datanode port has grown beyond the specified threshold within a given time interval.",
+        "description": "This service-level alert is triggered if the deviation of RPC queue latency on datanode port has grown beyond the specified threshold within an hour period.",
         "interval": 5,
         "scope": "ANY",
         "enabled": true,
@@ -638,7 +638,8 @@
               "display_name": "Time interval in minutes",
               "value": 60,
               "type": "NUMERIC",
-              "description": "Time interval in minutes."
+              "description": "Time interval in minutes.",
+              "visibility": "HIDDEN"
             },
             {
               "name": "appId",
@@ -658,26 +659,29 @@
             },
             {
               "name": "metric.deviation.warning.threshold",
-              "display_name": "The standard deviation threshold above which a warning is produced.",
+              "display_name": "Growth Rate",
               "type": "PERCENT",
               "units": "%",
               "value": 100,
+              "description": "The percentage of RPC queue latency growth.",
               "threshold": "WARNING"
             },
             {
               "name": "metric.deviation.critical.threshold",
-              "display_name": "The standard deviation threshold above which a critical alert is produced.",
+              "display_name": "Growth Rate",
               "type": "PERCENT",
               "units": "%",
               "value": 200,
+              "description": "The percentage of RPC queue latency growth.",
               "threshold": "CRITICAL"
             },
             {
               "name": "minimumValue",
-              "display_name": "Minimum Latency (in seconds)",
+              "display_name": "Minimum Latency",
               "value": 30,
               "type": "NUMERIC",
-              "description": "Minimum latency time to measure (in seconds)."
+              "units": "seconds",
+              "description": "The minimum latency to measure growth."
             }
           ]
         }
@@ -685,7 +689,7 @@
       {
         "name": "namenode_client_rpc_queue_latency_hourly",
         "label": "NameNode Client RPC Queue Latency (Hourly)",
-        "description": "This service-level alert is triggered if the deviation of RPC queue latency on client port has grown beyond the specified threshold within a given time interval.",
+        "description": "This service-level alert is triggered if the deviation of RPC queue latency on client port has grown beyond the specified threshold within an hour period.",
         "interval": 5,
         "scope": "ANY",
         "enabled": true,
@@ -706,7 +710,8 @@
               "display_name": "Time interval in minutes",
               "value": 60,
               "type": "NUMERIC",
-              "description": "Time interval in minutes."
+              "description": "Time interval in minutes.",
+              "visibility": "HIDDEN"
             },
             {
               "name": "appId",
@@ -726,26 +731,29 @@
             },
             {
               "name": "metric.deviation.warning.threshold",
-              "display_name": "The standard deviation threshold above which a warning is produced.",
+              "display_name": "Growth Rate",
               "type": "PERCENT",
               "units": "%",
               "value": 100,
+              "description": "The percentage of RPC queue latency growth.",
               "threshold": "WARNING"
             },
             {
               "name": "metric.deviation.critical.threshold",
-              "display_name": "The standard deviation threshold above which a critical alert is produced.",
+              "display_name": "Growth Rate",
               "type": "PERCENT",
               "units": "%",
               "value": 200,
+              "description": "The percentage of RPC queue latency growth.",
               "threshold": "CRITICAL"
             },
             {
               "name": "minimumValue",
-              "display_name": "Minimum Latency (in seconds)",
+              "display_name": "Minimum Latency",
               "value": 30,
               "type": "NUMERIC",
-              "description": "Minimum latency time to measure (in seconds)."
+              "units": "seconds",
+              "description": "The minimum latency to measure growth."
             }
           ]
         }
@@ -753,7 +761,7 @@
       {
         "name": "namenode_service_rpc_processing_latency_hourly",
         "label": "NameNode Service RPC Processing Latency (Hourly)",
-        "description": "This service-level alert is triggered if the deviation of RPC latency on datanode port has grown beyond the specified threshold within a given time interval.",
+        "description": "This service-level alert is triggered if the deviation of RPC latency on datanode port has grown beyond the specified threshold within an hour period.",
         "interval": 5,
         "scope": "ANY",
         "enabled": true,
@@ -774,7 +782,8 @@
               "display_name": "Time interval in minutes",
               "value": 60,
               "type": "NUMERIC",
-              "description": "Time interval in minutes."
+              "description": "Time interval in minutes.",
+              "visibility": "HIDDEN"
             },
             {
               "name": "appId",
@@ -794,26 +803,29 @@
             },
             {
               "name": "metric.deviation.warning.threshold",
-              "display_name": "The standard deviation threshold above which a warning is produced.",
+              "display_name": "Growth Rate",
               "type": "PERCENT",
               "units": "%",
               "value": 100,
+              "description": "The percentage of RPC processing latency growth.",
               "threshold": "WARNING"
             },
             {
               "name": "metric.deviation.critical.threshold",
-              "display_name": "The standard deviation threshold above which a critical alert is produced.",
+              "display_name": "Growth Rate",
               "type": "PERCENT",
               "units": "%",
               "value": 200,
+              "description": "The percentage of RPC processing latency growth.",
               "threshold": "CRITICAL"
             },
             {
               "name": "minimumValue",
-              "display_name": "Minimum Latency (in seconds)",
+              "display_name": "Minimum Latency",
               "value": 30,
               "type": "NUMERIC",
-              "description": "Minimum latency time to measure (in seconds)."
+              "units": "seconds",
+              "description": "The minimum latency to measure growth."
             }
           ]
         }
@@ -821,7 +833,7 @@
       {
         "name": "namenode_client_rpc_processing_latency_hourly",
         "label": "NameNode Client RPC Processing Latency (Hourly)",
-        "description": "This service-level alert is triggered if the deviation of RPC latency on client port has grown beyond the specified threshold within a given time interval.",
+        "description": "This service-level alert is triggered if the deviation of RPC latency on client port has grown beyond the specified threshold within an hour period.",
         "interval": 5,
         "scope": "ANY",
         "enabled": true,
@@ -842,7 +854,8 @@
               "display_name": "Time interval in minutes",
               "value": 60,
               "type": "NUMERIC",
-              "description": "Time interval in minutes."
+              "description": "Time interval in minutes.",
+              "visibility": "HIDDEN"
             },
             {
               "name": "appId",
@@ -862,26 +875,29 @@
             },
             {
               "name": "metric.deviation.warning.threshold",
-              "display_name": "The standard deviation threshold above which a warning is produced.",
+              "display_name": "Growth Rate",
               "type": "PERCENT",
               "units": "%",
               "value": 100,
+              "description": "The percentage of RPC processing latency growth.",
               "threshold": "WARNING"
             },
             {
               "name": "metric.deviation.critical.threshold",
-              "display_name": "The standard deviation threshold above which a critical alert is produced.",
+              "display_name": "Growth Rate",
               "type": "PERCENT",
               "units": "%",
               "value": 200,
+              "description": "The percentage of RPC processing latency growth.",
               "threshold": "CRITICAL"
             },
             {
               "name": "minimumValue",
-              "display_name": "Minimum Latency (in seconds)",
+              "display_name": "Minimum Latency",
               "value": 30,
               "type": "NUMERIC",
-              "description": "Minimum latency time to measure (in seconds)."
+              "units": "seconds",
+              "description": "The minimum latency to measure growth."
             }
           ]
         }
@@ -889,7 +905,7 @@
       {
         "name": "increase_nn_heap_usage_daily",
         "label": "NameNode Heap Usage (Daily)",
-        "description": "This service-level alert is triggered if the NN heap usage deviation has grown beyond the specified threshold within a given time interval.",
+        "description": "This service-level alert is triggered if the NameNode heap usage deviation has grown beyond the specified threshold within a day period.",
         "interval": 480,
         "scope": "ANY",
         "enabled": true,
@@ -910,7 +926,8 @@
               "display_name": "Time interval in minutes",
               "value": 1440,
               "type": "NUMERIC",
-              "description": "Time interval in minutes."
+              "description": "Time interval in minutes.",
+              "visibility": "HIDDEN"
             },
             {
               "name": "appId",
@@ -930,18 +947,20 @@
             },
             {
               "name": "metric.deviation.warning.threshold",
-              "display_name": "The standard deviation threshold above which a warning is produced.",
+              "display_name": "Growth Rate",
               "type": "PERCENT",
               "units": "%",
               "value": 20,
+              "description": "The percentage of NameNode heap usage growth.",
               "threshold": "WARNING"
             },
             {
               "name": "metric.deviation.critical.threshold",
-              "display_name": "The standard deviation threshold above which a critical alert is produced.",
+              "display_name": "Growth Rate",
               "type": "PERCENT",
               "units": "%",
               "value": 50,
+              "description": "The percentage of NameNode heap usage growth.",
               "threshold": "CRITICAL"
             }
           ]
@@ -950,7 +969,7 @@
       {
         "name": "namenode_service_rpc_processing_latency_daily",
         "label": "NameNode Service RPC Processing Latency (Daily)",
-        "description": "This service-level alert is triggered if the deviation of RPC latency on datanode port has grown beyond the specified threshold within a given time interval.",
+        "description": "This service-level alert is triggered if the deviation of RPC latency on datanode port has grown beyond the specified threshold within a day period.",
         "interval": 480,
         "scope": "ANY",
         "enabled": true,
@@ -971,7 +990,8 @@
               "display_name": "Time interval in minutes",
               "value": 1440,
               "type": "NUMERIC",
-              "description": "Time interval in minutes."
+              "description": "Time interval in minutes.",
+              "visibility": "HIDDEN"
             },
             {
               "name": "appId",
@@ -991,26 +1011,29 @@
             },
             {
               "name": "metric.deviation.warning.threshold",
-              "display_name": "The standard deviation threshold above which a warning is produced.",
+              "display_name": "Growth Rate",
               "type": "PERCENT",
               "units": "%",
               "value": 100,
+              "description": "The percentage of RPC processing latency growth.",
               "threshold": "WARNING"
             },
             {
               "name": "metric.deviation.critical.threshold",
-              "display_name": "The standard deviation threshold above which a critical alert is produced.",
+              "display_name": "Growth Rate",
               "type": "PERCENT",
               "units": "%",
               "value": 200,
+              "description": "The percentage of RPC processing latency growth.",
               "threshold": "CRITICAL"
             },
             {
               "name": "minimumValue",
-              "display_name": "Minimum Latency (in seconds)",
+              "display_name": "Minimum Latency",
               "value": 30,
               "type": "NUMERIC",
-              "description": "Minimum latency time to measure (in seconds)."
+              "units": "seconds",
+              "description": "The minimum latency to measure growth."
             }
           ]
         }
@@ -1018,7 +1041,7 @@
       {
         "name": "namenode_client_rpc_processing_latency_daily",
         "label": "NameNode Client RPC Processing Latency (Daily)",
-        "description": "This service-level alert is triggered if the deviation of RPC latency on client port has grown beyond the specified threshold within a given time interval.",
+        "description": "This service-level alert is triggered if the deviation of RPC latency on client port has grown beyond the specified threshold within a day period.",
         "interval": 480,
         "scope": "ANY",
         "enabled": true,
@@ -1039,7 +1062,8 @@
               "display_name": "Time interval in minutes",
               "value": 1440,
               "type": "NUMERIC",
-              "description": "Time interval in minutes."
+              "description": "Time interval in minutes.",
+              "visibility": "HIDDEN"
             },
             {
               "name": "appId",
@@ -1059,26 +1083,29 @@
             },
             {
               "name": "metric.deviation.warning.threshold",
-              "display_name": "The standard deviation threshold above which a warning is produced.",
+              "display_name": "Growth Rate",
               "type": "PERCENT",
               "units": "%",
               "value": 100,
+              "description": "The percentage of RPC processing latency growth.",
               "threshold": "WARNING"
             },
             {
               "name": "metric.deviation.critical.threshold",
-              "display_name": "The standard deviation threshold above which a critical alert is produced.",
+              "display_name": "Growth Rate",
               "type": "PERCENT",
               "units": "%",
               "value": 200,
+              "description": "The percentage of RPC processing latency growth.",
               "threshold": "CRITICAL"
             },
             {
               "name": "minimumValue",
-              "display_name": "Minimum Latency (in seconds)",
+              "display_name": "Minimum Latency",
               "value": 30,
               "type": "NUMERIC",
-              "description": "Minimum latency time to measure (in seconds)."
+              "units": "seconds",
+              "description": "The minimum latency to measure growth."
             }
           ]
         }
@@ -1086,7 +1113,7 @@
       {
         "name": "namenode_service_rpc_queue_latency_daily",
         "label": "NameNode Service RPC Queue Latency (Daily)",
-        "description": "This service-level alert is triggered if the deviation of RPC latency on datanode port has grown beyond the specified threshold within a given time interval.",
+        "description": "This service-level alert is triggered if the deviation of RPC latency on datanode port has grown beyond the specified threshold within a day period.",
         "interval": 480,
         "scope": "ANY",
         "enabled": true,
@@ -1107,7 +1134,8 @@
               "display_name": "Time interval in minutes",
               "value": 1440,
               "type": "NUMERIC",
-              "description": "Time interval in minutes."
+              "description": "Time interval in minutes.",
+              "visibility": "HIDDEN"
             },
             {
               "name": "appId",
@@ -1127,26 +1155,29 @@
             },
             {
               "name": "metric.deviation.warning.threshold",
-              "display_name": "The standard deviation threshold above which a warning is produced.",
+              "display_name": "Growth Rate",
               "type": "PERCENT",
               "units": "%",
               "value": 100,
+              "description": "The percentage of RPC queue latency growth.",
               "threshold": "WARNING"
             },
             {
               "name": "metric.deviation.critical.threshold",
-              "display_name": "The standard deviation threshold above which a critical alert is produced.",
+              "display_name": "Growth Rate",
               "type": "PERCENT",
               "units": "%",
               "value": 200,
+              "description": "The percentage of RPC queue latency growth.",
               "threshold": "CRITICAL"
             },
             {
               "name": "minimumValue",
-              "display_name": "Minimum Latency (in seconds)",
+              "display_name": "Minimum Latency",
               "value": 30,
               "type": "NUMERIC",
-              "description": "Minimum latency time to measure (in seconds)."
+              "units": "seconds",
+              "description": "The minimum latency to measure growth."
             }
           ]
         }
@@ -1154,7 +1185,7 @@
       {
         "name": "namenode_client_rpc_queue_latency_daily",
         "label": "NameNode Client RPC Queue Latency (Daily)",
-        "description": "This service-level alert is triggered if the deviation of RPC latency on client port has grown beyond the specified threshold within a given time interval.",
+        "description": "This service-level alert is triggered if the deviation of RPC latency on client port has grown beyond the specified threshold within a day period.",
         "interval": 480,
         "scope": "ANY",
         "enabled": true,
@@ -1175,7 +1206,8 @@
               "display_name": "Time interval in minutes",
               "value": 1440,
               "type": "NUMERIC",
-              "description": "Time interval in minutes."
+              "description": "Time interval in minutes.",
+              "visibility": "HIDDEN"
             },
             {
               "name": "appId",
@@ -1195,26 +1227,29 @@
             },
             {
               "name": "metric.deviation.warning.threshold",
-              "display_name": "The standard deviation threshold above which a warning is produced.",
+              "display_name": "Growth Rate",
               "type": "PERCENT",
               "units": "%",
               "value": 100,
+              "description": "The percentage of RPC queue latency growth.",
               "threshold": "WARNING"
             },
             {
               "name": "metric.deviation.critical.threshold",
-              "display_name": "The standard deviation threshold above which a critical alert is produced.",
+              "display_name": "Growth Rate",
               "type": "PERCENT",
               "units": "%",
               "value": 200,
+              "description": "The percentage of RPC queue latency growth.",
               "threshold": "CRITICAL"
             },
             {
               "name": "minimumValue",
-              "display_name": "Minimum Latency (in seconds)",
+              "display_name": "Minimum Latency",
               "value": 30,
               "type": "NUMERIC",
-              "description": "Minimum latency time to measure (in seconds)."
+              "units": "seconds",
+              "description": "The minimum latency to measure growth."
             }
           ]
         }
@@ -1222,7 +1257,7 @@
       {
         "name": "namenode_increase_in_storage_capacity_usage_daily",
         "label": "HDFS Storage Capacity Usage (Daily)",
-        "description": "This service-level alert is triggered if the increase in storage capacity usage deviation has grown beyond the specified threshold within a given time interval.",
+        "description": "This service-level alert is triggered if the increase in storage capacity usage deviation has grown beyond the specified threshold within a day period.",
         "interval": 480,
         "scope": "ANY",
         "enabled": true,
@@ -1243,7 +1278,8 @@
               "display_name": "Time interval in minutes",
               "value": 1440,
               "type": "NUMERIC",
-              "description": "Time interval in minutes."
+              "description": "Time interval in minutes.",
+              "visibility": "HIDDEN"
             },
             {
               "name": "appId",
@@ -1263,18 +1299,20 @@
             },
             {
               "name": "metric.deviation.warning.threshold",
-              "display_name": "The standard deviation threshold above which a warning is produced.",
+              "display_name": "Growth Rate",
               "type": "PERCENT",
               "units": "%",
               "value": 30,
+              "description": "The percentage of storage capacity usage growth.",
               "threshold": "WARNING"
             },
             {
               "name": "metric.deviation.critical.threshold",
-              "display_name": "The standard deviation threshold above which a critical alert is produced.",
+              "display_name": "Growth Rate",
               "type": "PERCENT",
               "units": "%",
               "value": 50,
+              "description": "The percentage of storage capacity usage growth.",
               "threshold": "CRITICAL"
             }
           ]
@@ -1283,7 +1321,7 @@
       {
         "name": "increase_nn_heap_usage_weekly",
         "label": "NameNode Heap Usage (Weekly)",
-        "description": "This service-level alert is triggered if the NN heap usage deviation has grown beyond the specified threshold within a given time interval.",
+        "description": "This service-level alert is triggered if the NameNode heap usage deviation has grown beyond the specified threshold within a week period.",
         "interval": 1440,
         "scope": "ANY",
         "enabled": true,
@@ -1304,7 +1342,8 @@
               "display_name": "Time interval in minutes",
               "value": 10080,
               "type": "NUMERIC",
-              "description": "Time interval in minutes."
+              "description": "Time interval in minutes.",
+              "visibility": "HIDDEN"
             },
             {
               "name": "appId",
@@ -1324,18 +1363,20 @@
             },
             {
               "name": "metric.deviation.warning.threshold",
-              "display_name": "The standard deviation threshold above which a warning is produced.",
+              "display_name": "Growth Rate",
               "type": "PERCENT",
               "units": "%",
               "value": 20,
+              "description": "The percentage of NameNode heap usage growth.",
               "threshold": "WARNING"
             },
             {
               "name": "metric.deviation.critical.threshold",
-              "display_name": "The standard deviation threshold above which a critical alert is produced.",
+              "display_name": "Growth Rate",
               "type": "PERCENT",
               "units": "%",
               "value": 50,
+              "description": "The percentage of NameNode heap usage growth.",
               "threshold": "CRITICAL"
             }
           ]
@@ -1344,7 +1385,7 @@
       {
         "name": "namenode_increase_in_storage_capacity_usage_weekly",
         "label": "HDFS Storage Capacity Usage (Weekly)",
-        "description": "This service-level alert is triggered if the increase in storage capacity usage deviation has grown beyond the specified threshold within a given time interval.",
+        "description": "This service-level alert is triggered if the increase in storage capacity usage deviation has grown beyond the specified threshold within a week period.",
         "interval": 1440,
         "scope": "ANY",
         "enabled": true,
@@ -1365,7 +1406,8 @@
               "display_name": "Time interval in minutes",
               "value": 10080,
               "type": "NUMERIC",
-              "description": "Time interval in minutes."
+              "description": "Time interval in minutes.",
+              "visibility": "HIDDEN"
             },
             {
               "name": "appId",
@@ -1385,18 +1427,20 @@
             },
             {
               "name": "metric.deviation.warning.threshold",
-              "display_name": "The standard deviation threshold above which a warning is produced.",
+              "display_name": "Growth Rate",
               "type": "PERCENT",
               "units": "%",
               "value": 10,
+              "description": "The percentage of storage capacity usage growth.",
               "threshold": "WARNING"
             },
             {
               "name": "metric.deviation.critical.threshold",
-              "display_name": "The standard deviation threshold above which a critical alert is produced.",
+              "display_name": "Growth Rate",
               "type": "PERCENT",
               "units": "%",
               "value": 20,
+              "description": "The percentage of storage capacity usage growth.",
               "threshold": "CRITICAL"
             }
           ]

http://git-wip-us.apache.org/repos/asf/ambari/blob/f2cf5170/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/alerts.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/alerts.json b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/alerts.json
index 1f86e57..9f0466c 100644
--- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/alerts.json
+++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/alerts.json
@@ -15,18 +15,20 @@
           "parameters": [
             {
               "name": "check.command.timeout",
-              "display_name": "Check command timeout",
+              "display_name": "Command Timeout",
               "value": 60.0,
               "type": "NUMERIC",
               "description": "The maximum time before check command will be killed by timeout",
-              "units": "seconds"
+              "units": "seconds",
+              "threshold": "CRITICAL"
             },
             {
               "name": "default.smoke.user",
               "display_name": "Default Smoke User",
               "value": "ambari-qa",
               "type": "STRING",
-              "description": "The user that will run the Hive commands if not specified in cluster-env/smokeuser"
+              "description": "The user that will run the Hive commands if not specified in cluster-env/smokeuser",
+              "visibility": "HIDDEN"
             },
             {
               "name": "default.smoke.principal",
@@ -62,18 +64,20 @@
           "parameters": [
             {
               "name": "check.command.timeout",
-              "display_name": "Check command timeout",
+              "display_name": "Command Timeout",
               "value": 60.0,
               "type": "NUMERIC",
               "description": "The maximum time before check command will be killed by timeout",
-              "units": "seconds"
+              "units": "seconds",
+              "threshold": "CRITICAL"
             },
             {
               "name": "default.smoke.user",
               "display_name": "Default Smoke User",
               "value": "ambari-qa",
               "type": "STRING",
-              "description": "The user that will run the Hive commands if not specified in cluster-env/smokeuser"
+              "description": "The user that will run the Hive commands if not specified in cluster-env/smokeuser",
+              "visibility": "HIDDEN"
             },
             {
               "name": "default.smoke.principal",
@@ -109,32 +113,36 @@
           "parameters": [
             {
               "name": "check.command.timeout",
-              "display_name": "Check command timeout",
+              "display_name": "Command Timeout",
               "value": 60.0,
               "type": "NUMERIC",
               "description": "The maximum time before check command will be killed by timeout",
-              "units": "seconds"
+              "units": "seconds",
+              "threshold": "CRITICAL"
             },
             {
               "name": "default.smoke.user",
               "display_name": "Default Smoke User",
               "value": "ambari-qa",
               "type": "STRING",
-              "description": "The user that will run the Hive commands if not specified in cluster-env/smokeuser"
+              "description": "The user that will run the Hive commands if not specified in cluster-env/smokeuser",
+              "visibility": "HIDDEN"
             },
             {
               "name": "default.smoke.principal",
               "display_name": "Default Smoke Principal",
               "value": "ambari-qa@EXAMPLE.COM",
               "type": "STRING",
-              "description": "The principal to use when retrieving the kerberos ticket if not specified in cluster-env/smokeuser_principal_name"
+              "description": "The principal to use when retrieving the kerberos ticket if not specified in cluster-env/smokeuser_principal_name",
+              "visibility": "HIDDEN"
             },
             {
               "name": "default.smoke.keytab",
               "display_name": "Default Smoke Keytab",
               "value": "/etc/security/keytabs/smokeuser.headless.keytab",
               "type": "STRING",
-              "description": "The keytab to use when retrieving the kerberos ticket if not specified in cluster-env/smokeuser_keytab"
+              "description": "The keytab to use when retrieving the kerberos ticket if not specified in cluster-env/smokeuser_keytab",
+              "visibility": "HIDDEN"
             }
           ]
         }

http://git-wip-us.apache.org/repos/asf/ambari/blob/f2cf5170/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/alerts/definition_configs_controller.js b/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
index 9dc4f92..617f7cc 100644
--- a/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
+++ b/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
@@ -332,25 +332,6 @@ App.MainAlertDefinitionConfigsController = Em.Controller.extend({
       App.AlertConfigProperties.Interval.create({
         value: isWizard ? '' : alertDefinition.get('interval')
       }),
-      App.AlertConfigProperties.Interval.create({
-        value: isWizard ? '' : alertDefinition.get('ams.interval'),
-        label: 'AMS Interval',
-        apiProperty: 'source.ams.interval'
-      }),
-      App.AlertConfigProperty.create({
-        value: isWizard ? '' : alertDefinition.get('ams.value'),
-        label: 'AMS Value',
-        displayType: 'textField',
-        apiProperty: 'source.ams.value',
-        isValid: function () {
-          return (this.get('value') || '').trim().length > 0;
-        }.property('value')
-      }),
-      App.AlertConfigProperties.Parameter.create({
-        value: isWizard ? '' : alertDefinition.get('ams.minimalValue'),
-        label: 'AMS Minimal Value',
-        apiProperty: 'source.ams.minimal_value'
-      }),
       App.AlertConfigProperties.Thresholds.OkThreshold.create({
         label: 'Thresholds',
         showInputForValue: false,

http://git-wip-us.apache.org/repos/asf/ambari/blob/f2cf5170/ambari-web/app/models/alerts/alert_definition.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/alerts/alert_definition.js b/ambari-web/app/models/alerts/alert_definition.js
index 245771e..4da7199 100644
--- a/ambari-web/app/models/alerts/alert_definition.js
+++ b/ambari-web/app/models/alerts/alert_definition.js
@@ -236,7 +236,7 @@ App.AlertDefinition = DS.Model.extend({
     'AGGREGATE': 'icon-plus',
     'SERVER': 'icon-desktop',
     'RECOVERY': 'icon-desktop',
-    'AMS': 'icon-rocket'
+    'AMS': 'icon-bar-chart'
   },
 
   /**