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/51a7baeb Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/51a7baeb Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/51a7baeb Branch: refs/heads/branch-feature-AMBARI-21674 Commit: 51a7baeb3dedda7a9b4a6582d0a8d148b0794a73 Parents: 10b6507 dc31e51 Author: Nate Cole <nc...@hortonworks.com> Authored: Thu Dec 14 07:43:50 2017 -0500 Committer: Nate Cole <nc...@hortonworks.com> Committed: Thu Dec 14 07:43:50 2017 -0500 ---------------------------------------------------------------------- .../app/views/userManagement/groupEdit.html | 2 +- .../userManagement/modals/groupCreate.html | 2 +- .../views/userManagement/modals/userCreate.html | 3 +- .../app/views/userManagement/userEdit.html | 2 +- .../core/providers/package/yumrpm.py | 13 +- .../functions/setup_ranger_plugin_xml.py | 14 +- .../config/api/LogSearchConfigFactory.java | 49 +- .../config/api/LogSearchConfigLogFeeder.java | 3 +- .../ambari-logsearch-logfeeder/.gitignore | 1 + .../ambari-logsearch-logfeeder/pom.xml | 62 ++- .../org/apache/ambari/logfeeder/LogFeeder.java | 167 +------ .../ambari/logfeeder/LogFeederCommandLine.java | 28 +- .../ambari/logfeeder/common/ConfigHandler.java | 47 +- .../ambari/logfeeder/common/ConfigItem.java | 8 +- .../logfeeder/common/LogEntryParseTester.java | 3 +- .../logfeeder/common/LogFeederConstants.java | 50 ++ .../logfeeder/conf/ApplicationConfig.java | 107 ++++ .../logfeeder/conf/InputSimulateConfig.java | 154 ++++++ .../logfeeder/conf/LogEntryCacheConfig.java | 118 +++++ .../ambari/logfeeder/conf/LogFeederProps.java | 226 +++++++++ .../logfeeder/conf/LogFeederSecurityConfig.java | 189 +++++++ .../logfeeder/conf/MetricsCollectorConfig.java | 113 +++++ .../apache/ambari/logfeeder/filter/Filter.java | 7 +- .../ambari/logfeeder/filter/FilterGrok.java | 7 +- .../ambari/logfeeder/filter/FilterKeyValue.java | 5 +- .../logfeeder/input/AbstractInputFile.java | 11 +- .../apache/ambari/logfeeder/input/Input.java | 25 +- .../logfeeder/input/InputConfigUploader.java | 82 +-- .../ambari/logfeeder/input/InputManager.java | 28 +- .../ambari/logfeeder/input/InputSimulate.java | 44 +- .../logfeeder/loglevelfilter/FilterLogData.java | 73 --- .../loglevelfilter/LogLevelFilterHandler.java | 89 +++- .../logfeeder/metrics/LogFeederAMSClient.java | 22 +- .../logfeeder/metrics/MetricsManager.java | 16 +- .../ambari/logfeeder/metrics/StatsLogger.java | 83 ++++ .../ambari/logfeeder/output/OutputFile.java | 5 +- .../ambari/logfeeder/output/OutputHDFSFile.java | 8 +- .../ambari/logfeeder/output/OutputKafka.java | 5 +- .../ambari/logfeeder/output/OutputManager.java | 36 +- .../ambari/logfeeder/output/OutputS3File.java | 8 +- .../ambari/logfeeder/output/OutputSolr.java | 10 +- .../logfeeder/util/LogFeederPropertiesUtil.java | 498 ------------------- .../apache/ambari/logfeeder/util/SSLUtil.java | 134 ----- .../shipper-conf/input.config-sample.json | 2 +- .../src/main/resources/log4j.xml | 15 +- .../src/main/resources/logfeeder.properties | 18 +- .../ambari/logfeeder/filter/FilterGrokTest.java | 3 +- .../ambari/logfeeder/filter/FilterJSONTest.java | 3 +- .../logfeeder/filter/FilterKeyValueTest.java | 3 +- .../ambari/logfeeder/input/InputFileTest.java | 11 +- .../logfeeder/input/InputManagerTest.java | 12 +- .../logconfig/LogConfigHandlerTest.java | 148 ------ .../logfeeder/metrics/MetricsManagerTest.java | 7 - .../logfeeder/output/OutputKafkaTest.java | 7 +- .../logfeeder/output/OutputManagerTest.java | 32 +- .../logfeeder/output/OutputS3FileTest.java | 9 +- .../ambari/logfeeder/output/OutputSolrTest.java | 10 +- .../ambari-logsearch-web/package.json | 3 +- .../ambari-logsearch-web/src/app/app.module.ts | 8 +- .../src/app/classes/filtering.ts | 2 +- .../src/app/classes/histogram-options.ts | 3 +- .../dropdown-list/dropdown-list.component.less | 24 +- .../filters-panel/filters-panel.component.html | 5 +- .../filters-panel/filters-panel.component.ts | 23 +- .../logs-container.component.html | 2 +- .../logs-container.component.less | 5 +- .../src/app/components/mixins.less | 35 +- .../search-box/search-box.component.html | 28 +- .../search-box/search-box.component.less | 30 +- .../search-box/search-box.component.spec.ts | 79 +++ .../search-box/search-box.component.ts | 214 ++++---- .../time-histogram.component.html | 29 ++ .../time-histogram.component.less | 162 +++++- .../time-histogram.component.spec.ts | 138 ++++- .../time-histogram/time-histogram.component.ts | 377 ++++++++++++-- .../app/services/component-actions.service.ts | 9 +- .../src/app/services/logs-container.service.ts | 26 +- .../src/assets/i18n/en.json | 13 +- ambari-logsearch/ambari-logsearch-web/yarn.lock | 6 +- .../ambari/server/agent/ExecutionCommand.java | 37 +- .../internal/ClientConfigResourceProvider.java | 2 + .../internal/HostResourceProvider.java | 2 +- .../internal/ScaleClusterRequest.java | 17 +- .../org/apache/ambari/server/state/Cluster.java | 9 + .../server/state/cluster/ClusterImpl.java | 31 ++ .../3.0.0.3.0/package/scripts/status_params.py | 2 +- .../0.12.0.2.0/package/scripts/params_linux.py | 2 + .../2.1.0.3.0/package/scripts/params_linux.py | 1 + .../package/scripts/setup_ranger_kafka.py | 14 +- .../0.8.1/package/scripts/setup_ranger_kafka.py | 15 +- .../package/scripts/setup_ranger_knox.py | 16 +- .../package/scripts/setup_ranger_knox.py | 16 +- .../0.9.1/package/scripts/setup_ranger_storm.py | 15 +- .../package/scripts/setup_ranger_storm.py | 15 +- .../configuration-mapred/mapred-site.xml | 2 +- .../2.1.0.2.0/package/scripts/params_linux.py | 41 +- .../configuration-mapred/mapred-site.xml | 2 +- .../YARN/3.0.0.3.0/kerberos.json | 4 +- .../3.0.0.3.0/package/scripts/params_linux.py | 41 +- .../scripts/interpreter_json_template.py | 152 ++++++ .../package/scripts/livy2_config_template.py | 112 ----- .../ZEPPELIN/0.7.0/package/scripts/master.py | 24 +- .../package/scripts/spark2_config_template.py | 84 ---- .../stacks/HDP/2.6/upgrades/config-upgrade.xml | 2 +- .../ExecutionCommandWrapperTest.java | 5 + .../AmbariCustomCommandExecutionHelperTest.java | 46 ++ .../internal/ScaleClusterRequestTest.java | 38 +- .../apache/ambari/server/orm/OrmTestHelper.java | 3 + .../2.6/ZEPPELIN/interpreter_json_generated.py | 2 +- .../controllers/main/service/info/configs.js | 46 +- ambari-web/app/messages.js | 1 + .../mixins/common/configs/configs_comparator.js | 1 - .../app/mixins/common/configs/configs_loader.js | 8 +- ambari-web/app/models/configs/config_group.js | 8 + ambari-web/app/models/repository.js | 3 +- ambari-web/app/styles/application.less | 243 +-------- ambari-web/app/styles/common.less | 1 + ambari-web/app/styles/modal_popups.less | 8 +- .../app/styles/service_configurations.less | 297 +++++++++++ ambari-web/app/styles/widgets.less | 7 +- ambari-web/app/styles/wizard.less | 19 +- ambari-web/app/templates.js | 2 + .../common/configs/compare_property.hbs | 38 -- .../common/configs/configs_comparison_cell.hbs | 26 + .../common/configs/configs_comparison_row.hbs | 79 +++ .../app/templates/common/configs/controls.hbs | 12 +- .../templates/common/configs/service_config.hbs | 30 +- .../common/configs/service_config_category.hbs | 120 ++--- .../service_config_layout_tab_compare.hbs | 80 +++ .../common/configs/service_config_wizard.hbs | 8 +- .../comparison/config_widget_comparison.hbs | 37 -- .../common/configs/widgets/controls.hbs | 15 - .../templates/common/filter_combo_cleanable.hbs | 7 +- .../app/templates/main/host/configs_service.hbs | 2 +- .../app/templates/main/service/info/configs.hbs | 2 +- ambari-web/app/views.js | 3 +- .../common/configs/compare_property_view.js | 25 - .../configs/config_versions_control_view.js | 39 +- .../configs/overriddenPropertyRow_view.js | 31 -- .../service_config_layout_tab_compare_view.js | 31 ++ .../views/common/configs/service_config_view.js | 7 +- .../configs/service_configs_by_category_view.js | 17 +- .../comparison/config_widget_comparison_view.js | 23 - .../app/views/common/filter_combo_cleanable.js | 6 +- .../upgrade_version_column_view.js | 11 +- .../common/configs/configs_comparator_test.js | 5 - .../config_versions_control_view_test.js | 1 - .../configs/overriddenProperty_view_test.js | 42 -- .../service_configs_by_category_view_test.js | 18 +- 149 files changed, 3697 insertions(+), 2472 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/51a7baeb/ambari-web/app/messages.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/51a7baeb/ambari-web/app/styles/wizard.less ----------------------------------------------------------------------
