ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject [50/50] ambari git commit: Merge branch 'trunk' into branch-feature-AMBARI-12556
Date Tue, 14 Mar 2017 18:42:34 GMT
Merge branch 'trunk' into branch-feature-AMBARI-12556


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: eb568132bd58fd734985c1aea57221b5afe247d8
Parents: 353cd9d 75f1a29
Author: Nate Cole <ncole@hortonworks.com>
Authored: Tue Mar 14 14:41:32 2017 -0400
Committer: Nate Cole <ncole@hortonworks.com>
Committed: Tue Mar 14 14:41:32 2017 -0400

----------------------------------------------------------------------
 .../scripts/controllers/users/UsersShowCtrl.js  |  10 +-
 .../ui/admin-web/app/scripts/i18n.config.js     |   4 +-
 .../resources/ui/admin-web/app/styles/main.css  |   5 +
 .../admin-web/app/views/stackVersions/list.html |   2 +-
 .../src/main/python/ambari_agent/ActionQueue.py |  53 +--
 .../main/python/ambari_agent/AmbariConfig.py    |   3 +
 .../src/main/python/ambari_agent/Controller.py  |  57 +--
 .../ambari_agent/CustomServiceOrchestrator.py   |   6 +-
 .../src/main/python/ambari_agent/ExitHelper.py  |   3 +
 .../ambari_agent/StatusCommandsExecutor.py      | 384 ++++++++++++++++---
 .../src/main/python/ambari_agent/main.py        |  35 +-
 .../test/python/ambari_agent/TestActionQueue.py |   6 +-
 .../test/python/ambari_agent/TestController.py  |   3 -
 .../src/test/python/ambari_agent/TestMain.py    |   9 +-
 .../resource_management/TestDatanodeHelper.py   |  16 +-
 .../python/resource_management/core/source.py   |   5 +-
 .../libraries/functions/stack_select.py         |   5 +-
 .../timeline/AbstractTimelineMetricsSink.java   |  16 +-
 .../ambari-metrics/datasource.js                |  45 ++-
 .../timeline/HadoopTimelineMetricsSink.java     |  15 +-
 .../conf/unix/metric_monitor.ini                |   2 +
 .../src/main/python/core/config_reader.py       |   7 +-
 .../src/main/python/core/host_info.py           |  41 +-
 .../src/test/python/core/TestHostInfo.py        | 147 ++++++-
 ambari-server/docs/api/v1/alert-definitions.md  |   2 +-
 ambari-server/docs/configuration/index.md       |  13 +-
 .../ambari/server/api/services/Result.java      |   2 +-
 .../server/configuration/Configuration.java     | 103 ++++-
 .../ambari/server/controller/AmbariServer.java  |   4 +
 .../server/controller/KerberosHelper.java       |   3 -
 .../server/controller/KerberosHelperImpl.java   | 104 ++---
 .../controller/RootServiceResponseFactory.java  |   5 +
 .../BlueprintConfigurationProcessor.java        |   5 +-
 .../internal/ClientConfigResourceProvider.java  |   3 +-
 .../upgrade/StackUpgradeFinishListener.java     |  14 +-
 .../events/publishers/AlertEventPublisher.java  |  21 +-
 .../system/impl/AmbariMetricSinkImpl.java       |   2 +-
 .../apache/ambari/server/orm/DBAccessor.java    |  11 +-
 .../ambari/server/orm/DBAccessorImpl.java       |  29 +-
 .../server/orm/entities/AlertNoticeEntity.java  |   4 +-
 .../AbstractPrepareKerberosServerAction.java    | 237 ++++++++----
 .../PrepareDisableKerberosServerAction.java     | 108 +-----
 .../PrepareEnableKerberosServerAction.java      |  19 +-
 .../PrepareKerberosIdentitiesServerAction.java  | 127 ++----
 .../org/apache/ambari/server/state/Service.java |   7 +
 .../apache/ambari/server/state/ServiceImpl.java |  33 +-
 .../state/stack/upgrade/HostOrderGrouping.java  |  15 +-
 .../server/upgrade/AbstractUpgradeCatalog.java  |  96 -----
 .../server/upgrade/UpgradeCatalog250.java       | 251 +++++++++---
 .../src/main/python/ambari_server/utils.py      |  14 +-
 .../src/main/python/ambari_server_main.py       |  28 +-
 .../0.1.0/configuration/ams-env.xml             |  16 +
 .../0.1.0/configuration/ams-grafana-ini.xml     |   2 +-
 .../0.1.0/configuration/ams-ssl-client.xml      |   3 +
 .../0.1.0/configuration/ams-ssl-server.xml      |   9 +
 .../0.1.0/package/scripts/metrics_grafana.py    |   4 +-
 .../package/scripts/metrics_grafana_util.py     |  42 ++
 .../0.1.0/package/scripts/params.py             |  23 +-
 .../package/templates/metric_monitor.ini.j2     |   2 +
 .../DRUID/0.9.2/package/scripts/superset.py     |   2 +-
 .../FLUME/1.4.0.2.0/metainfo.xml                |   4 +
 .../HDFS/3.0.0.3.0/configuration/hdfs-log4j.xml |   1 +
 .../package/scripts/hive_interactive.py         |   3 +-
 .../package/scripts/setup_ranger_knox.py        |  18 +-
 .../common-services/LOGSEARCH/0.5.0/alerts.json |   2 +
 .../LOGSEARCH/0.5.0/package/scripts/params.py   |   2 +-
 .../PXF/3.0.0/package/alerts/api_status.py      |  36 +-
 .../0.4.0/package/scripts/setup_ranger_xml.py   |   6 +
 .../RANGER_KMS/0.5.0.2.3/package/scripts/kms.py |  15 +
 .../0.5.0.2.3/package/scripts/params.py         |   5 +-
 .../0.60.0.2.2/package/scripts/service_check.py |   2 +-
 .../0.91.0.3.0/configuration/slider-client.xml  |  56 +++
 .../0.91.0.3.0/configuration/slider-env.xml     |  46 +++
 .../0.91.0.3.0/configuration/slider-log4j.xml   |  92 +++++
 .../SLIDER/0.91.0.3.0/kerberos.json             |  17 +
 .../SLIDER/0.91.0.3.0/metainfo.xml              | 109 ++++++
 .../package/files/hbaseSmokeVerify.sh           |  34 ++
 .../0.91.0.3.0/package/scripts/__init__.py      |  19 +
 .../SLIDER/0.91.0.3.0/package/scripts/params.py |  54 +++
 .../0.91.0.3.0/package/scripts/params_linux.py  |  80 ++++
 .../package/scripts/params_windows.py           |  45 +++
 .../0.91.0.3.0/package/scripts/service_check.py |  63 +++
 .../SLIDER/0.91.0.3.0/package/scripts/slider.py |  96 +++++
 .../0.91.0.3.0/package/scripts/slider_client.py |  71 ++++
 .../package/templates/storm-slider-env.sh.j2    |  38 ++
 .../SLIDER/0.91.0.3.0/service_advisor.py        | 133 +++++++
 .../SPARK2/2.0.0/configuration/spark2-env.xml   |   6 +-
 .../1.4.4.2.0/configuration/sqoop-site.xml      |   4 +
 .../common-services/STORM/0.9.1/kerberos.json   |  20 +-
 .../common-services/STORM/1.0.1/kerberos.json   |  20 +-
 .../YARN/3.0.0.3.0/service_advisor.py           |   8 +-
 .../configuration/zeppelin-shiro-ini.xml        |  71 ++--
 .../0.6.0.2.5/package/scripts/master.py         |  33 +-
 .../0.6.0.2.5/package/scripts/params.py         |  10 +
 .../services/HDFS/configuration/hdfs-log4j.xml  |   1 +
 .../stacks/HDP/2.2/services/stack_advisor.py    |  13 +-
 .../stacks/HDP/2.3/services/stack_advisor.py    |  44 +--
 .../stacks/HDP/2.3/upgrades/config-upgrade.xml  |   6 +
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml |  10 +-
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml |   8 +-
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml |   8 +-
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml |  12 +-
 .../stacks/HDP/2.3/upgrades/upgrade-2.3.xml     |  11 +-
 .../stacks/HDP/2.3/upgrades/upgrade-2.4.xml     |  11 +-
 .../stacks/HDP/2.3/upgrades/upgrade-2.5.xml     |   9 +-
 .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml     |  24 +-
 .../stacks/HDP/2.4/upgrades/config-upgrade.xml  |   5 +
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml |   8 +-
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml |   8 +-
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml |  13 +-
 .../stacks/HDP/2.4/upgrades/upgrade-2.4.xml     |  10 +-
 .../stacks/HDP/2.4/upgrades/upgrade-2.5.xml     |   9 +-
 .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml     |  24 +-
 .../stacks/HDP/2.5/services/HBASE/kerberos.json |   3 +-
 .../stacks/HDP/2.5/services/stack_advisor.py    |   8 +-
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml  |   5 +
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml |   5 +
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml     |   1 +
 .../YARN/configuration-mapred/mapred-site.xml   |  28 ++
 .../HDP/2.6/services/ZEPPELIN/metainfo.xml      |   2 +-
 .../stacks/HDP/3.0/services/SLIDER/metainfo.xml |  51 +++
 .../services/HDFS/configuration/hdfs-log4j.xml  |   1 +
 .../PERF/1.0/services/FAKEHBASE/kerberos.json   |   3 +-
 .../server/configuration/ConfigurationTest.java |  15 +-
 .../internal/AlertResourceProviderTest.java     |   4 +-
 .../BlueprintConfigurationProcessorTest.java    |  10 +-
 .../internal/UpgradeResourceProviderTest.java   |  54 +++
 .../upgrade/StackUpgradeFinishListenerTest.java |   1 +
 .../system/impl/TestAmbariMetricsSinkImpl.java  |   2 +-
 .../server/orm/dao/AlertsDAOCachedTest.java     |   4 +-
 ...AbstractPrepareKerberosServerActionTest.java |  30 +-
 .../services/CachedAlertFlushServiceTest.java   |   7 +-
 .../upgrade/AbstractUpgradeCatalogTest.java     |  64 ----
 .../server/upgrade/UpgradeCatalog250Test.java   | 265 +++++++++++--
 .../AMBARI_METRICS/test_metrics_grafana.py      |   4 +-
 .../2.0.6/YARN/test_yarn_service_check.py       |   2 +-
 .../stacks/2.2/common/test_stack_advisor.py     |   8 +-
 .../stacks/2.3/common/test_stack_advisor.py     |   2 +-
 .../stacks/2.5/HIVE/test_hive_server_int.py     |   2 +
 .../stacks/2.5/RANGER_KMS/test_kms_server.py    |  12 +
 .../stacks/2.5/common/test_stack_advisor.py     |  14 +-
 .../src/test/python/stacks/utils/RMFTestCase.py |   1 +
 ...test_kerberos_descriptor_2_5_infra_solr.json | 148 ++++++-
 .../data/stacks/HDP-2.1/service_components.json |  21 +-
 ambari-web/app/assets/test/tests.js             |   1 +
 .../controllers/main/host/combo_search_box.js   |   2 +-
 .../controllers/main/service/info/summary.js    |  45 +--
 ambari-web/app/controllers/main/service/item.js |   2 +
 .../main/service/reassign/step4_controller.js   |  17 +-
 .../main/service/reassign/step6_controller.js   |   9 +
 .../app/controllers/main/views_controller.js    |  32 +-
 .../app/controllers/wizard/step4_controller.js  |   6 +-
 ambari-web/app/messages.js                      |   6 +-
 .../configs/widgets/unique/num_llap_nodes.js    |   8 +-
 .../app/mixins/common/table_server_mixin.js     |   2 +-
 .../mixins/common/table_server_view_mixin.js    |   8 +-
 .../configs/component_actions_by_configs.js     |   2 +-
 .../wizard/wizardProgressPageController.js      |   6 +-
 .../app/mixins/wizard/wizard_menu_view.js       | 125 ++----
 ambari-web/app/models.js                        |   1 +
 .../app/models/alerts/alert_definition.js       |  13 +-
 .../app/models/configs/theme/sub_section.js     |   2 +-
 .../app/models/configs/theme/sub_section_tab.js |   9 +-
 ambari-web/app/models/view_instance.js          |  81 ++++
 ambari-web/app/routes/main.js                   |   4 +-
 ambari-web/app/routes/reassign_master_routes.js |  33 +-
 ambari-web/app/styles/alerts.less               |   8 +
 ambari-web/app/styles/application.less          |  39 +-
 .../app/styles/theme/bootstrap-ambari.css       |  13 +-
 ambari-web/app/styles/top-nav.less              |   3 +
 .../templates/common/host_progress_popup.hbs    |   2 +-
 .../main/service/info/service_alert_popup.hbs   |  19 +-
 .../service/info/summary/master_components.hbs  |   2 +-
 .../templates/main/service/services/hive.hbs    |   2 +-
 ambari-web/app/utils/config.js                  |   4 +-
 ambari-web/app/utils/validator.js               |   2 +-
 ambari-web/app/views/application.js             |  13 +-
 .../views/common/configs/config_diff_view.js    |  29 +-
 .../configs/service_config_layout_tab_view.js   |   4 +-
 .../common/host_progress_popup_body_view.js     |  20 +
 .../views/main/dashboard/config_history_view.js |   4 +
 .../main/service/info/components_list_view.js   |  23 +-
 .../app/views/main/service/reassign_view.js     |  32 --
 ambari-web/app/views/main/service/service.js    |  12 +-
 .../app/views/main/service/services/hdfs.js     |  17 +-
 .../app/views/main/service/services/hive.js     |  16 +-
 .../service/reassign/step4_controller_test.js   |  19 +-
 .../controllers/main/views_controller_test.js   |  38 +-
 .../common/table_server_view_mixin_test.js      |  27 +-
 .../component_actions_by_configs_test.js        |   2 +-
 .../test/models/alerts/alert_definition_test.js |   7 +
 .../configs/theme/sub_section_tab_test.js       |  41 +-
 ambari-web/test/models/view_instance_test.js    |  59 +++
 ambari-web/test/utils/config_test.js            |  30 ++
 ambari-web/test/utils/validator_test.js         |  21 +
 .../host_progress_popup_body_view_test.js       |  34 ++
 .../service/info/component_list_view_test.js    |  29 +-
 .../views/main/service/services/hdfs_test.js    |  40 +-
 .../vendor/scripts/theme/bootstrap-ambari.js    |  12 +-
 .../resources/ui/hive-web/app/styles/app.scss   |   6 +
 .../ui/hive-web/app/templates/splash.hbs        |   2 +-
 .../views/hive-next/src/main/resources/view.xml |   2 +-
 .../hive20/src/main/resources/ui/.jshintrc      |   2 +
 .../resources/ui/app/adapters/file-resource.js  |   1 -
 .../resources/ui/app/adapters/hdfs-viewer.js    |   1 +
 .../src/main/resources/ui/app/adapters/job.js   |   5 +-
 .../src/main/resources/ui/app/adapters/query.js |   5 +-
 .../resources/ui/app/adapters/saved-query.js    |   1 -
 .../resources/ui/app/adapters/table-info.js     |   2 +-
 .../src/main/resources/ui/app/adapters/table.js |   2 +-
 .../src/main/resources/ui/app/adapters/udf.js   |   8 -
 .../resources/ui/app/adapters/upload-table.js   |   4 +-
 .../resources/ui/app/components/create-table.js |   2 +-
 .../resources/ui/app/components/edit-table.js   |   6 +-
 .../ui/app/components/export-result.js          |   2 +-
 .../ui/app/components/fileresource-item.js      |   5 +-
 .../resources/ui/app/components/job-item.js     |   1 +
 .../resources/ui/app/components/list-filter.js  |   2 +-
 .../ui/app/components/notification-message.js   |   4 +-
 .../resources/ui/app/components/query-editor.js |   2 +-
 .../ui/app/components/query-result-table.js     |   9 +-
 .../app/components/table-advanced-settings.js   |   4 +-
 .../resources/ui/app/components/udf-item.js     | 153 +++++---
 .../main/resources/ui/app/components/udf-new.js |   2 +-
 .../ui/app/components/validated-text-field.js   |   2 +-
 .../ui/app/components/visual-explain.js         |  12 +-
 .../main/resources/ui/app/configs/datatypes.js  |   2 +-
 .../ui/app/controllers/service-check.js         |   8 +-
 .../resources/ui/app/helpers/extract-value.js   |   2 +-
 .../ui/app/helpers/format-column-size.js        |   2 +-
 .../resources/ui/app/models/table-property.js   |   2 +-
 .../main/resources/ui/app/models/worksheet.js   |   1 +
 .../hive20/src/main/resources/ui/app/router.js  |   2 +-
 .../main/resources/ui/app/routes/databases.js   |  25 ++
 .../ui/app/routes/databases/database/tables.js  |  59 ++-
 .../app/routes/databases/database/tables/new.js |  20 +-
 .../databases/database/tables/table/edit.js     |   1 +
 .../databases/database/tables/upload-table.js   |  58 ++-
 .../src/main/resources/ui/app/routes/jobs.js    |   6 +-
 .../src/main/resources/ui/app/routes/queries.js |   5 +-
 .../main/resources/ui/app/routes/queries/new.js |   9 +-
 .../resources/ui/app/routes/queries/query.js    | 173 +++++++--
 .../ui/app/routes/queries/query/log.js          |   4 +-
 .../resources/ui/app/routes/savedqueries.js     |   4 +-
 .../main/resources/ui/app/routes/settings.js    |   6 +-
 .../src/main/resources/ui/app/routes/udfs.js    |   6 +-
 .../main/resources/ui/app/routes/udfs/new.js    | 141 ++++---
 .../resources/ui/app/services/auto-refresh.js   | 148 +++++++
 .../src/main/resources/ui/app/services/jobs.js  |   6 +-
 .../src/main/resources/ui/app/services/query.js |  12 +-
 .../resources/ui/app/services/saved-queries.js  |  14 +-
 .../resources/ui/app/services/service-check.js  |   2 +-
 .../resources/ui/app/services/stats-service.js  |   6 +-
 .../ui/app/services/table-operations.js         |  22 +-
 .../src/main/resources/ui/app/services/udf.js   |  25 +-
 .../src/main/resources/ui/app/styles/app.scss   |   7 +
 .../components/table-advanced-settings.hbs      |   8 -
 .../ui/app/templates/components/udf-item.hbs    |  26 +-
 .../components/visual-explain-detail.hbs        |   3 +
 .../app/templates/components/visual-explain.hbs |   2 +-
 .../app/templates/databases/database/tables.hbs |   1 +
 .../main/resources/ui/app/templates/queries.hbs |  11 +-
 .../ui/app/templates/queries/query.hbs          |  35 +-
 .../main/resources/ui/app/transforms/date.js    |  50 +++
 .../ui/app/utils/hive-explainer/enhancer.js     |   2 +-
 .../app/utils/hive-explainer/renderer-force.js  |  21 +-
 .../ui/app/utils/hive-explainer/renderer.js     |  39 +-
 .../ui/app/utils/hive-explainer/transformer.js  |  11 +-
 .../src/main/resources/ui/config/environment.js |   6 +-
 .../views/hive20/src/main/resources/view.xml    |   9 +-
 .../ambari/view/OozieProxyImpersonator.java     |  42 +-
 .../org/apache/oozie/ambari/view/Utils.java     |  33 ++
 .../ui/app/components/bundle-config.js          |  15 +-
 .../ui/app/components/bundle-coord-config.js    |  28 +-
 .../resources/ui/app/components/coord-config.js |  25 +-
 .../ui/app/components/designer-errors.js        |   3 +
 .../ui/app/components/designer-workspace.js     |   1 +
 .../resources/ui/app/components/drafts-wf.js    |  84 +++-
 .../ui/app/components/flow-designer.js          | 108 ++++--
 .../ui/app/components/recent-projects.js        |  32 +-
 .../ui/app/domain/bundle/bundle-xml-importer.js |   4 +
 .../coordinator/coordinator-xml-importer.js     |   4 +
 .../ui/app/domain/cytoscape-flow-renderer.js    |   8 +-
 .../ui/app/domain/workflow-importer.js          |  14 +-
 .../src/main/resources/ui/app/styles/app.less   |  27 +-
 .../app/templates/components/bundle-config.hbs  |   4 +-
 .../components/bundle-coord-config.hbs          |   5 +-
 .../templates/components/designer-errors.hbs    |  11 +-
 .../templates/components/designer-workspace.hbs |   4 +-
 .../ui/app/templates/components/drafts-wf.hbs   | 175 ++++++---
 .../app/templates/components/flow-designer.hbs  |  17 +-
 .../templates/components/recent-projects.hbs    |  17 +-
 .../templates/components/workflow-actions.hbs   |   4 +-
 .../resources/ui/app/validators/workflow-dag.js |  11 +-
 294 files changed, 5259 insertions(+), 2175 deletions(-)
----------------------------------------------------------------------



Mime
View raw message