ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [50/50] [abbrv] git commit: Merge branch 'branch-alerts-dev' into trunk
Date Mon, 06 Oct 2014 21:04:12 GMT
Merge branch 'branch-alerts-dev' into trunk


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

Branch: refs/heads/trunk
Commit: 80bceaf3abc8028e7d6b9f9d3a7738132ece6b8a
Parents: 0d953b4 cc2d934
Author: Jonathan Hurley <jhurley@hortonworks.com>
Authored: Mon Oct 6 17:02:54 2014 -0400
Committer: Jonathan Hurley <jhurley@hortonworks.com>
Committed: Mon Oct 6 17:02:54 2014 -0400

----------------------------------------------------------------------
 ambari-agent/pom.xml                            |   1 +
 .../ambari_agent/AlertSchedulerHandler.py       | 371 ++++++++++
 .../src/main/python/ambari_agent/Controller.py  |  35 +-
 .../src/main/python/ambari_agent/Heartbeat.py   |   8 +-
 .../main/python/ambari_agent/alerts/__init__.py |  18 +
 .../python/ambari_agent/alerts/base_alert.py    | 204 ++++++
 .../python/ambari_agent/alerts/collector.py     |  70 ++
 .../python/ambari_agent/alerts/metric_alert.py  | 174 +++++
 .../python/ambari_agent/alerts/port_alert.py    |  71 ++
 .../python/ambari_agent/alerts/script_alert.py  |  70 ++
 .../python/ambari_agent/apscheduler/__init__.py |   3 +
 .../python/ambari_agent/apscheduler/events.py   |  64 ++
 .../main/python/ambari_agent/apscheduler/job.py | 137 ++++
 .../apscheduler/jobstores/__init__.py           |   0
 .../ambari_agent/apscheduler/jobstores/base.py  |  25 +
 .../apscheduler/jobstores/mongodb_store.py      |  84 +++
 .../apscheduler/jobstores/ram_store.py          |  25 +
 .../apscheduler/jobstores/redis_store.py        |  91 +++
 .../apscheduler/jobstores/shelve_store.py       |  74 ++
 .../apscheduler/jobstores/sqlalchemy_store.py   |  91 +++
 .../ambari_agent/apscheduler/scheduler.py       | 607 +++++++++++++++++
 .../ambari_agent/apscheduler/threadpool.py      | 133 ++++
 .../apscheduler/triggers/__init__.py            |   3 +
 .../apscheduler/triggers/cron/__init__.py       | 144 ++++
 .../apscheduler/triggers/cron/expressions.py    | 194 ++++++
 .../apscheduler/triggers/cron/fields.py         | 100 +++
 .../apscheduler/triggers/interval.py            |  39 ++
 .../ambari_agent/apscheduler/triggers/simple.py |  17 +
 .../python/ambari_agent/apscheduler/util.py     | 230 +++++++
 .../src/test/python/ambari_agent/TestAlerts.py  | 357 ++++++++++
 .../test/python/ambari_agent/TestController.py  |   1 +
 .../ambari_agent/dummy_files/definitions.json   |  37 +
 .../ambari_agent/dummy_files/test_script.py     |   3 +
 ambari-project/pom.xml                          |   7 +-
 ambari-server/pom.xml                           |  22 +-
 .../apache/ambari/server/EagerSingleton.java    |  43 ++
 .../apache/ambari/server/agent/ActionQueue.java |  51 +-
 .../ambari/server/agent/AgentCommand.java       |  37 +-
 .../server/agent/AlertDefinitionCommand.java    | 168 +++++
 .../server/agent/AlertExecutionCommand.java     |  74 ++
 .../ambari/server/agent/CancelCommand.java      |   5 +-
 .../ambari/server/agent/ExecutionCommand.java   | 109 +--
 .../apache/ambari/server/agent/HeartBeat.java   |   6 +
 .../ambari/server/agent/HeartBeatHandler.java   | 174 +++--
 .../ambari/server/agent/HeartBeatResponse.java  | 119 +++-
 .../ambari/server/agent/HeartbeatMonitor.java   |  40 +-
 .../ambari/server/agent/NagiosAlertCommand.java |  11 +-
 .../server/agent/RegistrationResponse.java      |  50 +-
 .../ambari/server/agent/StatusCommand.java      |  43 +-
 .../resources/AlertDefResourceDefinition.java   |   3 -
 .../resources/AlertGroupResourceDefinition.java |  50 ++
 .../api/resources/AlertResourceDefinition.java  |  41 ++
 .../AlertTargetResourceDefinition.java          |  50 ++
 .../resources/ClusterResourceDefinition.java    |   1 +
 .../api/resources/HostResourceDefinition.java   |   7 +-
 .../resources/ResourceInstanceFactoryImpl.java  |  12 +
 .../resources/ServiceResourceDefinition.java    |   5 +-
 .../server/api/services/AlertGroupService.java  | 121 ++++
 .../server/api/services/AlertService.java       |  93 +++
 .../server/api/services/AlertTargetService.java | 106 +++
 .../server/api/services/AmbariMetaInfo.java     | 368 +++++++---
 .../server/api/services/ClusterService.java     |  82 ++-
 .../ambari/server/api/services/HostService.java |  11 +
 .../server/api/services/ServiceService.java     |   9 +
 .../services/parsers/JsonRequestBodyParser.java |  14 +-
 .../controller/AlertDefinitionResponse.java     | 143 ++++
 .../ambari/server/controller/AmbariServer.java  |  26 +-
 .../server/controller/ControllerModule.java     |  71 +-
 .../AbstractControllerResourceProvider.java     |  12 +-
 .../internal/AbstractProviderModule.java        |  41 +-
 .../AlertDefinitionResourceProvider.java        | 465 +++++++++----
 .../internal/AlertGroupResourceProvider.java    | 403 +++++++++++
 .../internal/AlertResourceProvider.java         | 191 ++++++
 .../internal/AlertSummaryPropertyProvider.java  | 138 ++++
 .../internal/AlertTargetResourceProvider.java   | 369 ++++++++++
 .../nagios/NagiosPropertyProvider.java          |  27 +-
 .../ambari/server/controller/spi/Resource.java  |  15 +-
 .../events/AlertDefinitionDeleteEvent.java      |  55 ++
 .../AlertDefinitionRegistrationEvent.java       |  57 ++
 .../apache/ambari/server/events/AlertEvent.java |  58 ++
 .../server/events/AlertReceivedEvent.java       |  50 ++
 .../server/events/AlertStateChangeEvent.java    | 101 +++
 .../ambari/server/events/AmbariEvent.java       |  75 ++
 .../ambari/server/events/ClusterEvent.java      |  50 ++
 .../server/events/MaintenanceModeEvent.java     | 175 +++++
 .../ambari/server/events/ServiceEvent.java      |  75 ++
 .../server/events/ServiceInstalledEvent.java    |  52 ++
 .../listeners/AlertAggregateListener.java       | 126 ++++
 .../listeners/AlertLifecycleListener.java       | 127 ++++
 .../listeners/AlertMaintenanceModeListener.java | 199 ++++++
 .../events/listeners/AlertReceivedListener.java | 191 ++++++
 .../listeners/AlertServiceStateListener.java    | 150 ++++
 .../listeners/AlertStateChangedListener.java    | 113 +++
 .../events/publishers/AlertEventPublisher.java  | 108 +++
 .../events/publishers/AmbariEventPublisher.java |  66 ++
 .../server/notifications/DispatchCallback.java  |  50 ++
 .../notifications/DispatchCredentials.java      |  44 ++
 .../server/notifications/DispatchFactory.java   |  78 +++
 .../server/notifications/DispatchRunnable.java  |  60 ++
 .../server/notifications/Notification.java      |  75 ++
 .../notifications/NotificationDispatcher.java   |  47 ++
 .../ambari/server/notifications/Recipient.java  |  45 ++
 .../dispatchers/EmailDispatcher.java            | 179 +++++
 .../server/orm/dao/AlertDefinitionDAO.java      | 242 ++++++-
 .../ambari/server/orm/dao/AlertDispatchDAO.java | 183 ++++-
 .../ambari/server/orm/dao/AlertSummaryDTO.java  |  70 ++
 .../apache/ambari/server/orm/dao/AlertsDAO.java | 206 +++++-
 .../server/orm/entities/AlertCurrentEntity.java |  45 +-
 .../orm/entities/AlertDefinitionEntity.java     |  91 ++-
 .../server/orm/entities/AlertGroupEntity.java   |  65 +-
 .../server/orm/entities/AlertHistoryEntity.java |  55 +-
 .../server/orm/entities/AlertNoticeEntity.java  |   2 +
 .../server/orm/entities/AlertTargetEntity.java  |   3 +-
 .../server/orm/entities/ClusterEntity.java      |  75 +-
 .../org/apache/ambari/server/state/Alert.java   |  66 +-
 .../ambari/server/state/ConfigFactory.java      |   2 -
 .../apache/ambari/server/state/ServiceImpl.java |  61 +-
 .../state/alert/AggregateDefinitionMapping.java | 111 +++
 .../server/state/alert/AggregateSource.java     |  92 +++
 .../server/state/alert/AlertDefinition.java     | 221 +++++-
 .../state/alert/AlertDefinitionFactory.java     | 285 ++++++++
 .../server/state/alert/AlertDefinitionHash.java | 638 +++++++++++++++++
 .../ambari/server/state/alert/AlertGroup.java   | 124 ++++
 .../ambari/server/state/alert/AlertTarget.java  | 130 ++++
 .../ambari/server/state/alert/MetricSource.java | 128 +++-
 .../server/state/alert/PercentSource.java       | 191 ++++++
 .../ambari/server/state/alert/PortSource.java   | 113 +++
 .../ambari/server/state/alert/Reporting.java    | 247 +++++++
 .../apache/ambari/server/state/alert/Scope.java |  18 +-
 .../ambari/server/state/alert/ScriptSource.java |  81 +++
 .../ambari/server/state/alert/Source.java       |  71 +-
 .../ambari/server/state/alert/SourceType.java   |   9 +-
 .../ambari/server/state/alert/TargetType.java   |  46 ++
 .../server/state/cluster/ClusterImpl.java       | 109 ++-
 .../ambari/server/state/host/HostImpl.java      | 133 ++--
 .../services/AlertNoticeDispatchService.java    | 398 +++++++++++
 .../svccomphost/ServiceComponentHostImpl.java   | 109 ++-
 .../server/upgrade/UpgradeCatalog170.java       |   3 +-
 .../apache/ambari/server/utils/StageUtils.java  |  10 -
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |   2 +-
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql |   2 +-
 .../resources/Ambari-DDL-Postgres-CREATE.sql    |   2 +-
 .../Ambari-DDL-Postgres-EMBEDDED-CREATE.sql     |   2 +-
 .../src/main/resources/key_properties.json      |  13 +
 .../src/main/resources/properties.json          |  37 +-
 .../stacks/HDP/2.0.6/services/HBASE/alerts.json |  24 +
 .../stacks/HDP/2.0.6/services/HDFS/alerts.json  | 147 ++++
 .../ambari/server/agent/TestActionQueue.java    |  88 ++-
 .../api/query/render/DefaultRendererTest.java   |   3 +-
 .../api/query/render/MinimalRendererTest.java   |   3 +-
 .../ClusterResourceDefinitionTest.java          |   3 +-
 .../server/api/services/AmbariMetaInfoTest.java | 104 ++-
 .../AmbariManagementControllerTest.java         | 132 +++-
 .../AlertDefinitionResourceProviderTest.java    | 221 +++++-
 .../AlertGroupResourceProviderTest.java         | 611 +++++++++++++++++
 .../internal/AlertResourceProviderTest.java     | 241 +++++++
 .../AlertTargetResourceProviderTest.java        | 408 +++++++++++
 .../nagios/NagiosPropertyProviderTest.java      |  80 +--
 .../apache/ambari/server/events/EventsTest.java | 188 +++++
 .../ambari/server/events/MockEventListener.java |  99 +++
 .../notifications/EmailDispatcherTest.java      | 117 ++++
 .../server/notifications/MockDispatcher.java    |  46 ++
 .../apache/ambari/server/orm/OrmTestHelper.java |  42 +-
 .../server/orm/dao/AlertDefinitionDAOTest.java  | 165 ++++-
 .../server/orm/dao/AlertDispatchDAOTest.java    | 125 +++-
 .../ambari/server/orm/dao/AlertsDAOTest.java    | 681 +++++++++++++++++--
 .../alerts/AlertDefinitionEqualityTest.java     | 158 +++++
 .../state/alerts/AlertDefinitionHashTest.java   | 407 +++++++++++
 .../state/alerts/AlertEventPublisherTest.java   | 196 ++++++
 .../alerts/AlertStateChangedEventTest.java      | 147 ++++
 .../state/cluster/AlertDataManagerTest.java     | 449 ++++++++++++
 .../svccomphost/ServiceComponentHostTest.java   | 242 +++----
 .../ambari/server/utils/TestStageUtils.java     | 120 ++--
 .../stacks/HDP/2.0.5/services/HDFS/alerts.json  |  77 +++
 .../app/controllers/global/update_controller.js |   4 +-
 .../app/controllers/main/alerts_controller.js   |   4 +-
 ambari-web/app/controllers/main/host.js         |   4 +-
 ambari-web/app/mappers/hosts_mapper.js          |   2 +-
 ambari-web/app/mappers/service_mapper.js        |   8 +-
 ambari-web/app/utils/ajax/ajax.js               |   6 +-
 .../controllers/main/alerts_controller_test.js  |  28 +-
 181 files changed, 18299 insertions(+), 1292 deletions(-)
----------------------------------------------------------------------



Mime
View raw message