You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2014/07/18 16:21:32 UTC
[3/3] git commit: Merge remote-tracking branch 'origin/trunk' into
trunk
Merge remote-tracking branch 'origin/trunk' into trunk
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/366bcbb6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/366bcbb6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/366bcbb6
Branch: refs/heads/trunk
Commit: 366bcbb6998a87dbd59bd4defabff266079c9461
Parents: 5659f0a 39a92eb
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Fri Jul 18 17:21:11 2014 +0300
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Fri Jul 18 17:21:11 2014 +0300
----------------------------------------------------------------------
.../resources/AlertDefResourceDefinition.java | 44 ++++
.../resources/ClusterResourceDefinition.java | 1 +
.../resources/ResourceInstanceFactoryImpl.java | 4 +
.../api/services/AlertDefinitionService.java | 93 ++++++++
.../server/api/services/AmbariMetaInfo.java | 43 ++++
.../server/api/services/ClusterService.java | 9 +
.../server/api/util/StackExtensionHelper.java | 12 +-
.../ambari/server/controller/AmbariServer.java | 3 +
.../AbstractControllerResourceProvider.java | 2 +
.../AlertDefinitionResourceProvider.java | 178 ++++++++++++++
.../ambari/server/controller/spi/Resource.java | 6 +-
.../server/orm/dao/AlertDefinitionDAO.java | 27 ++-
.../ambari/server/orm/dao/AlertDispatchDAO.java | 230 ++++++++++++++++++-
.../apache/ambari/server/orm/dao/AlertsDAO.java | 138 +++++++++++
.../server/orm/entities/AlertCurrentEntity.java | 27 +++
.../orm/entities/AlertDefinitionEntity.java | 78 ++++++-
.../server/orm/entities/AlertGroupEntity.java | 46 +++-
.../server/orm/entities/AlertHistoryEntity.java | 36 ++-
.../server/orm/entities/AlertNoticeEntity.java | 29 +++
.../server/orm/entities/AlertTargetEntity.java | 38 ++-
.../apache/ambari/server/state/ServiceInfo.java | 18 +-
.../server/state/alert/AlertDefinition.java | 117 ++++++++++
.../ambari/server/state/alert/MetricAlert.java | 57 +++++
.../apache/ambari/server/state/alert/Scope.java | 33 +++
.../ambari/server/state/alert/SourceType.java | 40 ++++
.../resources/Ambari-DDL-Postgres-CREATE.sql | 1 +
.../Ambari-DDL-Postgres-EMBEDDED-CREATE.sql | 1 +
.../src/main/resources/key_properties.json | 4 +
.../src/main/resources/properties.json | 11 +
.../stacks/HDP/2.0.6/services/HDFS/alerts.json | 59 +++++
.../ClusterResourceDefinitionTest.java | 3 +-
.../server/api/services/AmbariMetaInfoTest.java | 22 ++
.../AlertDefinitionResourceProviderTest.java | 162 +++++++++++++
.../server/orm/dao/AlertDefinitionDAOTest.java | 6 +-
.../stacks/HDP/2.0.5/services/HDFS/alerts.json | 52 +++++
35 files changed, 1594 insertions(+), 36 deletions(-)
----------------------------------------------------------------------