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/07e50d86 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/07e50d86 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/07e50d86 Branch: refs/heads/branch-feature-AMBARI-20859 Commit: 07e50d869fd901fdd5c9a1c866ec2e566dbf4e4e Parents: e5c1b24 70cf77e Author: Robert Levas <[email protected]> Authored: Mon Jul 10 16:58:31 2017 -0400 Committer: Robert Levas <[email protected]> Committed: Mon Jul 10 16:58:31 2017 -0400 ---------------------------------------------------------------------- .../libraries/functions/solr_cloud_util.py | 10 + .../libraries/functions/stack_features.py | 13 + .../libraries/functions/stack_tools.py | 39 + .../libraries/script/script.py | 19 +- .../src/main/resources/solr | 826 ++++++++--- .../ambari/infra/solr/AmbariSolrCloudCLI.java | 14 + .../infra/solr/AmbariSolrCloudClient.java | 8 + .../commands/RemoveAdminHandlersCommand.java | 46 + .../commands/SetClusterPropertyZkCommand.java | 6 +- .../InfraRuleBasedAuthorizationPluginTest.java | 5 + ambari-infra/pom.xml | 2 +- .../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/filter/FilterJSONTest.java | 12 +- .../configsets/audit_logs/conf/solrconfig.xml | 3 +- .../configsets/hadoop_logs/conf/solrconfig.xml | 3 +- .../main/configsets/history/conf/solrconfig.xml | 3 +- .../common/ShipperConfigDescriptionStorage.java | 67 + .../logsearch/dao/SolrSchemaFieldDao.java | 2 +- .../ambari/logsearch/doc/DocConstants.java | 1 + .../ambari/logsearch/manager/InfoManager.java | 9 + .../response/ShipperConfigDescriptionData.java | 52 + .../ambari/logsearch/rest/InfoResource.java | 10 + ambari-logsearch/docker/Dockerfile | 2 +- ambari-logsearch/docker/bin/start.sh | 4 +- ambari-logsearch/pom.xml | 2 +- .../server/api/query/JpaPredicateVisitor.java | 8 +- .../controller/ActionExecutionContext.java | 26 + .../controller/AmbariActionExecutionHelper.java | 26 +- .../BlueprintConfigurationProcessor.java | 59 +- .../ClusterStackVersionResourceProvider.java | 163 ++- .../ambari/server/state/ConfigHelper.java | 32 + .../ambari/server/topology/AmbariContext.java | 35 +- .../server/upgrade/UpgradeCatalog252.java | 61 + .../server/upgrade/UpgradeCatalog300.java | 18 + .../0.1.0/package/scripts/params.py | 3 + .../0.1.0/package/scripts/setup_infra_solr.py | 17 +- .../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 +- .../properties/audit_logs-solrconfig.xml.j2 | 3 +- .../properties/service_logs-solrconfig.xml.j2 | 3 +- .../package/alerts/alert_check_oozie_server.py | 8 +- .../STORM/0.9.1/package/scripts/nimbus.py | 8 +- .../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 +- .../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 +- .../BlueprintConfigurationProcessorTest.java | 41 +- ...ClusterStackVersionResourceProviderTest.java | 4 +- .../ClusterConfigurationRequestTest.java | 60 +- .../server/upgrade/UpgradeCatalog300Test.java | 33 + .../common-services/configs/hawq_default.json | 6 +- .../python/host_scripts/TestAlertDiskSpace.py | 16 +- .../stacks/2.1/STORM/test_storm_nimbus.py | 60 +- .../stacks/2.1/configs/default-storm-start.json | 14 + .../test/python/stacks/2.1/configs/default.json | 13 + .../stacks/2.1/configs/secured-storm-start.json | 13 + .../test/python/stacks/2.1/configs/secured.json | 15 +- .../stacks/2.4/AMBARI_INFRA/test_infra_solr.py | 3 + .../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 +- 92 files changed, 5983 insertions(+), 4081 deletions(-) ----------------------------------------------------------------------
