diff --git a/apps/metricsreporter/features.xml b/apps/gangliametrics/features.xml similarity index 93% rename from apps/metricsreporter/features.xml rename to apps/gangliametrics/features.xml index 5bba72a52d..53139ddb2d 100644 --- a/apps/metricsreporter/features.xml +++ b/apps/gangliametrics/features.xml @@ -18,7 +18,7 @@ onos-api - mvn:${project.groupId}/onos-app-metrics-reporter/${project.version} + mvn:${project.groupId}/onos-app-ganglia/${project.version} mvn:io.dropwizard.metrics/metrics-core/3.1.2 mvn:io.dropwizard.metrics/metrics-ganglia/3.1.2 mvn:info.ganglia.gmetric4j/gmetric4j/1.0.10 diff --git a/apps/metricsreporter/pom.xml b/apps/gangliametrics/pom.xml similarity index 95% rename from apps/metricsreporter/pom.xml rename to apps/gangliametrics/pom.xml index 53669c8a36..6d68eb8905 100644 --- a/apps/metricsreporter/pom.xml +++ b/apps/gangliametrics/pom.xml @@ -26,14 +26,14 @@ ../pom.xml - onos-app-metrics-reporter + onos-app-ganglia bundle Performance metric service reporter - org.onosproject.metrics.reporter - Metric Service Reporter + org.onosproject.gangliametrics + Ganglia Report and Query App Monitoring http://onosproject.org 3.1.2 diff --git a/apps/metricsreporter/src/main/java/org/onosproject/metrics/reporter/GangliaMetricsReporter.java b/apps/gangliametrics/src/main/java/org/onosproject/gangliametrics/GangliaMetricsReporter.java similarity index 99% rename from apps/metricsreporter/src/main/java/org/onosproject/metrics/reporter/GangliaMetricsReporter.java rename to apps/gangliametrics/src/main/java/org/onosproject/gangliametrics/GangliaMetricsReporter.java index f2f48f4f4f..7695c95880 100644 --- a/apps/metricsreporter/src/main/java/org/onosproject/metrics/reporter/GangliaMetricsReporter.java +++ b/apps/gangliametrics/src/main/java/org/onosproject/gangliametrics/GangliaMetricsReporter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.onosproject.metrics.reporter; +package org.onosproject.gangliametrics; import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.ganglia.GangliaReporter; diff --git a/apps/metricsreporter/src/main/java/org/onosproject/metrics/reporter/MetricsReporter.java b/apps/gangliametrics/src/main/java/org/onosproject/gangliametrics/MetricsReporter.java similarity index 95% rename from apps/metricsreporter/src/main/java/org/onosproject/metrics/reporter/MetricsReporter.java rename to apps/gangliametrics/src/main/java/org/onosproject/gangliametrics/MetricsReporter.java index 572e45c011..b479bc598f 100644 --- a/apps/metricsreporter/src/main/java/org/onosproject/metrics/reporter/MetricsReporter.java +++ b/apps/gangliametrics/src/main/java/org/onosproject/gangliametrics/MetricsReporter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.onosproject.metrics.reporter; +package org.onosproject.gangliametrics; /** * A metric report that reports all metrics value to third party monitor. diff --git a/apps/metricsreporter/src/main/java/org/onosproject/metrics/reporter/package-info.java b/apps/gangliametrics/src/main/java/org/onosproject/gangliametrics/package-info.java similarity index 94% rename from apps/metricsreporter/src/main/java/org/onosproject/metrics/reporter/package-info.java rename to apps/gangliametrics/src/main/java/org/onosproject/gangliametrics/package-info.java index 0acbcf3d68..7b496228a1 100644 --- a/apps/metricsreporter/src/main/java/org/onosproject/metrics/reporter/package-info.java +++ b/apps/gangliametrics/src/main/java/org/onosproject/gangliametrics/package-info.java @@ -18,4 +18,4 @@ * Contains various reporters that backup all of the collected metrics * to monitoring server. */ -package org.onosproject.metrics.reporter; +package org.onosproject.gangliametrics; diff --git a/apps/metricsreporter/src/test/java/org/onosproject/metrics/reporter/GangliaMetricsReporterTest.java b/apps/gangliametrics/src/test/java/org/onosproject/gangliametrics/GangliaMetricsReporterTest.java similarity index 98% rename from apps/metricsreporter/src/test/java/org/onosproject/metrics/reporter/GangliaMetricsReporterTest.java rename to apps/gangliametrics/src/test/java/org/onosproject/gangliametrics/GangliaMetricsReporterTest.java index c0eeb1ac84..2c12b8e715 100644 --- a/apps/metricsreporter/src/test/java/org/onosproject/metrics/reporter/GangliaMetricsReporterTest.java +++ b/apps/gangliametrics/src/test/java/org/onosproject/gangliametrics/GangliaMetricsReporterTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.onosproject.metrics.reporter; +package org.onosproject.gangliametrics; import com.codahale.metrics.MetricRegistry; import com.google.common.collect.ImmutableSet; diff --git a/apps/pom.xml b/apps/pom.xml index 48f09f2825..4799f9dafb 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -38,7 +38,6 @@ sdnip optical metrics - metricsreporter routing routing-api reactive-routing @@ -70,7 +69,8 @@ openstacknetworking openstackinterface influxdbmetrics - + gangliametrics + default