[34/50] [abbrv] ambari git commit: AMBARI-13603. Alerts: Rename "Ambari Agent Disk Usage" alert (aonishuk)

2015-11-04 Thread ncole 
AMBARI-13603. Alerts: Rename "Ambari Agent Disk Usage" alert (aonishuk)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: f24058f79e9b12e8c80aa4c03f6b82b0123ce7c3
Parents: 9ce6311
Author: Andrew Onishuk 
Authored: Tue Nov 3 16:29:16 2015 +0200
Committer: Andrew Onishuk 
Committed: Tue Nov 3 16:29:16 2015 +0200

--
 ambari-server/docs/api/v1/alerts.md |  4 +-
 .../server/upgrade/UpgradeCatalog213.java   | 34 ++---
 ambari-server/src/main/resources/alerts.json|  6 +-
 .../server/upgrade/UpgradeCatalog213Test.java   | 76 
 .../assets/data/alerts/alertDefinitions.json|  4 +-
 .../app/assets/data/alerts/alert_instances.json |  2 +-
 .../app/assets/data/alerts/alert_summary.json   |  2 +-
 .../test/mappers/alert_instances_mapper_test.js |  2 +-
 8 files changed, 95 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f24058f7/ambari-server/docs/api/v1/alerts.md
--
diff --git a/ambari-server/docs/api/v1/alerts.md 
b/ambari-server/docs/api/v1/alerts.md
index f2c50a8..1ee13c5 100644
--- a/ambari-server/docs/api/v1/alerts.md
+++ b/ambari-server/docs/api/v1/alerts.md
@@ -48,7 +48,7 @@ Current alerts can be exposed on the following resource 
endpoints:
 "host_name" : "",
 "id" : 2,
 "instance" : null,
-"label" : "Ambari Agent Disk Usage",
+"label" : "Host Disk Usage",
 "latest_timestamp" : 1425704842163,
 "maintenance_state" : "OFF",
 "original_timestamp" : 1425600467615,
@@ -188,4 +188,4 @@ History can be exposed on the following resource endpoints:
 
 # All alerting events for HDFS and YARN
 GET 
api/v1/clusters/c1/alert_history?(AlertHistory/service_name.in(HDFS,YARN))
-
\ No newline at end of file
+

