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/16 19:46:06 UTC
[50/50] [abbrv] 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/d173011c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d173011c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d173011c
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: d173011c8b52d99708c842a6d6263b09695b128c
Parents: ceead22 365c91e
Author: Robert Levas <rl...@hortonworks.com>
Authored: Thu Nov 16 14:44:35 2017 -0500
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Thu Nov 16 14:45:02 2017 -0500
----------------------------------------------------------------------
.gitignore | 3 +
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 | 82 +-
.../app/scripts/controllers/AppCtrl.js | 177 +
.../controllers/ClusterInformationCtrl.js | 65 +
.../app/scripts/controllers/NavbarCtrl.js | 106 -
.../app/scripts/controllers/SideNavCtrl.js | 68 +
.../ambariViews/CloneViewInstanceCtrl.js | 274 +
.../ambariViews/CreateViewInstanceCtrl.js | 353 +-
.../controllers/ambariViews/ViewsListCtrl.js | 360 +-
.../controllers/clusters/ExportBlueprintCtrl.js | 58 -
.../app/scripts/controllers/mainCtrl.js | 183 -
.../ui/admin-web/app/scripts/i18n.config.js | 38 +-
.../ui/admin-web/app/scripts/routes.js | 134 +-
.../ui/admin-web/app/scripts/services/View.js | 32 +-
.../app/scripts/theme/bootstrap-ambari.js | 269 +
.../app/styles/cluster-information.css | 59 +
.../resources/ui/admin-web/app/styles/main.css | 581 +-
.../app/styles/theme/bootstrap-ambari.css | 1518 ++
.../ui/admin-web/app/styles/top-nav.css | 200 +
.../resources/ui/admin-web/app/styles/views.css | 49 +
.../admin-web/app/views/ambariViews/create.html | 20 +-
.../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 | 238 +-
.../app/views/ambariViews/modals/edit.html | 138 -
.../app/views/ambariViews/viewsList.html | 134 +
.../app/views/authentication/main.html | 8 +-
.../admin-web/app/views/clusterInformation.html | 66 +
.../app/views/clusters/exportBlueprint.html | 40 -
.../ui/admin-web/app/views/groups/list.html | 7 +-
.../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 | 6 +-
.../ui/admin-web/app/views/sideNav.html | 113 +
.../admin-web/app/views/stackVersions/list.html | 19 +-
.../views/stackVersions/stackVersionPage.html | 27 +-
.../ui/admin-web/app/views/urls/create.html | 4 +-
.../ui/admin-web/app/views/urls/edit.html | 4 +-
.../ui/admin-web/app/views/users/list.html | 7 +-
.../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 +
.../unit/controllers/CloneViewInstanceCtrl.js | 135 +
.../unit/controllers/CreateViewInstanceCtrl.js | 135 -
.../test/unit/controllers/mainCtrl_test.js | 215 -
.../test/unit/services/Utility_test.js | 3 +-
.../src/main/python/ambari_agent/ActionQueue.py | 5 +-
.../src/main/python/ambari_agent/AmbariAgent.py | 3 -
.../python/ambari_agent/alerts/base_alert.py | 2 +-
.../test/python/ambari_agent/TestAmbariAgent.py | 4 +-
.../core/providers/package/__init__.py | 2 +-
.../core/providers/package/apt.py | 23 +-
.../core/providers/package/yumrpm.py | 83 +-
.../core/providers/package/zypper.py | 37 +-
.../libraries/functions/conf_select.py | 58 +
.../libraries/functions/copy_tarball.py | 102 +-
.../libraries/functions/curl_krb_request.py | 22 +-
.../libraries/functions/package_conditions.py | 6 +-
.../libraries/functions/repository_util.py | 79 +-
.../libraries/functions/stack_select.py | 3 +-
.../libraries/functions/tar_archive.py | 6 +-
.../libraries/script/script.py | 4 +-
ambari-funtest/pom.xml | 67 -
.../solr/AmbariSolrCloudClientBuilder.java | 4 +-
.../solr/commands/CreateCollectionCommand.java | 12 +-
.../infra/solr/commands/CreateShardCommand.java | 5 +-
.../infra/solr/commands/GetShardsCommand.java | 2 +-
ambari-infra/pom.xml | 2 +-
ambari-logsearch/README.md | 27 +-
.../ambari-logsearch-logfeeder/README.md | 17 +-
.../ambari-logsearch-logfeeder/pom.xml | 6 +-
.../ambari/logfeeder/input/InputFile.java | 4 +-
.../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 +-
.../ambari/logsearch/conf/AuthPropsConfig.java | 18 +
.../ambari/logsearch/conf/SecurityConfig.java | 6 +-
.../LogsearchAuthenticationEntryPoint.java | 2 +-
.../src/main/resources/logsearch.properties | 54 +-
.../ambari-logsearch-web/src/app/app.module.ts | 12 +-
.../src/app/classes/filtering.ts | 355 +-
.../src/app/classes/models/app-state.ts | 6 +-
.../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 +-
.../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 | 58 +-
.../logs-container.component.less | 3 +
.../logs-container.component.spec.ts | 2 -
.../logs-container/logs-container.component.ts | 26 +-
.../logs-list/logs-list.component.html | 95 +-
.../logs-list/logs-list.component.less | 130 +-
.../logs-list/logs-list.component.spec.ts | 21 +-
.../components/logs-list/logs-list.component.ts | 10 +-
.../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 +-
.../time-range-picker.component.html | 3 +-
.../time-range-picker.component.spec.ts | 29 +-
.../time-range-picker.component.ts | 47 +-
.../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 | 3 +-
.../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 | 678 +-
.../src/app/services/utils.service.spec.ts | 285 +-
.../src/app/services/utils.service.ts | 65 +-
.../src/assets/i18n/en.json | 1 +
.../ambari-logsearch-web/webpack.config.js | 15 +-
ambari-logsearch/docker/.gitignore | 1 +
ambari-logsearch/docker/Dockerfile | 19 +-
ambari-logsearch/docker/all.yml | 40 +
ambari-logsearch/docker/bin/start.sh | 92 +-
ambari-logsearch/docker/docker-compose.yml | 89 +
ambari-logsearch/docker/logsearch-docker.sh | 51 +-
ambari-logsearch/docker/logsearch-logfeeder.yml | 35 +
ambari-logsearch/docker/logsearch-server.yml | 35 +
ambari-logsearch/docker/solr.yml | 34 +
ambari-logsearch/docker/zookeeper.yml | 52 +
ambari-logsearch/pom.xml | 3 +-
ambari-project/pom.xml | 52 +-
.../docs/security/kerberos/kerberos_service.md | 22 +-
ambari-server/pom.xml | 95 +-
.../ambari/server/agent/CommandRepository.java | 85 +
.../ambari/server/agent/ExecutionCommand.java | 35 +-
.../ambari/server/agent/HeartbeatProcessor.java | 72 +-
.../api/handlers/BaseManagementHandler.java | 8 -
.../server/api/handlers/CreateHandler.java | 4 +
.../resources/ResourceInstanceFactoryImpl.java | 5 +
.../RootServiceComponentResourceDefinition.java | 9 +-
.../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 | 46 +
.../api/services/ldap/LdapConfigOperation.java | 43 +
.../services/ldap/LdapConfigurationRequest.java | 49 +
.../services/ldap/LdapConfigurationService.java | 185 +
.../api/services/ldap/LdapRequestInfo.java | 61 +
.../stackadvisor/StackAdvisorRequest.java | 12 +
.../commands/StackAdvisorCommand.java | 68 +-
.../ambari/server/checks/CheckDescription.java | 9 +
.../checks/DatabaseConsistencyCheckHelper.java | 2 +-
.../apache/ambari/server/checks/LZOCheck.java | 76 +
.../server/configuration/Configuration.java | 13 +
.../controller/AmbariActionExecutionHelper.java | 1 -
.../AmbariCustomCommandExecutionHelper.java | 41 +-
.../server/controller/AmbariHandlerList.java | 5 +-
.../AmbariManagementControllerImpl.java | 73 +-
.../ambari/server/controller/AmbariServer.java | 3 +-
.../server/controller/ControllerModule.java | 3 +
.../controller/DeleteIdentityHandler.java | 3 +-
.../server/controller/KerberosHelper.java | 21 +-
.../server/controller/KerberosHelperImpl.java | 165 +-
.../controller/MaintenanceStateHelper.java | 3 +-
.../controller/ResourceProviderFactory.java | 24 +-
.../ambari/server/controller/RootComponent.java | 27 +
.../ambari/server/controller/RootService.java | 36 +
.../controller/RootServiceResponseFactory.java | 44 +-
.../AbstractControllerResourceProvider.java | 2 +
.../internal/AbstractPropertyProvider.java | 4 +
.../internal/AbstractProviderModule.java | 4 +-
.../internal/AbstractResourceProvider.java | 2 +-
.../internal/ActionResourceProvider.java | 4 +
.../AlertDefinitionResourceProvider.java | 4 +
.../internal/AlertGroupResourceProvider.java | 4 +
.../internal/AlertResourceProvider.java | 4 +
.../internal/AlertTargetResourceProvider.java | 4 +
.../internal/ArtifactResourceProvider.java | 4 +
.../controller/internal/BaseProvider.java | 6 +-
.../BlueprintConfigurationProcessor.java | 2 +-
.../internal/BlueprintResourceProvider.java | 4 +
.../internal/ClusterResourceProvider.java | 4 +
.../ClusterStackVersionResourceProvider.java | 45 +-
...atibleRepositoryVersionResourceProvider.java | 4 +
.../internal/ComponentResourceProvider.java | 4 +
.../internal/CredentialResourceProvider.java | 4 +
.../internal/DefaultProviderModule.java | 24 +-
.../internal/GroupResourceProvider.java | 4 +
.../internal/HostComponentResourceProvider.java | 4 +
.../HostKerberosIdentityResourceProvider.java | 16 +-
.../internal/HostResourceProvider.java | 2 +
.../HostStackVersionResourceProvider.java | 6 +-
.../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/RequestResourceProvider.java | 4 +
.../RoleAuthorizationResourceProvider.java | 4 +
...eComponentConfigurationResourceProvider.java | 476 +
.../RootServiceComponentPropertyProvider.java | 4 +-
.../RootServiceComponentResourceProvider.java | 4 +-
.../internal/ServiceResourceProvider.java | 7 +-
.../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 | 48 +-
.../internal/UserResourceProvider.java | 4 +
.../internal/ValidationResourceProvider.java | 4 +
.../VersionDefinitionResourceProvider.java | 4 +
.../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 | 3 +
.../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 | 11 +-
.../ServiceComponentUninstalledEvent.java | 11 +-
.../listeners/alerts/AlertReceivedListener.java | 10 +-
.../alerts/AlertStateChangedListener.java | 6 +-
.../apache/ambari/server/ldap/LdapModule.java | 82 +
.../ldap/domain/AmbariLdapConfigKeys.java | 83 +
.../ldap/domain/AmbariLdapConfiguration.java | 203 +
.../domain/AmbariLdapConfigurationFactory.java | 34 +
.../AmbariLdapConfigurationProvider.java | 113 +
.../ldap/service/AmbariLdapException.java | 33 +
.../server/ldap/service/AmbariLdapFacade.java | 140 +
.../server/ldap/service/AttributeDetector.java | 41 +
.../service/LdapAttributeDetectionService.java | 40 +
.../ldap/service/LdapConfigurationService.java | 60 +
.../service/LdapConnectionConfigService.java | 36 +
.../ambari/server/ldap/service/LdapFacade.java | 58 +
.../DefaultLdapAttributeDetectionService.java | 200 +
.../ads/DefaultLdapConfigurationService.java | 213 +
.../ads/DefaultLdapConnectionConfigService.java | 113 +
.../ads/LdapConnectionTemplateFactory.java | 111 +
.../ads/detectors/AttributeDetectorFactory.java | 75 +
.../ads/detectors/ChainedAttributeDetector.java | 73 +
.../ads/detectors/GroupMemberAttrDetector.java | 65 +
.../ads/detectors/GroupNameAttrDetector.java | 70 +
.../ads/detectors/GroupObjectClassDetector.java | 73 +
.../OccurrenceAndWeightBasedDetector.java | 143 +
.../detectors/UserGroupMemberAttrDetector.java | 64 +
.../ads/detectors/UserNameAttrDetector.java | 71 +
.../ads/detectors/UserObjectClassDetector.java | 69 +
.../metadata/AmbariServiceAlertDefinitions.java | 20 +-
.../server/orm/dao/AlertDefinitionDAO.java | 7 +-
.../ambari/server/orm/dao/AlertDispatchDAO.java | 4 +-
.../server/orm/dao/AmbariConfigurationDAO.java | 179 +
.../apache/ambari/server/orm/dao/DaoUtils.java | 13 +-
.../server/orm/dao/KerberosKeytabDAO.java | 110 +
.../server/orm/dao/KerberosPrincipalDAO.java | 7 +
.../orm/dao/KerberosPrincipalHostDAO.java | 40 +-
.../orm/entities/AmbariConfigurationEntity.java | 112 +
.../entities/AmbariConfigurationEntityPK.java | 88 +
.../orm/entities/KerberosKeytabEntity.java | 86 +
.../entities/KerberosPrincipalHostEntity.java | 57 +-
.../entities/KerberosPrincipalHostEntityPK.java | 19 +-
.../orm/entities/RemoteAmbariClusterEntity.java | 2 +-
.../orm/entities/RepositoryVersionEntity.java | 27 +
.../AmbariLdapAuthenticationProvider.java | 2 +-
.../authorization/RoleAuthorization.java | 95 +-
.../security/encryption/CredentialProvider.java | 2 +-
.../serveraction/ServerActionExecutor.java | 147 +-
.../kerberos/ADKerberosOperationHandler.java | 22 +-
.../AbstractPrepareKerberosServerAction.java | 50 +-
.../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 | 3 +-
.../stageutils/ResolvedKerberosKeytab.java | 257 +
.../upgrades/CreateAndConfigureAction.java | 164 +
.../upgrades/FinalizeUpgradeAction.java | 54 +-
.../upgrades/PreconfigureKerberosAction.java | 48 +-
.../ambari/server/stack/MasterHostResolver.java | 2 +-
.../ambari/server/stack/ServiceDirectory.java | 29 +
.../ambari/server/stack/ServiceModule.java | 8 +
.../apache/ambari/server/state/ServiceImpl.java | 2 +-
.../apache/ambari/server/state/ServiceInfo.java | 14 +
.../ambari/server/state/UpgradeContext.java | 2 +-
.../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/UpgradePack.java | 3 +
.../state/stack/upgrade/ClusterGrouping.java | 2 +
.../stack/upgrade/CreateAndConfigureTask.java | 57 +
.../stack/upgrade/RepositoryVersionHelper.java | 49 +-
.../ambari/server/state/stack/upgrade/Task.java | 6 +-
.../svccomphost/ServiceComponentHostImpl.java | 2 +-
.../topology/ClusterConfigurationRequest.java | 2 +-
.../server/topology/PersistedStateImpl.java | 2 +-
.../server/upgrade/SchemaUpgradeHelper.java | 3 +-
.../server/upgrade/UpgradeCatalog260.java | 13 +
.../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 +-
.../main/resources/Ambari-DDL-Derby-CREATE.sql | 24 +-
.../main/resources/Ambari-DDL-MySQL-CREATE.sql | 22 +-
.../main/resources/Ambari-DDL-Oracle-CREATE.sql | 22 +-
.../resources/Ambari-DDL-Postgres-CREATE.sql | 26 +-
.../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 22 +-
.../resources/Ambari-DDL-SQLServer-CREATE.sql | 23 +-
.../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 +-
.../FALCON/0.5.0.2.1/package/scripts/falcon.py | 11 +-
.../HBASE/2.0.0.3.0/service_advisor.py | 12 +-
.../HIVE/0.12.0.2.0/configuration/hive-site.xml | 38 +
.../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 +-
.../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 +-
.../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 +-
.../LOGSEARCH/0.5.0/metainfo.xml | 6 +-
.../1.0.0.2.3/package/scripts/service_check.py | 3 +-
.../OOZIE/4.2.0.2.3/metainfo.xml | 5 -
.../OOZIE/4.2.0.3.0/metainfo.xml | 5 -
.../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.9.0.3.0/configuration/tez-site.xml | 2 +-
.../0.9.0.3.0/package/scripts/params_linux.py | 2 +-
.../configuration-mapred/mapred-site.xml | 2 +-
.../2.1.0.2.0/package/scripts/params_linux.py | 2 +-
.../configuration-mapred/mapred-site.xml | 2 +-
.../3.0.0.3.0/package/scripts/params_linux.py | 2 +-
.../ZEPPELIN/0.7.0/package/scripts/master.py | 11 +-
.../ZOOKEEPER/3.4.5/metainfo.xml | 1 +
.../custom_actions/scripts/install_packages.py | 17 +-
.../before-ANY/files/changeToSecureUid.sh | 2 +-
.../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 -
.../stacks/HDP/2.1/services/HIVE/metainfo.xml | 5 -
.../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/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/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/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 +-
.../YARN/configuration-mapred/mapred-site.xml | 2 +-
.../resources/stacks/PERF/1.0/hdp_urlinfo.json | 12 +
.../stacks/PERF/1.0/repos/repoinfo.xml | 1 +
.../KERBEROS/configuration/kerberos-env.xml | 36 +-
.../src/main/resources/stacks/PERF/1.0/vdf.xml | 73 +
.../resources/stacks/PERF/2.0/hdp_urlinfo.json | 12 +
.../stacks/PERF/2.0/repos/repoinfo.xml | 1 +
.../src/main/resources/stacks/PERF/2.0/vdf.xml | 74 +
.../src/main/resources/upgrade-pack.xsd | 9 +-
.../server/agent/TestHeartbeatHandler.java | 2 +-
.../commands/StackAdvisorCommandTest.java | 212 +
.../ambari/server/checks/LZOCheckTest.java | 145 +
.../server/checks/UpgradeCheckOrderTest.java | 3 +-
.../AmbariManagementControllerImplTest.java | 2 +-
.../AmbariManagementControllerTest.java | 16 +-
.../server/controller/KerberosHelperTest.java | 12 +-
.../RootServiceResponseFactoryTest.java | 27 +-
...ClusterStackVersionResourceProviderTest.java | 241 +
...ostKerberosIdentityResourceProviderTest.java | 12 +-
...ponentConfigurationResourceProviderTest.java | 393 +
...ootServiceComponentPropertyProviderTest.java | 15 +-
...ootServiceComponentResourceProviderTest.java | 9 +-
.../StackAdvisorResourceProviderTest.java | 97 +-
.../internal/UpgradeResourceProviderTest.java | 8 +
.../utilities/KerberosIdentityCleanerTest.java | 10 +-
.../HostVersionOutOfSyncListenerTest.java | 2 +-
.../server/ldap/LdapModuleFunctionalTest.java | 149 +
.../TestAmbariLdapConfigurationFactory.java | 29 +
.../ldap/service/AmbariLdapFacadeTest.java | 215 +
...efaultLdapAttributeDetectionServiceTest.java | 188 +
.../DefaultLdapConfigurationServiceTest.java | 221 +
.../detectors/GroupMemberAttrDetectorTest.java | 107 +
.../metadata/AgentAlertDefinitionsTest.java | 6 +-
.../notifications/DispatchFactoryTest.java | 3 +-
.../server/orm/InMemoryDefaultTestModule.java | 2 +
.../ambari/server/orm/JdbcPropertyTest.java | 5 +-
.../server/orm/dao/AlertDefinitionDAOTest.java | 7 +-
.../orm/dao/AmbariConfigurationDAOTest.java | 298 +
...uthenticationProviderForDNWithSpaceTest.java | 35 +-
.../AmbariLdapAuthenticationProviderTest.java | 3 +-
.../authorization/LdapServerPropertiesTest.java | 5 +-
.../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 +
.../state/alerts/AlertReceivedListenerTest.java | 16 +-
.../alerts/AlertStateChangedEventTest.java | 4 +-
.../state/repository/VersionDefinitionTest.java | 42 +
.../server/upgrade/UpgradeCatalog300Test.java | 195 +-
.../ambari/server/utils/TestVersionUtils.java | 4 +
.../configs/install_packages_config.json | 1 +
.../install_packages_repository_file.json | 1 +
.../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.0.6/configs/repository_file.json | 1 +
.../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 +-
.../2.3/MAHOUT/test_mahout_service_check.py | 4 +-
.../2.3/SPARK/test_spark_thrift_server.py | 6 +-
.../stacks/2.5/HIVE/test_hive_server_int.py | 15 +-
.../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 +-
ambari-web/app/assets/test/tests.js | 2 +
ambari-web/app/config.js | 1 -
.../app/controllers/global/update_controller.js | 2 +-
.../main/admin/kerberos/step1_controller.js | 52 +-
.../main/admin/kerberos/step2_controller.js | 2 +-
.../main/dashboard/config_history_controller.js | 92 +-
.../main/host/bulk_operations_controller.js | 14 +-
ambari-web/app/controllers/main/service/item.js | 13 +-
.../app/mappers/components_state_mapper.js | 1 +
ambari-web/app/messages.js | 26 +-
.../main/host/details/actions/check_host.js | 6 +-
ambari-web/app/models/client_component.js | 1 +
ambari-web/app/routes/main.js | 2 -
ambari-web/app/styles/application.less | 8 +-
.../app/styles/theme/bootstrap-ambari.css | 35 +-
ambari-web/app/templates/main/alerts.hbs | 2 +-
.../templates/main/dashboard/config_history.hbs | 23 +-
ambari-web/app/templates/main/host.hbs | 2 +-
.../templates/main/service/services/hdfs.hbs | 116 +-
.../templates/main/service/services/yarn.hbs | 184 +-
ambari-web/app/utils/ajax/ajax.js | 4 +
ambari-web/app/views.js | 2 +
ambari-web/app/views/common/controls_view.js | 9 +-
ambari-web/app/views/common/search_box_view.js | 165 +
.../upgrade_version_column_view.js | 1 -
.../app/views/main/alerts/alert_search_box.js | 161 +-
.../main/dashboard/config_history_search_box.js | 221 +
.../views/main/dashboard/config_history_view.js | 101 -
.../app/views/main/host/combo_search_box.js | 44 +-
.../app/views/main/service/services/yarn.js | 21 +-
.../admin/kerberos/step1_controller_test.js | 17 -
.../admin/kerberos/step2_controller_test.js | 2 +-
.../test/controllers/main/service/item_test.js | 49 +-
.../test/views/common/controls_view_test.js | 2 +-
.../test/views/common/search_box_view_test.js | 240 +
.../views/main/alerts/alert_search_box_test.js | 74 +-
.../dashboard/config_history_search_box_test.js | 207 +
.../main/dashboard/config_history_view_test.js | 188 +-
.../views/main/host/combo_search_box_test.js | 66 +-
.../views/main/service/services/yarn_test.js | 22 -
.../vendor/scripts/theme/bootstrap-ambari.js | 7 -
.../stacks/ODPi/2.0/services/HIVE/metainfo.xml | 10 -
contrib/views/storm/pom.xml | 103 +-
.../src/main/resources/images/icon-bolt.png | Bin 2157 -> 0 bytes
.../src/main/resources/images/icon-spout.png | Bin 2620 -> 0 bytes
.../storm/src/main/resources/images/loader.gif | Bin 15017 -> 0 bytes
.../views/storm/src/main/resources/index.html | 45 -
.../js/backbone-paginator.min.js | 1325 --
.../main/resources/libs/Backbone/js/Backbone.js | 1920 --
.../libs/Bootstrap/css/bootstrap-editable.css | 663 -
.../libs/Bootstrap/css/bootstrap-slider.min.css | 28 -
.../libs/Bootstrap/css/bootstrap-switch.min.css | 22 -
.../resources/libs/Bootstrap/css/bootstrap.css | 5959 -----
.../fonts/glyphicons-halflings-regular.eot | Bin 20127 -> 0 bytes
.../fonts/glyphicons-halflings-regular.svg | 288 -
.../fonts/glyphicons-halflings-regular.ttf | Bin 45404 -> 0 bytes
.../fonts/glyphicons-halflings-regular.woff | Bin 23424 -> 0 bytes
.../fonts/glyphicons-halflings-regular.woff2 | Bin 18028 -> 0 bytes
.../resources/libs/Bootstrap/images/clear.png | Bin 509 -> 0 bytes
.../resources/libs/Bootstrap/images/loading.gif | Bin 1849 -> 0 bytes
.../libs/Bootstrap/js/bootstrap-editable.min.js | 7 -
.../libs/Bootstrap/js/bootstrap-notify.min.js | 1 -
.../libs/Bootstrap/js/bootstrap-slider.min.js | 29 -
.../libs/Bootstrap/js/bootstrap-switch.min.js | 22 -
.../libs/Bootstrap/js/bootstrap.min.js | 7 -
.../libs/Font-Awesome/css/font-awesome.min.css | 4 -
.../libs/Font-Awesome/fonts/FontAwesome.otf | Bin 109688 -> 0 bytes
.../Font-Awesome/fonts/fontawesome-webfont.eot | Bin 70807 -> 0 bytes
.../Font-Awesome/fonts/fontawesome-webfont.svg | 655 -
.../Font-Awesome/fonts/fontawesome-webfont.ttf | Bin 142072 -> 0 bytes
.../Font-Awesome/fonts/fontawesome-webfont.woff | Bin 83588 -> 0 bytes
.../fonts/fontawesome-webfont.woff2 | Bin 66624 -> 0 bytes
.../resources/libs/Underscore/js/Underscore.js | 1548 --
.../resources/libs/bootbox/js/bootbox.min.js | 6 -
.../src/main/resources/libs/d3/js/d3-tip.min.js | 1 -
.../src/main/resources/libs/d3/js/d3.min.js | 5 -
.../resources/libs/dagre-d3/dagre-d3.min.js | 28 -
.../libs/jQuery/js/jquery-2.2.3.min.js | 4 -
.../main/resources/libs/jsx/JSXTransformer.js | 15201 ------------
.../storm/src/main/resources/libs/jsx/jsx.js | 75 -
.../main/resources/libs/react/js/react-dom.js | 42 -
.../libs/react/js/react-with-addons.js | 20775 -----------------
.../resources/libs/require-js/js/require.min.js | 36 -
.../main/resources/libs/require-text/js/text.js | 390 -
.../scripts/collections/BaseCollection.js | 197 -
.../scripts/collections/VNimbusConfigList.js | 52 -
.../scripts/collections/VNimbusList.js | 52 -
.../scripts/collections/VSupervisorList.js | 52 -
.../scripts/collections/VTopologyConfigList.js | 49 -
.../scripts/collections/VTopologyList.js | 52 -
.../resources/scripts/components/BarChart.jsx | 402 -
.../scripts/components/Breadcrumbs.jsx | 50 -
.../main/resources/scripts/components/Modal.jsx | 60 -
.../scripts/components/RadialChart.jsx | 127 -
.../resources/scripts/components/SearchLogs.jsx | 89 -
.../main/resources/scripts/components/Table.jsx | 101 -
.../scripts/components/TopologyGraph.jsx | 199 -
.../scripts/containers/ClusterSummary.jsx | 122 -
.../scripts/containers/NimbusConfigSummary.jsx | 103 -
.../scripts/containers/NimbusSummary.jsx | 139 -
.../scripts/containers/SupervisorSummary.jsx | 155 -
.../containers/TopologyConfiguration.jsx | 93 -
.../scripts/containers/TopologyDetailGraph.jsx | 66 -
.../scripts/containers/TopologyListing.jsx | 188 -
.../storm/src/main/resources/scripts/main.js | 98 -
.../main/resources/scripts/models/BaseModel.js | 83 -
.../main/resources/scripts/models/VCluster.js | 42 -
.../main/resources/scripts/models/VNimbus.js | 42 -
.../resources/scripts/models/VNimbusConfig.js | 42 -
.../resources/scripts/models/VSupervisor.js | 42 -
.../main/resources/scripts/models/VTopology.js | 90 -
.../resources/scripts/models/VTopologyConfig.js | 34 -
.../scripts/modules/Table/PageableTable.jsx | 47 -
.../scripts/modules/Table/Pagination.jsx | 161 -
.../src/main/resources/scripts/router/Router.js | 123 -
.../src/main/resources/scripts/utils/Globals.js | 30 -
.../main/resources/scripts/utils/Overrides.js | 30 -
.../src/main/resources/scripts/utils/Utils.js | 113 -
.../scripts/views/ComponentDetailView.jsx | 534 -
.../main/resources/scripts/views/Dashboard.jsx | 65 -
.../src/main/resources/scripts/views/Footer.jsx | 48 -
.../scripts/views/NimbusSummaryView.jsx | 65 -
.../resources/scripts/views/ProfilingView.jsx | 214 -
.../resources/scripts/views/RebalanceView.jsx | 223 -
.../scripts/views/SupervisorSummaryView.jsx | 65 -
.../scripts/views/TopologyDetailView.jsx | 1039 -
.../scripts/views/TopologyListingView.jsx | 65 -
.../storm/src/main/resources/styles/style.css | 579 -
.../views/storm/src/main/resources/ui/.babelrc | 25 +
.../src/main/resources/ui/.eslintignore.js | 3 +
.../storm/src/main/resources/ui/.eslintrc.js | 58 +
.../src/main/resources/ui/app/scripts/app.js | 40 +
.../ui/app/scripts/components/BarChart.jsx | 429 +
.../ui/app/scripts/components/Breadcrumbs.jsx | 45 +
.../app/scripts/components/CommonExpanded.jsx | 30 +
.../scripts/components/CommonNotification.jsx | 69 +
.../app/scripts/components/CommonPagination.jsx | 56 +
.../components/CommonSwitchComponent.jsx | 41 +
.../scripts/components/CommonWindowPanel.jsx | 99 +
.../scripts/components/CustomToastContainer.jsx | 41 +
.../ui/app/scripts/components/Editable.jsx | 127 +
.../ui/app/scripts/components/FSModel.jsx | 149 +
.../ui/app/scripts/components/FSReactToastr.jsx | 37 +
.../ui/app/scripts/components/Footer.jsx | 28 +
.../scripts/components/LogLevelComponent.jsx | 236 +
.../ui/app/scripts/components/ProfilingView.jsx | 168 +
.../ui/app/scripts/components/RadialChart.jsx | 134 +
.../scripts/components/RebalanceTopology.jsx | 152 +
.../ui/app/scripts/components/SearchLogs.jsx | 84 +
.../ui/app/scripts/components/TopologyGraph.jsx | 208 +
.../ui/app/scripts/containers/BaseContainer.jsx | 50 +
.../app/scripts/containers/ClusterSummary.jsx | 125 +
.../scripts/containers/ComponentDetailView.jsx | 714 +
.../ui/app/scripts/containers/Dashboard.jsx | 52 +
.../scripts/containers/NimbusConfigSummary.jsx | 126 +
.../ui/app/scripts/containers/NimbusSummary.jsx | 150 +
.../scripts/containers/SupervisorSummary.jsx | 165 +
.../scripts/containers/TopologyDetailView.jsx | 862 +
.../app/scripts/containers/TopologyListing.jsx | 222 +
.../src/main/resources/ui/app/scripts/main.js | 46 +
.../ui/app/scripts/rest/TopologyREST.js | 118 +
.../resources/ui/app/scripts/routers/routes.jsx | 68 +
.../resources/ui/app/scripts/utils/Constants.js | 45 +
.../resources/ui/app/scripts/utils/Utils.js | 51 +
.../resources/ui/app/styles/css/bootstrap.css | 6757 ++++++
.../ui/app/styles/css/font-awesome.min.css | 4 +
.../main/resources/ui/app/styles/css/style.css | 836 +
.../resources/ui/app/styles/css/toastr.min.css | 1 +
.../ui/app/styles/fonts/fontawesome-webfont.eot | Bin 0 -> 76518 bytes
.../ui/app/styles/fonts/fontawesome-webfont.svg | 685 +
.../ui/app/styles/fonts/fontawesome-webfont.ttf | Bin 0 -> 152796 bytes
.../app/styles/fonts/fontawesome-webfont.woff | Bin 0 -> 90412 bytes
.../app/styles/fonts/fontawesome-webfont.woff2 | Bin 0 -> 71896 bytes
.../fonts/glyphicons-halflings-regular.eot | Bin 0 -> 20127 bytes
.../fonts/glyphicons-halflings-regular.svg | 288 +
.../fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 45404 bytes
.../fonts/glyphicons-halflings-regular.woff | Bin 0 -> 23424 bytes
.../fonts/glyphicons-halflings-regular.woff2 | Bin 0 -> 18028 bytes
.../resources/ui/app/styles/img/icon-bolt.png | Bin 0 -> 2157 bytes
.../resources/ui/app/styles/img/icon-spout.png | Bin 0 -> 2620 bytes
.../main/resources/ui/app/styles/img/loader.gif | Bin 0 -> 15017 bytes
.../resources/ui/config/webpack.config.base.js | 101 +
.../ui/config/webpack.config.development.js | 64 +
.../ui/config/webpack.config.production.js | 131 +
.../storm/src/main/resources/ui/dev-server.js | 101 +
.../storm/src/main/resources/ui/index.html | 47 +
.../storm/src/main/resources/ui/package.json | 110 +
docs/pom.xml | 22 +-
pom.xml | 7 +-
760 files changed, 42655 insertions(+), 63881 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d173011c/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d173011c/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d173011c/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
----------------------------------------------------------------------
diff --cc ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
index d9b8577,17155a4..b14ffa7
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseService.java
@@@ -49,51 -49,48 +49,48 @@@ import org.slf4j.LoggerFactory
public abstract class BaseService {
public final static MediaType MEDIA_TYPE_TEXT_CSV_TYPE = new MediaType("text", "csv");
- static final String MSG_SUCCESSFUL_OPERATION = "Successful operation";
- static final String MSG_REQUEST_ACCEPTED = "Request is accepted, but not completely processed yet";
- static final String MSG_INVALID_ARGUMENTS = "Invalid arguments";
- static final String MSG_INVALID_REQUEST = "Invalid request";
- static final String MSG_CLUSTER_NOT_FOUND = "Cluster not found";
- static final String MSG_CLUSTER_OR_HOST_NOT_FOUND = "Cluster or host not found";
- static final String MSG_NOT_AUTHENTICATED = "Not authenticated";
- static final String MSG_PERMISSION_DENIED = "Not permitted to perform the operation";
- static final String MSG_SERVER_ERROR = "Internal server error";
- static final String MSG_RESOURCE_ALREADY_EXISTS = "The requested resource already exists.";
- static final String MSG_RESOURCE_NOT_FOUND = "The requested resource doesn't exist.";
-
- static final String QUERY_FIELDS = "fields";
- static final String QUERY_FILTER_DESCRIPTION = "Filter fields in the response (identifier fields are mandatory)";
- static final String QUERY_SORT = "sortBy";
- static final String QUERY_SORT_DESCRIPTION = "Sort resources in result by (asc | desc)";
- static final String QUERY_PAGE_SIZE = "page_size";
- static final String QUERY_PAGE_SIZE_DESCRIPTION = "The number of resources to be returned for the paged response.";
- static final String DEFAULT_PAGE_SIZE = "10";
- static final String QUERY_FROM = "from";
- static final String QUERY_FROM_DESCRIPTION = "The starting page resource (inclusive). \"start\" is also accepted.";
- static final String QUERY_FROM_VALUES = "range[0, infinity]";
- static final String DEFAULT_FROM = "0";
- static final String QUERY_TO = "to";
- static final String QUERY_TO_DESCRIPTION = "The ending page resource (inclusive). \"end\" is also accepted.";
- static final String QUERY_TO_TYPE = "integer";
- static final String QUERY_TO_VALUES = "range[1, infinity]";
- static final String QUERY_PREDICATE = "{predicate}";
- static final String QUERY_PREDICATE_DESCRIPTION = "The predicate to filter resources by. Omitting the predicate will " +
+ public static final String MSG_SUCCESSFUL_OPERATION = "Successful operation";
+ public static final String MSG_REQUEST_ACCEPTED = "Request is accepted, but not completely processed yet";
+ public static final String MSG_INVALID_ARGUMENTS = "Invalid arguments";
+ public static final String MSG_INVALID_REQUEST = "Invalid request";
+ public static final String MSG_CLUSTER_NOT_FOUND = "Cluster not found";
+ public static final String MSG_CLUSTER_OR_HOST_NOT_FOUND = "Cluster or host not found";
+ public static final String MSG_NOT_AUTHENTICATED = "Not authenticated";
+ public static final String MSG_PERMISSION_DENIED = "Not permitted to perform the operation";
+ public static final String MSG_SERVER_ERROR = "Internal server error";
+ public static final String MSG_RESOURCE_ALREADY_EXISTS = "The requested resource already exists.";
+ public static final String MSG_RESOURCE_NOT_FOUND = "The requested resource doesn't exist.";
+
+ public static final String QUERY_FIELDS = "fields";
+ public static final String QUERY_FILTER_DESCRIPTION = "Filter fields in the response (identifier fields are mandatory)";
+ public static final String QUERY_SORT = "sortBy";
+ public static final String QUERY_SORT_DESCRIPTION = "Sort resources in result by (asc | desc)";
+ public static final String QUERY_PAGE_SIZE = "page_size";
+ public static final String QUERY_PAGE_SIZE_DESCRIPTION = "The number of resources to be returned for the paged response.";
+ public static final String DEFAULT_PAGE_SIZE = "10";
+ public static final String QUERY_FROM = "from";
+ public static final String QUERY_FROM_DESCRIPTION = "The starting page resource (inclusive). \"start\" is also accepted.";
+ public static final String QUERY_FROM_VALUES = "range[0, infinity]";
+ public static final String DEFAULT_FROM = "0";
+ public static final String QUERY_TO = "to";
+ public static final String QUERY_TO_DESCRIPTION = "The ending page resource (inclusive). \"end\" is also accepted.";
+ public static final String QUERY_TO_TYPE = "integer";
+ public static final String QUERY_TO_VALUES = "range[1, infinity]";
+ public static final String QUERY_PREDICATE = "{predicate}";
+ public static final String QUERY_PREDICATE_DESCRIPTION = "The predicate to filter resources by. Omitting the predicate will " +
"match all resources.";
- static final String RESPONSE_CONTAINER_LIST = "List";
+ public static final String RESPONSE_CONTAINER_LIST = "List";
- static final String DATA_TYPE_INT = "integer";
- static final String DATA_TYPE_STRING = "string";
+ public static final String DATA_TYPE_INT = "integer";
+ public static final String DATA_TYPE_STRING = "string";
- static final String PARAM_TYPE_QUERY = "query";
- static final String PARAM_TYPE_BODY = "body";
+ public static final String PARAM_TYPE_QUERY = "query";
+ public static final String PARAM_TYPE_BODY = "body";
- static final String FIELDS_SEPARATOR = ", ";
+ public static final String FIELDS_SEPARATOR = ", ";
- /**
- * Logger instance.
- */
- protected final static Logger LOG = LoggerFactory.getLogger(BaseService.class);
+ private final static Logger LOG = LoggerFactory.getLogger(BaseService.class);
/**
* Factory for creating resource instances.
http://git-wip-us.apache.org/repos/asf/ambari/blob/d173011c/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d173011c/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d173011c/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d173011c/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
----------------------------------------------------------------------
diff --cc ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
index 6027519,ed7513f..8de5141
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
@@@ -72,10 -72,9 +72,11 @@@ import org.apache.ambari.server.control
import org.apache.ambari.server.controller.internal.KerberosDescriptorResourceProvider;
import org.apache.ambari.server.controller.internal.MemberResourceProvider;
import org.apache.ambari.server.controller.internal.RepositoryVersionResourceProvider;
+ import org.apache.ambari.server.controller.internal.RootServiceComponentConfigurationResourceProvider;
import org.apache.ambari.server.controller.internal.ServiceResourceProvider;
import org.apache.ambari.server.controller.internal.UpgradeResourceProvider;
+import org.apache.ambari.server.controller.internal.UserAuthenticationSourceResourceProvider;
+import org.apache.ambari.server.controller.internal.UserResourceProvider;
import org.apache.ambari.server.controller.internal.ViewInstanceResourceProvider;
import org.apache.ambari.server.controller.logging.LoggingRequestHelperFactory;
import org.apache.ambari.server.controller.logging.LoggingRequestHelperFactoryImpl;
http://git-wip-us.apache.org/repos/asf/ambari/blob/d173011c/ambari-server/src/main/java/org/apache/ambari/server/controller/ResourceProviderFactory.java
----------------------------------------------------------------------
diff --cc ambari-server/src/main/java/org/apache/ambari/server/controller/ResourceProviderFactory.java
index dc46a40,f6ca16b..523e21c
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ResourceProviderFactory.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ResourceProviderFactory.java
@@@ -50,16 -49,9 +49,15 @@@ public interface ResourceProviderFactor
ResourceProvider getComponentResourceProvider(AmbariManagementController managementController);
@Named("member")
- ResourceProvider getMemberResourceProvider(Set<String> propertyIds,
- Map<Type, String> keyPropertyIds,
- AmbariManagementController managementController);
+ ResourceProvider getMemberResourceProvider(Set<String> propertyIds, Map<Type, String> keyPropertyIds,
+ AmbariManagementController managementController);
+ @Named("user")
+ ResourceProvider getUserResourceProvider(AmbariManagementController managementController);
+
+ @Named("userAuthenticationSource")
+ ResourceProvider getUserAuthenticationSourceResourceProvider();
+
@Named("hostKerberosIdentity")
ResourceProvider getHostKerberosIdentityResourceProvider(AmbariManagementController managementController);
http://git-wip-us.apache.org/repos/asf/ambari/blob/d173011c/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractControllerResourceProvider.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d173011c/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UserResourceProvider.java
----------------------------------------------------------------------
diff --cc ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UserResourceProvider.java
index 99f88ca,698f419..90effac
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UserResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UserResourceProvider.java
@@@ -39,102 -36,36 +39,106 @@@ import org.apache.ambari.server.control
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.spi.ResourceAlreadyExistsException;
import org.apache.ambari.server.controller.spi.ResourcePredicateEvaluator;
+import org.apache.ambari.server.controller.spi.ResourceProvider;
import org.apache.ambari.server.controller.spi.SystemException;
import org.apache.ambari.server.controller.spi.UnsupportedPropertyException;
+import org.apache.ambari.server.controller.utilities.PredicateBuilder;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
+import org.apache.ambari.server.orm.entities.MemberEntity;
+import org.apache.ambari.server.orm.entities.UserAuthenticationEntity;
+import org.apache.ambari.server.orm.entities.UserEntity;
import org.apache.ambari.server.security.authorization.AuthorizationException;
+import org.apache.ambari.server.security.authorization.AuthorizationHelper;
+import org.apache.ambari.server.security.authorization.ResourceType;
import org.apache.ambari.server.security.authorization.RoleAuthorization;
+import org.apache.ambari.server.security.authorization.UserAuthenticationType;
+import org.apache.ambari.server.security.authorization.Users;
+import org.apache.commons.lang.StringUtils;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
+import com.google.inject.assistedinject.Assisted;
+import com.google.inject.assistedinject.AssistedInject;
+
/**
* Resource provider for user resources.
*/
public class UserResourceProvider extends AbstractControllerResourceProvider implements ResourcePredicateEvaluator {
+ private static final Logger LOG = LoggerFactory.getLogger(UserResourceProvider.class);
+
// ----- Property ID constants ---------------------------------------------
+ public static final String USER_RESOURCE_CATEGORY = "Users";
+
// Users
- public static final String USER_USERNAME_PROPERTY_ID = PropertyHelper.getPropertyId("Users", "user_name");
- public static final String USER_PASSWORD_PROPERTY_ID = PropertyHelper.getPropertyId("Users", "password");
- public static final String USER_OLD_PASSWORD_PROPERTY_ID = PropertyHelper.getPropertyId("Users", "old_password");
- public static final String USER_LDAP_USER_PROPERTY_ID = PropertyHelper.getPropertyId("Users", "ldap_user");
- public static final String USER_TYPE_PROPERTY_ID = PropertyHelper.getPropertyId("Users", "user_type");
- public static final String USER_ACTIVE_PROPERTY_ID = PropertyHelper.getPropertyId("Users", "active");
- public static final String USER_GROUPS_PROPERTY_ID = PropertyHelper.getPropertyId("Users", "groups");
- public static final String USER_ADMIN_PROPERTY_ID = PropertyHelper.getPropertyId("Users", "admin");
-
- private static Set<String> pkPropertyIds =
- new HashSet<>(Arrays.asList(new String[]{
- USER_USERNAME_PROPERTY_ID}));
+ public static final String USERNAME_PROPERTY_ID = "user_name";
+ public static final String DISPLAY_NAME_PROPERTY_ID = "display_name";
+ public static final String LOCAL_USERNAME_PROPERTY_ID = "local_user_name";
+ public static final String ACTIVE_PROPERTY_ID = "active";
+ public static final String CREATE_TIME_PROPERTY_ID = "created";
+ public static final String CONSECUTIVE_FAILURES_PROPERTY_ID = "consecutive_failures";
+ public static final String ADMIN_PROPERTY_ID = "admin";
+ public static final String GROUPS_PROPERTY_ID = "groups";
+
+ public static final String USER_USERNAME_PROPERTY_ID = USER_RESOURCE_CATEGORY + "/" + USERNAME_PROPERTY_ID;
+ public static final String USER_DISPLAY_NAME_PROPERTY_ID = USER_RESOURCE_CATEGORY + "/" + DISPLAY_NAME_PROPERTY_ID;
+ public static final String USER_LOCAL_USERNAME_PROPERTY_ID = USER_RESOURCE_CATEGORY + "/" + LOCAL_USERNAME_PROPERTY_ID;
+ public static final String USER_ACTIVE_PROPERTY_ID = USER_RESOURCE_CATEGORY + "/" + ACTIVE_PROPERTY_ID;
+ public static final String USER_CREATE_TIME_PROPERTY_ID = USER_RESOURCE_CATEGORY + "/" + CREATE_TIME_PROPERTY_ID;
+ public static final String USER_CONSECUTIVE_FAILURES_PROPERTY_ID = USER_RESOURCE_CATEGORY + "/" + CONSECUTIVE_FAILURES_PROPERTY_ID;
+ public static final String USER_ADMIN_PROPERTY_ID = USER_RESOURCE_CATEGORY + "/" + ADMIN_PROPERTY_ID;
+ public static final String USER_GROUPS_PROPERTY_ID = USER_RESOURCE_CATEGORY + "/" + GROUPS_PROPERTY_ID;
+
+ /* *******************************************************
+ * Deprecated properties, kept for backwards compatibility and to maintain API V1 contract.
+ * These properties are related to a user's authentication resource.
+ * ******************************************************* */
+ @Deprecated
+ public static final String PASSWORD_PROPERTY_ID = "password";
+ @Deprecated
+ public static final String OLD_PASSWORD_PROPERTY_ID = "old_password";
+ @Deprecated
+ public static final String LDAP_USER_PROPERTY_ID = "ldap_user";
+ @Deprecated
+ public static final String USER_TYPE_PROPERTY_ID = "user_type";
+
+ @Deprecated
+ public static final String USER_PASSWORD_PROPERTY_ID = USER_RESOURCE_CATEGORY + "/" + PASSWORD_PROPERTY_ID;
+ @Deprecated
+ public static final String USER_OLD_PASSWORD_PROPERTY_ID = USER_RESOURCE_CATEGORY + "/" + OLD_PASSWORD_PROPERTY_ID;
+ @Deprecated
+ public static final String USER_LDAP_USER_PROPERTY_ID = USER_RESOURCE_CATEGORY + "/" + LDAP_USER_PROPERTY_ID;
+ @Deprecated
+ public static final String USER_USER_TYPE_PROPERTY_ID = USER_RESOURCE_CATEGORY + "/" + USER_TYPE_PROPERTY_ID;
+ /* ******************************************************* */
+
+ private static final Set<String> PK_PROPERTY_IDS = ImmutableSet.of(
+ USER_USERNAME_PROPERTY_ID
+ );
+ private static final Set<String> PROPERTY_IDS = ImmutableSet.of(
+ USER_USERNAME_PROPERTY_ID,
+ USER_DISPLAY_NAME_PROPERTY_ID,
+ USER_LOCAL_USERNAME_PROPERTY_ID,
+ USER_ACTIVE_PROPERTY_ID,
+ USER_CREATE_TIME_PROPERTY_ID,
+ USER_CONSECUTIVE_FAILURES_PROPERTY_ID,
+ USER_GROUPS_PROPERTY_ID,
+ USER_PASSWORD_PROPERTY_ID,
+ USER_OLD_PASSWORD_PROPERTY_ID,
+ USER_LDAP_USER_PROPERTY_ID,
+ USER_USER_TYPE_PROPERTY_ID,
+ USER_ADMIN_PROPERTY_ID
+ );
+ private static final Map<Resource.Type, String> KEY_PROPERTY_IDS = ImmutableMap.of(
+ Resource.Type.User, USER_USERNAME_PROPERTY_ID
+ );
+
+ @Inject
+ private Users users;
/**
* Create a new resource provider for the given management controller.
http://git-wip-us.apache.org/repos/asf/ambari/blob/d173011c/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/Resource.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d173011c/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/AmbariLdapAuthenticationProvider.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d173011c/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d173011c/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d173011c/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d173011c/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d173011c/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d173011c/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d173011c/ambari-server/src/main/resources/META-INF/persistence.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d173011c/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d173011c/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariLdapAuthenticationProviderForDNWithSpaceTest.java
----------------------------------------------------------------------
diff --cc ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariLdapAuthenticationProviderForDNWithSpaceTest.java
index fd967c2,566d6b7..10076b0
--- a/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariLdapAuthenticationProviderForDNWithSpaceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariLdapAuthenticationProviderForDNWithSpaceTest.java
@@@ -26,11 -26,10 +26,12 @@@ import org.apache.ambari.server.H2Datab
import org.apache.ambari.server.audit.AuditLoggerModule;
import org.apache.ambari.server.configuration.Configuration;
import org.apache.ambari.server.controller.ControllerModule;
+ import org.apache.ambari.server.ldap.LdapModule;
import org.apache.ambari.server.orm.GuiceJpaInitializer;
import org.apache.ambari.server.orm.dao.UserDAO;
+import org.apache.ambari.server.orm.entities.UserEntity;
import org.apache.ambari.server.security.ClientSecurityType;
+import org.apache.ambari.server.security.authentication.InvalidUsernamePasswordCombinationException;
import org.apache.directory.server.annotations.CreateLdapServer;
import org.apache.directory.server.annotations.CreateTransport;
import org.apache.directory.server.core.annotations.ApplyLdifFiles;
http://git-wip-us.apache.org/repos/asf/ambari/blob/d173011c/ambari-server/src/test/java/org/apache/ambari/server/security/authorization/AmbariLdapAuthenticationProviderTest.java
----------------------------------------------------------------------