Merge branch 'trunk' into branch-feature-AMBARI-21674
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f02eb4e1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f02eb4e1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f02eb4e1 Branch: refs/heads/branch-feature-AMBARI-21674 Commit: f02eb4e1806bde6aa7c21e03ac5b233c2265963d Parents: d43882d c3150a4 Author: Nate Cole <[email protected]> Authored: Thu Nov 30 09:24:41 2017 -0500 Committer: Nate Cole <[email protected]> Committed: Thu Nov 30 09:24:41 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 | 290 ------- .../ui/admin-web/app/scripts/i18n.config.js | 15 +- .../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 | 17 +- .../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 | 132 +-- .../ui/admin-web/app/styles/toggle-switch.css | 72 ++ .../ui/admin-web/app/styles/top-nav.css | 3 + .../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 | 204 ----- .../admin-web/app/views/ambariViews/edit.html | 37 +- .../app/views/ambariViews/modals/create.html | 262 +++--- .../app/views/ambariViews/viewsList.html | 65 +- .../app/views/authentication/main.html | 14 +- .../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 -- .../views/loginActivities/homeDirectory.html | 6 +- .../app/views/loginActivities/loginMessage.html | 6 +- .../app/views/modals/AddVersionModal.html | 14 +- .../app/views/remoteClusters/list.html | 5 +- .../ui/admin-web/app/views/sideNav.html | 22 +- .../admin-web/app/views/stackVersions/list.html | 18 +- .../views/stackVersions/stackVersionPage.html | 55 +- .../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 | 87 ++ .../views/userManagement/modals/userCreate.html | 152 ++++ .../app/views/userManagement/userEdit.html | 144 ++++ .../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 | 122 --- .../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/TestAmbariAgent.py | 4 +- .../test/python/ambari_agent/TestHardware.py | 56 +- .../python/ambari_agent/TestRegistration.py | 5 +- .../core/providers/package/yumrpm.py | 8 +- .../libraries/functions/__init__.py | 1 + .../libraries/functions/component_version.py | 9 +- .../libraries/functions/copy_tarball.py | 201 ++++- .../libraries/functions/lzo_utils.py | 93 +++ .../libraries/functions/tar_archive.py | 6 +- ambari-infra/ambari-infra-manager/pom.xml | 11 + .../infra/job/archive/CompositeFileAction.java | 46 ++ .../ambari/infra/job/archive/Document.java | 54 ++ .../infra/job/archive/DocumentDestination.java | 23 + .../archive/DocumentExportConfiguration.java | 118 +++ .../job/archive/DocumentExportJobListener.java | 35 + .../job/archive/DocumentExportProperties.java | 112 +++ .../job/archive/DocumentExportStepListener.java | 47 ++ .../infra/job/archive/DocumentExporter.java | 99 +++ .../infra/job/archive/DocumentItemReader.java | 135 +++ .../infra/job/archive/DocumentItemWriter.java | 25 + .../infra/job/archive/DocumentIterator.java | 25 + .../infra/job/archive/DocumentSource.java | 24 + .../ambari/infra/job/archive/FileAction.java | 25 + .../job/archive/LocalDocumentItemWriter.java | 72 ++ .../ambari/infra/job/archive/S3Properties.java | 64 ++ .../ambari/infra/job/archive/S3Uploader.java | 51 ++ .../infra/job/archive/SolrDocumentIterator.java | 90 ++ .../infra/job/archive/SolrDocumentSource.java | 68 ++ .../infra/job/archive/SolrQueryBuilder.java | 115 +++ .../infra/job/archive/SolrQueryProperties.java | 69 ++ .../infra/job/archive/TarGzCompressor.java | 50 ++ .../apache/ambari/infra/manager/JobManager.java | 21 +- .../src/main/resources/infra-manager.properties | 12 + .../src/main/resources/log4j2.xml | 2 +- .../infra/job/archive/DocumentExporterTest.java | 147 ++++ .../job/archive/DocumentItemReaderTest.java | 197 +++++ .../archive/LocalDocumentItemWriterTest.java | 98 +++ .../infra/job/archive/SolrQueryBuilderTest.java | 113 +++ ambari-logsearch/README.md | 1 + .../ambari/logfeeder/filter/FilterKeyValue.java | 4 +- .../logfeeder/metrics/LogFeederAMSClient.java | 3 + .../logfeeder/metrics/MetricsManager.java | 8 +- .../logfeeder/metrics/MetricsManagerTest.java | 10 +- .../configsets/hadoop_logs/conf/managed-schema | 2 + .../ambari/logsearch/solr/SolrConstants.java | 1 + .../solr/model/SolrServiceLogData.java | 17 + .../LogsearchAuthenticationEntryPoint.java | 15 +- .../ambari-logsearch-web/src/app/app.module.ts | 10 +- .../components/logs-table-component.spec.ts | 61 ++ .../classes/components/logs-table-component.ts | 51 ++ .../src/app/classes/filtering.ts | 22 +- .../src/app/classes/models/app-state.ts | 3 +- .../src/app/classes/models/audit-log.ts | 2 +- .../classes/queries/audit-logs-query-params.ts | 3 +- .../service-logs-truncated-query-params.ts | 3 +- .../src/app/classes/string.ts | 25 + .../src/app/components/app.component.spec.ts | 4 +- .../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 +- .../dropdown-button.component.spec.ts | 4 +- .../dropdown-list.component.spec.ts | 4 +- .../filter-button.component.spec.ts | 4 +- .../filter-dropdown.component.spec.ts | 4 +- .../filters-panel/filters-panel.component.html | 8 +- .../filters-panel.component.spec.ts | 1 + .../filters-panel/filters-panel.component.ts | 101 +-- .../login-form/login-form.component.spec.ts | 7 +- .../login-form/login-form.component.ts | 34 +- .../logs-container.component.html | 17 +- .../logs-container/logs-container.component.ts | 65 +- .../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 ---- .../menu-button/menu-button.component.spec.ts | 4 +- .../src/app/components/mixins.less | 2 +- .../search-box/search-box.component.html | 24 +- .../search-box/search-box.component.less | 23 +- .../search-box/search-box.component.ts | 122 ++- .../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 +- .../timezone-picker.component.spec.ts | 4 +- .../components/top-menu/top-menu.component.ts | 3 +- .../src/app/components/variables.less | 6 +- .../ambari-logsearch-web/src/app/mock-data.ts | 7 +- .../src/app/services/auth.service.spec.ts | 133 +++ .../src/app/services/auth.service.ts | 123 +++ .../services/component-actions.service.spec.ts | 8 +- .../app/services/component-actions.service.ts | 22 +- .../component-generator.service.spec.ts | 4 +- .../app/services/logs-container.service.spec.ts | 4 +- .../src/app/services/logs-container.service.ts | 182 +++- .../src/app/services/mock-api-data.service.ts | 22 + .../src/app/services/utils.service.ts | 4 + .../src/assets/i18n/en.json | 5 +- .../test-config/logfeeder/logfeeder.properties | 2 +- 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 | 47 +- .../ambari/server/agent/CommandRepository.java | 2 +- .../ambari/server/agent/ExecutionCommand.java | 1 + .../ambari/server/agent/HeartbeatMonitor.java | 3 +- .../api/handlers/BaseManagementHandler.java | 8 - .../server/api/handlers/CreateHandler.java | 4 + .../resources/ResourceInstanceFactoryImpl.java | 9 +- .../RootServiceComponentResourceDefinition.java | 9 +- .../AmbariConfigurationRequestSwagger.java | 47 -- .../AmbariConfigurationResponseSwagger.java | 40 - .../services/AmbariConfigurationService.java | 193 ----- .../server/api/services/AmbariMetaInfo.java | 4 +- .../ambari/server/api/services/BaseService.java | 5 +- .../server/api/services/LoggingService.java | 4 + ...iceComponentConfigurationRequestSwagger.java | 43 + ...ceComponentConfigurationResponseSwagger.java | 43 + ...ootServiceComponentConfigurationService.java | 226 +++++ .../server/api/services/RootServiceService.java | 7 + .../api/services/ldap/AmbariConfiguration.java | 51 +- .../services/ldap/LdapConfigurationRequest.java | 2 +- .../services/ldap/LdapConfigurationService.java | 10 +- .../stackadvisor/StackAdvisorRequest.java | 19 + .../commands/StackAdvisorCommand.java | 73 +- .../checks/DatabaseConsistencyCheckHelper.java | 2 +- .../apache/ambari/server/checks/LZOCheck.java | 6 +- .../server/configuration/Configuration.java | 19 + .../controller/ActionExecutionContext.java | 6 +- .../controller/AmbariActionExecutionHelper.java | 72 +- .../AmbariCustomCommandExecutionHelper.java | 259 +----- .../server/controller/AmbariHandlerList.java | 5 +- .../AmbariManagementControllerImpl.java | 30 +- .../ambari/server/controller/AmbariServer.java | 3 +- .../server/controller/ControllerModule.java | 4 +- .../server/controller/KerberosHelperImpl.java | 65 +- .../controller/MaintenanceStateHelper.java | 3 +- .../server/controller/RepositoryResponse.java | 23 +- .../controller/ResourceProviderFactory.java | 4 +- .../ambari/server/controller/RootComponent.java | 27 + .../ambari/server/controller/RootService.java | 36 + .../controller/RootServiceResponseFactory.java | 44 +- .../AbstractControllerResourceProvider.java | 4 +- .../internal/AbstractPropertyProvider.java | 4 + .../internal/AbstractProviderModule.java | 2 +- .../internal/AbstractResourceProvider.java | 2 +- .../internal/ActionResourceProvider.java | 4 + .../AlertDefinitionResourceProvider.java | 4 + .../internal/AlertGroupResourceProvider.java | 4 + .../internal/AlertResourceProvider.java | 4 + .../internal/AlertTargetResourceProvider.java | 4 + .../AmbariConfigurationResourceProvider.java | 328 -------- .../internal/ArtifactResourceProvider.java | 4 + .../controller/internal/BaseProvider.java | 6 +- .../BlueprintConfigurationProcessor.java | 2 +- .../internal/BlueprintResourceProvider.java | 7 +- .../internal/ClientConfigResourceProvider.java | 2 + .../internal/ClusterResourceProvider.java | 4 + .../ClusterStackVersionResourceProvider.java | 20 +- ...atibleRepositoryVersionResourceProvider.java | 4 + .../internal/ComponentResourceProvider.java | 4 + .../internal/CredentialResourceProvider.java | 4 + .../internal/GroupResourceProvider.java | 4 + .../internal/HostComponentResourceProvider.java | 4 + .../internal/HostResourceProvider.java | 56 +- .../HostStackVersionResourceProvider.java | 7 +- .../controller/internal/HostStatusHelper.java | 2 +- .../internal/HttpPropertyProvider.java | 2 +- .../internal/JsonHttpPropertyRequest.java | 2 +- .../internal/LdapSyncEventResourceProvider.java | 2 +- .../internal/MemberResourceProvider.java | 4 + .../QuickLinkArtifactResourceProvider.java | 4 + .../RecommendationResourceProvider.java | 4 + .../internal/RepositoryResourceProvider.java | 3 + .../internal/RequestResourceProvider.java | 4 + .../RoleAuthorizationResourceProvider.java | 4 + ...eComponentConfigurationResourceProvider.java | 476 +++++++++++ .../RootServiceComponentPropertyProvider.java | 4 +- .../RootServiceComponentResourceProvider.java | 4 +- .../internal/ServiceResourceProvider.java | 5 + .../internal/StackAdvisorResourceProvider.java | 13 +- .../internal/StackArtifactResourceProvider.java | 5 + .../internal/StageResourceProvider.java | 4 + .../internal/TaskResourceProvider.java | 4 + .../internal/ThemeArtifactResourceProvider.java | 4 + .../internal/UpgradeItemResourceProvider.java | 4 + .../internal/UpgradeResourceProvider.java | 47 +- .../internal/UserResourceProvider.java | 4 + .../internal/ValidationResourceProvider.java | 4 + .../VersionDefinitionResourceProvider.java | 13 + .../controller/jdbc/JDBCResourceProvider.java | 2 +- .../controller/jmx/JMXPropertyProvider.java | 2 +- .../metrics/MetricsCollectorHAClusterState.java | 2 +- .../metrics/MetricsCollectorHAManager.java | 2 +- .../metrics/MetricsDownsamplingMethod.java | 2 +- .../metrics/MetricsPropertyProvider.java | 2 +- .../metrics/MetricsReportPropertyProvider.java | 2 +- .../metrics/RestMetricsPropertyProvider.java | 2 +- .../ThreadPoolEnabledPropertyProvider.java | 4 + .../ganglia/GangliaPropertyProvider.java | 2 +- .../ganglia/GangliaReportPropertyProvider.java | 2 +- .../metrics/timeline/AMSPropertyProvider.java | 3 + .../timeline/AMSReportPropertyProvider.java | 3 + .../ambari/server/controller/spi/Resource.java | 6 +- .../controller/utilities/DatabaseChecker.java | 2 +- .../state/DefaultServiceCalculatedState.java | 2 +- .../state/FlumeServiceCalculatedState.java | 4 + .../state/HBaseServiceCalculatedState.java | 4 + .../state/HDFSServiceCalculatedState.java | 4 + .../state/HiveServiceCalculatedState.java | 4 + .../state/OozieServiceCalculatedState.java | 4 + .../state/YARNServiceCalculatedState.java | 4 + .../events/AmbariConfigurationChangedEvent.java | 36 + .../ambari/server/events/AmbariEvent.java | 4 +- .../events/AmbariLdapConfigChangedEvent.java | 37 - .../listeners/alerts/AlertReceivedListener.java | 10 +- .../alerts/AlertStateChangedListener.java | 6 +- .../ldap/domain/AmbariLdapConfiguration.java | 26 +- .../domain/AmbariLdapConfigurationFactory.java | 2 +- .../AmbariLdapConfigurationProvider.java | 57 +- .../ads/DefaultLdapConnectionConfigService.java | 2 +- .../ads/LdapConnectionTemplateFactory.java | 4 +- .../metadata/AmbariServiceAlertDefinitions.java | 20 +- .../dispatchers/AmbariSNMPDispatcher.java | 10 +- .../server/orm/dao/AlertDefinitionDAO.java | 7 +- .../ambari/server/orm/dao/AlertDispatchDAO.java | 4 +- .../server/orm/dao/AmbariConfigurationDAO.java | 146 +++- .../orm/entities/AmbariConfigurationEntity.java | 94 ++- .../entities/AmbariConfigurationEntityPK.java | 88 ++ .../orm/entities/ConfigurationBaseEntity.java | 159 ---- .../orm/entities/RemoteAmbariClusterEntity.java | 2 +- .../server/orm/entities/RepositoryEntity.java | 53 +- .../AmbariLdapAuthenticationProvider.java | 2 +- .../security/encryption/CredentialProvider.java | 2 +- .../AbstractPrepareKerberosServerAction.java | 27 +- .../kerberos/CreatePrincipalsServerAction.java | 6 +- .../kerberos/KDCKerberosOperationHandler.java | 2 +- .../kerberos/KerberosServerAction.java | 21 + .../PrepareKerberosIdentitiesServerAction.java | 5 +- .../stageutils/ResolvedKerberosKeytab.java | 16 +- .../upgrades/CreateAndConfigureAction.java | 164 ++++ .../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 +- .../apache/ambari/server/state/ServiceInfo.java | 2 +- .../server/state/alert/AlertDefinitionHash.java | 8 +- .../server/state/cluster/ClusterImpl.java | 4 +- .../services/AmbariServerAlertService.java | 4 +- .../state/services/MetricsRetrievalService.java | 2 +- .../ambari/server/state/stack/OsFamily.java | 2 +- .../ambari/server/state/stack/RepoTag.java | 34 + .../server/state/stack/RepositoryXml.java | 13 + .../ambari/server/state/stack/UpgradePack.java | 3 + .../state/stack/upgrade/ClusterGrouping.java | 2 + .../stack/upgrade/CreateAndConfigureTask.java | 57 ++ .../stack/upgrade/RepositoryVersionHelper.java | 330 +++++++- .../ambari/server/state/stack/upgrade/Task.java | 6 +- .../ambari/server/topology/AmbariContext.java | 3 +- .../ambari/server/topology/Blueprint.java | 2 +- .../server/topology/BlueprintFactory.java | 3 +- .../ambari/server/topology/BlueprintImpl.java | 3 +- .../server/topology/BlueprintValidator.java | 3 +- .../server/topology/BlueprintValidatorImpl.java | 23 +- .../topology/ClusterConfigurationRequest.java | 2 +- .../GPLLicenseNotAcceptedException.java | 28 + .../server/topology/PersistedStateImpl.java | 2 +- .../validators/RequiredPasswordValidator.java | 3 +- .../server/upgrade/AbstractUpgradeCatalog.java | 8 + .../server/upgrade/SchemaUpgradeHelper.java | 30 +- .../ambari/server/upgrade/UpgradeCatalog.java | 6 + .../server/upgrade/UpgradeCatalog260.java | 182 +++- .../server/upgrade/UpgradeCatalog261.java | 119 +++ .../server/upgrade/UpgradeCatalog300.java | 21 +- .../apache/ambari/server/utils/RetryHelper.java | 2 +- .../server/view/ViewDataMigrationUtility.java | 2 +- .../ambari/server/view/ViewExtractor.java | 2 +- .../apache/ambari/server/view/ViewRegistry.java | 2 +- .../server/view/ViewSubResourceProvider.java | 4 + .../server/view/persistence/DataStoreImpl.java | 2 +- 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 +- .../main/resources/Ambari-DDL-Derby-CREATE.sql | 21 +- .../main/resources/Ambari-DDL-MySQL-CREATE.sql | 20 +- .../main/resources/Ambari-DDL-Oracle-CREATE.sql | 20 +- .../resources/Ambari-DDL-Postgres-CREATE.sql | 19 +- .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 20 +- .../resources/Ambari-DDL-SQLServer-CREATE.sql | 19 +- .../src/main/resources/META-INF/persistence.xml | 1 - .../DRUID/0.10.1/package/scripts/params.py | 4 +- .../HDFS/2.1.0.2.0/package/scripts/datanode.py | 1 + .../HDFS/2.1.0.2.0/package/scripts/hdfs.py | 3 + .../2.1.0.2.0/package/scripts/hdfs_client.py | 1 + .../2.1.0.2.0/package/scripts/install_params.py | 5 - .../2.1.0.2.0/package/scripts/journalnode.py | 1 + .../HDFS/2.1.0.2.0/package/scripts/namenode.py | 1 + .../2.1.0.2.0/package/scripts/params_linux.py | 5 - .../HDFS/3.0.0.3.0/package/scripts/hdfs.py | 3 + .../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 | 34 +- .../package/scripts/oozie_server_upgrade.py | 7 +- .../4.0.0.2.0/package/scripts/params_linux.py | 6 +- .../OOZIE/4.2.0.3.0/metainfo.xml | 9 +- .../OOZIE/4.2.0.3.0/package/scripts/oozie.py | 11 +- .../package/scripts/oozie_server_upgrade.py | 5 - .../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.4.0.2.1/package/scripts/tez_client.py | 32 + .../TEZ/0.9.0.3.0/configuration/tez-site.xml | 4 +- .../TEZ/0.9.0.3.0/package/scripts/tez.py | 4 + .../TEZ/0.9.0.3.0/package/scripts/tez_client.py | 26 + .../configuration-mapred/mapred-site.xml | 2 +- .../2.1.0.2.0/package/scripts/params_linux.py | 6 + .../YARN/2.1.0.2.0/package/scripts/yarn.py | 3 + .../configuration-mapred/mapred-site.xml | 2 +- .../3.0.0.3.0/package/scripts/params_linux.py | 6 + .../YARN/3.0.0.3.0/package/scripts/yarn.py | 3 + .../custom_actions/scripts/remove_bits.py | 2 +- .../custom_actions/scripts/ru_execute_tasks.py | 5 +- .../BIGTOP/0.8/services/HDFS/metainfo.xml | 16 + .../0.8/services/HDFS/package/scripts/params.py | 6 +- .../HDP/2.0.6/properties/stack_features.json | 17 +- .../HDP/2.0.6/properties/stack_packages.json | 9 +- .../stacks/HDP/2.0.6/role_command_order.json | 1 + .../stacks/HDP/2.0.6/services/stack_advisor.py | 35 + .../services/HIVE/configuration/hive-site.xml | 2 +- .../services/HIVE/configuration/hive-site.xml | 2 +- .../2.2/services/TEZ/configuration/tez-site.xml | 4 +- .../YARN/configuration-mapred/mapred-site.xml | 2 +- .../2.3.GlusterFS/services/HDFS/metainfo.xml | 10 + .../stacks/HDP/2.5/services/FALCON/metainfo.xml | 4 +- .../services/YARN/configuration/yarn-site.xml | 4 +- .../stacks/HDP/2.5/services/YARN/kerberos.json | 12 +- .../stacks/HDP/2.5/services/stack_advisor.py | 2 +- .../stacks/HDP/2.5/upgrades/config-upgrade.xml | 23 + .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 23 +- .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 45 +- .../stacks/HDP/2.6/services/FALCON/metainfo.xml | 26 + .../stacks/HDP/2.6/services/OOZIE/metainfo.xml | 37 + .../configuration/spark2-log4j-properties.xml | 56 ++ .../stacks/HDP/2.6/services/YARN/kerberos.json | 24 +- .../stacks/HDP/2.6/services/stack_advisor.py | 3 + .../stacks/HDP/2.6/upgrades/config-upgrade.xml | 20 +- .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 10 +- .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 4 + .../HDP/3.0/properties/stack_packages.json | 10 +- .../services/YARN/configuration/yarn-site.xml | 4 +- .../PERF/1.0/configuration/cluster-env.xml | 26 + .../1.0/hooks/before-INSTALL/scripts/hook.py | 7 + .../PERF/1.0/properties/stack_packages.json | 8 + .../FAKEYARN/configuration/yarn-site.xml | 4 +- .../src/main/resources/stacks/stack_advisor.py | 9 + .../src/main/resources/upgrade-pack.xsd | 9 +- .../src/main/resources/version_definition.xsd | 23 +- .../ExecutionCommandWrapperTest.java | 15 +- .../commands/StackAdvisorCommandTest.java | 8 +- .../ambari/server/checks/LZOCheckTest.java | 13 +- .../AmbariCustomCommandExecutionHelperTest.java | 13 +- .../AmbariManagementControllerImplTest.java | 3 +- .../AmbariManagementControllerTest.java | 234 +++--- .../RootServiceResponseFactoryTest.java | 27 +- ...AmbariConfigurationResourceProviderTest.java | 251 ------ .../ClientConfigResourceProviderTest.java | 2 + ...ClusterStackVersionResourceProviderTest.java | 51 +- .../internal/HostResourceProviderTest.java | 6 +- .../RepositoryResourceProviderTest.java | 6 +- ...ponentConfigurationResourceProviderTest.java | 393 +++++++++ ...ootServiceComponentPropertyProviderTest.java | 15 +- ...ootServiceComponentResourceProviderTest.java | 9 +- .../internal/UpgradeResourceProviderTest.java | 12 +- .../ValidationResourceProviderTest.java | 4 +- .../server/ldap/LdapModuleFunctionalTest.java | 4 +- .../TestAmbariLdapConfigurationFactory.java | 2 +- .../ldap/service/AmbariLdapFacadeTest.java | 4 +- ...efaultLdapAttributeDetectionServiceTest.java | 8 +- .../DefaultLdapConfigurationServiceTest.java | 12 +- .../metadata/AgentAlertDefinitionsTest.java | 6 +- .../dispatchers/AmbariSNMPDispatcherTest.java | 23 +- .../apache/ambari/server/orm/OrmTestHelper.java | 4 +- .../server/orm/dao/AlertDefinitionDAOTest.java | 7 +- .../orm/dao/AmbariConfigurationDAOTest.java | 298 +++++++ .../upgrades/CreateAndConfigureActionTest.java | 357 ++++++++ .../ambari/server/state/ConfigHelperTest.java | 47 ++ .../state/alerts/AlertReceivedListenerTest.java | 16 +- .../alerts/AlertStateChangedEventTest.java | 4 +- .../state/repository/VersionDefinitionTest.java | 35 +- .../AlertNoticeDispatchServiceTest.java | 53 +- .../upgrade/RepositoryVersionHelperTest.java | 2 +- .../server/topology/BlueprintImplTest.java | 87 +- .../topology/BlueprintValidatorImplTest.java | 10 +- .../server/upgrade/UpgradeCatalog260Test.java | 136 ++- .../server/upgrade/UpgradeCatalog300Test.java | 43 + .../src/test/python/TestAmbariServer.py | 7 +- .../python/custom_actions/TestRemoveBits.py | 5 +- .../custom_actions/test_ru_execute_tasks.py | 6 +- .../stacks/2.0.6/common/test_stack_advisor.py | 59 +- .../stacks/2.1/FALCON/test_falcon_server.py | 6 +- .../stacks/2.2/configs/oozie-upgrade.json | 3 +- .../HIVE/running_withMOTDmsg_andTrailingMsg.txt | 46 ++ .../stacks/2.5/HIVE/test_hive_server_int.py | 21 + .../stacks/2.5/common/test_stack_advisor.py | 2 +- .../stacks/2.6/common/test_stack_advisor.py | 11 + .../test_kerberos_descriptor_ranger_kms.json | 286 +++++++ .../resources/version_definition_with_tags.xml | 86 ++ ambari-web/app/controllers/installer.js | 58 +- .../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 | 8 +- .../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 + ambari-web/app/views/common/controls_view.js | 9 +- .../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 +- .../test/views/common/controls_view_test.js | 2 +- contrib/utils/perf/deploy-gce-perf-cluster.py | 1 + contrib/version-builder/version_builder.py | 13 +- .../resources/ui/app/components/upload-file.js | 38 +- .../files/src/main/resources/ui/bower.json | 4 +- .../src/main/resources/ui/hive-web/bower.json | 4 +- .../scripts/containers/ComponentDetailView.jsx | 2 +- .../storm/src/main/resources/ui/package.json | 20 +- .../apache/ambari/view/utils/hdfs/HdfsApi.java | 16 +- .../apache/ambari/view/utils/hdfs/HdfsUtil.java | 17 +- .../ui/app/domain/workflow-importer.js | 3 +- 532 files changed, 13938 insertions(+), 8216 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f02eb4e1/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f02eb4e1/ambari-web/app/messages.js ----------------------------------------------------------------------
