This is an automated email from the ASF dual-hosted git repository. jonathanhurley pushed a commit to branch branch-feature-AMBARI-14714 in repository https://gitbox.apache.org/repos/asf/ambari.git
commit e7a01f7b12db0a262f215a600b191d92aee67e41 Merge: 1edb62b b4398d5 Author: Jonathan Hurley <[email protected]> AuthorDate: Tue Sep 18 15:43:07 2018 -0400 Merge branch 'trunk' into branch-feature-AMBARI-14714 Merge branch 'trunk' into branch-feature-AMBARI-14714 .../main/resources/ui/admin-web/app/scripts/app.js | 2 +- .../python/ambari_agent/AlertSchedulerHandler.py | 4 +- .../src/main/python/ambari_agent/Hardware.py | 6 +- .../src/main/python/ambari_agent/security.py | 2 +- .../src/test/python/ambari_agent/TestHardware.py | 4 +- .../src/main/python/ambari_ws4py/websocket.py | 3 +- .../libraries/providers/hdfs_resource.py | 2 +- ambari-logsearch/ambari-logsearch-server/build.xml | 2 +- .../configsets/hadoop_logs/conf/solrconfig.xml | 4 +- .../logsearch/auth/filter/AbstractJWTFilter.java | 5 +- .../logsearch/common/LabelFallbackHandler.java | 20 ++- .../logsearch/common/LogSearchConstants.java | 4 +- .../ambari/logsearch/conf/AuthPropsConfig.java | 126 +++++++++++++- .../ambari/logsearch/conf/SecurityConfig.java | 24 ++- .../ambari/logsearch/conf/UIMappingConfig.java | 41 ++++- .../org/apache/ambari/logsearch/dao/RoleDao.java | 126 ++++++++++++++ .../org/apache/ambari/logsearch/dao/UserDao.java | 13 +- .../ambari/logsearch/manager/AuditLogsManager.java | 5 +- .../logsearch/manager/ServiceLogsManager.java | 3 +- .../logsearch/model/response/ServiceLogData.java | 10 ++ .../ambari/logsearch/solr/SolrConstants.java | 5 + .../logsearch/solr/model/SolrCommonLogData.java | 49 ++++++ .../logsearch/solr/model/SolrServiceLogData.java | 26 +++ .../logsearch/web/filters/LogsearchJWTFilter.java | 13 +- .../web/filters/LogsearchTrustedProxyFilter.java | 175 ++++++++++++++++++++ .../src/main/resources/roles.json | 5 + .../logsearch/common/LabelFallbackHandlerTest.java | 26 ++- .../apache/ambari/logsearch/dao/RoleDaoTest.java | 63 +++++++ .../search-box/search-box.component.html | 2 +- .../search-box/search-box.component.spec.ts | 17 +- ambari-logsearch/docker/Dockerfile | 2 +- ambari-logsearch/docker/bin/start.sh | 1 + .../test-config/logsearch/logsearch-sso.properties | 3 + .../test-config/logsearch/logsearch.properties | 2 + .../TimelineMetricClusterAggregatorSecond.java | 4 +- .../query/render/AlertSummaryGroupedRenderer.java | 12 ++ .../ambari/server/api/services/AmbariMetaInfo.java | 3 +- .../internal/AlertDefinitionResourceProvider.java | 2 +- .../internal/WidgetResourceProvider.java | 37 ++--- .../events/AlertDefinitionDisabledEvent.java | 17 +- .../alerts/AlertDefinitionDisabledListener.java | 15 ++ .../listeners/alerts/AlertReceivedListener.java | 8 + .../security/authorization/RoleAuthorization.java | 1 + .../src/main/resources/Ambari-DDL-Derby-CREATE.sql | 4 + .../src/main/resources/Ambari-DDL-MySQL-CREATE.sql | 4 + .../main/resources/Ambari-DDL-Oracle-CREATE.sql | 4 + .../main/resources/Ambari-DDL-Postgres-CREATE.sql | 4 + .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 4 + .../main/resources/Ambari-DDL-SQLServer-CREATE.sql | 4 + .../src/main/resources/stacks/PERF/check_host.sed | 20 +++ .../src/main/resources/stacks/stack_advisor.py | 7 + .../internal/WidgetResourceProviderTest.java | 2 +- ambari-web/app/assets/test/tests.js | 1 + ambari-web/app/controllers/installer.js | 2 +- ambari-web/app/controllers/main/host/details.js | 6 +- ambari-web/app/controllers/main/service/item.js | 2 +- ambari-web/app/messages.js | 4 +- .../app/mixins/common/configs/enhanced_configs.js | 33 ++-- .../app/mixins/common/widgets/time_range_mixin.js | 4 +- ambari-web/app/models/host.js | 2 +- ambari-web/app/models/host_component.js | 12 +- ambari-web/app/styles/common.less | 17 ++ ambari-web/app/styles/service_configurations.less | 3 + ambari-web/app/styles/wizard.less | 143 ++++++++++------ .../common/configs/config_versions_control.hbs | 2 +- .../common/configs/configs_comparison_cell.hbs | 4 +- .../common/configs/configs_comparison_row.hbs | 2 +- .../templates/common/configs/services_config.hbs | 4 +- .../app/templates/common/host_progress_popup.hbs | 2 +- .../common/modal_popups/log_tail_popup.hbs | 2 +- .../templates/main/alerts/definition_details.hbs | 2 +- .../main/dashboard/widgets/hbase_links.hbs | 6 +- .../main/dashboard/widgets/hdfs_links.hbs | 4 +- .../main/dashboard/widgets/yarn_links.hbs | 4 +- ambari-web/app/templates/main/host/logs.hbs | 2 +- .../metrics/flume/flume_agent_metrics_section.hbs | 4 +- .../app/templates/main/service/info/summary.hbs | 4 +- ambari-web/app/templates/wizard/step6.hbs | 71 ++++---- .../common/configs/config_versions_control_view.js | 4 +- .../configs/service_config_container_view.js | 5 +- ambari-web/app/views/main/host/details.js | 7 +- .../app/views/main/service/info/metrics_view.js | 1 + ambari-web/app/views/wizard/step6_view.js | 36 ++-- .../journalNode/step3_controller_test.js | 80 +++++++++ .../test/controllers/main/host/details_test.js | 11 +- ambari-web/test/models/host_component_test.js | 34 +++- .../configs/config_versions_control_view_test.js | 12 +- ambari-web/test/views/wizard/step6_view_test.js | 21 +-- .../stacks/HDF/2.0/services/stack_advisor.py | 3 + .../stacks/ODPi/2.0/services/stack_advisor.py | 3 + contrib/utils/perf/deploy-gce-perf-cluster.py | 19 ++- install-ambari-python.sh | 182 +++++++++++++++++++++ setup.py | 36 +++- 93 files changed, 1459 insertions(+), 284 deletions(-)
