Merge trunk with feature branch and fix some UT compilation issues (mradhakrishnan)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e83bf1bd Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e83bf1bd Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e83bf1bd Branch: refs/heads/branch-feature-AMBARI-14714 Commit: e83bf1bd983a1f002fa90cdf8124cfb3c3c7fcc5 Parents: 586ab64 Author: Madhuvanthi Radhakrishnan <[email protected]> Authored: Mon Nov 27 15:28:09 2017 -0800 Committer: Madhuvanthi Radhakrishnan <[email protected]> Committed: Mon Nov 27 15:28:09 2017 -0800 ---------------------------------------------------------------------- ambari-admin/pom.xml | 2 +- .../app/assets/fonts/Roboto-Regular-webfont.eot | Bin 0 -> 79547 bytes .../app/assets/fonts/Roboto-Regular-webfont.svg | 7606 ++++++++++++++++++ .../app/assets/fonts/Roboto-Regular-webfont.ttf | Bin 0 -> 234464 bytes .../assets/fonts/Roboto-Regular-webfont.woff | Bin 0 -> 105700 bytes .../main/resources/ui/admin-web/app/index.html | 97 +- .../resources/ui/admin-web/app/scripts/app.js | 3 +- .../app/scripts/controllers/AppCtrl.js | 177 + .../app/scripts/controllers/NavbarCtrl.js | 106 - .../app/scripts/controllers/SideNavCtrl.js | 68 + .../ambariViews/CreateViewInstanceCtrl.js | 406 +- .../controllers/ambariViews/ViewsListCtrl.js | 361 +- .../clusters/ClusterInformationCtrl.js | 106 + .../clusters/ClustersManageAccessCtrl.js | 97 - .../controllers/clusters/ExportBlueprintCtrl.js | 58 - .../controllers/clusters/UserAccessListCtrl.js | 351 - .../controllers/groups/GroupsCreateCtrl.js | 65 - .../controllers/groups/GroupsEditCtrl.js | 180 - .../controllers/groups/GroupsListCtrl.js | 106 - .../app/scripts/controllers/mainCtrl.js | 183 - .../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 | 49 +- .../ui/admin-web/app/scripts/routes.js | 161 +- .../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 | 40 +- .../app/scripts/theme/bootstrap-ambari.js | 269 + .../app/styles/cluster-information.css | 58 + .../resources/ui/admin-web/app/styles/main.css | 696 +- .../app/styles/theme/bootstrap-ambari.css | 1518 ++++ .../ui/admin-web/app/styles/top-nav.css | 200 + .../ui/admin-web/app/styles/user-management.css | 43 + .../resources/ui/admin-web/app/styles/views.css | 105 + .../admin-web/app/views/ambariViews/create.html | 204 - .../admin-web/app/views/ambariViews/edit.html | 37 +- .../app/views/ambariViews/listTable.html | 110 - .../app/views/ambariViews/listUrls.html | 117 - .../app/views/ambariViews/modals/create.html | 311 +- .../app/views/ambariViews/modals/edit.html | 138 - .../app/views/ambariViews/viewsList.html | 151 + .../app/views/authentication/main.html | 8 +- .../app/views/clusters/clusterInformation.html | 87 + .../app/views/clusters/exportBlueprint.html | 40 - .../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 | 79 - .../ui/admin-web/app/views/leftNavbar.html | 126 - .../resources/ui/admin-web/app/views/main.html | 96 - .../app/views/modals/AddVersionModal.html | 14 +- .../app/views/remoteClusters/list.html | 11 +- .../ui/admin-web/app/views/sideNav.html | 99 + .../admin-web/app/views/stackVersions/list.html | 22 +- .../views/stackVersions/stackVersionPage.html | 55 +- .../ui/admin-web/app/views/urls/create.html | 6 +- .../ui/admin-web/app/views/urls/edit.html | 6 +- .../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 | 96 - .../app/views/users/modals/changePassword.html | 46 - .../ui/admin-web/app/views/users/show.html | 122 - .../src/main/resources/ui/admin-web/bower.json | 2 +- .../src/main/resources/ui/admin-web/gulpfile.js | 10 +- .../main/resources/ui/admin-web/package.json | 6 +- .../test/unit/controllers/AppCtrl_test.js | 211 + .../controllers/ClusterInformationCtrl_test.js | 102 + .../unit/controllers/CreateViewInstanceCtrl.js | 135 - .../clusters/UserAccessListCtrl_test.js | 820 -- .../controllers/groups/GroupsListCtrl_test.js | 129 - .../test/unit/controllers/mainCtrl_test.js | 215 - .../userManagement/GroupsListCtrl_test.js | 129 + .../userManagement/UsersListCtrl_test.js | 344 + .../controllers/users/UsersListCtrl_test.js | 383 - .../test/unit/services/Utility_test.js | 11 +- .../src/main/python/ambari_agent/AmbariAgent.py | 3 - .../src/main/python/ambari_agent/Hardware.py | 130 +- .../src/main/python/ambari_agent/Heartbeat.py | 8 +- .../src/main/python/ambari_agent/HostInfo.py | 83 +- .../python/ambari_agent/alerts/base_alert.py | 2 +- .../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 | 2 +- .../libraries/functions/conf_select.py | 58 + .../libraries/functions/copy_tarball.py | 195 +- .../libraries/functions/curl_krb_request.py | 22 +- .../libraries/functions/get_lzo_packages.py | 50 - .../libraries/functions/lzo_utils.py | 93 + .../libraries/functions/package_conditions.py | 14 +- .../libraries/functions/stack_select.py | 3 +- .../libraries/functions/tar_archive.py | 6 +- .../funtest/server/tests/DeleteServiceTest.java | 11 +- ambari-logsearch/README.md | 27 +- .../ambari-logsearch-logfeeder/README.md | 17 +- .../ambari-logsearch-logfeeder/pom.xml | 6 +- .../logfeeder/metrics/LogFeederAMSClient.java | 3 + .../logfeeder/metrics/MetricsManager.java | 8 +- .../src/main/resources/log-samples/.gitignore | 4 + .../log-samples/logs/service_sample.txt | 3 + .../log-samples/shipper-conf/global.config.json | 10 + .../shipper-conf/input.config-sample.json | 31 + .../shipper-conf/output.config-sample.json | 34 + .../src/main/resources/log4j.xml | 4 +- .../src/main/resources/logfeeder.properties | 31 +- .../logfeeder/metrics/MetricsManagerTest.java | 10 +- .../ambari-logsearch-server/.gitignore | 1 + .../ambari-logsearch-server/README.md | 44 +- .../ambari-logsearch-server/pom.xml | 2 +- ambari-logsearch/ambari-logsearch-server/run.sh | 2 +- .../configsets/hadoop_logs/conf/managed-schema | 2 + .../ambari/logsearch/conf/AuthPropsConfig.java | 18 + .../ambari/logsearch/conf/SecurityConfig.java | 6 +- .../ambari/logsearch/solr/SolrConstants.java | 1 + .../solr/model/SolrServiceLogData.java | 17 + .../LogsearchAuthenticationEntryPoint.java | 2 +- .../src/main/resources/logsearch.properties | 54 +- .../ambari-logsearch-web/src/app/app.module.ts | 18 +- .../components/logs-table-component.spec.ts | 61 + .../classes/components/logs-table-component.ts | 51 + .../src/app/classes/filtering.ts | 355 +- .../src/app/classes/models/app-state.ts | 6 +- .../src/app/classes/models/audit-log.ts | 2 +- .../src/app/classes/models/node-item.ts | 30 + .../src/app/classes/models/node.ts | 30 - .../src/app/classes/models/store.ts | 6 +- .../src/app/classes/models/tab.ts | 12 +- .../action-menu/action-menu.component.html | 20 + .../action-menu/action-menu.component.less | 27 + .../action-menu/action-menu.component.spec.ts | 47 + .../action-menu/action-menu.component.ts | 105 + .../src/app/components/app.component.html | 4 +- .../src/app/components/app.component.less | 5 +- .../src/app/components/app.component.spec.ts | 4 +- .../src/app/components/app.component.ts | 6 +- .../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.html | 4 +- .../dropdown-button.component.spec.ts | 6 +- .../dropdown-button.component.ts | 55 +- .../dropdown-list/dropdown-list.component.html | 2 +- .../dropdown-list.component.spec.ts | 10 +- .../filter-button.component.spec.ts | 6 +- .../filter-button/filter-button.component.ts | 35 +- .../filter-dropdown.component.spec.ts | 18 +- .../filter-dropdown.component.ts | 22 +- .../filters-panel/filters-panel.component.html | 6 +- .../filters-panel.component.spec.ts | 6 +- .../filters-panel/filters-panel.component.ts | 18 +- .../log-context/log-context.component.spec.ts | 4 +- .../log-level/log-level.component.html | 18 + .../log-level/log-level.component.spec.ts | 73 + .../components/log-level/log-level.component.ts | 52 + .../log-message/log-message.component.html | 24 + .../log-message/log-message.component.less | 69 + .../log-message/log-message.component.spec.ts | 64 + .../log-message/log-message.component.ts | 129 + .../login-form/login-form.component.spec.ts | 7 +- .../login-form/login-form.component.ts | 34 +- .../logs-container.component.html | 59 +- .../logs-container.component.less | 3 + .../logs-container.component.spec.ts | 2 - .../logs-container/logs-container.component.ts | 88 +- .../logs-list/logs-list.component.html | 65 - .../logs-list/logs-list.component.less | 109 - .../logs-list/logs-list.component.spec.ts | 95 - .../components/logs-list/logs-list.component.ts | 151 - .../main-container.component.html | 2 +- .../menu-button/menu-button.component.html | 17 +- .../menu-button/menu-button.component.less | 22 +- .../menu-button/menu-button.component.spec.ts | 6 +- .../menu-button/menu-button.component.ts | 146 +- .../src/app/components/mixins.less | 5 + .../pagination-controls.component.html | 15 +- .../pagination-controls.component.spec.ts | 101 + .../pagination-controls.component.ts | 76 +- .../pagination/pagination.component.html | 2 +- .../pagination/pagination.component.spec.ts | 9 +- .../pagination/pagination.component.ts | 10 +- .../search-box/search-box.component.ts | 12 +- .../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 | 9 +- .../time-range-picker.component.spec.ts | 29 +- .../time-range-picker.component.ts | 57 +- .../timezone-picker.component.spec.ts | 6 +- .../components/top-menu/top-menu.component.html | 10 +- .../components/top-menu/top-menu.component.less | 1 + .../components/top-menu/top-menu.component.ts | 86 +- .../src/app/components/variables.less | 3 + .../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 | 6 +- .../app/services/component-actions.service.ts | 42 +- .../component-generator.service.spec.ts | 2 - .../src/app/services/filtering.service.spec.ts | 97 - .../src/app/services/filtering.service.ts | 253 - .../app/services/logs-container.service.spec.ts | 31 +- .../src/app/services/logs-container.service.ts | 767 +- .../src/app/services/mock-api-data.service.ts | 22 + .../src/app/services/utils.service.spec.ts | 285 +- .../src/app/services/utils.service.ts | 65 +- .../src/assets/i18n/en.json | 5 +- .../ambari-logsearch-web/webpack.config.js | 15 +- ambari-metrics/ambari-metrics-assembly/pom.xml | 1 - .../ambari-metrics-hadoop-sink/pom.xml | 3 +- .../timeline/HadoopTimelineMetricsSink.java | 6 +- .../timeline/HadoopTimelineMetricsSinkTest.java | 21 +- .../docs/security/kerberos/kerberos_service.md | 22 +- ambari-server/pom.xml | 12 + .../actionmanager/ExecutionCommandWrapper.java | 42 +- .../ambari/server/agent/CommandRepository.java | 2 +- .../ambari/server/agent/ExecutionCommand.java | 35 +- .../ambari/server/agent/HeartbeatMonitor.java | 3 +- .../ambari/server/agent/HeartbeatProcessor.java | 72 +- .../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 +- .../commands/StackAdvisorCommand.java | 71 +- .../ambari/server/checks/CheckDescription.java | 9 + .../checks/DatabaseConsistencyCheckHelper.java | 2 +- .../apache/ambari/server/checks/LZOCheck.java | 80 + .../server/configuration/Configuration.java | 19 + .../controller/ActionExecutionContext.java | 6 +- .../controller/AmbariActionExecutionHelper.java | 72 +- .../AmbariCustomCommandExecutionHelper.java | 282 +- .../server/controller/AmbariHandlerList.java | 5 +- .../AmbariManagementControllerImpl.java | 81 +- .../server/controller/ControllerModule.java | 4 +- .../controller/DeleteIdentityHandler.java | 3 +- .../server/controller/KerberosHelper.java | 21 +- .../server/controller/KerberosHelperImpl.java | 169 +- .../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 | 4 + .../internal/ClientConfigResourceProvider.java | 2 + .../internal/ClusterResourceProvider.java | 4 + .../ClusterStackVersionResourceProvider.java | 59 +- ...atibleRepositoryVersionResourceProvider.java | 4 + .../internal/ComponentResourceProvider.java | 5 + .../internal/CredentialResourceProvider.java | 4 + .../internal/GroupResourceProvider.java | 4 + .../internal/HostComponentResourceProvider.java | 4 + .../HostKerberosIdentityResourceProvider.java | 16 +- .../internal/HostResourceProvider.java | 2 + .../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/ServiceGroupResourceProvider.java | 1 + .../internal/ServiceResourceProvider.java | 5 + .../internal/StackAdvisorResourceProvider.java | 4 + .../internal/StackArtifactResourceProvider.java | 5 + .../internal/StageResourceProvider.java | 4 + .../internal/TaskResourceProvider.java | 4 + .../internal/ThemeArtifactResourceProvider.java | 4 + .../internal/UpgradeItemResourceProvider.java | 4 + .../internal/UpgradeResourceProvider.java | 51 +- .../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 - .../ServiceComponentUninstalledEvent.java | 12 +- .../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 +- .../server/orm/dao/AlertDefinitionDAO.java | 7 +- .../ambari/server/orm/dao/AlertDispatchDAO.java | 4 +- .../server/orm/dao/AmbariConfigurationDAO.java | 146 +- .../server/orm/dao/KerberosKeytabDAO.java | 110 + .../server/orm/dao/KerberosPrincipalDAO.java | 7 + .../orm/dao/KerberosPrincipalHostDAO.java | 40 +- .../orm/entities/AmbariConfigurationEntity.java | 94 +- .../entities/AmbariConfigurationEntityPK.java | 88 + .../orm/entities/ConfigurationBaseEntity.java | 159 - .../orm/entities/KerberosKeytabEntity.java | 86 + .../entities/KerberosPrincipalHostEntity.java | 57 +- .../entities/KerberosPrincipalHostEntityPK.java | 19 +- .../orm/entities/RemoteAmbariClusterEntity.java | 2 +- .../server/orm/entities/RepositoryEntity.java | 53 +- .../AmbariLdapAuthenticationProvider.java | 2 +- .../security/encryption/CredentialProvider.java | 2 +- .../serveraction/ServerActionExecutor.java | 147 +- .../kerberos/ADKerberosOperationHandler.java | 22 +- .../AbstractPrepareKerberosServerAction.java | 54 +- .../kerberos/CleanupServerAction.java | 14 +- .../server/serveraction/kerberos/Component.java | 13 +- .../ConfigureAmbariIdentitiesServerAction.java | 31 +- .../kerberos/CreateKeytabFilesServerAction.java | 65 +- .../kerberos/CreatePrincipalsServerAction.java | 56 +- .../kerberos/DestroyPrincipalsServerAction.java | 3 +- .../kerberos/IPAKerberosOperationHandler.java | 1067 +-- .../kerberos/KDCKerberosOperationHandler.java | 391 + .../kerberos/KerberosIdentityDataFile.java | 2 - .../KerberosIdentityDataFileWriter.java | 9 +- .../kerberos/KerberosOperationHandler.java | 64 +- .../kerberos/KerberosServerAction.java | 48 +- .../kerberos/MITKerberosOperationHandler.java | 406 +- .../PrepareDisableKerberosServerAction.java | 2 +- .../PrepareEnableKerberosServerAction.java | 2 +- .../PrepareKerberosIdentitiesServerAction.java | 8 +- .../stageutils/ResolvedKerberosKeytab.java | 257 + .../upgrades/CreateAndConfigureAction.java | 164 + .../upgrades/PreconfigureKerberosAction.java | 48 +- .../apache/ambari/server/stack/RepoUtil.java | 1 + .../ambari/server/stack/ServiceDirectory.java | 29 + .../ambari/server/stack/ServiceModule.java | 8 + .../ambari/server/stack/StackManager.java | 5 - .../ambari/server/state/ConfigHelper.java | 28 +- .../ambari/server/state/RepositoryInfo.java | 23 +- .../apache/ambari/server/state/ServiceImpl.java | 2 +- .../apache/ambari/server/state/ServiceInfo.java | 14 + .../server/state/alert/AlertDefinitionHash.java | 8 +- .../server/state/cluster/ClusterImpl.java | 4 +- .../state/repository/ClusterVersionSummary.java | 3 + .../state/repository/ServiceVersionSummary.java | 11 +- .../state/repository/VersionDefinitionXml.java | 25 +- .../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 | 338 +- .../ambari/server/state/stack/upgrade/Task.java | 6 +- .../svccomphost/ServiceComponentHostImpl.java | 3 +- .../server/topology/BlueprintFactory.java | 3 +- .../topology/ClusterConfigurationRequest.java | 2 +- .../server/topology/PersistedStateImpl.java | 2 +- .../validators/RequiredPasswordValidator.java | 2 +- .../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 | 51 +- .../apache/ambari/server/utils/RetryHelper.java | 2 +- .../ambari/server/utils/VersionUtils.java | 46 +- .../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 | 44 +- .../main/resources/Ambari-DDL-MySQL-CREATE.sql | 41 +- .../main/resources/Ambari-DDL-Oracle-CREATE.sql | 41 +- .../resources/Ambari-DDL-Postgres-CREATE.sql | 30 +- .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 41 +- .../resources/Ambari-DDL-SQLServer-CREATE.sql | 40 +- .../src/main/resources/META-INF/persistence.xml | 2 +- .../ATLAS/0.1.0.2.3/package/scripts/params.py | 2 +- .../ATLAS/0.7.0.3.0/package/scripts/params.py | 2 +- .../DRUID/0.10.1/package/scripts/druid.py | 3 +- .../DRUID/0.10.1/package/scripts/params.py | 5 +- .../FALCON/0.5.0.2.1/package/scripts/falcon.py | 11 +- .../HBASE/2.0.0.3.0/service_advisor.py | 12 +- .../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 | 40 +- .../HIVE/0.12.0.2.0/metainfo.xml | 5 - .../package/alerts/alert_hive_thrift_port.py | 3 +- .../0.12.0.2.0/package/files/startMetastore.sh | 4 +- .../HIVE/0.12.0.2.0/package/scripts/hive.py | 15 +- .../package/scripts/hive_server_interactive.py | 20 +- .../0.12.0.2.0/package/scripts/hive_service.py | 10 +- .../package/scripts/hive_service_interactive.py | 5 +- .../0.12.0.2.0/package/scripts/params_linux.py | 3 +- .../0.12.0.2.0/package/scripts/service_check.py | 6 +- .../package/scripts/webhcat_service.py | 19 +- .../common-services/HIVE/2.1.0.3.0/metainfo.xml | 10 - .../2.1.0.3.0/package/files/startMetastore.sh | 4 +- .../HIVE/2.1.0.3.0/package/scripts/hive.py | 3 + .../2.1.0.3.0/package/scripts/hive_service.py | 8 +- .../package/scripts/hive_service_interactive.py | 5 +- .../2.1.0.3.0/package/scripts/params_linux.py | 10 +- .../2.1.0.3.0/package/scripts/service_check.py | 6 +- .../package/scripts/webhcat_service.py | 19 +- .../1.10.3-10/configuration/kerberos-env.xml | 36 +- .../package/scripts/kerberos_common.py | 7 +- .../1.10.3-30/configuration/kerberos-env.xml | 36 +- .../package/scripts/kerberos_common.py | 7 +- .../1.0.0.2.3/package/scripts/service_check.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.2.3/metainfo.xml | 5 - .../OOZIE/4.2.0.3.0/metainfo.xml | 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 - .../scripts/alerts/alert_spark_thrift_port.py | 8 +- .../SPARK/1.2.1/package/scripts/setup_spark.py | 3 +- .../scripts/alerts/alert_spark2_thrift_port.py | 8 +- .../SPARK2/2.0.0/package/scripts/setup_spark.py | 3 +- .../SQOOP/1.4.4.2.0/metainfo.xml | 5 - .../1.4.4.2.0/package/scripts/params_linux.py | 4 +- .../SQOOP/1.4.4.3.0/metainfo.xml | 10 - .../1.4.4.3.0/package/scripts/params_linux.py | 4 +- .../0.4.0.2.1/package/scripts/params_linux.py | 2 +- .../TEZ/0.4.0.2.1/package/scripts/tez.py | 5 +- .../TEZ/0.9.0.3.0/configuration/tez-site.xml | 4 +- .../0.9.0.3.0/package/scripts/params_linux.py | 2 +- .../TEZ/0.9.0.3.0/package/scripts/tez.py | 4 + .../configuration-mapred/mapred-site.xml | 2 +- .../2.1.0.2.0/package/scripts/params_linux.py | 2 +- .../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 | 2 +- .../YARN/3.0.0.3.0/package/scripts/yarn.py | 3 + .../ZEPPELIN/0.7.0/package/scripts/master.py | 11 +- .../custom_actions/scripts/install_packages.py | 12 +- .../BIGTOP/0.8/services/HIVE/metainfo.xml | 4 - .../BIGTOP/0.8/services/OOZIE/metainfo.xml | 4 - .../2.0.6.GlusterFS/services/HIVE/metainfo.xml | 4 - .../2.0.6.GlusterFS/services/OOZIE/metainfo.xml | 4 - .../HDP/2.0.6/properties/stack_features.json | 20 + .../HDP/2.0.6/properties/stack_packages.json | 107 +- .../stacks/HDP/2.0.6/role_command_order.json | 1 + .../2.1.GlusterFS/services/HIVE/metainfo.xml | 4 - .../2.1.GlusterFS/services/OOZIE/metainfo.xml | 4 - .../services/HIVE/configuration/hive-site.xml | 2 +- .../stacks/HDP/2.1/services/HIVE/metainfo.xml | 5 - .../stacks/HDP/2.2/services/HDFS/metainfo.xml | 35 - .../services/HIVE/configuration/hive-site.xml | 2 +- .../stacks/HDP/2.2/services/HIVE/metainfo.xml | 10 - .../stacks/HDP/2.2/services/OOZIE/metainfo.xml | 5 - .../stacks/HDP/2.2/services/SQOOP/metainfo.xml | 10 - .../2.2/services/TEZ/configuration/tez-site.xml | 4 +- .../YARN/configuration-mapred/mapred-site.xml | 2 +- .../2.3.GlusterFS/services/HIVE/metainfo.xml | 9 - .../2.3.GlusterFS/services/SQOOP/metainfo.xml | 9 - .../main/resources/stacks/HDP/2.3/metainfo.xml | 2 +- .../stacks/HDP/2.3/services/HDFS/metainfo.xml | 30 - .../stacks/HDP/2.3/services/HIVE/metainfo.xml | 10 - .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 1 + .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 1 + .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 1 + .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 1 + .../stacks/HDP/2.5/services/FALCON/metainfo.xml | 4 +- .../stacks/HDP/2.5/services/HIVE/metainfo.xml | 10 - .../stacks/HDP/2.5/services/YARN/kerberos.json | 12 +- .../stacks/HDP/2.5/upgrades/config-upgrade.xml | 23 + .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 24 +- .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 46 +- .../resources/stacks/HDP/2.6/repos/repoinfo.xml | 2 +- .../configuration/spark2-log4j-properties.xml | 56 + .../stacks/HDP/2.6/services/YARN/kerberos.json | 24 +- .../stacks/HDP/2.6/upgrades/config-upgrade.xml | 23 + .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 10 + .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 5 + .../HDP/3.0/properties/stack_packages.json | 108 +- .../stacks/HDP/3.0/services/HDFS/metainfo.xml | 30 - .../YARN/configuration-mapred/mapred-site.xml | 2 +- .../KERBEROS/configuration/kerberos-env.xml | 36 +- .../src/main/resources/upgrade-pack.xsd | 9 +- .../src/main/resources/version_definition.xsd | 23 +- .../server/agent/TestHeartbeatHandler.java | 2 +- .../commands/StackAdvisorCommandTest.java | 8 +- .../ambari/server/checks/LZOCheckTest.java | 152 + .../AmbariCustomCommandExecutionHelperTest.java | 13 +- .../AmbariManagementControllerImplTest.java | 5 +- .../AmbariManagementControllerTest.java | 192 +- .../server/controller/KerberosHelperTest.java | 12 +- .../RootServiceResponseFactoryTest.java | 27 +- ...AmbariConfigurationResourceProviderTest.java | 251 - .../ClientConfigResourceProviderTest.java | 2 + ...ClusterStackVersionResourceProviderTest.java | 284 + ...ostKerberosIdentityResourceProviderTest.java | 12 +- .../RepositoryResourceProviderTest.java | 6 +- ...ponentConfigurationResourceProviderTest.java | 393 + ...ootServiceComponentPropertyProviderTest.java | 15 +- ...ootServiceComponentResourceProviderTest.java | 9 +- .../internal/UpgradeResourceProviderTest.java | 20 +- .../utilities/KerberosIdentityCleanerTest.java | 10 +- .../HostVersionOutOfSyncListenerTest.java | 2 +- .../server/ldap/LdapModuleFunctionalTest.java | 4 +- .../TestAmbariLdapConfigurationFactory.java | 2 +- .../ldap/service/AmbariLdapFacadeTest.java | 4 +- ...efaultLdapAttributeDetectionServiceTest.java | 8 +- .../DefaultLdapConfigurationServiceTest.java | 12 +- .../metadata/AgentAlertDefinitionsTest.java | 6 +- .../apache/ambari/server/orm/OrmTestHelper.java | 4 +- .../server/orm/dao/AlertDefinitionDAOTest.java | 7 +- .../orm/dao/AmbariConfigurationDAOTest.java | 298 + .../ADKerberosOperationHandlerTest.java | 261 +- ...AbstractPrepareKerberosServerActionTest.java | 11 +- ...nfigureAmbariIdentitiesServerActionTest.java | 11 +- .../FinalizeKerberosServerActionTest.java | 5 + .../IPAKerberosOperationHandlerTest.java | 147 +- .../KDCKerberosOperationHandlerTest.java | 168 + .../kerberos/KerberosIdentityDataFileTest.java | 8 +- .../kerberos/KerberosOperationHandlerTest.java | 152 +- .../kerberos/KerberosServerActionTest.java | 137 +- .../MITKerberosOperationHandlerTest.java | 633 +- .../upgrades/CreateAndConfigureActionTest.java | 357 + .../PreconfigureKerberosActionTest.java | 10 + .../ambari/server/stack/ServiceModuleTest.java | 30 + .../server/stack/StackManagerExtensionTest.java | 6 + .../ambari/server/state/ConfigHelperTest.java | 47 + .../state/alerts/AlertReceivedListenerTest.java | 16 +- .../alerts/AlertStateChangedEventTest.java | 4 +- .../state/repository/VersionDefinitionTest.java | 77 +- .../upgrade/RepositoryVersionHelperTest.java | 2 +- .../server/upgrade/UpgradeCatalog260Test.java | 136 +- .../server/upgrade/UpgradeCatalog300Test.java | 194 +- .../ambari/server/utils/TestVersionUtils.java | 4 + .../src/test/python/TestAmbariServer.py | 7 +- .../stacks/2.0.6/HIVE/test_hive_metastore.py | 8 +- .../stacks/2.0.6/HIVE/test_hive_server.py | 18 +- .../2.0.6/HIVE/test_hive_service_check.py | 2 +- .../stacks/2.0.6/HIVE/test_webhcat_server.py | 4 - .../stacks/2.1/FALCON/test_falcon_server.py | 16 +- .../stacks/2.1/HIVE/test_hive_metastore.py | 9 +- .../python/stacks/2.1/TEZ/test_tez_client.py | 2 +- .../stacks/2.2/SPARK/test_job_history_server.py | 12 +- .../stacks/2.2/SPARK/test_spark_client.py | 12 +- .../stacks/2.2/common/test_conf_select.py | 14 +- .../stacks/2.2/configs/oozie-upgrade.json | 3 +- .../2.3/MAHOUT/test_mahout_service_check.py | 4 +- .../2.3/SPARK/test_spark_thrift_server.py | 6 +- .../HIVE/running_withMOTDmsg_andTrailingMsg.txt | 46 + .../stacks/2.5/HIVE/test_hive_server_int.py | 36 +- .../2.5/configs/ranger-admin-secured.json | 2 - .../stacks/2.5/configs/ranger-kms-secured.json | 2 - .../2.6/configs/ranger-admin-secured.json | 2 - .../PreconfigureActionTest_cluster_config.json | 4 +- .../test_kerberos_descriptor_ranger_kms.json | 286 + .../resources/version_definition_with_tags.xml | 86 + ambari-web/app/config.js | 1 - ambari-web/app/controllers/installer.js | 53 +- .../main/admin/kerberos/step1_controller.js | 52 +- .../main/admin/kerberos/step2_controller.js | 2 +- .../main/host/bulk_operations_controller.js | 14 +- ambari-web/app/controllers/main/service/item.js | 13 +- .../main/service/reassign/step3_controller.js | 3 + .../main/service/reassign/step4_controller.js | 12 +- .../app/controllers/wizard/step8_controller.js | 12 +- .../app/mappers/components_state_mapper.js | 1 + .../app/mappers/repository_version_mapper.js | 3 +- ambari-web/app/mappers/stack_mapper.js | 3 +- ambari-web/app/messages.js | 8 +- 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/client_component.js | 1 + ambari-web/app/models/repository.js | 17 + .../app/models/stack_version/repository.js | 3 +- ambari-web/app/styles/application.less | 3 +- .../app/styles/theme/bootstrap-ambari.css | 35 +- .../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 +- .../admin/kerberos/step1_controller_test.js | 17 - .../admin/kerberos/step2_controller_test.js | 2 +- .../test/controllers/main/service/item_test.js | 49 +- .../service/reassign/step4_controller_test.js | 9 +- .../test/mixins/common/serverValidator_test.js | 15 +- .../test/views/common/controls_view_test.js | 2 +- .../vendor/scripts/theme/bootstrap-ambari.js | 7 - .../stacks/ODPi/2.0/services/HIVE/metainfo.xml | 10 - 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 +- 678 files changed, 28418 insertions(+), 13891 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e83bf1bd/ambari-admin/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-admin/pom.xml b/ambari-admin/pom.xml index cb82e45..281280a 100644 --- a/ambari-admin/pom.xml +++ b/ambari-admin/pom.xml @@ -192,7 +192,7 @@ <exclude>src/main/resources/ui/admin-web/bower_components/**</exclude> <exclude>src/main/resources/ui/admin-web/dist/**</exclude> <exclude>src/main/resources/ui/admin-web/node/**</exclude> - <exclude>src/main/resources/ui/admin-web/app/assets/data/**</exclude> + <exclude>src/main/resources/ui/admin-web/app/assets/**</exclude> <exclude>src/main/resources/ui/admin-web/node_modules/**</exclude> <exclude>src/main/resources/ui/admin-web/app/bower_components/**</exclude> <exclude>src/main/resources/ui/admin-web/test/bower_components/**</exclude> http://git-wip-us.apache.org/repos/asf/ambari/blob/e83bf1bd/ambari-admin/src/main/resources/ui/admin-web/app/assets/fonts/Roboto-Regular-webfont.eot ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/assets/fonts/Roboto-Regular-webfont.eot b/ambari-admin/src/main/resources/ui/admin-web/app/assets/fonts/Roboto-Regular-webfont.eot new file mode 100644 index 0000000..d4e185d Binary files /dev/null and b/ambari-admin/src/main/resources/ui/admin-web/app/assets/fonts/Roboto-Regular-webfont.eot differ
