Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 87B09200B21 for ; Fri, 10 Jun 2016 09:06:21 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 86498160A38; Fri, 10 Jun 2016 07:06:21 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id CDE0D160A04 for ; Fri, 10 Jun 2016 09:06:20 +0200 (CEST) Received: (qmail 42434 invoked by uid 500); 10 Jun 2016 07:06:19 -0000 Mailing-List: contact commits-help@falcon.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@falcon.apache.org Delivered-To: mailing list commits@falcon.apache.org Received: (qmail 42425 invoked by uid 99); 10 Jun 2016 07:06:19 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Jun 2016 07:06:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BCB68DFC6F; Fri, 10 Jun 2016 07:06:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pallavi@apache.org To: commits@falcon.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: falcon git commit: FALCON-2020 Changes in Graphite Notification Plugin Date: Fri, 10 Jun 2016 07:06:19 +0000 (UTC) archived-at: Fri, 10 Jun 2016 07:06:21 -0000 Repository: falcon Updated Branches: refs/heads/0.10 49df8da45 -> 9dce4e7f9 FALCON-2020 Changes in Graphite Notification Plugin Author: Praveen Adlakha Reviewers: @bvellanki, @pallavi-rao Closes #180 from PraveenAdlakha/2020 and squashes the following commits: ecfae9a [Praveen Adlakha] comments addressed 5f3b962 [Praveen Adlakha] FALCON-2020 Changes in Graphite Notification Plugin (cherry picked from commit 54430ed279909c3e7d488e4ef98d05f56c4ecf45) Signed-off-by: Pallavi Rao Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/9dce4e7f Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/9dce4e7f Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/9dce4e7f Branch: refs/heads/0.10 Commit: 9dce4e7f98d9603733bab4fe1c2b8ff9685939b0 Parents: 49df8da Author: Praveen Adlakha Authored: Fri Jun 10 12:35:39 2016 +0530 Committer: Pallavi Rao Committed: Fri Jun 10 12:36:02 2016 +0530 ---------------------------------------------------------------------- .../plugin/GraphiteNotificationPlugin.java | 35 +++++++++++--------- 1 file changed, 20 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/9dce4e7f/prism/src/main/java/org/apache/falcon/plugin/GraphiteNotificationPlugin.java ---------------------------------------------------------------------- diff --git a/prism/src/main/java/org/apache/falcon/plugin/GraphiteNotificationPlugin.java b/prism/src/main/java/org/apache/falcon/plugin/GraphiteNotificationPlugin.java index 9d46b0d..abe6777 100644 --- a/prism/src/main/java/org/apache/falcon/plugin/GraphiteNotificationPlugin.java +++ b/prism/src/main/java/org/apache/falcon/plugin/GraphiteNotificationPlugin.java @@ -45,34 +45,39 @@ public class GraphiteNotificationPlugin implements MonitoringPlugin { MetricNotificationService metricNotificationService = Services.get().getService(MetricNotificationService.SERVICE_NAME); try { - String entityType = message.getDimensions().get("entity-type"); - String entityName = message.getDimensions().get("entity-name"); + String entityType = StringUtils.isNotBlank(message.getDimensions().get("entityType")) + ? message.getDimensions().get("entityType") :message.getDimensions().get("entity-type"); + String entityName = StringUtils.isNotBlank(message.getDimensions().get("entityName")) + ? message.getDimensions().get("entityName") :message.getDimensions().get("entity-name"); String prefix = StartupProperties.get().getProperty("falcon.graphite.prefix"); - if (entityType.equals(EntityType.PROCESS.name())) { + String separator = "."; + LOG.debug("message:" + message.getAction()); + if (entityType.equalsIgnoreCase(EntityType.PROCESS.name())) { Entity entity = ConfigurationStore.get().get(EntityType.PROCESS, entityName); Process process = (Process) entity; String pipeline = StringUtils.isNotBlank(process.getPipelines()) ? process.getPipelines() : "default"; - if ((message.getAction().equals("wf-instance-succeeded"))) { Long timeTaken = message.getExecutionTime() / 1000000000; - String metricsName = prefix + message.getDimensions().get("cluster") + pipeline - + ".GENERATE." + entityName + ".processing_time"; - metricNotificationService.publish(metricsName, timeTaken); + StringBuilder processingMetric = new StringBuilder(prefix).append(".").append(message. + getDimensions().get("cluster")).append(".").append(pipeline).append(".GENERATE.") + .append(entityName).append(".processing_time"); + metricNotificationService.publish(processingMetric.toString(), timeTaken); DateTime nominalTime = new DateTime(message.getDimensions().get("nominal-time")); DateTime startTime = new DateTime(message.getDimensions().get("start-time")); - metricsName = prefix + message.getDimensions().get("cluster") + pipeline - + ".GENERATE." + entityName + ".start_delay"; - metricNotificationService.publish(metricsName, - (long)Seconds.secondsBetween(nominalTime, startTime).getSeconds()); + StringBuilder startTimeMetric = new StringBuilder(prefix).append(".").append(message. + getDimensions().get("cluster")).append(".").append(pipeline).append(".GENERATE."). + append(entityName).append(".start_delay"); + metricNotificationService.publish(startTimeMetric.toString(), + (long)Seconds.secondsBetween(nominalTime, startTime).getSeconds()); } if (message.getAction().equals("wf-instance-failed")){ - String metricName = prefix + message.getDimensions().get("cluster") + pipeline - + ".GENERATE." + entityName + ".failure" - + message.getDimensions().get("error-message"); - metricNotificationService.publish(metricName, (long) 1); + StringBuilder metricName = new StringBuilder(prefix).append(".").append(message. + getDimensions().get("cluster")).append(".").append(pipeline).append(".GENERATE."). + append(entityName).append(".failure").append(message.getDimensions().get("error-message")); + metricNotificationService.publish(metricName.toString(), (long) 1); } } } catch (Exception e) {