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 2018/01/05 23:04:46 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/7ff4a96c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7ff4a96c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7ff4a96c
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 7ff4a96ca958e0d4b2a41fea5ad7754c5ac4712c
Parents: b74b05c 2b9a34b
Author: Robert Levas <rl...@hortonworks.com>
Authored: Fri Jan 5 18:03:38 2018 -0500
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Fri Jan 5 18:03:38 2018 -0500
----------------------------------------------------------------------
.../main/resources/ui/admin-web/app/index.html | 2 +
.../app/scripts/controllers/SideNavCtrl.js | 6 +-
.../controllers/ambariViews/ViewsListCtrl.js | 184 ++-
.../remoteClusters/RemoteClustersListCtrl.js | 109 +-
.../stackVersions/StackVersionsEditCtrl.js | 2 +-
.../stackVersions/StackVersionsListCtrl.js | 191 ++-
.../userManagement/GroupsListCtrl.js | 86 +-
.../controllers/userManagement/UsersListCtrl.js | 132 +-
.../app/scripts/directives/comboSearch.js | 66 +-
.../admin-web/app/scripts/services/Cluster.js | 3 +-
.../admin-web/app/scripts/services/Filters.js | 84 ++
.../ui/admin-web/app/scripts/services/Group.js | 11 +-
.../app/scripts/services/Pagination.js | 59 +
.../app/scripts/services/RemoteCluster.js | 10 +-
.../ui/admin-web/app/scripts/services/Stack.js | 34 +-
.../ui/admin-web/app/scripts/services/User.js | 13 +-
.../ui/admin-web/app/styles/user-management.css | 4 +
.../app/views/ambariViews/viewsList.html | 5 +-
.../app/views/remoteClusters/list.html | 33 +-
.../admin-web/app/views/stackVersions/list.html | 34 +-
.../app/views/userManagement/groupsList.html | 51 +-
.../app/views/userManagement/usersList.html | 61 +-
.../ambariViews/ViewsListCtrl_test.js | 66 +-
.../userManagement/GroupsListCtrl_test.js | 100 +-
.../userManagement/UsersListCtrl_test.js | 306 -----
.../test/unit/directives/comboSearch_test.js | 200 +++-
.../test/unit/services/Filters_test.js | 161 +++
.../test/unit/services/Pagination_test.js | 72 ++
.../src/main/python/ambari_agent/ActionQueue.py | 21 +-
.../python/ambari_agent/CommandStatusDict.py | 2 +-
.../src/main/python/ambari_agent/Controller.py | 25 +-
.../ambari_agent/CustomServiceOrchestrator.py | 4 +-
.../src/main/python/ambari_agent/DataCleaner.py | 4 +-
.../src/main/python/ambari_agent/Heartbeat.py | 17 +-
.../src/main/python/ambari_agent/LiveStatus.py | 3 +-
.../main/python/ambari_agent/PythonExecutor.py | 15 +-
.../ambari_agent/PythonReflectiveExecutor.py | 3 +-
.../main/python/ambari_agent/RecoveryManager.py | 17 +-
.../ambari_agent/StatusCommandsExecutor.py | 3 +-
.../python/ambari_agent/alerts/ams_alert.py | 8 +-
.../python/ambari_agent/alerts/metric_alert.py | 3 +-
.../src/main/python/ambari_agent/security.py | 8 +-
.../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 | 148 +++
.../src/test/resources/log4j.properties | 16 +
.../resources/stories/infra_api_tests.story | 38 +
.../ambari-infra-manager/docker/Dockerfile | 6 +-
.../docker/docker-compose.yml | 81 ++
.../docker/infra-manager-docker-compose.sh | 107 ++
ambari-infra/ambari-infra-manager/pom.xml | 5 +
.../ambari/infra/job/CloseableIterator.java | 24 +
.../apache/ambari/infra/job/JobProperties.java | 47 +
.../apache/ambari/infra/job/JobPropertyMap.java | 57 +
.../apache/ambari/infra/job/ObjectSource.java | 23 +
.../apache/ambari/infra/job/PropertyMap.java | 25 +
.../apache/ambari/infra/job/SolrDAOBase.java | 65 +
.../infra/job/archive/AbstractFileAction.java | 38 +
.../infra/job/archive/CompositeFileAction.java | 3 +-
.../ambari/infra/job/archive/Document.java | 3 +-
.../archive/DocumentArchivingConfiguration.java | 142 +++
.../archive/DocumentExportConfiguration.java | 118 --
.../job/archive/DocumentExportJobListener.java | 35 -
.../job/archive/DocumentExportProperties.java | 173 ++-
.../job/archive/DocumentExportPropertyMap.java | 44 +
.../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/DocumentWiper.java | 23 +
.../job/archive/FileNameSuffixFormatter.java | 56 +
.../infra/job/archive/ItemWriterListener.java | 23 +
.../job/archive/LocalDocumentItemWriter.java | 23 +-
.../job/archive/LocalItemWriterListener.java | 36 +
.../ambari/infra/job/archive/S3Properties.java | 64 +-
.../ambari/infra/job/archive/S3Uploader.java | 25 +-
.../ambari/infra/job/archive/SolrDAO.java | 68 ++
.../infra/job/archive/SolrDocumentIterator.java | 6 +-
.../infra/job/archive/SolrDocumentSource.java | 57 +-
.../job/archive/SolrParametrizedString.java | 77 ++
.../infra/job/archive/SolrProperties.java | 117 ++
.../infra/job/archive/SolrQueryBuilder.java | 59 +-
.../infra/job/archive/SolrQueryProperties.java | 40 +-
.../infra/job/archive/TarGzCompressor.java | 4 +-
.../infra/job/archive/WriteCompletedEvent.java | 45 +
.../deleting/DocumentDeletingConfiguration.java | 90 ++
.../deleting/DocumentDeletingProperties.java | 77 ++
.../deleting/DocumentDeletingPropertyMap.java | 44 +
.../job/deleting/DocumentWiperTasklet.java | 49 +
.../src/main/resources/infra-manager.properties | 52 +-
.../ambari/infra/job/JobPropertiesTest.java | 56 +
.../job/archive/DocumentItemReaderTest.java | 8 +-
.../archive/FileNameSuffixFormatterTest.java | 58 +
.../archive/LocalDocumentItemWriterTest.java | 27 +-
.../job/archive/SolrParametrizedStringTest.java | 57 +
.../infra/job/archive/SolrPropertiesTest.java | 54 +
.../infra/job/archive/SolrQueryBuilderTest.java | 55 +-
.../job/archive/SolrQueryPropertiesTest.java | 54 +
ambari-infra/pom.xml | 5 +-
.../package/rpm/logfeeder/postremove.sh~HEAD | 21 +
.../package/rpm/logfeeder/postremove.sh~trunk | 21 +
.../main/package/rpm/portal/postremove.sh~HEAD | 21 +
.../main/package/rpm/portal/postremove.sh~trunk | 21 +
.../src/main/scripts/logfeeder-env.sh~HEAD | 40 +
.../src/main/scripts/logfeeder-env.sh~trunk | 40 +
.../src/main/scripts/logsearch-env.sh~HEAD | 40 +
.../src/main/scripts/logsearch-env.sh~trunk | 40 +
.../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 | 126 +-
.../server/configuration/Configuration.java | 1 -
.../ambari/server/controller/AmbariServer.java | 2 +-
.../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 +-
.../ambari/server/orm/DBAccessorImpl.java | 3 +
.../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 +
.../state/alert/AlertDefinitionFactory.java | 31 +-
.../ambari/server/state/alert/ScriptSource.java | 4 +
.../server/state/cluster/ClustersImpl.java | 8 +-
.../upgrade/AbstractFinalUpgradeCatalog.java | 58 +
.../server/upgrade/FinalUpgradeCatalog.java | 28 +-
.../server/upgrade/SchemaUpgradeHelper.java | 1 +
.../server/upgrade/UpdateAlertScriptPaths.java | 48 +
.../server/upgrade/UpgradeCatalog252.java | 7 +-
.../server/upgrade/UpgradeCatalog260.java | 3 +
.../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 +
.../KAFKA/0.8.1/package/scripts/params.py | 6 +-
.../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 +-
.../SPARK/1.2.1/package/scripts/livy_service.py | 2 -
.../2.0.0/package/scripts/livy2_service.py | 2 -
.../SUPERSET/0.15.0/metainfo.xml | 2 +-
.../configuration-mapred/mapred-site.xml | 2 +-
.../ZEPPELIN/0.7.0/package/scripts/master.py | 11 +-
.../custom_actions/scripts/install_packages.py | 38 +-
.../HDP/2.0.6/properties/stack_packages.json | 122 +-
.../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.3/services/stack_advisor.py | 9 +-
.../stacks/HDP/2.6/upgrades/config-upgrade.xml | 6 +-
.../server/agent/TestHeartbeatHandler.java | 79 +-
.../server/api/services/AmbariMetaInfoTest.java | 91 +-
.../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 +-
.../server/upgrade/UpgradeCatalog260Test.java | 1 +
.../src/test/python/TestAmbariServer.py | 4 +-
.../stacks/2.3/common/test_stack_advisor.py | 17 +
.../2.6/KAFKA/test_kafka_broker_other_sasl.py | 16 +
.../stacks/2.6/RANGER/test_ranger_admin.py | 10 +-
.../2.6/configs/secure_kafka_sasl_ssl.json | 632 ++++++++++
ambari-web/app/assets/test/tests.js | 1 +
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 | 38 +-
.../app/controllers/main/service/info/metric.js | 13 +
ambari-web/app/controllers/main/service/item.js | 29 +-
.../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 | 52 +-
.../app/mixins/common/widgets/widget_mixin.js | 1 +
.../configs/component_actions_by_configs.js | 4 +-
ambari-web/app/models/host_component.js | 6 +
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 | 31 +-
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 | 36 +-
.../common/assign_master_components_view.js | 4 +-
.../configs/config_versions_dropdown_view.js | 13 +-
.../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 +-
ambari-web/app/views/main/host/details.js | 4 +
ambari-web/app/views/main/service/item.js | 4 +
.../main/service/widgets/create/wizard_view.js | 2 +-
.../kerberos/kerberos_wizard_controler_test.js | 8 +-
ambari-web/test/utils/date/timezone_test.js | 2 +-
.../config_versions_dropdown_view_test.js | 82 ++
docs/src/site/site.xml | 14 +-
338 files changed, 10835 insertions(+), 5064 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7ff4a96c/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7ff4a96c/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/User.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7ff4a96c/ambari-logsearch/ambari-logsearch-assembly/src/main/package/rpm/logfeeder/postremove.sh~HEAD
----------------------------------------------------------------------
diff --cc ambari-logsearch/ambari-logsearch-assembly/src/main/package/rpm/logfeeder/postremove.sh~HEAD
index 0000000,0000000..5f1c623
new file mode 100755
--- /dev/null
+++ b/ambari-logsearch/ambari-logsearch-assembly/src/main/package/rpm/logfeeder/postremove.sh~HEAD
@@@ -1,0 -1,0 +1,21 @@@
++#!/bin/bash
++# Licensed to the Apache Software Foundation (ASF) under one or more
++# contributor license agreements. See the NOTICE file distributed with
++# this work for additional information regarding copyright ownership.
++# The ASF licenses this file to You under the Apache License, Version 2.0
++# (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License
++
++LOGFEEDER_SCRIPT_LINK_NAME="/usr/bin/logfeeder"
++LOGFEEDER_CONF_DIR_LINK="/etc/ambari-logsearch-logfeeder/conf"
++
++rm -f $LOGFEEDER_SCRIPT_LINK_NAME
++rm -f $LOGFEEDER_CONF_DIR_LINK
http://git-wip-us.apache.org/repos/asf/ambari/blob/7ff4a96c/ambari-logsearch/ambari-logsearch-assembly/src/main/package/rpm/logfeeder/postremove.sh~trunk
----------------------------------------------------------------------
diff --cc ambari-logsearch/ambari-logsearch-assembly/src/main/package/rpm/logfeeder/postremove.sh~trunk
index 0000000,0000000..5f1c623
new file mode 100755
--- /dev/null
+++ b/ambari-logsearch/ambari-logsearch-assembly/src/main/package/rpm/logfeeder/postremove.sh~trunk
@@@ -1,0 -1,0 +1,21 @@@
++#!/bin/bash
++# Licensed to the Apache Software Foundation (ASF) under one or more
++# contributor license agreements. See the NOTICE file distributed with
++# this work for additional information regarding copyright ownership.
++# The ASF licenses this file to You under the Apache License, Version 2.0
++# (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License
++
++LOGFEEDER_SCRIPT_LINK_NAME="/usr/bin/logfeeder"
++LOGFEEDER_CONF_DIR_LINK="/etc/ambari-logsearch-logfeeder/conf"
++
++rm -f $LOGFEEDER_SCRIPT_LINK_NAME
++rm -f $LOGFEEDER_CONF_DIR_LINK
http://git-wip-us.apache.org/repos/asf/ambari/blob/7ff4a96c/ambari-logsearch/ambari-logsearch-assembly/src/main/package/rpm/portal/postremove.sh~HEAD
----------------------------------------------------------------------
diff --cc ambari-logsearch/ambari-logsearch-assembly/src/main/package/rpm/portal/postremove.sh~HEAD
index 0000000,0000000..8de05c1
new file mode 100644
--- /dev/null
+++ b/ambari-logsearch/ambari-logsearch-assembly/src/main/package/rpm/portal/postremove.sh~HEAD
@@@ -1,0 -1,0 +1,21 @@@
++#!/bin/bash
++# Licensed to the Apache Software Foundation (ASF) under one or more
++# contributor license agreements. See the NOTICE file distributed with
++# this work for additional information regarding copyright ownership.
++# The ASF licenses this file to You under the Apache License, Version 2.0
++# (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License
++
++LOGSEARCH_SCRIPT_LINK_NAME="/usr/bin/logsearch"
++LOGSEARCH_CONF_DIR_LINK="/etc/ambari-logsearch-portal/conf"
++
++rm -f $LOGSEARCH_SCRIPT_LINK_NAME
++rm -f $LOGSEARCH_CONF_DIR_LINK
http://git-wip-us.apache.org/repos/asf/ambari/blob/7ff4a96c/ambari-logsearch/ambari-logsearch-assembly/src/main/package/rpm/portal/postremove.sh~trunk
----------------------------------------------------------------------
diff --cc ambari-logsearch/ambari-logsearch-assembly/src/main/package/rpm/portal/postremove.sh~trunk
index 0000000,0000000..8de05c1
new file mode 100644
--- /dev/null
+++ b/ambari-logsearch/ambari-logsearch-assembly/src/main/package/rpm/portal/postremove.sh~trunk
@@@ -1,0 -1,0 +1,21 @@@
++#!/bin/bash
++# Licensed to the Apache Software Foundation (ASF) under one or more
++# contributor license agreements. See the NOTICE file distributed with
++# this work for additional information regarding copyright ownership.
++# The ASF licenses this file to You under the Apache License, Version 2.0
++# (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License
++
++LOGSEARCH_SCRIPT_LINK_NAME="/usr/bin/logsearch"
++LOGSEARCH_CONF_DIR_LINK="/etc/ambari-logsearch-portal/conf"
++
++rm -f $LOGSEARCH_SCRIPT_LINK_NAME
++rm -f $LOGSEARCH_CONF_DIR_LINK
http://git-wip-us.apache.org/repos/asf/ambari/blob/7ff4a96c/ambari-logsearch/ambari-logsearch-logfeeder/src/main/scripts/logfeeder-env.sh~HEAD
----------------------------------------------------------------------
diff --cc ambari-logsearch/ambari-logsearch-logfeeder/src/main/scripts/logfeeder-env.sh~HEAD
index 0000000,0000000..37e9930
new file mode 100755
--- /dev/null
+++ b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/scripts/logfeeder-env.sh~HEAD
@@@ -1,0 -1,0 +1,40 @@@
++#!/bin/bash
++# Licensed to the Apache Software Foundation (ASF) under one or more
++# contributor license agreements. See the NOTICE file distributed with
++# this work for additional information regarding copyright ownership.
++# The ASF licenses this file to You under the Apache License, Version 2.0
++# (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
++# Log Feeder extra options
++export LOGFEEDER_JAVA_OPTS=${LOGFEEDER_JAVA_OPTS:-""}
++
++# Log Feeder debug options
++# export LOGFEEDER_DEBUG=true
++# exoprt LOGFEEDER_DEBUG_SUSPEND=n
++export LOGFEEDER_DEBUG_PORT=5006
++
++# Log Feeder memory
++# export LOGFEEDER_JAVA_MEM="-Xmx512m"
++
++# export LOG_PATH=/var/log/ambari-logsearch-logfeeder/
++# export LOG_FILE=logfeeder.log
++
++# Pid file of the application
++# export LOGFEEDER_PID_DIR=/var/run/ambari-logsearch-logfeeder
++# export LOGFEEDER_PID_FILE=logfeeder.pid
++
++# SSL settings"
++# export LOGFEEDER_SSL="true"
++# export LOGFEEDER_KEYSTORE_LOCATION="/my/path/keystore.jks"
++# export LOGFEEDER_KEYSTORE_TYPE="jks"
++# export LOGFEEDER_TRUSTSTORE_LOCATION="/my/path/trutstore.jks"
++# export LOGFEEDER_TRUSTSTORE_TYPE="jks"
http://git-wip-us.apache.org/repos/asf/ambari/blob/7ff4a96c/ambari-logsearch/ambari-logsearch-logfeeder/src/main/scripts/logfeeder-env.sh~trunk
----------------------------------------------------------------------
diff --cc ambari-logsearch/ambari-logsearch-logfeeder/src/main/scripts/logfeeder-env.sh~trunk
index 0000000,0000000..37e9930
new file mode 100755
--- /dev/null
+++ b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/scripts/logfeeder-env.sh~trunk
@@@ -1,0 -1,0 +1,40 @@@
++#!/bin/bash
++# Licensed to the Apache Software Foundation (ASF) under one or more
++# contributor license agreements. See the NOTICE file distributed with
++# this work for additional information regarding copyright ownership.
++# The ASF licenses this file to You under the Apache License, Version 2.0
++# (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
++# Log Feeder extra options
++export LOGFEEDER_JAVA_OPTS=${LOGFEEDER_JAVA_OPTS:-""}
++
++# Log Feeder debug options
++# export LOGFEEDER_DEBUG=true
++# exoprt LOGFEEDER_DEBUG_SUSPEND=n
++export LOGFEEDER_DEBUG_PORT=5006
++
++# Log Feeder memory
++# export LOGFEEDER_JAVA_MEM="-Xmx512m"
++
++# export LOG_PATH=/var/log/ambari-logsearch-logfeeder/
++# export LOG_FILE=logfeeder.log
++
++# Pid file of the application
++# export LOGFEEDER_PID_DIR=/var/run/ambari-logsearch-logfeeder
++# export LOGFEEDER_PID_FILE=logfeeder.pid
++
++# SSL settings"
++# export LOGFEEDER_SSL="true"
++# export LOGFEEDER_KEYSTORE_LOCATION="/my/path/keystore.jks"
++# export LOGFEEDER_KEYSTORE_TYPE="jks"
++# export LOGFEEDER_TRUSTSTORE_LOCATION="/my/path/trutstore.jks"
++# export LOGFEEDER_TRUSTSTORE_TYPE="jks"
http://git-wip-us.apache.org/repos/asf/ambari/blob/7ff4a96c/ambari-logsearch/ambari-logsearch-server/src/main/scripts/logsearch-env.sh~HEAD
----------------------------------------------------------------------
diff --cc ambari-logsearch/ambari-logsearch-server/src/main/scripts/logsearch-env.sh~HEAD
index 0000000,0000000..d8a837f
new file mode 100755
--- /dev/null
+++ b/ambari-logsearch/ambari-logsearch-server/src/main/scripts/logsearch-env.sh~HEAD
@@@ -1,0 -1,0 +1,40 @@@
++#!/bin/bash
++# Licensed to the Apache Software Foundation (ASF) under one or more
++# contributor license agreements. See the NOTICE file distributed with
++# this work for additional information regarding copyright ownership.
++# The ASF licenses this file to You under the Apache License, Version 2.0
++# (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
++# Log Search extra options
++export LOGSEARCH_JAVA_OPTS=${LOGSEARCH_JAVA_OPTS:-""}
++
++# Log Search debug options
++# export LOGSEARCH_DEBUG=true
++# exoprt LOGSEARCH_DEBUG_SUSPEND=n
++export LOGSEARCH_DEBUG_PORT=5005
++
++# Log Search memory
++# export LOGSEARCH_JAVA_MEM="--Xmx1024m"
++
++# export LOG_PATH=/var/log/ambari-logsearch-logfeeder/
++# export LOG_FILE=logsearch.log
++
++# Pid file of the application
++# export LOGSEARCH_PID_DIR=/var/run/ambari-logsearch-logfeeder
++# export LOGSEARCH_PID_FILE=logfeeder.pid
++
++# SSL settings"
++# export LOGSEARCH_SSL="true"
++# export LOGSEARCH_KEYSTORE_LOCATION="/my/path/keystore.jks"
++# export LOGSEARCH_KEYSTORE_TYPE="jks"
++# export LOGSEARCH_TRUSTSTORE_LOCATION="/my/path/trutstore.jks"
++# export LOGSEARCH_TRUSTSTORE_TYPE="jks"
http://git-wip-us.apache.org/repos/asf/ambari/blob/7ff4a96c/ambari-logsearch/ambari-logsearch-server/src/main/scripts/logsearch-env.sh~trunk
----------------------------------------------------------------------
diff --cc ambari-logsearch/ambari-logsearch-server/src/main/scripts/logsearch-env.sh~trunk
index 0000000,0000000..d8a837f
new file mode 100755
--- /dev/null
+++ b/ambari-logsearch/ambari-logsearch-server/src/main/scripts/logsearch-env.sh~trunk
@@@ -1,0 -1,0 +1,40 @@@
++#!/bin/bash
++# Licensed to the Apache Software Foundation (ASF) under one or more
++# contributor license agreements. See the NOTICE file distributed with
++# this work for additional information regarding copyright ownership.
++# The ASF licenses this file to You under the Apache License, Version 2.0
++# (the "License"); you may not use this file except in compliance with
++# the License. You may obtain a copy of the License at
++#
++# http://www.apache.org/licenses/LICENSE-2.0
++#
++# Unless required by applicable law or agreed to in writing, software
++# distributed under the License is distributed on an "AS IS" BASIS,
++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++# See the License for the specific language governing permissions and
++# limitations under the License.
++
++# Log Search extra options
++export LOGSEARCH_JAVA_OPTS=${LOGSEARCH_JAVA_OPTS:-""}
++
++# Log Search debug options
++# export LOGSEARCH_DEBUG=true
++# exoprt LOGSEARCH_DEBUG_SUSPEND=n
++export LOGSEARCH_DEBUG_PORT=5005
++
++# Log Search memory
++# export LOGSEARCH_JAVA_MEM="--Xmx1024m"
++
++# export LOG_PATH=/var/log/ambari-logsearch-logfeeder/
++# export LOG_FILE=logsearch.log
++
++# Pid file of the application
++# export LOGSEARCH_PID_DIR=/var/run/ambari-logsearch-logfeeder
++# export LOGSEARCH_PID_FILE=logfeeder.pid
++
++# SSL settings"
++# export LOGSEARCH_SSL="true"
++# export LOGSEARCH_KEYSTORE_LOCATION="/my/path/keystore.jks"
++# export LOGSEARCH_KEYSTORE_TYPE="jks"
++# export LOGSEARCH_TRUSTSTORE_LOCATION="/my/path/trutstore.jks"
++# export LOGSEARCH_TRUSTSTORE_TYPE="jks"
http://git-wip-us.apache.org/repos/asf/ambari/blob/7ff4a96c/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
----------------------------------------------------------------------
diff --cc ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index 9cc7ad0,7003c98..d31aa93
--- a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@@ -2777,20 -2786,6 +2777,19 @@@ public class Configuration
@Markdown(description = "Whether security password encryption is enabled or not. In case it is we store passwords in their own file(s); otherwise we store passwords in the Ambari credential store.")
public static final ConfigurationProperty<Boolean> SECURITY_PASSWORD_ENCRYPTON_ENABLED = new ConfigurationProperty<Boolean>("security.passwords.encryption.enabled", false);
-
+ /**
+ * The maximum number of authentication attempts permitted to a local user. Once the number of failures reaches this limit the user will be locked out. 0 indicates unlimited failures
+ */
+ @Markdown(description = "The maximum number of authentication attempts permitted to a local user. Once the number of failures reaches this limit the user will be locked out. 0 indicates unlimited failures.")
+ public static final ConfigurationProperty<Integer> MAX_LOCAL_AUTHENTICATION_FAILURES = new ConfigurationProperty<>(
+ "authentication.local.max.failures", 10);
+
+ /**
+ * A flag to determine whether locked out messages are to be shown to users, if relevant, when authenticating into Ambari
+ */
+ @Markdown(description = "Show or hide whether the user account is disabled or locked out, if relevant, when an authentication attempt fails.")
+ public static final ConfigurationProperty<String> SHOW_LOCKED_OUT_USER_MESSAGE = new ConfigurationProperty<>(
+ "authentication.local.show.locked.account.messages", "false");
private static final Logger LOG = LoggerFactory.getLogger(
Configuration.class);
http://git-wip-us.apache.org/repos/asf/ambari/blob/7ff4a96c/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7ff4a96c/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7ff4a96c/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7ff4a96c/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7ff4a96c/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7ff4a96c/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7ff4a96c/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7ff4a96c/ambari-server/src/main/resources/META-INF/persistence.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7ff4a96c/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_packages.json
----------------------------------------------------------------------
diff --cc ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_packages.json
index 6a0eadd,c3d0d9b..bb5a588
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_packages.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_packages.json
@@@ -1064,15 -1091,17 +1091,23 @@@
"livy": [
{
"conf_dir": "/etc/livy/conf",
- "current_dir": "{0}/current/livy-client/conf"
+ "current_dir": "{0}/current/livy-client/conf",
+ "component": "livy-client"
+ }
+ ],
+ "livy2": [
+ {
+ "conf_dir": "/etc/livy2/conf",
+ "current_dir": "{0}/current/livy2-client/conf",
+ "component": "livy2-client"
}
],
+ "livy2": [
+ {
+ "conf_dir": "/etc/livy2/conf",
+ "current_dir": "{0}/current/livy2-client/conf"
+ }
+ ],
"mahout": [
{
"conf_dir": "/etc/mahout/conf",