Merge branch 'trunk' into branch-feature-AMBARI-21674
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f1a2b3a1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f1a2b3a1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f1a2b3a1 Branch: refs/heads/branch-feature-AMBARI-21674 Commit: f1a2b3a1c115efb4d29d90e4ffb1b8f64c19787c Parents: f02eb4e a9c3bf5 Author: Nate Cole <[email protected]> Authored: Thu Dec 7 11:39:41 2017 -0500 Committer: Nate Cole <[email protected]> Committed: Thu Dec 7 11:39:41 2017 -0500 ---------------------------------------------------------------------- .../resources/ui/admin-web/app/scripts/app.js | 2 +- .../stackVersions/StackVersionsCreateCtrl.js | 28 +- .../stackVersions/StackVersionsEditCtrl.js | 2 +- .../admin-web/app/views/ambariViews/edit.html | 8 +- .../app/views/ambariViews/viewsList.html | 2 +- .../app/views/directives/editableList.html | 2 +- .../app/views/modals/AddRepositoryModal.html | 2 +- .../app/views/modals/RoleDetailsModal.html | 2 +- .../app/views/remoteClusters/list.html | 2 +- .../admin-web/app/views/stackVersions/list.html | 4 +- .../views/stackVersions/stackVersionPage.html | 4 +- .../app/views/userManagement/groupEdit.html | 12 +- .../app/views/userManagement/groupsList.html | 6 +- .../userManagement/modals/changePassword.html | 2 +- .../app/views/userManagement/userEdit.html | 16 +- .../app/views/userManagement/usersList.html | 4 +- .../src/main/resources/ui/admin-web/bower.json | 11 +- .../main/resources/ui/admin-web/package.json | 2 +- .../core/providers/package/__init__.py | 15 + .../core/providers/package/yumrpm.py | 108 +++ .../libraries/functions/constants.py | 12 +- .../libraries/functions/lzo_utils.py | 6 +- .../libraries/providers/hdfs_resource.py | 2 + ...xternalServerAuthenticationProviderTest.java | 1 - .../action-menu/action-menu.component.less | 3 - .../action-menu/action-menu.component.ts | 4 - .../audit-logs-table.component.html | 8 +- .../dropdown-button.component.html | 4 +- .../dropdown-button.component.less | 17 +- .../dropdown-button.component.ts | 3 + .../filters-panel/filters-panel.component.html | 14 +- .../filters-panel/filters-panel.component.less | 11 +- .../filters-panel/filters-panel.component.ts | 21 +- .../menu-button/menu-button.component.less | 13 +- .../src/app/components/mixins.less | 17 + .../pagination/pagination.component.html | 4 +- .../search-box/search-box.component.html | 2 +- .../search-box/search-box.component.less | 18 +- .../search-box/search-box.component.ts | 38 +- .../service-logs-table.component.html | 7 +- .../service-logs-table.component.less | 1 - .../components/top-menu/top-menu.component.html | 7 +- .../components/top-menu/top-menu.component.less | 4 + .../top-menu/top-menu.component.spec.ts | 64 +- .../components/top-menu/top-menu.component.ts | 25 +- .../src/app/components/variables.less | 3 +- .../src/app/services/logs-container.service.ts | 11 +- .../src/assets/i18n/en.json | 2 +- .../ambari-logsearch-web/webpack.config.js | 20 +- ambari-logsearch/docker/all.yml | 2 +- .../ambari-metrics-hadoop-sink/pom.xml | 4 +- .../server/api/handlers/CreateHandler.java | 8 +- .../server/api/handlers/UpdateHandler.java | 8 +- .../resources/ResourceInstanceFactoryImpl.java | 4 +- ...ootServiceComponentConfigurationService.java | 15 + .../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 -- .../services/serializers/JsonSerializer.java | 38 +- .../commands/StackAdvisorCommand.java | 14 +- .../RequiredServicesInRepositoryCheck.java | 18 +- .../AmbariManagementControllerImpl.java | 77 +- .../ambari/server/controller/AmbariServer.java | 6 + .../server/controller/RepositoryRequest.java | 22 +- .../controller/ResourceProviderFactory.java | 17 +- .../AbstractAuthorizedResourceProvider.java | 12 +- .../AbstractControllerResourceProvider.java | 83 +- .../internal/AbstractDRResourceProvider.java | 9 +- .../internal/ActionResourceProvider.java | 34 +- .../ActiveWidgetLayoutResourceProvider.java | 2 +- .../AlertDefinitionResourceProvider.java | 2 +- .../internal/AlertGroupResourceProvider.java | 2 +- .../internal/AlertHistoryResourceProvider.java | 2 +- .../internal/AlertNoticeResourceProvider.java | 2 +- .../internal/AlertResourceProvider.java | 2 +- .../internal/AlertTargetResourceProvider.java | 2 +- .../AmbariPrivilegeResourceProvider.java | 36 +- .../AmbariServerConfigurationCategory.java | 69 ++ .../AmbariServerConfigurationHandler.java | 110 +++ .../AmbariServerLDAPConfigurationHandler.java | 172 +++++ .../internal/BlueprintResourceProvider.java | 37 +- .../internal/ClientConfigResourceProvider.java | 31 +- ...usterKerberosDescriptorResourceProvider.java | 2 +- .../ClusterPrivilegeResourceProvider.java | 31 +- .../internal/ClusterResourceProvider.java | 23 +- .../ClusterStackVersionResourceProvider.java | 16 +- .../internal/ConfigGroupResourceProvider.java | 39 +- .../internal/ConfigurationResourceProvider.java | 2 +- .../internal/CredentialResourceProvider.java | 2 +- .../internal/DefaultProviderModule.java | 17 +- .../internal/ExtensionLinkResourceProvider.java | 33 +- .../internal/ExtensionResourceProvider.java | 27 +- .../ExtensionVersionResourceProvider.java | 32 +- .../internal/FeedResourceProvider.java | 41 +- .../GroupPrivilegeResourceProvider.java | 42 +- .../internal/GroupResourceProvider.java | 32 +- .../HostComponentProcessResourceProvider.java | 38 +- .../internal/HostComponentResourceProvider.java | 49 +- .../HostKerberosIdentityResourceProvider.java | 2 +- .../internal/HostResourceProvider.java | 51 +- .../HostStackVersionResourceProvider.java | 2 +- .../internal/InstanceResourceProvider.java | 35 +- .../internal/JobResourceProvider.java | 57 +- .../KerberosDescriptorResourceProvider.java | 20 +- .../internal/LdapSyncEventResourceProvider.java | 47 +- .../internal/LoggingResourceProvider.java | 9 +- .../internal/MemberResourceProvider.java | 29 +- .../OperatingSystemResourceProvider.java | 2 +- .../internal/OperationStatusMetaData.java | 90 +++ .../internal/PermissionResourceProvider.java | 25 +- .../internal/PrivilegeResourceProvider.java | 2 +- .../QuickLinkArtifactResourceProvider.java | 2 +- .../internal/ReadOnlyResourceProvider.java | 7 - .../RecommendationResourceProvider.java | 65 +- .../internal/RemoteClusterResourceProvider.java | 28 +- .../internal/RepositoryResourceProvider.java | 3 +- .../internal/RequestResourceProvider.java | 25 +- .../RequestScheduleResourceProvider.java | 55 +- .../RoleAuthorizationResourceProvider.java | 2 +- ...ootServiceComponentConfigurationHandler.java | 114 +++ ...iceComponentConfigurationHandlerFactory.java | 54 ++ ...eComponentConfigurationResourceProvider.java | 245 +++--- .../RootServiceComponentResourceProvider.java | 31 +- ...ootServiceHostComponentResourceProvider.java | 34 +- .../internal/RootServiceResourceProvider.java | 26 +- .../ServiceConfigVersionResourceProvider.java | 2 +- .../internal/SettingResourceProvider.java | 2 +- .../internal/StackAdvisorResourceProvider.java | 7 +- .../internal/StackArtifactResourceProvider.java | 2 +- ...ConfigurationDependencyResourceProvider.java | 40 +- .../StackConfigurationResourceProvider.java | 42 +- .../StackDependencyResourceProvider.java | 41 +- ...StackLevelConfigurationResourceProvider.java | 40 +- .../internal/StackResourceProvider.java | 28 +- .../StackServiceComponentResourceProvider.java | 52 +- .../internal/StackServiceResourceProvider.java | 45 +- .../internal/StackVersionResourceProvider.java | 39 +- .../internal/StageResourceProvider.java | 2 +- .../internal/TargetClusterResourceProvider.java | 31 +- .../internal/TaskAttemptResourceProvider.java | 53 +- .../internal/TaskResourceProvider.java | 27 +- .../internal/ThemeArtifactResourceProvider.java | 2 +- .../internal/UpgradeGroupResourceProvider.java | 2 +- .../internal/UpgradeItemResourceProvider.java | 2 +- .../internal/UpgradeResourceProvider.java | 2 +- .../UpgradeSummaryResourceProvider.java | 2 +- .../UserAuthorizationResourceProvider.java | 2 +- .../internal/UserPrivilegeResourceProvider.java | 40 +- .../internal/UserResourceProvider.java | 33 +- .../internal/ValidationResourceProvider.java | 86 ++- .../VersionDefinitionResourceProvider.java | 2 +- .../internal/ViewInstanceResourceProvider.java | 55 +- .../ViewPermissionResourceProvider.java | 29 +- .../internal/ViewPrivilegeResourceProvider.java | 36 +- .../internal/ViewResourceProvider.java | 19 +- .../internal/ViewURLResourceProvider.java | 25 +- .../internal/ViewVersionResourceProvider.java | 45 +- .../internal/WidgetLayoutResourceProvider.java | 2 +- .../internal/WidgetResourceProvider.java | 2 +- .../internal/WorkflowResourceProvider.java | 54 +- .../controller/utilities/PropertyHelper.java | 6 +- .../upgrade/HostVersionOutOfSyncListener.java | 24 + .../apache/ambari/server/ldap/LdapModule.java | 4 - .../ldap/domain/AmbariLdapConfigKeys.java | 83 -- .../ldap/domain/AmbariLdapConfiguration.java | 85 +-- .../domain/AmbariLdapConfigurationFactory.java | 34 - .../domain/AmbariLdapConfigurationKeys.java | 83 ++ .../AmbariLdapConfigurationProvider.java | 19 +- .../server/ldap/service/AmbariLdapFacade.java | 4 +- .../ambari/server/ldap/service/LdapFacade.java | 9 +- .../DefaultLdapAttributeDetectionService.java | 8 +- .../ads/DefaultLdapConfigurationService.java | 4 +- .../ads/detectors/GroupMemberAttrDetector.java | 4 +- .../ads/detectors/GroupNameAttrDetector.java | 7 +- .../ads/detectors/GroupObjectClassDetector.java | 8 +- .../detectors/UserGroupMemberAttrDetector.java | 5 +- .../ads/detectors/UserNameAttrDetector.java | 4 +- .../ads/detectors/UserObjectClassDetector.java | 4 +- .../system/impl/AmbariMetricSinkImpl.java | 2 - .../state/repository/VersionDefinitionXml.java | 59 +- .../server/upgrade/UpgradeCatalog260.java | 4 + .../python/ambari_server/serverConfiguration.py | 17 +- .../main/python/ambari_server/serverSetup.py | 5 +- .../main/python/ambari_server/serverUpgrade.py | 14 +- .../2.0.0.3.0/package/scripts/status_params.py | 2 +- .../HIVE/0.12.0.2.0/package/scripts/hive.py | 10 +- .../HIVE/2.1.0.3.0/package/scripts/hive.py | 10 +- .../KAFKA/0.10.0/configuration/kafka-broker.xml | 39 + .../configuration/kafka_client_jaas_conf.xml | 43 ++ .../0.10.0/configuration/kafka_jaas_conf.xml | 116 +++ .../KAFKA/0.8.1/configuration/kafka-env.xml | 2 +- .../KAFKA/0.8.1/package/scripts/kafka.py | 4 +- .../KAFKA/0.8.1/package/scripts/params.py | 16 +- .../0.8.1/package/scripts/service_check.py | 15 +- .../0.8.1/package/scripts/setup_ranger_kafka.py | 8 +- .../KAFKA/0.8.1/package/scripts/upgrade.py | 3 +- .../package/templates/kafka_client_jaas.conf.j2 | 3 + .../0.8.1/package/templates/kafka_jaas.conf.j2 | 47 ++ .../KAFKA/0.9.0/configuration/kafka-broker.xml | 2 +- .../1.10.3-10/configuration/kerberos-env.xml | 4 +- .../1.10.3-30/configuration/kerberos-env.xml | 4 +- .../MAHOUT/1.0.0.2.3/package/scripts/mahout.py | 12 +- .../package/scripts/oozie_server_upgrade.py | 24 +- .../package/scripts/oozie_server_upgrade.py | 50 +- .../PIG/0.12.0.2.0/package/scripts/pig.py | 16 +- .../PIG/0.16.1.3.0/package/scripts/pig.py | 16 +- .../common-services/SPARK/1.2.1/alerts.json | 2 +- .../SPARK/1.2.1/package/scripts/livy_service.py | 18 +- .../SPARK/1.2.1/package/scripts/params.py | 2 + .../SPARK/1.2.1/package/scripts/setup_spark.py | 20 +- .../SPARK/2.2.0/package/scripts/livy_service.py | 13 +- .../SPARK/2.2.0/package/scripts/params.py | 2 + .../SPARK/2.2.0/package/scripts/setup_spark.py | 25 +- .../common-services/SPARK2/2.0.0/alerts.json | 2 +- .../2.0.0/package/scripts/livy2_service.py | 11 +- .../SPARK2/2.0.0/package/scripts/params.py | 2 + .../SPARK2/2.0.0/package/scripts/setup_spark.py | 22 +- .../scripts/interpreter_json_template.py | 2 +- .../custom_actions/scripts/install_packages.py | 12 +- .../src/main/resources/key_properties.json | 161 ---- .../src/main/resources/properties.json | 487 ------------ .../HDP/2.0.6/properties/stack_features.json | 11 + .../HDP/2.0.6/properties/stack_packages.json | 10 +- .../stacks/HDP/2.0.6/services/stack_advisor.py | 2 +- .../2.6/services/TEZ/configuration/tez-site.xml | 8 + .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 2 +- .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 2 +- .../HDP/3.0/properties/stack_features.json | 6 + .../HDP/3.0/properties/stack_packages.json | 9 - .../KERBEROS/configuration/kerberos-env.xml | 4 +- .../api/query/render/MinimalRendererTest.java | 6 + .../commands/StackAdvisorCommandTest.java | 4 +- .../RequiredServicesInRepositoryCheckTest.java | 6 +- .../AmbariManagementControllerImplTest.java | 53 +- .../AmbariManagementControllerTest.java | 7 +- .../AbstractControllerResourceProviderTest.java | 10 +- .../AbstractDRResourceProviderTest.java | 2 - .../internal/AbstractResourceProviderTest.java | 26 +- .../internal/ActionResourceProviderTest.java | 4 - .../ActiveWidgetLayoutResourceProviderTest.java | 2 - .../internal/BlueprintResourceProviderTest.java | 21 +- .../ClientConfigResourceProviderTest.java | 10 - .../internal/ClusterControllerImplTest.java | 14 +- ...rKerberosDescriptorResourceProviderTest.java | 17 - .../internal/ClusterResourceProviderTest.java | 14 - ...ClusterStackVersionResourceProviderTest.java | 12 +- .../ConfigGroupResourceProviderTest.java | 2 - .../ConfigurationResourceProviderTest.java | 6 - .../CredentialResourceProviderTest.java | 23 - .../internal/ExtensionResourceProviderTest.java | 2 - .../internal/FeedResourceProviderTest.java | 29 +- .../internal/GroupResourceProviderTest.java | 8 - ...ostComponentProcessResourceProviderTest.java | 2 - .../HostComponentResourceProviderTest.java | 49 +- .../internal/HostResourceProviderTest.java | 53 +- .../HostStackVersionResourceProviderTest.java | 14 +- .../internal/InstanceResourceProviderTest.java | 29 +- .../internal/JMXHostProviderTest.java | 5 +- .../internal/JobResourceProviderTest.java | 37 +- .../KerberosDescriptorResourceProviderTest.java | 6 +- .../internal/MemberResourceProviderTest.java | 25 +- .../internal/RequestResourceProviderTest.java | 42 +- .../RequestScheduleResourceProviderTest.java | 2 - ...ponentConfigurationResourceProviderTest.java | 214 +++++- ...ootServiceComponentResourceProviderTest.java | 2 - ...erviceHostComponentResourceProviderTest.java | 2 - .../RootServiceResourceProviderTest.java | 2 - .../StackAdvisorResourceProviderTest.java | 12 +- .../StackArtifactResourceProviderTest.java | 2 - ...igurationDependencyResourceProviderTest.java | 2 - .../StackConfigurationResourceProviderTest.java | 4 - .../StackDependencyResourceProviderTest.java | 5 +- ...kLevelConfigurationResourceProviderTest.java | 4 - .../internal/StackResourceProviderTest.java | 2 - .../StackServiceResourceProviderTest.java | 4 - .../TargetClusterResourceProviderTest.java | 28 +- .../TaskAttemptResourceProviderTest.java | 2 +- .../internal/TaskResourceProviderTest.java | 22 +- .../internal/TestIvoryProviderModule.java | 6 +- .../internal/UpgradeResourceProviderTest.java | 4 +- .../internal/UserResourceProviderDBTest.java | 2 +- .../internal/UserResourceProviderTest.java | 2 - .../ValidationResourceProviderTest.java | 3 +- .../internal/WorkflowResourceProviderTest.java | 30 +- .../server/ldap/LdapModuleFunctionalTest.java | 49 +- .../TestAmbariLdapConfigurationFactory.java | 29 - .../ldap/service/AmbariLdapFacadeTest.java | 36 +- ...efaultLdapAttributeDetectionServiceTest.java | 24 +- .../DefaultLdapConfigurationServiceTest.java | 31 +- .../state/repository/VersionDefinitionTest.java | 55 ++ .../server/upgrade/UpgradeCatalog260Test.java | 4 + .../stacks/2.0.6/OOZIE/test_oozie_server.py | 24 +- .../stacks/2.0.6/common/test_stack_advisor.py | 4 +- .../2.6/KAFKA/test_kafka_broker_other_sasl.py | 97 +++ .../2.6/ZEPPELIN/interpreter_json_generated.py | 8 +- .../2.6/configs/default_kafka_plaintext.json | 631 ++++++++++++++++ .../configs/default_kafka_plaintextsasl.json | 631 ++++++++++++++++ .../configs/default_kafka_sasl_plaintext.json | 631 ++++++++++++++++ .../2.6/configs/default_kafka_sasl_ssl.json | 631 ++++++++++++++++ ambari-web/app/assets/test/tests.js | 2 +- .../controllers/main/service/info/configs.js | 5 + ambari-web/app/controllers/main/service/item.js | 4 +- ambari-web/app/data/db_properties_info.js | 15 +- ambari-web/app/messages.js | 14 +- .../mixins/common/configs/configs_comparator.js | 6 +- ambari-web/app/styles/application.less | 24 +- ambari-web/app/styles/bootstrap_overrides.less | 2 +- ambari-web/app/styles/config_history_flow.less | 414 ---------- .../app/styles/config_versions_control.less | 144 ++++ ambari-web/app/styles/widgets.less | 7 +- .../configs/config_history_dropdown_row.hbs | 24 - .../common/configs/config_history_flow.hbs | 148 ---- .../common/configs/config_versions_control.hbs | 42 ++ .../common/configs/config_versions_dropdown.hbs | 69 ++ .../templates/common/configs/service_config.hbs | 97 ++- ambari-web/app/views.js | 3 +- .../views/common/configs/config_history_flow.js | 644 ---------------- .../configs/config_versions_control_view.js | 235 ++++++ .../configs/config_versions_dropdown_view.js | 52 ++ .../views/common/configs/service_config_view.js | 66 ++ ambari-web/app/views/common/controls_view.js | 5 +- .../common/configs/config_history_flow_test.js | 756 ------------------- .../config_versions_control_view_test.js | 152 ++++ .../common/configs/service_config_view_test.js | 52 +- .../test/views/common/controls_view_test.js | 46 +- .../host_progress_popup_body_view_test.js | 9 +- 328 files changed, 7404 insertions(+), 5372 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f1a2b3a1/ambari-web/app/messages.js ----------------------------------------------------------------------
