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 Mon, 27 Aug 2018 15:03:21 GMT
Repository: storm
Updated Branches:
  refs/heads/1.x-branch b8f2039d6 -> fe56cfc5a


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/42981a09
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/42981a09
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/42981a09

Branch: refs/heads/1.x-branch
Commit: 42981a09361e34cac639a867fa32134c76e4cbbc
Parents: 4f8b0e3
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: Sat Aug 18 13:41:43 2018 +0200

----------------------------------------------------------------------
 docs/metrics_v2.md                              |   2 -
 pom.xml                                         |  20 +--
 storm-core/pom.xml                              |  11 --
 .../reporters/GangliaStormReporter.java         | 133 -------------------
 4 files changed, 7 insertions(+), 159 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/42981a09/docs/metrics_v2.md
----------------------------------------------------------------------
diff --git a/docs/metrics_v2.md b/docs/metrics_v2.md
index 761d3e6..8c7653f 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/42981a09/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cbbce20..cff8bc7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,6 @@
         <version>10</version>
     </parent>
 
-
     <groupId>org.apache.storm</groupId>
     <artifactId>storm</artifactId>
     <version>1.2.3-SNAPSHOT</version>
@@ -82,7 +81,7 @@
             <roles>
                 <role>Committer</role>
             </roles>
-            <timezone />
+            <timezone/>
         </developer>
         <developer>
             <id>afeng</id>
@@ -109,7 +108,7 @@
             <roles>
                 <role>Committer</role>
             </roles>
-            <timezone />
+            <timezone/>
         </developer>
         <developer>
             <id>jjackson</id>
@@ -277,7 +276,7 @@
         <!-- Kafka version used by old storm-kafka spout code -->
         <storm.kafka.version>0.8.2.1</storm.kafka.version>
         <storm.kafka.artifact.id>kafka_2.10</storm.kafka.artifact.id>
-
+        
         <!-- kafka version used by new storm-kafka-client spout code -->
         <storm.kafka.client.version>0.10.1.0</storm.kafka.client.version>
 
@@ -895,11 +894,6 @@
                 <version>${metrics.version}</version>
             </dependency>
             <dependency>
-                <groupId>io.dropwizard.metrics</groupId>
-                <artifactId>metrics-ganglia</artifactId>
-                <version>${metrics.version}</version>
-            </dependency>
-            <dependency>
                 <groupId>metrics-clojure</groupId>
                 <artifactId>metrics-clojure</artifactId>
                 <version>${metrics-clojure.version}</version>
@@ -1011,12 +1005,12 @@
                         <groupId>log4j</groupId>
                         <artifactId>log4j</artifactId>
                     </exclusion>
-                    <exclusion>
-                        <groupId>org.slf4j</groupId>
+                   <exclusion>
+                       <groupId>org.slf4j</groupId>
                         <artifactId>slf4j-log4j12</artifactId>
-                    </exclusion>
+                   </exclusion>
                 </exclusions>
-            </dependency>
+           </dependency>
             <dependency>
                 <groupId>org.apache.kafka</groupId>
                 <artifactId>kafka-clients</artifactId>

http://git-wip-us.apache.org/repos/asf/storm/blob/42981a09/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 3e6282c..bb8c0aa 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -260,17 +260,6 @@
             <artifactId>metrics-graphite</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.dropwizard.metrics</groupId>
-            <artifactId>metrics-ganglia</artifactId>
-            <exclusions>
-                <!-- the following is LGPL and needs to be installed manually -->
-                <exclusion>
-                    <groupId>org.acplt</groupId>
-                    <artifactId>oncrpc</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
             <groupId>metrics-clojure</groupId>
             <artifactId>metrics-clojure</artifactId>
         </dependency>

http://git-wip-us.apache.org/repos/asf/storm/blob/42981a09/storm-core/src/jvm/org/apache/storm/metrics2/reporters/GangliaStormReporter.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/metrics2/reporters/GangliaStormReporter.java
b/storm-core/src/jvm/org/apache/storm/metrics2/reporters/GangliaStormReporter.java
deleted file mode 100644
index 497cb04..0000000
--- a/storm-core/src/jvm/org/apache/storm/metrics2/reporters/GangliaStormReporter.java
+++ /dev/null
@@ -1,133 +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.ganglia.GangliaReporter;
-import com.codahale.metrics.MetricRegistry;
-import info.ganglia.gmetric4j.gmetric.GMetric;
-import org.apache.storm.daemon.metrics.MetricsUtils;
-import org.apache.storm.metrics2.filters.StormMetricsFilter;
-import org.apache.storm.utils.Utils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-public class GangliaStormReporter extends ScheduledStormReporter {
-    private final static Logger LOG = LoggerFactory.getLogger(GangliaStormReporter.class);
-
-    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";
-
-    @Override
-    public void prepare(MetricRegistry metricsRegistry, Map stormConf, Map reporterConf)
{
-        LOG.debug("Preparing...");
-        GangliaReporter.Builder builder = GangliaReporter.forRegistry(metricsRegistry);
-
-        TimeUnit durationUnit = MetricsUtils.getMetricsDurationUnit(reporterConf);
-        if (durationUnit != null) {
-            builder.convertDurationsTo(durationUnit);
-        }
-
-        TimeUnit rateUnit = MetricsUtils.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);
-        }
-    }
-
-
-    public static String getMetricsTargetUDPGroup(Map reporterConf) {
-        return Utils.getString(reporterConf.get(GANGLIA_UDP_GROUP), null);
-    }
-
-    public static String getMetricsTargetUDPAddressingMode(Map reporterConf) {
-        return Utils.getString(reporterConf.get(GANGLIA_UDP_ADDRESSING_MODE), null);
-    }
-
-    public static Integer getMetricsTargetTtl(Map reporterConf) {
-        return Utils.getInt(reporterConf.get(GANGLIA_TTL), null);
-    }
-
-    public static Integer getGangliaDMax(Map reporterConf) {
-        return Utils.getInt(reporterConf.get(GANGLIA_DMAX), null);
-    }
-
-    public static Integer getGangliaTMax(Map reporterConf) {
-        return Utils.getInt(reporterConf.get(GANGLIA_TMAX), null);
-    }
-
-
-    private static Integer getMetricsTargetPort(Map reporterConf) {
-        return Utils.getInt(reporterConf.get(GANGLIA_PORT), null);
-    }
-
-    private static String getMetricsPrefixedWith(Map reporterConf) {
-        return Utils.getString(reporterConf.get(GANGLIA_PREFIXED_WITH), null);
-    }
-
-}
\ No newline at end of file


Mime
View raw message