storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject [1/2] storm git commit: STORM-3199: Remove metrics-ganglia due to LGPL dependency
Date Fri, 24 Aug 2018 20:13:44 GMT
Repository: storm
Updated Branches:
  refs/heads/master 47575ec6f -> aa6bc4d2c


STORM-3199: Remove metrics-ganglia due to LGPL dependency


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/806bb11c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/806bb11c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/806bb11c

Branch: refs/heads/master
Commit: 806bb11ca26b5caa41c6d0ef7c4658855219cec3
Parents: 88d19b0
Author: Stig Rohde Døssing <srdo@apache.org>
Authored: Thu Aug 16 20:04:11 2018 +0200
Committer: Stig Rohde Døssing <srdo@apache.org>
Committed: Thu Aug 16 20:04:11 2018 +0200

----------------------------------------------------------------------
 docs/metrics_v2.md                              |   2 -
 pom.xml                                         |   5 -
 storm-client/pom.xml                            |   4 -
 .../reporters/GangliaStormReporter.java         | 124 -------------------
 4 files changed, 135 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/806bb11c/docs/metrics_v2.md
----------------------------------------------------------------------
diff --git a/docs/metrics_v2.md b/docs/metrics_v2.md
index e90ec76..ad52b39 100644
--- a/docs/metrics_v2.md
+++ b/docs/metrics_v2.md
@@ -78,8 +78,6 @@ public class TupleCountingBolt extends BaseRichBolt {
     Reports metrics to `System.out`.
   * CSV Reporter (`org.apache.storm.metrics2.reporters.CsvReporter`):
     Reports metrics to a CSV file.
-  * Ganglia Reporter (`org.apache.storm.metrics2.reporters.GagliaStormReporter`):
-    Reports metrics to a [Ganglia](http://ganglia.info) server.
   * Graphite Reporter (`org.apache.storm.metrics2.reporters.GraphiteStormReporter`):
     Reports metrics to a [Graphite](https://graphiteapp.org) server.
   * JMX Reporter (`org.apache.storm.metrics2.reporters.JmxStormReporter`):

http://git-wip-us.apache.org/repos/asf/storm/blob/806bb11c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 19b6d7b..299b6e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -980,11 +980,6 @@
             </dependency>
             <dependency>
                 <groupId>io.dropwizard.metrics</groupId>
-                <artifactId>metrics-ganglia</artifactId>
-                <version>${metrics.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.dropwizard.metrics</groupId>
                 <artifactId>metrics-graphite</artifactId>
                 <version>${metrics.version}</version>
             </dependency>

http://git-wip-us.apache.org/repos/asf/storm/blob/806bb11c/storm-client/pom.xml
----------------------------------------------------------------------
diff --git a/storm-client/pom.xml b/storm-client/pom.xml
index 7c28cce..1a120d8 100644
--- a/storm-client/pom.xml
+++ b/storm-client/pom.xml
@@ -88,10 +88,6 @@
         </dependency>
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
-            <artifactId>metrics-ganglia</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.dropwizard.metrics</groupId>
             <artifactId>metrics-graphite</artifactId>
         </dependency>
 

http://git-wip-us.apache.org/repos/asf/storm/blob/806bb11c/storm-client/src/jvm/org/apache/storm/metrics2/reporters/GangliaStormReporter.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/metrics2/reporters/GangliaStormReporter.java
b/storm-client/src/jvm/org/apache/storm/metrics2/reporters/GangliaStormReporter.java
deleted file mode 100644
index 7cd2396..0000000
--- a/storm-client/src/jvm/org/apache/storm/metrics2/reporters/GangliaStormReporter.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The ASF licenses
this file to you under the Apache License, Version
- * 2.0 (the "License"); you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * Unless required by applicable law or agreed to in writing, software distributed under
the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
for the specific language governing permissions
- * and limitations under the License.
- */
-
-package org.apache.storm.metrics2.reporters;
-
-import com.codahale.metrics.MetricRegistry;
-import com.codahale.metrics.ganglia.GangliaReporter;
-import info.ganglia.gmetric4j.gmetric.GMetric;
-import java.io.IOException;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import org.apache.storm.daemon.metrics.ClientMetricsUtils;
-import org.apache.storm.metrics2.filters.StormMetricsFilter;
-import org.apache.storm.utils.ObjectReader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class GangliaStormReporter extends ScheduledStormReporter {
-    public static final String GANGLIA_HOST = "ganglia.host";
-    public static final String GANGLIA_PORT = "ganglia.port";
-    public static final String GANGLIA_PREFIXED_WITH = "ganglia.prefixed.with";
-    public static final String GANGLIA_DMAX = "ganglia.dmax";
-    public static final String GANGLIA_TMAX = "ganglia.tmax";
-    public static final String GANGLIA_UDP_ADDRESSING_MODE = "ganglia.udp.addressing.mode";
-    public static final String GANGLIA_RATE_UNIT = "ganglia.rate.unit";
-    public static final String GANGLIA_DURATION_UNIT = "ganglia.duration.unit";
-    public static final String GANGLIA_TTL = "ganglia.ttl";
-    public static final String GANGLIA_UDP_GROUP = "ganglia.udp.group";
-    private static final Logger LOG = LoggerFactory.getLogger(GangliaStormReporter.class);
-
-    public static String getMetricsTargetUdpGroup(Map reporterConf) {
-        return ObjectReader.getString(reporterConf.get(GANGLIA_UDP_GROUP), null);
-    }
-
-    public static String getMetricsTargetUdpAddressingMode(Map reporterConf) {
-        return ObjectReader.getString(reporterConf.get(GANGLIA_UDP_ADDRESSING_MODE), null);
-    }
-
-    public static Integer getMetricsTargetTtl(Map reporterConf) {
-        return ObjectReader.getInt(reporterConf.get(GANGLIA_TTL), null);
-    }
-
-    public static Integer getGangliaDMax(Map reporterConf) {
-        return ObjectReader.getInt(reporterConf.get(GANGLIA_DMAX), null);
-    }
-
-    public static Integer getGangliaTMax(Map reporterConf) {
-        return ObjectReader.getInt(reporterConf.get(GANGLIA_TMAX), null);
-    }
-
-    private static Integer getMetricsTargetPort(Map reporterConf) {
-        return ObjectReader.getInt(reporterConf.get(GANGLIA_PORT), null);
-    }
-
-    private static String getMetricsPrefixedWith(Map reporterConf) {
-        return ObjectReader.getString(reporterConf.get(GANGLIA_PREFIXED_WITH), null);
-    }
-
-    @Override
-    public void prepare(MetricRegistry metricsRegistry, Map stormConf, Map reporterConf)
{
-        LOG.debug("Preparing...");
-        GangliaReporter.Builder builder = GangliaReporter.forRegistry(metricsRegistry);
-
-        TimeUnit durationUnit = ClientMetricsUtils.getMetricsDurationUnit(reporterConf);
-        if (durationUnit != null) {
-            builder.convertDurationsTo(durationUnit);
-        }
-
-        TimeUnit rateUnit = ClientMetricsUtils.getMetricsRateUnit(reporterConf);
-        if (rateUnit != null) {
-            builder.convertRatesTo(rateUnit);
-        }
-
-        StormMetricsFilter filter = getMetricsFilter(reporterConf);
-        if (filter != null) {
-            builder.filter(filter);
-        }
-        String prefix = getMetricsPrefixedWith(reporterConf);
-        if (prefix != null) {
-            builder.prefixedWith(prefix);
-        }
-
-        Integer dmax = getGangliaDMax(reporterConf);
-        if (prefix != null) {
-            builder.withDMax(dmax);
-        }
-
-        Integer tmax = getGangliaTMax(reporterConf);
-        if (prefix != null) {
-            builder.withTMax(tmax);
-        }
-
-        //defaults to 10
-        reportingPeriod = getReportPeriod(reporterConf);
-
-        //defaults to seconds
-        reportingPeriodUnit = getReportPeriodUnit(reporterConf);
-
-        String group = getMetricsTargetUdpGroup(reporterConf);
-        Integer port = getMetricsTargetPort(reporterConf);
-        String udpAddressingMode = getMetricsTargetUdpAddressingMode(reporterConf);
-        Integer ttl = getMetricsTargetTtl(reporterConf);
-
-        GMetric.UDPAddressingMode mode = udpAddressingMode.equalsIgnoreCase("multicast")
-            ? GMetric.UDPAddressingMode.MULTICAST : GMetric.UDPAddressingMode.UNICAST;
-
-        try {
-            GMetric sender = new GMetric(group, port, mode, ttl);
-            reporter = builder.build(sender);
-        } catch (IOException ioe) {
-            LOG.error("Exception in GangliaReporter config", ioe);
-        }
-    }
-
-}
\ No newline at end of file


Mime
View raw message