You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2014/10/06 23:04:11 UTC
[49/50] [abbrv] git commit: Merge branch 'trunk' into
branch-alerts-dev
Merge branch 'trunk' into branch-alerts-dev
Conflicts:
ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractControllerResourceProvider.java
ambari-server/src/main/resources/key_properties.json
ambari-server/src/main/resources/properties.json
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cc2d9341
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cc2d9341
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cc2d9341
Branch: refs/heads/trunk
Commit: cc2d9341336218878af81bea0cc8ee7fc2a7d9ec
Parents: 9919b3f 811ea58
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Mon Oct 6 16:27:12 2014 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Mon Oct 6 16:27:12 2014 -0400
----------------------------------------------------------------------
.../resources/ControllerResourceDefinition.java | 60 ----
.../resources/ResourceInstanceFactoryImpl.java | 6 -
.../server/api/services/ControllerService.java | 98 -------
.../server/api/util/StackExtensionHelper.java | 14 +-
.../AbstractControllerResourceProvider.java | 2 -
.../internal/ControllerResourceProvider.java | 282 -------------------
.../controller/internal/ControllerType.java | 65 -----
.../internal/StackDefinedPropertyProvider.java | 10 +-
.../metrics/RestMetricsPropertyProvider.java | 19 +-
.../ambari/server/controller/spi/Resource.java | 2 -
ambari-server/src/main/python/ambari-server.py | 13 +-
.../src/main/resources/key_properties.json | 3 -
.../src/main/resources/properties.json | 9 -
.../stacks/HDP/2.2/services/HIVE/metainfo.xml | 5 +
.../stacks/HDP/2.2/services/stack_advisor.py | 5 +-
.../api/util/StackExtensionHelperTest.java | 27 ++
.../stacks/2.2/common/test_stack_advisor.py | 137 +++++++--
.../single_stack/ABC/1.0.0/metainfo.xml | 22 ++
.../ABC/1.0.0/services/HDFS/metainfo.xml | 193 +++++++++++++
.../ui/app/scripts/models/jobs/tez_dag.js | 4 +-
.../main/resources/ui/app/models/slider_app.js | 16 ++
.../resources/ui/app/templates/slider_apps.hbs | 4 +-
.../ui/app/views/common/filter_view.js | 4 +-
.../resources/ui/app/views/common/table_view.js | 2 +-
.../resources/ui/app/views/slider_apps_view.js | 15 +-
.../ui/test/unit/views/slider_apps_view_test.js | 37 +++
26 files changed, 469 insertions(+), 585 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/cc2d9341/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/cc2d9341/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractControllerResourceProvider.java
----------------------------------------------------------------------
diff --cc ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractControllerResourceProvider.java
index f3f92a1,17df861..5810633
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractControllerResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractControllerResourceProvider.java
@@@ -149,16 -149,8 +149,14 @@@ public abstract class AbstractControlle
return new RecommendationResourceProvider(propertyIds, keyPropertyIds, managementController);
case Validation:
return new ValidationResourceProvider(propertyIds, keyPropertyIds, managementController);
+ case Alert:
+ return new AlertResourceProvider(propertyIds, keyPropertyIds, managementController);
case AlertDefinition:
return new AlertDefinitionResourceProvider(propertyIds, keyPropertyIds, managementController);
+ case AlertGroup:
+ return new AlertGroupResourceProvider(propertyIds, keyPropertyIds, managementController);
+ case AlertTarget:
+ return new AlertTargetResourceProvider(propertyIds, keyPropertyIds, managementController);
- case Controller:
- return new ControllerResourceProvider(propertyIds, keyPropertyIds, managementController);
case ClientConfig:
return new ClientConfigResourceProvider(propertyIds, keyPropertyIds, managementController);
default:
http://git-wip-us.apache.org/repos/asf/ambari/blob/cc2d9341/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/Resource.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/cc2d9341/ambari-server/src/main/resources/key_properties.json
----------------------------------------------------------------------
diff --cc ambari-server/src/main/resources/key_properties.json
index d127bc5,b4dfbf7..085dc11
--- a/ambari-server/src/main/resources/key_properties.json
+++ b/ambari-server/src/main/resources/key_properties.json
@@@ -155,16 -149,6 +155,13 @@@
"Cluster": "AlertDefinition/cluster_name",
"AlertDefinition": "AlertDefinition/id"
},
+ "AlertTarget": {
+ "AlertTarget": "AlertTarget/id"
+ },
+ "AlertGroup": {
+ "Cluster": "AlertGroup/cluster_name",
+ "AlertGroup": "AlertGroup/id"
+ },
- "Controller": {
- "Controller": "Controllers/name"
- },
"ClientConfig": {
"Cluster": "ServiceComponentInfo/cluster_name",
"Service": "ServiceComponentInfo/service_name",
http://git-wip-us.apache.org/repos/asf/ambari/blob/cc2d9341/ambari-server/src/main/resources/properties.json
----------------------------------------------------------------------
diff --cc ambari-server/src/main/resources/properties.json
index 96f44c4,bff0c94..8a0a58a
--- a/ambari-server/src/main/resources/properties.json
+++ b/ambari-server/src/main/resources/properties.json
@@@ -447,34 -431,8 +447,25 @@@
"AlertDefinition/interval",
"AlertDefinition/enabled",
"AlertDefinition/scope",
- "AlertDefinition/source"
- ],
+ "AlertDefinition/source",
+ "AlertDefinition/run_now"
+ ],
+ "AlertGroup": [
+ "AlertGroup/id",
+ "AlertGroup/name",
+ "AlertGroup/cluster_name",
+ "AlertGroup/default",
+ "AlertGroup/definitions",
+ "AlertGroup/targets"
+ ],
+ "AlertTarget": [
+ "AlertTarget/id",
+ "AlertTarget/name",
+ "AlertTarget/description",
+ "AlertTarget/notification_type",
+ "AlertTarget/properties",
+ "AlertTarget/groups"
+ ],
- "Controller":[
- "Controllers/name",
- "LDAP/configured",
- "LDAP/users",
- "LDAP/groups",
- "LDAP/synced_users",
- "LDAP/synced_groups",
- "_"
- ],
"ClientConfig":[
"ServiceComponentInfo/service_name",
"ServiceComponentInfo/component_name",