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/c3a08382 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c3a08382 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c3a08382 Branch: refs/heads/branch-feature-AMBARI-21674 Commit: c3a0838260e421f2a71e3f4feec0a3f6d4d2b184 Parents: 40a97cf c813e05 Author: Nate Cole <[email protected]> Authored: Tue Jan 2 11:55:41 2018 -0500 Committer: Nate Cole <[email protected]> Committed: Tue Jan 2 11:55:41 2018 -0500 ---------------------------------------------------------------------- .../app/scripts/directives/comboSearch.js | 27 +- .../ui/admin-web/app/scripts/services/Stack.js | 2 +- .../test/unit/directives/comboSearch_test.js | 187 ++- .../src/main/python/ambari_agent/Controller.py | 2 +- .../test/python/ambari_agent/TestController.py | 8 +- .../ambari_agent/examples/ControllerTester.py | 6 +- ambari-infra/ambari-infra-manager-it/pom.xml | 155 +++ .../org/apache/ambari/infra/InfraClient.java | 93 ++ .../ambari/infra/InfraManagerStories.java | 108 ++ .../ambari/infra/OffsetDateTimeConverter.java | 39 + .../ambari/infra/steps/AbstractInfraSteps.java | 223 ++++ .../ambari/infra/steps/ExportJobsSteps.java | 106 ++ .../src/test/resources/log4j.properties | 16 + .../resources/stories/infra_api_tests.story | 23 + .../ambari-infra-manager/docker/Dockerfile | 6 +- .../docker/docker-compose.yml | 81 ++ .../docker/infra-manager-docker-compose.sh | 105 ++ .../ambari/infra/job/CloseableIterator.java | 24 + .../apache/ambari/infra/job/ObjectSource.java | 23 + .../infra/job/archive/AbstractFileAction.java | 33 + .../infra/job/archive/CompositeFileAction.java | 7 +- .../ambari/infra/job/archive/Document.java | 1 - .../archive/DocumentExportConfiguration.java | 74 +- .../job/archive/DocumentExportJobListener.java | 23 + .../job/archive/DocumentExportProperties.java | 140 ++- .../job/archive/DocumentExportPropertyMap.java | 38 + .../job/archive/DocumentExportStepListener.java | 47 - .../infra/job/archive/DocumentItemReader.java | 8 +- .../infra/job/archive/DocumentIterator.java | 25 - .../infra/job/archive/DocumentSource.java | 24 - .../ambari/infra/job/archive/FileAction.java | 2 +- .../infra/job/archive/ItemWriterListener.java | 25 + .../job/archive/LocalDocumentItemWriter.java | 8 +- .../ambari/infra/job/archive/S3Properties.java | 57 +- .../ambari/infra/job/archive/S3Uploader.java | 23 +- .../infra/job/archive/SolrDocumentIterator.java | 3 +- .../infra/job/archive/SolrDocumentSource.java | 22 +- .../infra/job/archive/SolrQueryBuilder.java | 28 +- .../infra/job/archive/SolrQueryProperties.java | 40 +- .../infra/job/archive/TarGzCompressor.java | 2 +- .../src/main/resources/infra-manager.properties | 48 +- .../archive/DocumentExportPropertiesTest.java | 54 + .../job/archive/DocumentItemReaderTest.java | 8 +- .../archive/LocalDocumentItemWriterTest.java | 8 +- .../infra/job/archive/SolrQueryBuilderTest.java | 18 +- .../job/archive/SolrQueryPropertiesTest.java | 54 + ambari-infra/pom.xml | 5 +- .../ambari-logsearch-web/package.json | 2 + .../ambari-logsearch-web/src/app/app.module.ts | 15 + .../components/graph/graph.component.less | 48 + .../classes/components/graph/graph.component.ts | 355 ++++++ .../components/logs-table-component.spec.ts | 61 - .../classes/components/logs-table-component.ts | 51 - .../logs-table/logs-table-component.spec.ts | 61 + .../logs-table/logs-table-component.ts | 51 + .../src/app/classes/graph.ts | 42 + .../src/app/classes/histogram-options.ts | 35 - .../src/app/classes/models/tab.ts | 7 +- .../src/app/classes/object.ts | 19 + .../classes/queries/audit-logs-query-params.ts | 19 +- .../audit-logs-top-resources-query-params.ts | 23 + .../queries/service-logs-query-params.ts | 4 +- .../src/app/classes/service-injector.ts | 23 + .../audit-logs-entries.component.html | 30 + .../audit-logs-entries.component.spec.ts | 110 ++ .../audit-logs-entries.component.ts | 86 ++ .../audit-logs-table.component.ts | 2 +- .../collapsible-panel.component.html | 2 +- .../collapsible-panel.component.ts | 4 +- .../dropdown-button.component.spec.ts | 10 +- .../dropdown-button.component.ts | 6 +- .../filter-button.component.spec.ts | 10 +- .../filter-button/filter-button.component.ts | 7 +- .../filter-dropdown.component.spec.ts | 14 +- .../filter-dropdown.component.ts | 5 +- .../filters-panel/filters-panel.component.ts | 7 +- .../graph-legend-item.component.html | 19 + .../graph-legend-item.component.less | 27 + .../graph-legend-item.component.spec.ts | 42 + .../graph-legend-item.component.ts | 37 + .../graph-legend/graph-legend.component.html | 19 + .../graph-legend/graph-legend.component.spec.ts | 50 + .../graph-legend/graph-legend.component.ts | 32 + .../graph-tooltip/graph-tooltip.component.html | 22 + .../graph-tooltip/graph-tooltip.component.less | 69 ++ .../graph-tooltip.component.spec.ts | 50 + .../graph-tooltip/graph-tooltip.component.ts | 36 + .../horizontal-histogram.component.html | 22 + .../horizontal-histogram.component.less | 22 + .../horizontal-histogram.component.spec.ts | 61 + .../horizontal-histogram.component.ts | 114 ++ .../logs-container.component.html | 6 +- .../logs-container/logs-container.component.ts | 10 +- .../menu-button/menu-button.component.spec.ts | 10 +- .../menu-button/menu-button.component.ts | 6 +- .../search-box/search-box.component.ts | 3 +- .../service-logs-table.component.ts | 2 +- .../app/components/tabs/tabs.component.spec.ts | 4 - .../src/app/components/tabs/tabs.component.ts | 1 + .../time-histogram.component.html | 32 +- .../time-histogram.component.less | 145 +-- .../time-histogram.component.spec.ts | 104 +- .../time-histogram/time-histogram.component.ts | 314 +---- .../components/top-menu/top-menu.component.ts | 3 +- .../src/app/components/variables.less | 3 + .../ambari-logsearch-web/src/app/mock-data.ts | 142 ++- .../app/services/component-actions.service.ts | 1 - .../src/app/services/http-client.service.ts | 39 +- .../app/services/logs-container.service.spec.ts | 4 +- .../src/app/services/logs-container.service.ts | 85 +- .../src/app/services/utils.service.spec.ts | 117 ++ .../src/app/services/utils.service.ts | 12 + .../src/assets/i18n/en.json | 6 +- .../ambari-logsearch-web/src/styles.less | 4 + .../src/vendor/css/bootstrap-logsearch.min.css | 2 +- .../src/vendor/js/bootstrap-logsearch.min.js | 2 +- ambari-logsearch/ambari-logsearch-web/yarn.lock | 10 + .../ambari/server/agent/HeartBeatHandler.java | 122 +- .../ambari/server/agent/HeartbeatProcessor.java | 33 +- .../server/api/services/AmbariMetaInfo.java | 12 +- .../controller/DeleteIdentityHandler.java | 5 +- .../server/controller/KerberosHelper.java | 2 +- .../server/controller/KerberosHelperImpl.java | 1129 +++++++++--------- .../HostKerberosIdentityResourceProvider.java | 15 +- .../internal/RepositoryResourceProvider.java | 14 +- .../internal/UpgradeResourceProvider.java | 27 +- .../server/orm/dao/KerberosKeytabDAO.java | 154 ++- .../orm/dao/KerberosKeytabPrincipalDAO.java | 309 +++++ .../server/orm/dao/KerberosPrincipalDAO.java | 9 - .../orm/dao/KerberosPrincipalHostDAO.java | 252 ---- .../entities/HostGroupComponentEntityPK.java | 4 +- .../orm/entities/KerberosKeytabEntity.java | 152 ++- .../entities/KerberosKeytabPrincipalEntity.java | 236 ++++ .../KerberosKeytabServiceMappingEntity.java | 88 ++ .../orm/entities/KerberosPrincipalEntity.java | 25 - .../entities/KerberosPrincipalHostEntity.java | 213 ---- .../entities/KerberosPrincipalHostEntityPK.java | 115 -- .../orm/entities/RepositoryVersionEntity.java | 5 + .../AbstractPrepareKerberosServerAction.java | 31 +- .../kerberos/CleanupServerAction.java | 6 +- .../ConfigureAmbariIdentitiesServerAction.java | 141 ++- .../kerberos/CreateKeytabFilesServerAction.java | 112 +- .../kerberos/CreatePrincipalsServerAction.java | 47 +- .../kerberos/DestroyPrincipalsServerAction.java | 62 +- .../kerberos/FinalizeKerberosServerAction.java | 24 +- .../kerberos/KerberosServerAction.java | 291 ++--- .../PrepareEnableKerberosServerAction.java | 16 +- .../PrepareKerberosIdentitiesServerAction.java | 9 - .../stageutils/KerberosKeytabController.java | 213 ++++ .../stageutils/ResolvedKerberosKeytab.java | 117 +- .../stageutils/ResolvedKerberosPrincipal.java | 169 +++ .../upgrades/PreconfigureKerberosAction.java | 12 +- .../ambari/server/state/UpgradeContext.java | 14 + .../server/state/cluster/ClustersImpl.java | 8 +- .../main/resources/Ambari-DDL-Derby-CREATE.sql | 34 +- .../main/resources/Ambari-DDL-MySQL-CREATE.sql | 33 +- .../main/resources/Ambari-DDL-Oracle-CREATE.sql | 35 +- .../resources/Ambari-DDL-Postgres-CREATE.sql | 35 +- .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 33 +- .../resources/Ambari-DDL-SQLServer-CREATE.sql | 33 +- .../src/main/resources/META-INF/persistence.xml | 3 +- .../HIVE/0.12.0.2.0/configuration/hive-env.xml | 1 + .../HIVE/2.1.0.3.0/configuration/hive-env.xml | 1 + .../OOZIE/4.0.0.2.0/configuration/oozie-env.xml | 1 + .../OOZIE/4.2.0.3.0/configuration/oozie-env.xml | 1 + .../RANGER/0.4.0/package/scripts/params.py | 4 +- .../0.4.0/package/scripts/ranger_admin.py | 10 +- .../0.4.0/package/scripts/setup_ranger_xml.py | 19 +- .../RANGER_KMS/0.5.0.2.3/package/scripts/kms.py | 13 +- .../0.5.0.2.3/package/scripts/kms_server.py | 6 +- .../SUPERSET/0.15.0/metainfo.xml | 2 +- .../configuration-mapred/mapred-site.xml | 2 +- .../ZEPPELIN/0.7.0/package/scripts/master.py | 11 +- .../HDP/2.0.6/properties/stack_packages.json | 16 +- .../2.2/services/TEZ/configuration/tez-site.xml | 4 +- .../YARN/configuration-mapred/mapred-site.xml | 2 +- .../services/HIVE/configuration/hive-env.xml | 1 + .../services/OOZIE/configuration/oozie-env.xml | 1 + .../stacks/HDP/2.6/upgrades/config-upgrade.xml | 6 +- .../server/agent/TestHeartbeatHandler.java | 79 +- .../server/api/services/AmbariMetaInfoTest.java | 32 +- .../server/controller/KerberosHelperTest.java | 47 +- ...ostKerberosIdentityResourceProviderTest.java | 15 +- .../RepositoryResourceProviderTest.java | 2 + .../RepositoryVersionResourceProviderTest.java | 5 +- .../VersionDefinitionResourceProviderTest.java | 2 +- .../apache/ambari/server/orm/db/DDLTests.java | 2 +- ...nfigureAmbariIdentitiesServerActionTest.java | 36 +- .../FinalizeKerberosServerActionTest.java | 5 +- .../kerberos/KerberosServerActionTest.java | 26 +- .../PreconfigureKerberosActionTest.java | 16 +- .../state/stack/ConfigUpgradeValidityTest.java | 41 +- .../src/test/python/TestAmbariServer.py | 4 +- .../stacks/2.6/RANGER/test_ranger_admin.py | 10 +- ambari-web/app/controllers/installer.js | 44 +- .../hawq/addStandby/step3_controller.js | 3 +- .../main/admin/kerberos/wizard_controller.js | 2 +- .../main/admin/stack_and_upgrade_controller.js | 3 +- .../main/host/bulk_operations_controller.js | 369 +++--- ambari-web/app/controllers/main/host/details.js | 6 +- .../app/controllers/main/service/info/metric.js | 13 + ambari-web/app/controllers/main/service/item.js | 4 +- .../app/controllers/wizard/step3_controller.js | 2 +- .../app/controllers/wizard/step6_controller.js | 12 - .../app/controllers/wizard/step8_controller.js | 2 +- ambari-web/app/messages.js | 48 +- .../app/mixins/common/widgets/widget_mixin.js | 1 + .../configs/component_actions_by_configs.js | 4 +- ambari-web/app/routes/create_widget.js | 3 + ambari-web/app/styles/application.less | 44 +- ambari-web/app/styles/common.less | 1 + .../app/styles/config_versions_control.less | 10 +- .../app/styles/enhanced_service_dashboard.less | 26 +- ambari-web/app/styles/hosts.less | 5 + ambari-web/app/styles/modal_popups.less | 19 +- .../app/styles/theme/bootstrap-ambari.css | 7 +- ambari-web/app/styles/wizard.less | 20 + ambari-web/app/templates/application.hbs | 6 +- .../common/assign_master_components.hbs | 24 +- .../common/configs/config_versions_dropdown.hbs | 2 +- .../service_config_layout_tab_compare.hbs | 6 +- .../templates/common/host_progress_popup.hbs | 115 +- .../modal_popups/widget_browser_footer.hbs | 1 - .../templates/common/widget/gauge_widget.hbs | 2 +- .../templates/common/widget/graph_widget.hbs | 2 +- .../templates/common/widget/number_widget.hbs | 2 +- .../templates/common/widget/template_widget.hbs | 2 +- .../main/host/bulk_add_delete_confirm_popup.hbs | 40 + .../main/host/delete_hosts_dry_run_popup.hbs | 32 - .../templates/main/host/delete_hosts_popup.hbs | 21 +- .../main/host/delete_hosts_result_popup.hbs | 4 +- .../app/templates/main/service/menu_item.hbs | 6 +- ambari-web/app/templates/wizard/step3.hbs | 12 +- ambari-web/app/templates/wizard/step6.hbs | 30 +- .../wizard/step6/step6_issues_popup.hbs | 43 - ambari-web/app/utils/ajax/ajax.js | 6 +- .../common/assign_master_components_view.js | 4 +- .../configs/config_versions_dropdown_view.js | 11 + .../service_config_layout_tab_compare_view.js | 10 + .../configs/widgets/combo_config_widget_view.js | 8 + ambari-web/app/views/common/controls_view.js | 2 +- .../common/form/manage_credentials_form_view.js | 3 +- .../common/host_progress_popup_body_view.js | 12 + .../common/modal_popups/confirmation_popup.js | 11 +- .../main/service/widgets/create/wizard_view.js | 2 +- .../kerberos/kerberos_wizard_controler_test.js | 8 +- docs/src/site/site.xml | 14 +- 247 files changed, 7203 insertions(+), 3565 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/c3a08382/ambari-server/src/test/python/TestAmbariServer.py ----------------------------------------------------------------------
