Merge branch 'trunk' into branch-alerts-dev
Conflicts:
ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2262400c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2262400c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2262400c
Branch: refs/heads/branch-alerts-dev
Commit: 2262400c6057aec451027f432b83f2c88ac1d8c3
Parents: 05da121 3035978
Author: Jonathan Hurley <jhur...@hortonworks.com>
Authored: Thu Sep 11 15:02:05 2014 -0400
Committer: Jonathan Hurley <jhur...@hortonworks.com>
Committed: Thu Sep 11 15:02:05 2014 -0400
----------------------------------------------------------------------
.../ui/admin-web/app/scripts/services/View.js | 6 +-
.../app/views/ambariViews/listTable.html | 2 +-
ambari-server/conf/unix/ambari.properties | 1 +
.../server/api/services/ComponentService.java | 5 +-
.../api/services/HostComponentService.java | 5 +-
.../server/configuration/Configuration.java | 4 +
.../controller/RequestStatusResponse.java | 12 +
.../internal/AbstractResourceProvider.java | 3 +
.../AmbariPrivilegeResourceProvider.java | 8 +-
.../internal/BaseBlueprintProcessor.java | 7 +-
.../internal/ClientConfigResourceProvider.java | 5 +-
.../internal/ClusterResourceProvider.java | 17 +-
.../internal/ServiceResourceProvider.java | 14 +-
.../internal/ViewVersionResourceProvider.java | 3 +
.../server/orm/entities/AlertCurrentEntity.java | 19 ++
.../ambari/server/orm/entities/ViewEntity.java | 29 +-
.../server/upgrade/UpgradeCatalog161.java | 2 +-
.../server/upgrade/UpgradeCatalog170.java | 86 ++++++
.../server/view/configuration/ViewConfig.java | 14 +
ambari-server/src/main/python/bootstrap.py | 24 +-
.../main/resources/Ambari-DDL-MySQL-CREATE.sql | 3 +-
.../main/resources/Ambari-DDL-Oracle-CREATE.sql | 3 +-
.../resources/Ambari-DDL-Postgres-CREATE.sql | 3 +-
.../Ambari-DDL-Postgres-EMBEDDED-CREATE.sql | 3 +-
.../services/HIVE/package/scripts/params.py | 6 +-
.../services/OOZIE/package/scripts/oozie.py | 2 +-
.../OOZIE/package/scripts/oozie_service.py | 2 +-
.../services/OOZIE/package/scripts/params.py | 10 +
.../2.1.GlusterFS/services/STORM/metainfo.xml | 5 +
.../2.1.GlusterFS/services/YARN/metainfo.xml | 1 +
.../AmbariPrivilegeResourceProviderTest.java | 1 +
.../internal/BlueprintResourceProviderTest.java | 15 +
.../ClientConfigResourceProviderTest.java | 16 +-
.../internal/ClusterResourceProviderTest.java | 239 ++++++++++++---
.../internal/RequestResourceProviderTest.java | 16 +-
.../internal/ServiceResourceProviderTest.java | 122 +++++++-
.../server/orm/entities/ViewEntityTest.java | 11 +
.../server/upgrade/UpgradeCatalog161Test.java | 2 +-
.../server/upgrade/UpgradeCatalog170Test.java | 49 +++-
.../view/configuration/ViewConfigTest.java | 23 ++
ambari-server/src/test/python/TestBootstrap.py | 29 +-
ambari-web/app/app.js | 3 +
.../app/controllers/wizard/step5_controller.js | 2 +-
.../app/controllers/wizard/step6_controller.js | 2 +-
.../app/controllers/wizard/step8_controller.js | 2 +-
ambari-web/app/data/HDP2/config_mapping.js | 4 +-
ambari-web/app/data/config_mapping.js | 4 +-
ambari-web/app/data/site_properties.js | 2 +-
ambari-web/app/styles/application.less | 9 +-
.../common/configs/config_history_flow.hbs | 12 +-
.../main/dashboard/widgets/cluster_metrics.hbs | 2 +-
.../main/dashboard/widgets/hbase_links.hbs | 2 +-
.../main/dashboard/widgets/hdfs_links.hbs | 2 +-
.../main/dashboard/widgets/mapreduce_links.hbs | 2 +-
.../main/dashboard/widgets/mapreduce_slots.hbs | 2 +-
.../main/dashboard/widgets/pie_chart.hbs | 2 +-
.../main/dashboard/widgets/simple_text.hbs | 2 +-
.../templates/main/dashboard/widgets/uptime.hbs | 2 +-
ambari-web/app/utils/config.js | 19 +-
.../views/common/configs/config_history_flow.js | 5 +
ambari-web/app/views/main/dashboard/widget.js | 4 +-
ambari-web/app/views/main/dashboard/widgets.js | 14 +
ambari-web/vendor/scripts/jquery.hoverIntent.js | 115 ++++++++
contrib/views/slider/pom.xml | 8 -
.../view/slider/SliderAppsViewController.java | 5 +
.../slider/SliderAppsViewControllerImpl.java | 262 +++++------------
.../apache/ambari/view/slider/ViewStatus.java | 33 +--
.../view/slider/clients/AmbariClient.java | 3 -
.../slider/clients/AmbariInternalClient.java | 292 -------------------
.../slider/rest/client/JMXMetricHolder.java | 50 ++++
.../slider/rest/client/SliderAppJmxHelper.java | 1 -
.../resources/ui/app/assets/data/apps/apps.json | 16 +-
.../assets/data/resource/service_configs.json | 38 +++
.../ui/app/components/configSection.js | 16 +-
.../createAppWizard/step1_controller.js | 41 ++-
.../createAppWizard/step2_controller.js | 3 +-
.../createAppWizard/step3_controller.js | 123 +++++++-
.../ui/app/controllers/slider_app_controller.js | 127 ++++++--
.../app/controllers/slider_apps_controller.js | 8 +-
.../src/main/resources/ui/app/helpers/ajax.js | 9 +
.../src/main/resources/ui/app/initialize.js | 19 +-
.../ui/app/mappers/slider_apps_mapper.js | 4 +-
.../main/resources/ui/app/mixins/with_panels.js | 50 ++++
.../resources/ui/app/models/config_property.js | 44 +++
.../main/resources/ui/app/models/slider_app.js | 24 +-
.../resources/ui/app/models/slider_app_type.js | 2 +-
.../resources/ui/app/styles/application.less | 46 ++-
.../ui/app/templates/common/config.hbs | 37 +++
.../app/templates/components/configSection.hbs | 95 +++---
.../ui/app/templates/slider_app/configs.hbs | 36 ++-
.../ui/app/templates/slider_app/flex_popup.hbs | 39 +++
.../ui/app/templates/slider_app/summary.hbs | 10 +-
.../src/main/resources/ui/app/translations.js | 9 +-
.../ui/app/views/common/config_set_view.js | 56 ++++
.../ui/app/views/slider_app/configs_view.js | 57 ++++
.../views/slider/src/main/resources/view.xml | 23 +-
96 files changed, 1846 insertions(+), 780 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/2262400c/ambari-server/conf/unix/ambari.properties
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/2262400c/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/2262400c/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertCurrentEntity.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/2262400c/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
----------------------------------------------------------------------
diff --cc
ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
index 71cd2d7,0e8aea5..145096d
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog170.java
@@@ -73,7 -80,7 +80,8 @@@ import org.apache.ambari.server.state.C
import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.Config;
import org.apache.ambari.server.state.ConfigHelper;
+import org.apache.ambari.server.state.alert.Scope;
+ import org.apache.ambari.server.utils.StageUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/ambari/blob/2262400c/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/2262400c/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/2262400c/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/2262400c/ambari-server/src/main/resources/Ambari-DDL-Postgres-EMBEDDED-CREATE.sql
----------------------------------------------------------------------
