ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject [13/13] ambari git commit: Merge branch 'trunk' into branch-dev-patch-upgrade
Date Tue, 29 Nov 2016 16:24:30 GMT
Merge branch 'trunk' into branch-dev-patch-upgrade


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f70591b1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f70591b1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f70591b1

Branch: refs/heads/branch-dev-patch-upgrade
Commit: f70591b13d3f037fac58d8da4476ba7305ffc887
Parents: 1f8b527 a952843
Author: Nate Cole <ncole@hortonworks.com>
Authored: Tue Nov 29 11:24:09 2016 -0500
Committer: Nate Cole <ncole@hortonworks.com>
Committed: Tue Nov 29 11:24:09 2016 -0500

----------------------------------------------------------------------
 .../views/stackVersions/stackVersionPage.html   |   2 +-
 .../org/apache/ambari/logsearch/LogSearch.java  |  15 +-
 .../logsearch/common/LogSearchConstants.java    |   1 +
 .../AbstractOperationHolderConverter.java       |   9 +
 ...actServiceLogRequestFacetQueryConverter.java |  44 ++
 .../BaseServiceLogRequestQueryConverter.java    |   1 +
 ...ServiceLogAnyGraphRequestQueryConverter.java |  13 +
 ...eLogComponentLevelRequestQueryConverter.java |  15 +-
 ...eLogComponentRequestFacetQueryConverter.java |  15 +-
 ...rviceLogLevelCountRequestQueryConverter.java |  16 +
 ...eLogLevelDateRangeRequestQueryConverter.java |  16 +-
 ...erviceLogTreeRequestFacetQueryConverter.java |  17 +-
 .../ambari/logsearch/doc/DocConstants.java      |   1 +
 .../logsearch/graph/GraphDataGenerator.java     |  26 +-
 .../logsearch/manager/ServiceLogsManager.java   |   2 +-
 .../request/ServiceLogParamDefinition.java      |   6 +
 .../request/impl/BaseServiceLogRequest.java     |  13 +
 .../LogsearchKRBAuthenticationFilter.java       |   4 +-
 .../src/main/resources/logsearch.properties     |   2 +-
 .../dashboard/BubbleGraphTableLayoutView.js     |   4 +-
 .../views/dashboard/ComponentListView.js        |   2 +-
 .../scripts/views/dashboard/HostListView.js     |  14 +-
 .../main/webapp/scripts/views/tabs/TreeView.js  |  10 +-
 .../webapp/templates/tabs/TreeView_tmpl.html    | 115 ++--
 ...ComponentLevelRequestQueryConverterTest.java |   7 +-
 ...ComponentRequestFacetQueryConverterTest.java |   4 +-
 .../ambari/server/checks/CheckDescription.java  |  13 +
 .../server/checks/ServicePresenceCheck.java     | 177 ++++++
 .../upgrades/RangerKmsProxyConfig.java          |  95 +++
 .../configuration/logfeeder-ambari-config.xml   |  37 ++
 .../configuration/logfeeder-output-config.xml   |  37 ++
 .../configuration/logsearch-properties.xml      |  40 ++
 .../LOGSEARCH/0.5.0/metainfo.xml                |   5 +
 .../LOGSEARCH/0.5.0/package/scripts/params.py   |  17 +-
 .../0.5.0/package/scripts/setup_logfeeder.py    |  10 +
 .../templates/input.config-ambari.json.j2       | 602 -------------------
 .../package/templates/output.config.json.j2     |  61 --
 .../properties/input.config-ambari.json.j2      | 602 +++++++++++++++++++
 .../0.5.0/properties/output.config.json.j2      |  61 ++
 .../0.6.0.2.5/package/scripts/master.py         |  15 +-
 .../0.6.0.2.5/package/scripts/params.py         |  28 +-
 .../ZEPPELIN/0.6.0.2.5/role_command_order.json  |   2 +-
 .../HDP/2.0.6/configuration/cluster-env.xml     |   6 +
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml |   7 +
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml |   7 +
 .../stacks/HDP/2.3/upgrades/upgrade-2.5.xml     |  11 +
 .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml     |  11 +
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml |   7 +
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml |   7 +
 .../stacks/HDP/2.4/upgrades/upgrade-2.5.xml     |  11 +
 .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml     |  11 +
 .../server/checks/ServicePresenceCheckTest.java | 217 +++++++
 .../upgrades/RangerKmsProxyConfigTest.java      | 141 +++++
 .../stacks/2.4/LOGSEARCH/test_logfeeder.py      |  14 +-
 .../test/python/stacks/2.4/configs/default.json |   6 +
 .../controllers/main/service/add_controller.js  |  11 +-
 .../configs/services/logsearch_properties.js    |  51 +-
 ambari-web/app/messages.js                      |   3 +
 ambari-web/app/styles/application.less          |  10 +-
 ambari-web/app/styles/bootstrap_overrides.less  |   9 +
 .../app/styles/enhanced_service_dashboard.less  | 343 ++++-------
 ambari-web/app/styles/hosts.less                |   3 -
 .../app/styles/theme/bootstrap-ambari.css       |   5 +-
 .../modal_popups/widget_browser_popup.hbs       | 108 ++--
 .../main/service/widgets/create/expression.hbs  |  36 +-
 .../main/service/widgets/create/step1.hbs       |  18 +-
 .../main/service/widgets/create/step2.hbs       |  22 +-
 .../service/widgets/create/step2_add_metric.hbs |  12 +-
 .../main/service/widgets/create/step2_graph.hbs |   4 +-
 .../service/widgets/create/step2_number.hbs     |   4 +-
 .../service/widgets/create/step2_template.hbs   |   4 +-
 .../main/service/widgets/create/step3.hbs       |  42 +-
 .../create/widget_property_threshold.hbs        |  18 +-
 ambari-web/app/views/common/chosen_plugin.js    |  21 +-
 ambari-web/app/views/common/controls_view.js    |   2 +-
 ambari-web/app/views/main/dashboard/widgets.js  |  17 +-
 .../main/service/widgets/create/step2_view.js   |   2 +
 .../main/service/add_controller_test.js         |  29 +-
 .../test/views/main/dashboard/widgets_test.js   |  11 +-
 79 files changed, 2193 insertions(+), 1224 deletions(-)
----------------------------------------------------------------------



Mime
View raw message