http://git-wip-us.apache.org/repos/asf/ambari/blob/f24058f7/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
index 34072dc..895d24b 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
@@ -202,9 +202,9 @@ public class UpgradeCatalog213 extends 
AbstractUpgradeCatalog {
 
   private void executeBlueprintDDLUpdates() throws AmbariException, 
SQLException {
 dbAccessor.addColumn(BLUEPRINT_TABLE, new 
DBAccessor.DBColumnInfo(SECURITY_TYPE_COLUMN,
-  String.class, 32, "NONE", false));
+String.class, 32, "NONE", false));
 dbAccessor.addColumn(BLUEPRINT_TABLE, new 
DBAccessor.DBColumnInfo(SECURITY_DESCRIPTOR_REF_COLUMN,
-  String.class, null, null, true));
+String.class, null, null, true));
   }
 
 /**
@@ -628,19 +628,33 @@ public class UpgradeCatalog213 extends 
AbstractUpgradeCatalog {
 
 Map clusterMap = getCheckedClusterMap(clusters);
 for (final Cluster cluster : clusterMap.values()) {
-  final AlertDefinitionEntity alertDefinitionEntity = 
alertDefinitionDAO.findByName(
-cluster.getClusterId(), "journalnode_process");
+  long clusterID = cluster.getClusterId();
 
-  if (alertDefinitionEntity != null) {
-String source = alertDefinitionEntity.getSource();
+  final AlertDefinitionEntity journalNodeProcessAlertDefinitionEntity = 
alertDefinitionDAO.findByName(
+  clusterID, "journalnode_process");
+  final AlertDefinitionEntity hostDiskUsageAlertDefinitionEntity = 
alertDefinitionDAO.findByName(
+  clusterID, "ambari_agent_disk_usage");
 
-
alertDefinitionEntity.setSource(modifyJournalnodeProcessAlertSource(source));
-alertDefinitionEntity.setSourceType(SourceType.WEB);
-alertDefinitionEntity.setHash(UUID.randomUUID().toString());
+  if (journalNodeProcessAlertDefinitionEntity != null) {
+String source = journalNodeProcessAlertDefinitionEntity.getSource();
 
-alertDefinitionDAO.merge(alertDefinitionEntity);
+
journalNodeProcessAlertDefinitionEntity.setSource(modifyJournalnodeProcessAlertSource(source));
+journalNodeProcessAlertDefinitionEntity.setSourceType(SourceType.WEB);
+

ambari git commit: AMBARI-13603. Alerts: Rename "Ambari Agent Disk Usage" alert (aonishuk)

2015-11-03 Thread aonishuk 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 2ddd0b453 -> 4813cd34c


AMBARI-13603. Alerts: Rename "Ambari Agent Disk Usage" alert (aonishuk)


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

Branch: refs/heads/branch-2.1
Commit: 4813cd34cbe117a784ea9fc102e84a63a12e32b1
Parents: 2ddd0b4
Author: Andrew Onishuk 
Authored: Tue Nov 3 16:27:45 2015 +0200
Committer: Andrew Onishuk 
Committed: Tue Nov 3 16:28:28 2015 +0200

--
 ambari-server/docs/api/v1/alerts.md |  4 +-
 .../server/upgrade/UpgradeCatalog213.java   | 28 +++---
 ambari-server/src/main/resources/alerts.json|  6 +--
 .../server/upgrade/UpgradeCatalog213Test.java   | 55 ++--
 .../assets/data/alerts/alertDefinitions.json|  4 +-
 .../app/assets/data/alerts/alert_instances.json |  2 +-
 .../app/assets/data/alerts/alert_summary.json   |  2 +-
 .../test/mappers/alert_instances_mapper_test.js |  2 +-
 8 files changed, 81 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4813cd34/ambari-server/docs/api/v1/alerts.md
--
diff --git a/ambari-server/docs/api/v1/alerts.md 
b/ambari-server/docs/api/v1/alerts.md
index f2c50a8..1ee13c5 100644
--- a/ambari-server/docs/api/v1/alerts.md
+++ b/ambari-server/docs/api/v1/alerts.md
@@ -48,7 +48,7 @@ Current alerts can be exposed on the following resource 
endpoints:
 "host_name" : "",
 "id" : 2,
 "instance" : null,
-"label" : "Ambari Agent Disk Usage",
+"label" : "Host Disk Usage",
 "latest_timestamp" : 1425704842163,
 "maintenance_state" : "OFF",
 "original_timestamp" : 1425600467615,
@@ -188,4 +188,4 @@ History can be exposed on the following resource endpoints:
 
 # All alerting events for HDFS and YARN
 GET 
api/v1/clusters/c1/alert_history?(AlertHistory/service_name.in(HDFS,YARN))
-
\ No newline at end of file
+

http://git-wip-us.apache.org/repos/asf/ambari/blob/4813cd34/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
index 2823a07..8f1a481 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
@@ -628,19 +628,31 @@ public class UpgradeCatalog213 extends 
AbstractUpgradeCatalog {
 
 Map clusterMap = getCheckedClusterMap(clusters);
 for (final Cluster cluster : clusterMap.values()) {
-  final AlertDefinitionEntity alertDefinitionEntity = 
alertDefinitionDAO.findByName(
-  cluster.getClusterId(), "journalnode_process");
+  long clusterID = cluster.getClusterId();
+  final AlertDefinitionEntity journalNodeProcessAlertDefinitionEntity = 
alertDefinitionDAO.findByName(
+  clusterID, "journalnode_process");
+  final AlertDefinitionEntity hostDiskUsageAlertDefinitionEntity = 
alertDefinitionDAO.findByName(
+  clusterID, "ambari_agent_disk_usage");
 
-  if (alertDefinitionEntity != null) {
-String source = alertDefinitionEntity.getSource();
+  if (journalNodeProcessAlertDefinitionEntity != null) {
+String source = journalNodeProcessAlertDefinitionEntity.getSource();
 
-
alertDefinitionEntity.setSource(modifyJournalnodeProcessAlertSource(source));
-alertDefinitionEntity.setSourceType(SourceType.WEB);
-alertDefinitionEntity.setHash(UUID.randomUUID().toString());
+
journalNodeProcessAlertDefinitionEntity.setSource(modifyJournalnodeProcessAlertSource(source));
+journalNodeProcessAlertDefinitionEntity.setSourceType(SourceType.WEB);
+
journalNodeProcessAlertDefinitionEntity.setHash(UUID.randomUUID().toString());
 
-alertDefinitionDAO.merge(alertDefinitionEntity);
+alertDefinitionDAO.merge(journalNodeProcessAlertDefinitionEntity);
 LOG.info("journalnode_process alert definition was updated.");
   }
+
+  if (hostDiskUsageAlertDefinitionEntity != null) {
+hostDiskUsageAlertDefinitionEntity.setDescription("This host-level 
alert is triggered if the amount of disk " +
+"space used goes above specific thresholds. The default threshold 
values are 50% for

ambari git commit: AMBARI-13603. Alerts: Rename "Ambari Agent Disk Usage" alert (aonishuk)

2015-11-03 Thread aonishuk 
Repository: ambari
Updated Branches:
  refs/heads/trunk 9ce6311f6 -> f24058f79


AMBARI-13603. Alerts: Rename "Ambari Agent Disk Usage" alert (aonishuk)


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

Branch: refs/heads/trunk
Commit: f24058f79e9b12e8c80aa4c03f6b82b0123ce7c3
Parents: 9ce6311
Author: Andrew Onishuk 
Authored: Tue Nov 3 16:29:16 2015 +0200
Committer: Andrew Onishuk 
Committed: Tue Nov 3 16:29:16 2015 +0200

--
 ambari-server/docs/api/v1/alerts.md |  4 +-
 .../server/upgrade/UpgradeCatalog213.java   | 34 ++---
 ambari-server/src/main/resources/alerts.json|  6 +-
 .../server/upgrade/UpgradeCatalog213Test.java   | 76 
 .../assets/data/alerts/alertDefinitions.json|  4 +-
 .../app/assets/data/alerts/alert_instances.json |  2 +-
 .../app/assets/data/alerts/alert_summary.json   |  2 +-
 .../test/mappers/alert_instances_mapper_test.js |  2 +-
 8 files changed, 95 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f24058f7/ambari-server/docs/api/v1/alerts.md
--
diff --git a/ambari-server/docs/api/v1/alerts.md 
b/ambari-server/docs/api/v1/alerts.md
index f2c50a8..1ee13c5 100644
--- a/ambari-server/docs/api/v1/alerts.md
+++ b/ambari-server/docs/api/v1/alerts.md
@@ -48,7 +48,7 @@ Current alerts can be exposed on the following resource 
endpoints:
 "host_name" : "",
 "id" : 2,
 "instance" : null,
-"label" : "Ambari Agent Disk Usage",
+"label" : "Host Disk Usage",
 "latest_timestamp" : 1425704842163,
 "maintenance_state" : "OFF",
 "original_timestamp" : 1425600467615,
@@ -188,4 +188,4 @@ History can be exposed on the following resource endpoints:
 
 # All alerting events for HDFS and YARN
 GET 
api/v1/clusters/c1/alert_history?(AlertHistory/service_name.in(HDFS,YARN))
-
\ No newline at end of file
+

http://git-wip-us.apache.org/repos/asf/ambari/blob/f24058f7/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
index 34072dc..895d24b 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
@@ -202,9 +202,9 @@ public class UpgradeCatalog213 extends 
AbstractUpgradeCatalog {
 
   private void executeBlueprintDDLUpdates() throws AmbariException, 
SQLException {
 dbAccessor.addColumn(BLUEPRINT_TABLE, new 
DBAccessor.DBColumnInfo(SECURITY_TYPE_COLUMN,
-  String.class, 32, "NONE", false));
+String.class, 32, "NONE", false));
 dbAccessor.addColumn(BLUEPRINT_TABLE, new 
DBAccessor.DBColumnInfo(SECURITY_DESCRIPTOR_REF_COLUMN,
-  String.class, null, null, true));
+String.class, null, null, true));
   }
 
 /**
@@ -628,19 +628,33 @@ public class UpgradeCatalog213 extends 
AbstractUpgradeCatalog {
 
 Map clusterMap = getCheckedClusterMap(clusters);
 for (final Cluster cluster : clusterMap.values()) {
-  final AlertDefinitionEntity alertDefinitionEntity = 
alertDefinitionDAO.findByName(
-cluster.getClusterId(), "journalnode_process");
+  long clusterID = cluster.getClusterId();
 
-  if (alertDefinitionEntity != null) {
-String source = alertDefinitionEntity.getSource();
+  final AlertDefinitionEntity journalNodeProcessAlertDefinitionEntity = 
alertDefinitionDAO.findByName(
+  clusterID, "journalnode_process");
+  final AlertDefinitionEntity hostDiskUsageAlertDefinitionEntity = 
alertDefinitionDAO.findByName(
+  clusterID, "ambari_agent_disk_usage");
 
-
alertDefinitionEntity.setSource(modifyJournalnodeProcessAlertSource(source));
-alertDefinitionEntity.setSourceType(SourceType.WEB);
-alertDefinitionEntity.setHash(UUID.randomUUID().toString());
+  if (journalNodeProcessAlertDefinitionEntity != null) {
+String source = journalNodeProcessAlertDefinitionEntity.getSource();
 
-alertDefinitionDAO.merge(alertDefinitionEntity);
+
journalNodeProcessAlertDefinitionEntity.setSource(modifyJournalnodeProcessAlertSource(source));
+