AMBARI-6860 - Alerts: Add Ability to Invalidate Definition Hash For An Agent (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/209f8404 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/209f8404 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/209f8404 Branch: refs/heads/branch-alerts-dev Commit: 209f8404896ec600729af39e64b9825b72b0a1b7 Parents: aa77ca7 Author: Jonathan Hurley <jhur...@hortonworks.com> Authored: Thu Aug 14 09:22:49 2014 -0400 Committer: Jonathan Hurley <jhur...@hortonworks.com> Committed: Tue Aug 19 00:13:57 2014 -0400 ---------------------------------------------------------------------- .../controller/internal/AlertDefinitionResourceProvider.java | 1 - ambari-server/src/main/resources/properties.json | 3 +-- .../controller/internal/AlertDefinitionResourceProviderTest.java | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/209f8404/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProvider.java index 9c4b01e..f20a9a9 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProvider.java @@ -72,7 +72,6 @@ public class AlertDefinitionResourceProvider extends AbstractControllerResourceP protected static final String ALERT_DEF_COMPONENT_NAME = "AlertDefinition/component_name"; protected static final String ALERT_DEF_ENABLED = "AlertDefinition/enabled"; protected static final String ALERT_DEF_SCOPE = "AlertDefinition/scope"; - protected static final String ALERT_DEF_UUID = "AlertDefinition/uuid"; private static Set<String> pkPropertyIds = new HashSet<String>( Arrays.asList(ALERT_DEF_ID, ALERT_DEF_NAME)); http://git-wip-us.apache.org/repos/asf/ambari/blob/209f8404/ambari-server/src/main/resources/properties.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/properties.json b/ambari-server/src/main/resources/properties.json index 6f79413..aa2bf71 100644 --- a/ambari-server/src/main/resources/properties.json +++ b/ambari-server/src/main/resources/properties.json @@ -420,8 +420,7 @@ "AlertDefinition/interval", "AlertDefinition/enabled", "AlertDefinition/scope", - "AlertDefinition/source", - "AlertDefinition/uuid" + "AlertDefinition/source" ], "Controller":[ "Controllers/name", http://git-wip-us.apache.org/repos/asf/ambari/blob/209f8404/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProviderTest.java index b6ef241..76a633c 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProviderTest.java @@ -73,8 +73,6 @@ public class AlertDefinitionResourceProviderTest { private static String DEFINITION_UUID = UUID.randomUUID().toString(); - private static String DEFINITION_UUID = UUID.randomUUID().toString(); - @Before public void before() { dao = createStrictMock(AlertDefinitionDAO.class);