You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2017/11/27 20:24:59 UTC

[49/49] ambari git commit: Merge branch 'trunk' into branch-feature-AMBARI-20859

 Merge branch 'trunk' into branch-feature-AMBARI-20859


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 167b4829413d5119f11fd0bb12c8db340a78b540
Parents: d173011 0b98ccd
Author: Robert Levas <rl...@hortonworks.com>
Authored: Mon Nov 27 15:23:58 2017 -0500
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Mon Nov 27 15:23:58 2017 -0500

----------------------------------------------------------------------
 .../main/resources/ui/admin-web/app/index.html  |  19 +-
 .../resources/ui/admin-web/app/scripts/app.js   |   3 +-
 .../controllers/ClusterInformationCtrl.js       |  65 --
 .../ambariViews/CloneViewInstanceCtrl.js        | 274 -------
 .../ambariViews/CreateViewInstanceCtrl.js       | 103 ++-
 .../controllers/ambariViews/ViewsListCtrl.js    |  25 +-
 .../clusters/ClusterInformationCtrl.js          | 106 +++
 .../clusters/ClustersManageAccessCtrl.js        |  97 ---
 .../controllers/clusters/UserAccessListCtrl.js  | 351 --------
 .../controllers/groups/GroupsCreateCtrl.js      |  65 --
 .../controllers/groups/GroupsEditCtrl.js        | 180 ----
 .../controllers/groups/GroupsListCtrl.js        | 106 ---
 .../stackVersions/StackVersionsEditCtrl.js      |  27 +-
 .../userManagement/GroupCreateCtrl.js           | 120 +++
 .../controllers/userManagement/GroupEditCtrl.js | 248 ++++++
 .../userManagement/GroupsListCtrl.js            | 167 ++++
 .../userManagement/UserCreateCtrl.js            | 113 +++
 .../controllers/userManagement/UserEditCtrl.js  | 364 ++++++++
 .../userManagement/UserManagementCtrl.js        |  23 +
 .../controllers/userManagement/UsersListCtrl.js | 177 ++++
 .../controllers/users/UsersCreateCtrl.js        |  75 --
 .../scripts/controllers/users/UsersListCtrl.js  | 122 ---
 .../scripts/controllers/users/UsersShowCtrl.js  | 294 -------
 .../ui/admin-web/app/scripts/i18n.config.js     |  17 +-
 .../ui/admin-web/app/scripts/routes.js          |  67 +-
 .../admin-web/app/scripts/services/Cluster.js   |  90 +-
 .../ui/admin-web/app/scripts/services/Group.js  | 144 ++--
 .../app/scripts/services/GroupConstants.js      |  38 -
 .../app/scripts/services/RoleDetailsModal.js    |   5 +-
 .../ui/admin-web/app/scripts/services/Stack.js  |  14 +
 .../ui/admin-web/app/scripts/services/User.js   |  20 +-
 .../ui/admin-web/app/scripts/services/View.js   |   8 +-
 .../app/styles/cluster-information.css          |  13 +-
 .../resources/ui/admin-web/app/styles/main.css  | 121 +--
 .../ui/admin-web/app/styles/user-management.css |  43 +
 .../resources/ui/admin-web/app/styles/views.css |  90 +-
 .../admin-web/app/views/ambariViews/create.html | 200 -----
 .../app/views/ambariViews/modals/create.html    | 261 +++---
 .../app/views/ambariViews/viewsList.html        |  65 +-
 .../admin-web/app/views/clusterInformation.html |  66 --
 .../app/views/clusters/clusterInformation.html  |  87 ++
 .../app/views/clusters/manageAccess.html        |  63 --
 .../app/views/clusters/userAccessList.html      | 102 ---
 .../ui/admin-web/app/views/groups/create.html   |  43 -
 .../ui/admin-web/app/views/groups/edit.html     |  98 ---
 .../ui/admin-web/app/views/groups/list.html     |  80 --
 .../app/views/remoteClusters/list.html          |   5 +-
 .../ui/admin-web/app/views/sideNav.html         |  22 +-
 .../admin-web/app/views/stackVersions/list.html |   7 +-
 .../views/stackVersions/stackVersionPage.html   |  28 +-
 .../ui/admin-web/app/views/urls/create.html     |   2 -
 .../ui/admin-web/app/views/urls/edit.html       |   2 -
 .../app/views/userManagement/groupEdit.html     | 122 +++
 .../app/views/userManagement/groupsList.html    |  94 +++
 .../app/views/userManagement/main.html          |  36 +
 .../userManagement/modals/changePassword.html   |  46 ++
 .../userManagement/modals/groupCreate.html      |  86 ++
 .../views/userManagement/modals/userCreate.html | 147 ++++
 .../app/views/userManagement/userEdit.html      | 140 ++++
 .../app/views/userManagement/usersList.html     | 119 +++
 .../ui/admin-web/app/views/users/create.html    |  82 --
 .../ui/admin-web/app/views/users/list.html      |  97 ---
 .../app/views/users/modals/changePassword.html  |  46 --
 .../ui/admin-web/app/views/users/show.html      | 135 ---
 .../unit/controllers/CloneViewInstanceCtrl.js   | 135 ---
 .../controllers/ClusterInformationCtrl_test.js  | 102 +++
 .../clusters/UserAccessListCtrl_test.js         | 820 -------------------
 .../controllers/groups/GroupsListCtrl_test.js   | 129 ---
 .../userManagement/GroupsListCtrl_test.js       | 129 +++
 .../userManagement/UsersListCtrl_test.js        | 344 ++++++++
 .../controllers/users/UsersListCtrl_test.js     | 383 ---------
 .../test/unit/services/Utility_test.js          |  10 +-
 .../src/main/python/ambari_agent/Hardware.py    | 130 +--
 .../src/main/python/ambari_agent/Heartbeat.py   |   8 +-
 .../src/main/python/ambari_agent/HostInfo.py    |  83 +-
 .../test/python/ambari_agent/TestHardware.py    |  56 +-
 .../python/ambari_agent/TestRegistration.py     |   5 +-
 .../core/providers/package/yumrpm.py            |   4 +-
 .../libraries/functions/__init__.py             |   2 +-
 .../libraries/functions/copy_tarball.py         |  99 ++-
 .../libraries/functions/get_lzo_packages.py     |  50 --
 .../libraries/functions/lzo_utils.py            |  93 +++
 .../libraries/functions/package_conditions.py   |   8 +-
 .../configsets/hadoop_logs/conf/managed-schema  |   2 +
 .../ambari/logsearch/solr/SolrConstants.java    |   1 +
 .../solr/model/SolrServiceLogData.java          |  17 +
 .../ambari-logsearch-web/src/app/app.module.ts  |   6 +-
 .../components/logs-table-component.spec.ts     |  61 ++
 .../classes/components/logs-table-component.ts  |  51 ++
 .../src/app/classes/models/audit-log.ts         |   2 +-
 .../audit-logs-table.component.html             |  54 ++
 .../audit-logs-table.component.less             |  21 +
 .../audit-logs-table.component.spec.ts          | 157 ++++
 .../audit-logs-table.component.ts               |  55 ++
 .../date-picker/date-picker.component.spec.ts   |   2 +
 .../date-picker/date-picker.component.ts        |  35 +-
 .../filters-panel/filters-panel.component.ts    |   2 +-
 .../logs-container.component.html               |  15 +-
 .../logs-container/logs-container.component.ts  |  62 +-
 .../logs-list/logs-list.component.html          |  72 --
 .../logs-list/logs-list.component.less          |  97 ---
 .../logs-list/logs-list.component.spec.ts       | 110 ---
 .../components/logs-list/logs-list.component.ts | 151 ----
 .../service-logs-table.component.html           |  76 ++
 .../service-logs-table.component.less           |  97 +++
 .../service-logs-table.component.spec.ts        | 126 +++
 .../service-logs-table.component.ts             | 135 +++
 .../time-range-picker.component.html            |   6 +-
 .../time-range-picker.component.ts              |  12 +-
 .../ambari-logsearch-web/src/app/mock-data.ts   |   4 +-
 .../src/app/services/auth.service.spec.ts       |   2 +-
 .../src/app/services/logs-container.service.ts  | 115 ++-
 .../src/app/services/mock-api-data.service.ts   |  22 +
 .../src/assets/i18n/en.json                     |   4 +-
 ambari-metrics/ambari-metrics-assembly/pom.xml  |   1 -
 .../ambari-metrics-hadoop-sink/pom.xml          |   3 +-
 .../timeline/HadoopTimelineMetricsSink.java     |   6 +-
 .../timeline/HadoopTimelineMetricsSinkTest.java |  21 +-
 .../actionmanager/ExecutionCommandWrapper.java  |  42 +-
 .../ambari/server/agent/CommandRepository.java  |   2 +-
 .../ambari/server/agent/ExecutionCommand.java   |   1 +
 .../ambari/server/agent/HeartbeatMonitor.java   |   3 +-
 .../commands/StackAdvisorCommand.java           |  15 +-
 .../apache/ambari/server/checks/LZOCheck.java   |   6 +-
 .../server/configuration/Configuration.java     |  19 +
 .../controller/ActionExecutionContext.java      |   6 +-
 .../controller/AmbariActionExecutionHelper.java |  72 +-
 .../AmbariCustomCommandExecutionHelper.java     | 259 +-----
 .../AmbariManagementControllerImpl.java         |  21 +-
 .../server/controller/KerberosHelperImpl.java   |   6 +-
 .../server/controller/RepositoryResponse.java   |  23 +-
 .../internal/ClientConfigResourceProvider.java  |   2 +
 .../ClusterStackVersionResourceProvider.java    |  16 +-
 .../HostStackVersionResourceProvider.java       |   3 +-
 .../internal/RepositoryResourceProvider.java    |   3 +
 ...eComponentConfigurationResourceProvider.java |   8 +-
 .../internal/UpgradeResourceProvider.java       |   3 +-
 .../VersionDefinitionResourceProvider.java      |   9 +
 .../server/orm/entities/RepositoryEntity.java   |  53 +-
 .../AbstractPrepareKerberosServerAction.java    |   6 +-
 .../PrepareKerberosIdentitiesServerAction.java  |   5 +-
 .../apache/ambari/server/stack/RepoUtil.java    |   1 +
 .../ambari/server/stack/StackManager.java       |   5 -
 .../ambari/server/state/ConfigHelper.java       |  28 +-
 .../ambari/server/state/RepositoryInfo.java     |  23 +-
 .../ambari/server/state/stack/RepoTag.java      |  34 +
 .../server/state/stack/RepositoryXml.java       |  13 +
 .../stack/upgrade/RepositoryVersionHelper.java  | 330 +++++++-
 .../ambari/server/topology/AmbariContext.java   |   3 +-
 .../server/topology/BlueprintFactory.java       |   3 +-
 .../validators/RequiredPasswordValidator.java   |   3 +-
 .../server/upgrade/AbstractUpgradeCatalog.java  |   8 +
 .../server/upgrade/SchemaUpgradeHelper.java     |  27 +
 .../ambari/server/upgrade/UpgradeCatalog.java   |   6 +
 .../server/upgrade/UpgradeCatalog260.java       | 182 +++-
 .../server/upgrade/UpgradeCatalog261.java       | 119 +++
 ambari-server/src/main/python/ambari-server.py  |   2 +
 .../python/ambari_server/serverConfiguration.py |  29 +
 .../main/python/ambari_server/serverSetup.py    |   8 +-
 .../main/python/ambari_server/serverUpgrade.py  |  18 +-
 .../DRUID/0.10.1/package/scripts/druid.py       |   3 +-
 .../DRUID/0.10.1/package/scripts/params.py      |   5 +-
 .../common-services/HDFS/2.1.0.2.0/metainfo.xml |  30 -
 .../HDFS/2.1.0.2.0/package/scripts/hdfs.py      |   8 +-
 .../2.1.0.2.0/package/scripts/install_params.py |   4 -
 .../2.1.0.2.0/package/scripts/params_linux.py   |   5 -
 .../common-services/HDFS/3.0.0.3.0/metainfo.xml |  30 -
 .../HDFS/3.0.0.3.0/package/scripts/hdfs.py      |   8 +-
 .../3.0.0.3.0/package/scripts/install_params.py |   4 -
 .../3.0.0.3.0/package/scripts/params_linux.py   |   4 -
 .../HIVE/0.12.0.2.0/configuration/hive-site.xml |   2 +-
 .../HIVE/0.12.0.2.0/package/scripts/hive.py     |  15 +-
 .../package/scripts/hive_server_interactive.py  |  20 +-
 .../HIVE/2.1.0.3.0/package/scripts/hive.py      |   3 +
 .../OOZIE/4.0.0.2.0/package/scripts/oozie.py    |  38 +-
 .../4.0.0.2.0/package/scripts/params_linux.py   |   5 +-
 .../OOZIE/4.2.0.3.0/package/scripts/oozie.py    |  15 +-
 .../4.2.0.3.0/package/scripts/params_linux.py   |   5 +-
 .../0.5.0.2.3/configuration/kms-site.xml        |  26 -
 .../1.0.0.3.0/configuration/kms-site.xml        |  26 -
 .../TEZ/0.4.0.2.1/package/scripts/tez.py        |   5 +-
 .../TEZ/0.9.0.3.0/configuration/tez-site.xml    |   4 +-
 .../TEZ/0.9.0.3.0/package/scripts/tez.py        |   4 +
 .../configuration-mapred/mapred-site.xml        |   2 +-
 .../YARN/2.1.0.2.0/package/scripts/yarn.py      |   3 +
 .../configuration-mapred/mapred-site.xml        |   2 +-
 .../YARN/3.0.0.3.0/package/scripts/yarn.py      |   3 +
 .../HDP/2.0.6/properties/stack_packages.json    |   2 +-
 .../services/HIVE/configuration/hive-site.xml   |   2 +-
 .../stacks/HDP/2.2/services/HDFS/metainfo.xml   |  35 -
 .../services/HIVE/configuration/hive-site.xml   |   2 +-
 .../2.2/services/TEZ/configuration/tez-site.xml |   4 +-
 .../YARN/configuration-mapred/mapred-site.xml   |   2 +-
 .../stacks/HDP/2.3/services/HDFS/metainfo.xml   |  30 -
 .../stacks/HDP/2.5/services/YARN/kerberos.json  |  12 +-
 .../stacks/HDP/2.6/services/YARN/kerberos.json  |  24 +-
 .../stacks/HDP/2.6/upgrades/config-upgrade.xml  |   6 +-
 .../HDP/3.0/properties/stack_packages.json      |   2 +-
 .../stacks/HDP/3.0/services/HDFS/metainfo.xml   |  30 -
 .../src/main/resources/version_definition.xsd   |  23 +-
 .../ambari/server/checks/LZOCheckTest.java      |  13 +-
 .../AmbariCustomCommandExecutionHelperTest.java |  13 +-
 .../AmbariManagementControllerImplTest.java     |   3 +-
 .../AmbariManagementControllerTest.java         | 176 ++--
 .../ClientConfigResourceProviderTest.java       |   2 +
 ...ClusterStackVersionResourceProviderTest.java |  51 +-
 .../RepositoryResourceProviderTest.java         |   6 +-
 .../internal/UpgradeResourceProviderTest.java   |  12 +-
 .../apache/ambari/server/orm/OrmTestHelper.java |   4 +-
 .../ambari/server/state/ConfigHelperTest.java   |  47 ++
 .../state/repository/VersionDefinitionTest.java |  35 +-
 .../upgrade/RepositoryVersionHelperTest.java    |   2 +-
 .../server/upgrade/UpgradeCatalog260Test.java   | 136 ++-
 .../src/test/python/TestAmbariServer.py         |   7 +-
 .../stacks/2.2/configs/oozie-upgrade.json       |   3 +-
 .../HIVE/running_withMOTDmsg_andTrailingMsg.txt |  46 ++
 .../stacks/2.5/HIVE/test_hive_server_int.py     |  21 +
 .../test_kerberos_descriptor_ranger_kms.json    | 286 +++++++
 .../resources/version_definition_with_tags.xml  |  86 ++
 ambari-web/app/controllers/installer.js         |  53 +-
 .../main/service/reassign/step3_controller.js   |   3 +
 .../main/service/reassign/step4_controller.js   |  12 +-
 .../app/controllers/wizard/step8_controller.js  |  12 +-
 .../app/mappers/repository_version_mapper.js    |   3 +-
 ambari-web/app/mappers/stack_mapper.js          |   3 +-
 ambari-web/app/messages.js                      |   5 +-
 ambari-web/app/mixins/common/serverValidator.js |  41 +-
 .../main/host/details/actions/check_host.js     |   2 +-
 .../app/mixins/wizard/addSecurityConfigs.js     |   7 +
 ambari-web/app/models/repository.js             |  17 +
 .../app/models/stack_version/repository.js      |   3 +-
 ambari-web/app/styles/application.less          |   3 +-
 .../config_recommendation_popup.hbs             | 102 ++-
 ambari-web/app/templates/wizard/step1.hbs       |  36 +
 .../config_validation_popup.js                  |   7 +-
 ambari-web/test/controllers/installer_test.js   |  14 +-
 .../service/reassign/step4_controller_test.js   |   9 +-
 .../test/mixins/common/serverValidator_test.js  |  15 +-
 contrib/utils/perf/deploy-gce-perf-cluster.py   |   1 +
 contrib/version-builder/version_builder.py      |  13 +-
 .../apache/ambari/view/utils/hdfs/HdfsApi.java  |  16 +-
 .../apache/ambari/view/utils/hdfs/HdfsUtil.java |  17 +-
 .../ui/app/domain/workflow-importer.js          |   3 +-
 243 files changed, 7123 insertions(+), 6369 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/167b4829/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/User.js
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/167b4829/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/167b4829/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/167b4829/ambari-server/src/main/python/ambari-server.py
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/167b4829/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/167b4829/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java
----------------------------------------------------------------------