Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E27CF11681 for ; Tue, 19 Aug 2014 15:46:26 +0000 (UTC) Received: (qmail 76479 invoked by uid 500); 19 Aug 2014 15:46:26 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 76450 invoked by uid 500); 19 Aug 2014 15:46:26 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 76373 invoked by uid 99); 19 Aug 2014 15:46:26 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Aug 2014 15:46:26 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 39FF18BF2EC; Tue, 19 Aug 2014 15:46:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jonathanhurley@apache.org To: commits@ambari.apache.org Date: Tue, 19 Aug 2014 15:46:33 -0000 Message-Id: <5c33357e98dc4149b80148f2bc2a2a65@git.apache.org> In-Reply-To: <77745eceef5e4941b603af1b0c841b86@git.apache.org> References: <77745eceef5e4941b603af1b0c841b86@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [8/9] git commit: AMBARI-6860 - Alerts: Add Ability to Invalidate Definition Hash For An Agent (jonathanhurley) 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/89922458 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/89922458 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/89922458 Branch: refs/heads/branch-alerts-dev Commit: 8992245870a35925bae84f851147f901e21ba759 Parents: 2edb076 Author: Jonathan Hurley Authored: Thu Aug 14 09:22:49 2014 -0400 Committer: Jonathan Hurley Committed: Tue Aug 19 11:42:42 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/ambari/server/controller/AmbariServer.java | 1 + .../controller/internal/AlertDefinitionResourceProvider.java | 1 - ambari-server/src/main/resources/properties.json | 3 +-- 3 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/89922458/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java index 489fbb2..687a3d0 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java @@ -91,6 +91,7 @@ import org.apache.ambari.server.security.unsecured.rest.CertificateSign; import org.apache.ambari.server.security.unsecured.rest.ConnectionInfo; import org.apache.ambari.server.state.Clusters; import org.apache.ambari.server.state.ConfigHelper; +import org.apache.ambari.server.state.alert.AlertDefinitionHash; import org.apache.ambari.server.utils.StageUtils; import org.apache.ambari.server.utils.VersionUtils; import org.apache.ambari.server.view.ViewRegistry; http://git-wip-us.apache.org/repos/asf/ambari/blob/89922458/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 9b0ce1c..bed25e7 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"; protected static final String ALERT_DEF_SOURCE = "AlertDefinition/source"; protected static final String ALERT_DEF_SOURCE_TYPE = "AlertDefinition/source/type"; http://git-wip-us.apache.org/repos/asf/ambari/blob/89922458/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",