You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2017/07/14 12:38:21 UTC
[31/31] ambari git commit: Merge branch 'trunk' into
branch-feature-logsearch-ui
Merge branch 'trunk' into branch-feature-logsearch-ui
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0256fb7f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0256fb7f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0256fb7f
Branch: refs/heads/branch-feature-logsearch-ui
Commit: 0256fb7f76635d10d56020ae9bf30680795fe2fd
Parents: c9338e6 63186bf
Author: ababiichuk <ab...@hortonworks.com>
Authored: Fri Jul 14 15:28:54 2017 +0300
Committer: ababiichuk <ab...@hortonworks.com>
Committed: Fri Jul 14 15:28:54 2017 +0300
----------------------------------------------------------------------
.../python/ambari_commons/get_ambari_version.py | 44 +
.../libraries/functions/conf_select.py | 56 +-
.../libraries/functions/stack_features.py | 41 +-
.../libraries/functions/stack_tools.py | 39 +
.../libraries/script/script.py | 19 +-
.../api/ShipperConfigElementDescription.java | 59 +
.../api/ShipperConfigTypeDescription.java | 44 +
.../model/inputconfig/impl/ConditionsImpl.java | 13 +
.../model/inputconfig/impl/FieldsImpl.java | 14 +
.../inputconfig/impl/FilterDescriptorImpl.java | 51 +
.../impl/FilterGrokDescriptorImpl.java | 24 +
.../impl/FilterKeyValueDescriptorImpl.java | 28 +
.../model/inputconfig/impl/InputConfigImpl.java | 18 +
.../inputconfig/impl/InputDescriptorImpl.java | 101 ++
.../impl/InputFileBaseDescriptorImpl.java | 27 +
.../impl/InputS3FileDescriptorImpl.java | 16 +
.../impl/MapAnonymizeDescriptorImpl.java | 21 +-
.../inputconfig/impl/MapDateDescriptorImpl.java | 20 +-
.../impl/MapFieldCopyDescriptorImpl.java | 14 +-
.../impl/MapFieldDescriptorImpl.java | 33 +
.../impl/MapFieldNameDescriptorImpl.java | 14 +-
.../impl/MapFieldValueDescriptorImpl.java | 20 +-
.../inputconfig/impl/PostMapValuesAdapter.java | 2 +-
.../ambari-logsearch-logfeeder/docs/filter.md | 4 +-
.../ambari-logsearch-logfeeder/docs/input.md | 10 +-
.../docs/postMapValues.md | 2 +-
.../logfeeder/common/LogEntryParseTester.java | 2 +-
.../ambari/logfeeder/mapper/MapperDate.java | 42 +-
.../ambari/logfeeder/filter/FilterJSONTest.java | 12 +-
.../common/ShipperConfigDescriptionStorage.java | 67 +
.../ambari/logsearch/doc/DocConstants.java | 1 +
.../ambari/logsearch/manager/InfoManager.java | 9 +
.../response/ShipperConfigDescriptionData.java | 52 +
.../ambari/logsearch/rest/InfoResource.java | 10 +
.../server/api/query/JpaPredicateVisitor.java | 8 +-
.../controller/ActionExecutionContext.java | 28 +
.../controller/AmbariActionExecutionHelper.java | 27 +-
.../controller/DeleteIdentityHandler.java | 77 +-
.../server/controller/KerberosHelper.java | 2 +-
.../server/controller/KerberosHelperImpl.java | 5 +-
.../BlueprintConfigurationProcessor.java | 59 +-
.../ClusterStackVersionResourceProvider.java | 163 ++-
.../utilities/KerberosIdentityCleaner.java | 88 +-
.../utilities/RemovableIdentities.java | 145 ++
.../controller/utilities/UsedIdentities.java | 101 ++
.../ServiceComponentUninstalledEvent.java | 6 +
.../server/events/ServiceRemovedEvent.java | 29 +-
.../ambari/server/orm/dao/ClusterDAO.java | 15 +
.../orm/entities/ClusterConfigEntity.java | 3 +
.../upgrades/UpgradeUserKerberosDescriptor.java | 142 +-
.../org/apache/ambari/server/state/Cluster.java | 7 +
.../ambari/server/state/ConfigHelper.java | 32 +
.../apache/ambari/server/state/ServiceImpl.java | 14 +-
.../ambari/server/state/UpgradeContext.java | 16 +-
.../server/state/cluster/ClusterImpl.java | 9 +
.../AbstractKerberosDescriptorContainer.java | 12 +
.../kerberos/KerberosComponentDescriptor.java | 15 -
.../kerberos/KerberosIdentityDescriptor.java | 14 +-
.../ambari/server/topology/AmbariContext.java | 46 +-
.../server/upgrade/UpgradeCatalog252.java | 61 +
.../HBASE/0.96.0.2.0/package/scripts/hbase.py | 12 +-
.../0.96.0.2.0/package/scripts/params_linux.py | 3 +
.../package/alerts/alert_hive_metastore.py | 11 +-
.../package/alerts/alert_llap_app_status.py | 12 +-
.../HIVE/0.12.0.2.0/package/scripts/hive.py | 3 +-
.../0.12.0.2.0/package/scripts/params_linux.py | 6 +
.../0.12.0.2.0/package/scripts/service_check.py | 3 +-
.../package/alerts/alert_check_oozie_server.py | 8 +-
.../SPARK/1.2.1/package/scripts/params.py | 11 +-
.../SPARK/1.2.1/package/scripts/setup_spark.py | 6 +-
.../1.2.1/package/scripts/spark_service.py | 6 +-
.../0.6.0.2.5/configuration/zeppelin-env.xml | 2 +-
.../resources/host_scripts/alert_disk_space.py | 10 +-
.../host_scripts/alert_version_select.py | 16 +-
.../HDP/2.0.6/configuration/cluster-env.xml | 16 +-
.../HDP/2.0.6/properties/stack_features.json | 852 +++++------
.../HDP/2.0.6/properties/stack_tools.json | 16 +-
.../stacks/HDP/2.5/services/stack_advisor.py | 5 +-
.../resources/stacks/HDP/2.6/repos/repoinfo.xml | 6 +-
.../services/HIVE/configuration/hive-env.xml | 78 +-
.../HIVE/configuration/hive-interactive-env.xml | 62 +-
.../services/HIVE/configuration/hive-site.xml | 35 +
.../stacks/HDP/2.6/services/HIVE/kerberos.json | 151 ++
.../stacks/HDP/2.6/services/YARN/kerberos.json | 2 +-
.../PERF/1.0/configuration/cluster-env.xml | 16 +-
.../PERF/1.0/properties/stack_features.json | 38 +-
.../stacks/PERF/1.0/properties/stack_tools.json | 16 +-
.../src/main/resources/stacks/stack_advisor.py | 19 +-
.../BlueprintConfigurationProcessorTest.java | 41 +-
...ClusterStackVersionResourceProviderTest.java | 4 +-
.../utilities/KerberosIdentityCleanerTest.java | 102 +-
.../server/orm/dao/ServiceConfigDAOTest.java | 12 +
.../UpgradeUserKerberosDescriptorTest.java | 59 +-
.../ClusterConfigurationRequestTest.java | 60 +-
.../src/test/python/TestStackFeature.py | 44 +-
.../common-services/configs/hawq_default.json | 6 +-
.../python/host_scripts/TestAlertDiskSpace.py | 16 +-
.../2.0.6/HBASE/test_phoenix_queryserver.py | 23 -
.../stacks/2.0.6/HIVE/test_hive_server.py | 2 +
.../stacks/2.0.6/YARN/test_historyserver.py | 21 +-
.../test/python/stacks/2.0.6/configs/nn_eu.json | 2 +-
.../stacks/2.0.6/configs/nn_eu_standby.json | 2 +-
.../2.1/configs/hive-metastore-upgrade.json | 2 +-
.../python/stacks/2.2/configs/knox_upgrade.json | 2 +-
.../stacks/2.5/common/test_stack_advisor.py | 150 +-
.../2.5/configs/ranger-admin-default.json | 990 ++++++-------
.../2.5/configs/ranger-admin-secured.json | 1108 +++++++--------
.../stacks/2.5/configs/ranger-kms-default.json | 1158 +++++++--------
.../stacks/2.5/configs/ranger-kms-secured.json | 1320 +++++++++---------
.../2.6/configs/ranger-admin-default.json | 953 +++++++------
.../2.6/configs/ranger-admin-secured.json | 1066 +++++++-------
.../src/test/python/stacks/utils/RMFTestCase.py | 8 +-
ambari-web/app/controllers/main/service.js | 13 +-
ambari-web/app/utils/ajax/ajax.js | 22 +
.../test/controllers/main/service_test.js | 4 +-
.../hive20/src/main/resources/ui/package.json | 1 +
.../src/main/resources/ui/package.json | 1 +
117 files changed, 6255 insertions(+), 4411 deletions(-)
----------------------------------------------------------------------