Merge branch 'trunk' into branch-alerts-dev
Conflicts:
ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a533c1b4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a533c1b4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a533c1b4
Branch: refs/heads/branch-alerts-dev
Commit: a533c1b4f35c94a28a291b493543b74aa7190aa2
Parents: 3da10f6 68a5d44
Author: Jonathan Hurley <[email protected]>
Authored: Fri Aug 22 08:45:06 2014 -0400
Committer: Jonathan Hurley <[email protected]>
Committed: Fri Aug 22 08:45:06 2014 -0400
----------------------------------------------------------------------
.../ambariViews/CreateViewInstanceCtrl.js | 3 +-
.../ambariViews/EditViewInstanceCtrl.js | 154 -----
.../controllers/ambariViews/ViewsEditCtrl.js | 74 +-
.../controllers/ambariViews/ViewsListCtrl.js | 1 -
.../scripts/controllers/users/UsersListCtrl.js | 11 +-
.../scripts/controllers/users/UsersShowCtrl.js | 9 +-
.../ui/admin-web/app/scripts/services/User.js | 1 +
.../ui/admin-web/app/scripts/services/View.js | 7 +-
.../resources/ui/admin-web/app/styles/main.css | 24 +
.../admin-web/app/views/ambariViews/create.html | 9 +
.../admin-web/app/views/ambariViews/edit.html | 41 +-
.../app/views/ambariViews/listTable.html | 8 +-
.../ui/admin-web/app/views/groups/list.html | 3 +-
.../ui/admin-web/app/views/users/list.html | 9 +
.../app/views/users/modals/changePassword.html | 8 +-
.../ui/admin-web/app/views/users/show.html | 11 +-
ambari-admin/src/main/resources/view.xml | 1 +
.../main/python/ambari_agent/AmbariConfig.py | 9 +-
.../src/main/python/ambari_agent/Controller.py | 55 +-
.../src/main/python/ambari_agent/DataCleaner.py | 6 +-
.../test/python/ambari_agent/TestActionQueue.py | 9 +-
.../test/python/ambari_agent/TestController.py | 76 +-
.../test/python/ambari_agent/TestDataCleaner.py | 15 +
.../src/main/python/ambari_commons/firewall.py | 15 +-
.../ambari/server/controller/AmbariServer.java | 16 +-
.../ServiceConfigVersionResponse.java | 30 +
.../ganglia/GangliaPropertyProvider.java | 2 +-
.../internal/ConfigGroupResourceProvider.java | 15 +
.../ServiceConfigVersionResourceProvider.java | 11 +-
.../internal/ViewInstanceResourceProvider.java | 15 +-
.../controller/jmx/JMXPropertyProvider.java | 1 -
.../ambari/server/orm/dao/ClusterDAO.java | 14 +
.../apache/ambari/server/orm/dao/ViewDAO.java | 18 +
.../orm/entities/ServiceConfigEntity.java | 28 +
.../server/orm/entities/ViewInstanceEntity.java | 13 +-
.../org/apache/ambari/server/state/Cluster.java | 5 +
.../server/state/cluster/ClusterImpl.java | 159 ++++-
.../server/state/cluster/ClustersImpl.java | 50 +-
.../svccomphost/ServiceComponentHostImpl.java | 2 +-
.../server/upgrade/UpgradeCatalog150.java | 8 +-
.../server/upgrade/UpgradeCatalog160.java | 12 +-
.../server/upgrade/UpgradeCatalog161.java | 36 +-
.../server/upgrade/UpgradeCatalog170.java | 71 ++
.../apache/ambari/server/view/ViewRegistry.java | 304 +++-----
ambari-server/src/main/python/ambari-server.py | 15 +-
.../src/main/python/ambari_server/utils.py | 59 +-
.../main/resources/Ambari-DDL-MySQL-CREATE.sql | 4 +-
.../main/resources/Ambari-DDL-Oracle-CREATE.sql | 4 +-
.../resources/Ambari-DDL-Postgres-CREATE.sql | 5 +-
.../Ambari-DDL-Postgres-EMBEDDED-CREATE.sql | 10 +-
.../src/main/resources/properties.json | 3 +
.../hooks/before-INSTALL/scripts/params.py | 4 +-
.../scripts/shared_initialization.py | 7 +
.../services/HDFS/package/scripts/params.py | 5 +-
.../services/HDFS/package/scripts/utils.py | 5 +-
.../stacks/HDP/1.3.2/services/HIVE/metainfo.xml | 22 +
.../PIG/configuration/pig-properties.xml | 83 +++
.../services/PIG/configuration/pig.properties | 52 --
.../stacks/HDP/1.3.2/services/PIG/metainfo.xml | 8 +-
.../services/PIG/package/scripts/params.py | 2 +
.../1.3.2/services/PIG/package/scripts/pig.py | 24 +-
.../PIG/package/templates/pig.properties.j2 | 74 --
.../services/SQOOP/configuration/sqoop-env.xml | 5 +
.../services/SQOOP/package/scripts/params.py | 2 +-
.../hooks/before-INSTALL/scripts/params.py | 2 +
.../scripts/shared_initialization.py | 9 +-
.../scripts/balancer-emulator/hdfs-command.py | 4 +-
.../services/HDFS/package/scripts/namenode.py | 18 +-
.../services/HDFS/package/scripts/params.py | 5 +-
.../services/HDFS/package/scripts/utils.py | 5 +-
.../stacks/HDP/2.0.6/services/HIVE/metainfo.xml | 25 +-
.../stacks/HDP/2.0.6/services/PIG/metainfo.xml | 2 +-
.../services/PIG/package/scripts/params.py | 16 +-
.../2.0.6/services/PIG/package/scripts/pig.py | 12 -
.../services/SQOOP/configuration/sqoop-env.xml | 6 +-
.../services/SQOOP/package/scripts/params.py | 2 +-
.../services/SQOOP/package/scripts/sqoop.py | 2 +-
.../stacks/HDP/2.0.6/services/stack_advisor.py | 20 +-
.../2.1.GlusterFS/services/HIVE/metainfo.xml | 25 +-
.../server/api/handlers/CreateHandlerTest.java | 7 +
.../server/api/handlers/DeleteHandlerTest.java | 7 +
.../server/api/handlers/UpdateHandlerTest.java | 7 +
.../resources/BaseResourceDefinitionTest.java | 7 +
.../AmbariPrivilegeResourceProviderTest.java | 20 +-
.../ViewPrivilegeResourceProviderTest.java | 21 +-
.../server/upgrade/UpgradeCatalog170Test.java | 53 +-
.../ambari/server/view/ViewRegistryTest.java | 242 +++----
.../src/test/python/TestAmbariServer.py | 86 ++-
ambari-server/src/test/python/TestOSCheck.py | 8 +-
ambari-server/src/test/python/TestUtils.py | 46 +-
.../python/stacks/1.3.2/HDFS/test_datanode.py | 13 +-
.../python/stacks/1.3.2/HDFS/test_namenode.py | 13 +-
.../python/stacks/1.3.2/HDFS/test_snamenode.py | 13 +-
.../python/stacks/1.3.2/PIG/test_pig_client.py | 14 +-
.../1.3.2/configs/default.hbasedecom.json | 3 +-
.../python/stacks/1.3.2/configs/default.json | 6 +-
.../1.3.2/configs/default.non_gmetad_host.json | 3 +-
.../python/stacks/1.3.2/configs/secured.json | 6 +-
.../hooks/before-INSTALL/test_before_install.py | 5 +
.../python/stacks/2.0.6/HDFS/test_datanode.py | 13 +-
.../stacks/2.0.6/HDFS/test_journalnode.py | 13 +-
.../python/stacks/2.0.6/HDFS/test_namenode.py | 66 +-
.../python/stacks/2.0.6/HDFS/test_snamenode.py | 13 +-
.../test/python/stacks/2.0.6/HDFS/test_zkfc.py | 13 +-
.../python/stacks/2.0.6/configs/default.json | 5 +-
.../2.0.6/configs/default.non_gmetad_host.json | 3 +-
.../python/stacks/2.0.6/configs/ha_default.json | 5 +-
.../python/stacks/2.0.6/configs/ha_secured.json | 5 +-
.../2.0.6/configs/rebalancehdfs_default.json | 2 +-
.../python/stacks/2.0.6/configs/secured.json | 5 +-
.../hooks/before-INSTALL/test_before_install.py | 5 +
.../test/python/stacks/2.1/configs/default.json | 3 +-
.../test/python/stacks/2.1/configs/secured.json | 3 +-
.../PIG/configuration/pig-properties.xml | 2 +-
ambari-web/app/assets/test/tests.js | 3 +
ambari-web/app/controllers.js | 1 -
.../controllers/main/admin/access_controller.js | 66 --
.../main/admin/highAvailability_controller.js | 4 +-
.../main/admin/security/add/step2.js | 16 +-
.../main/dashboard/config_history_controller.js | 28 +-
.../controllers/main/service/info/configs.js | 95 +--
.../app/controllers/wizard/step4_controller.js | 18 +-
.../app/controllers/wizard/step5_controller.js | 52 +-
.../app/controllers/wizard/step6_controller.js | 48 +-
.../app/controllers/wizard/step7_controller.js | 2 +-
ambari-web/app/data/HDP2/site_properties.js | 14 +
ambari-web/app/data/site_properties.js | 28 +
ambari-web/app/messages.js | 13 +-
ambari-web/app/mixins/common/serverValidator.js | 83 ++-
ambari-web/app/models/service_config_version.js | 7 +-
ambari-web/app/models/stack_service.js | 6 +-
ambari-web/app/router.js | 7 +-
ambari-web/app/routes/add_host_routes.js | 14 +-
ambari-web/app/routes/add_service_routes.js | 12 +-
.../app/routes/high_availability_routes.js | 4 +-
ambari-web/app/routes/installer.js | 20 +-
ambari-web/app/routes/main.js | 50 +-
.../app/routes/rm_high_availability_routes.js | 14 +-
ambari-web/app/routes/rollbackHA_routes.js | 2 +-
ambari-web/app/styles/application.less | 76 +-
.../common/configs/config_history_flow.hbs | 2 +-
.../templates/main/admin/highAvailability.hbs | 51 --
.../templates/main/dashboard/config_history.hbs | 147 ++--
ambari-web/app/templates/wizard/step5.hbs | 4 +-
ambari-web/app/templates/wizard/step6.hbs | 4 +-
ambari-web/app/utils/ajax/ajax.js | 2 +-
ambari-web/app/utils/host_progress_popup.js | 8 +-
ambari-web/app/views.js | 1 -
.../views/common/configs/config_history_flow.js | 44 +-
ambari-web/app/views/main/admin.js | 7 -
.../views/main/admin/highAvailability_view.js | 27 -
.../views/main/dashboard/config_history_view.js | 16 +-
.../main/dashboard/widgets/namenode_cpu.js | 13 +-
ambari-web/app/views/main/menu.js | 7 -
.../admin/highAvailability_controller_test.js | 2 +-
.../main/admin/security/add/step2_test.js | 60 +-
.../dashboard/config_history_controller_test.js | 164 +++++
.../main/service/info/config_test.js | 24 +-
.../service/reassign/step2_controller_test.js | 12 +-
.../test/controllers/wizard/step4_test.js | 30 +-
.../common/configs/config_history_flow_test.js | 687 +++++++++++++++++++
.../main/dashboard/config_history_view_test.js | 240 +++++++
.../resources/ui/app/scripts/helpers/jobs.js | 2 +
.../mappers/application_status_mapper.js | 29 +-
.../ui/app/scripts/models/jobs/tez_dag.js | 2 +
.../main/resources/ui/app/templates/job/job.hbs | 2 +-
contrib/views/jobs/src/main/resources/view.xml | 3 -
.../slider/slider/0.30.0/slider-0.30.0.jar | Bin 1036988 -> 1125710 bytes
.../slider/slider/maven-metadata-local.xml | 2 +-
.../slider/SliderAppsViewControllerImpl.java | 62 +-
pom.xml | 20 +
171 files changed, 3264 insertions(+), 1744 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a533c1b4/ambari-agent/src/main/python/ambari_agent/Controller.py
----------------------------------------------------------------------
diff --cc ambari-agent/src/main/python/ambari_agent/Controller.py
index 23c28ae,7859a2d..4537434
--- a/ambari-agent/src/main/python/ambari_agent/Controller.py
+++ b/ambari-agent/src/main/python/ambari_agent/Controller.py
@@@ -135,15 -129,9 +137,15 @@@ class Controller(threading.Thread)
pass
else:
self.hasMappedComponents = False
+
+ if 'alertDefinitionCommands' in ret.keys():
+ logger.info("Got alert definition update on registration " +
pprint.pformat(ret['alertDefinitionCommands']))
+
self.alert_scheduler_handler.update_definitions(ret['alertDefinitionCommands'])
+ pass
+
pass
except ssl.SSLError:
- self.repeatRegistration=False
+ self.repeatRegistration = False
self.isRegistered = False
return
except Exception:
http://git-wip-us.apache.org/repos/asf/ambari/blob/a533c1b4/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
----------------------------------------------------------------------
diff --cc
ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
index beab1f2,e0049ec..9975c86
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
@@@ -79,8 -76,6 +75,7 @@@ import org.apache.ambari.server.resourc
import org.apache.ambari.server.scheduler.ExecutionScheduleManager;
import org.apache.ambari.server.security.CertificateManager;
import org.apache.ambari.server.security.SecurityFilter;
- import org.apache.ambari.server.security.SecurityHelper;
+import
org.apache.ambari.server.security.authorization.AmbariAuthorizationFilter;
import
org.apache.ambari.server.security.authorization.AmbariLdapAuthenticationProvider;
import
org.apache.ambari.server.security.authorization.AmbariLdapDataPopulator;
import
org.apache.ambari.server.security.authorization.AmbariLocalUserDetailsService;
http://git-wip-us.apache.org/repos/asf/ambari/blob/a533c1b4/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
----------------------------------------------------------------------
diff --cc
ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
index 5cc9276,eb3a578..04ef2f7
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
@@@ -72,7 -74,7 +74,8 @@@ import org.apache.ambari.server.state.C
import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.Config;
import org.apache.ambari.server.state.ConfigHelper;
+import org.apache.ambari.server.state.alert.Scope;
+ import org.apache.ambari.server.view.configuration.InstanceConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/ambari/blob/a533c1b4/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a533c1b4/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a533c1b4/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a533c1b4/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql
----------------------------------------------------------------------
