openstack
/
monasca-persister
Code Issues Proposed changes

Use monasca everywhere 

Rename all uses of mon-persister to monasca-persister. For example,
the service is now called monasca-persister not mon-persister

Rename all packages from com.hpcloud.mon.persister to monasca.persister

Change-Id: Ic131b0eb0ac30e9ae91ca1f2f9df88fc9f837c98
This commit is contained in:
Craig Bryant 2014-08-07 15:40:14 -06:00
parent f61bde1051
commit 9bc5997853
56 changed files with 178 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -1,4 +1,4 @@
mon-persister
monasca-persister
=============
The Monitoring Persister consumes metrics and alarm state transitions from the Message Queue and stores them in the Metrics and Alarms database.
@ -11,7 +11,7 @@ The number of output processors/threads in the Persister can be specified to sca
# Build
Requires mon-common from https://github.com/hpcloud-mon/mon-common. Download and build following instructions in its README.md. Then build mon-persister by:
Requires monasca-common from https://github.com/stackforge/monasca-common. Download and build following instructions in its README.md. Then build monasca-persister by:
```
mvn clean package

16
pom.xml
View File

@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>monasca-persister</groupId>
<artifactId>mon-persister</artifactId>
<artifactId>monasca-persister</artifactId>
<version>1.0-SNAPSHOT</version>
<properties>
@ -18,8 +18,8 @@
<!--Needed for buildnumber-maven-plugin-->
<scm>
<connection>scm:git:git@keg.dev.uswest.hpcloud.net:som-persister</connection>
<developerConnection>scm:git:git@keg.dev.uswest.hpcloud.net:som-persister
<connection>scm:git:git@github.com:stackforge/monasca-persister</connection>
<developerConnection>scm:git:git@github.com:stackforge/monasca-persister
</developerConnection>
</scm>
@ -151,7 +151,7 @@
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>com.hpcloud.mon.persister.MonPersisterApplication
<mainClass>monasca.persister.MonPersisterApplication
</mainClass>
</transformer>
</transformers>
@ -216,19 +216,19 @@
<type>file</type>
<src>${project.build.directory}/${artifactNamedVersion}.jar
</src>
<dst>/opt/mon/mon-persister.jar</dst>
<dst>/opt/monasca/monasca-persister.jar</dst>
</data>
<data>
<type>file</type>
<src>${project.basedir}/src/deb/init/mon-persister.conf</src>
<dst>/etc/init/mon-persister.conf</dst>
<src>${project.basedir}/src/deb/init/monasca-persister.conf</src>
<dst>/etc/init/monasca-persister.conf</dst>
</data>
<data>
<type>file</type>
<src>
${project.basedir}/src/deb/etc/persister-config.yml-sample
</src>
<dst>/etc/mon/persister-config.yml-sample</dst>
<dst>/etc/monasca/persister-config.yml-sample</dst>
</data>
</dataSet>
</configuration>

4
src/deb/control/postinst
View File

@ -7,8 +7,8 @@ case "$1" in
fi
#Restart does not pick up upstart job config changes stop/start is needed
stop mon-persister
start mon-persister
stop monasca-persister
start monasca-persister
;;
esac

2
src/deb/control/prerm
View File

@ -2,7 +2,7 @@
case "$1" in
remove)
stop mon-persister
stop monasca-persister
;;
esac

10
src/deb/etc/persister-config.yml-sample
View File

@ -1,4 +1,4 @@
name: mon-persister
name: monasca-persister
#Kafka settings.
kafkaConfiguration:
@ -42,7 +42,7 @@ verticaMetricRepositoryConfiguration:
databaseConfiguration:
driverClass: com.vertica.jdbc.Driver
# url: jdbc:vertica://mon-aw1rdd1-vertica0001.rndd.aw1.hpcloud.net:5433/som
# url: jdbc:vertica://mini-mon:5433/monasca
url: jdbc:vertica://15.185.94.245:5433/som
user: persister
password: password
@ -117,7 +117,7 @@ logging:
# The file to which statements will be logged.
#
# If enabled is true, this must be specified.
currentLogFilename: ./logs/mon-persister.log
currentLogFilename: ./logs/monasca-persister.log
# If true, log files are rotated and archived.
archive: true
@ -127,7 +127,7 @@ logging:
# and new statements written to it.
#
# If archive is true, this must be specified.
archivedLogFilenamePattern: ./logs/mon-persister-%d.log.gz
archivedLogFilenamePattern: ./logs/monasca-persister-%d.log.gz
# The maximum number of log files to archive.
archivedFileCount: 5
@ -157,4 +157,4 @@ logging:
timeZone: UTC
# A custom Logback format string.
logFormat: null
logFormat: null

11
src/deb/init/mon-persister.conf
View File

@ -1,11 +0,0 @@
# Startup script for the mon-persister
description "MON Persister java app"
start on runlevel [2345]
console log
respawn
setgid persister
setuid persister
exec /usr/bin/java -Dfile.encoding=UTF-8 -Xmx8g -cp /opt/mon/mon-persister.jar:/opt/mon/vertica/vertica_jdbc.jar com.hpcloud.mon.persister.MonPersisterApplication server /etc/mon/persister-config.yml

11
src/deb/init/monasca-persister.conf Normal file
View File

@ -0,0 +1,11 @@
# Startup script for the monasca-persister
description "Monasca Persister java app"
start on runlevel [2345]
console log
respawn
setgid monasca
setuid persister
exec /usr/bin/java -Dfile.encoding=UTF-8 -Xmx8g -cp /opt/monasca/monasca-persister.jar:/opt/monasca/vertica/vertica_jdbc.jar monasca.persister.MonPersisterApplication server /etc/monasca/persister-config.yml

42
src/main/java/com/hpcloud/mon/persister/MonPersisterApplication.java → src/main/java/monasca/persister/MonPersisterApplication.java
View File

@ -15,27 +15,27 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister;
package monasca.persister;
import com.hpcloud.mon.persister.configuration.MonPersisterConfiguration;
import com.hpcloud.mon.persister.consumer.AlarmStateTransitionConsumer;
import com.hpcloud.mon.persister.consumer.AlarmStateTransitionConsumerFactory;
import com.hpcloud.mon.persister.consumer.KafkaAlarmStateTransitionConsumer;
import com.hpcloud.mon.persister.consumer.KafkaAlarmStateTransitionConsumerFactory;
import com.hpcloud.mon.persister.consumer.KafkaChannel;
import com.hpcloud.mon.persister.consumer.KafkaChannelFactory;
import com.hpcloud.mon.persister.consumer.KafkaMetricsConsumer;
import com.hpcloud.mon.persister.consumer.KafkaMetricsConsumerFactory;
import com.hpcloud.mon.persister.consumer.MetricsConsumer;
import com.hpcloud.mon.persister.consumer.MetricsConsumerFactory;
import com.hpcloud.mon.persister.healthcheck.SimpleHealthCheck;
import com.hpcloud.mon.persister.pipeline.AlarmStateTransitionPipeline;
import com.hpcloud.mon.persister.pipeline.AlarmStateTransitionPipelineFactory;
import com.hpcloud.mon.persister.pipeline.MetricPipeline;
import com.hpcloud.mon.persister.pipeline.MetricPipelineFactory;
import com.hpcloud.mon.persister.pipeline.event.AlarmStateTransitionedEventHandlerFactory;
import com.hpcloud.mon.persister.pipeline.event.MetricHandlerFactory;
import com.hpcloud.mon.persister.resource.Resource;
import monasca.persister.configuration.MonPersisterConfiguration;
import monasca.persister.consumer.AlarmStateTransitionConsumer;
import monasca.persister.consumer.AlarmStateTransitionConsumerFactory;
import monasca.persister.consumer.KafkaAlarmStateTransitionConsumer;
import monasca.persister.consumer.KafkaAlarmStateTransitionConsumerFactory;
import monasca.persister.consumer.KafkaChannel;
import monasca.persister.consumer.KafkaChannelFactory;
import monasca.persister.consumer.KafkaMetricsConsumer;
import monasca.persister.consumer.KafkaMetricsConsumerFactory;
import monasca.persister.consumer.MetricsConsumer;
import monasca.persister.consumer.MetricsConsumerFactory;
import monasca.persister.healthcheck.SimpleHealthCheck;
import monasca.persister.pipeline.AlarmStateTransitionPipeline;
import monasca.persister.pipeline.AlarmStateTransitionPipelineFactory;
import monasca.persister.pipeline.MetricPipeline;
import monasca.persister.pipeline.MetricPipelineFactory;
import monasca.persister.pipeline.event.AlarmStateTransitionedEventHandlerFactory;
import monasca.persister.pipeline.event.MetricHandlerFactory;
import monasca.persister.resource.Resource;
import com.google.inject.Guice;
import com.google.inject.Injector;
@ -60,7 +60,7 @@ public class MonPersisterApplication extends Application<MonPersisterConfigurati
@Override
public String getName() {
return "mon-persister";
return "monasca-persister";
}
@Override

62
src/main/java/com/hpcloud/mon/persister/MonPersisterModule.java → src/main/java/monasca/persister/MonPersisterModule.java
View File

@ -15,38 +15,38 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister;
package monasca.persister;
import com.hpcloud.mon.persister.configuration.MonPersisterConfiguration;
import com.hpcloud.mon.persister.consumer.AlarmStateTransitionConsumer;
import com.hpcloud.mon.persister.consumer.AlarmStateTransitionConsumerFactory;
import com.hpcloud.mon.persister.consumer.KafkaAlarmStateTransitionConsumer;
import com.hpcloud.mon.persister.consumer.KafkaAlarmStateTransitionConsumerFactory;
import com.hpcloud.mon.persister.consumer.KafkaAlarmStateTransitionConsumerRunnableBasic;
import com.hpcloud.mon.persister.consumer.KafkaAlarmStateTransitionConsumerRunnableBasicFactory;
import com.hpcloud.mon.persister.consumer.KafkaChannel;
import com.hpcloud.mon.persister.consumer.KafkaChannelFactory;
import com.hpcloud.mon.persister.consumer.KafkaMetricsConsumer;
import com.hpcloud.mon.persister.consumer.KafkaMetricsConsumerFactory;
import com.hpcloud.mon.persister.consumer.KafkaMetricsConsumerRunnableBasic;
import com.hpcloud.mon.persister.consumer.KafkaMetricsConsumerRunnableBasicFactory;
import com.hpcloud.mon.persister.consumer.MetricsConsumer;
import com.hpcloud.mon.persister.consumer.MetricsConsumerFactory;
import com.hpcloud.mon.persister.dbi.DBIProvider;
import com.hpcloud.mon.persister.pipeline.AlarmStateTransitionPipeline;
import com.hpcloud.mon.persister.pipeline.AlarmStateTransitionPipelineFactory;
import com.hpcloud.mon.persister.pipeline.MetricPipeline;
import com.hpcloud.mon.persister.pipeline.MetricPipelineFactory;
import com.hpcloud.mon.persister.pipeline.event.AlarmStateTransitionedEventHandler;
import com.hpcloud.mon.persister.pipeline.event.AlarmStateTransitionedEventHandlerFactory;
import com.hpcloud.mon.persister.pipeline.event.MetricHandler;
import com.hpcloud.mon.persister.pipeline.event.MetricHandlerFactory;
import com.hpcloud.mon.persister.repository.AlarmRepository;
import com.hpcloud.mon.persister.repository.InfluxDBAlarmRepository;
import com.hpcloud.mon.persister.repository.InfluxDBMetricRepository;
import com.hpcloud.mon.persister.repository.MetricRepository;
import com.hpcloud.mon.persister.repository.VerticaAlarmRepository;
import com.hpcloud.mon.persister.repository.VerticaMetricRepository;
import monasca.persister.configuration.MonPersisterConfiguration;
import monasca.persister.consumer.AlarmStateTransitionConsumer;
import monasca.persister.consumer.AlarmStateTransitionConsumerFactory;
import monasca.persister.consumer.KafkaAlarmStateTransitionConsumer;
import monasca.persister.consumer.KafkaAlarmStateTransitionConsumerFactory;
import monasca.persister.consumer.KafkaAlarmStateTransitionConsumerRunnableBasic;
import monasca.persister.consumer.KafkaAlarmStateTransitionConsumerRunnableBasicFactory;
import monasca.persister.consumer.KafkaChannel;
import monasca.persister.consumer.KafkaChannelFactory;
import monasca.persister.consumer.KafkaMetricsConsumer;
import monasca.persister.consumer.KafkaMetricsConsumerFactory;
import monasca.persister.consumer.KafkaMetricsConsumerRunnableBasic;
import monasca.persister.consumer.KafkaMetricsConsumerRunnableBasicFactory;
import monasca.persister.consumer.MetricsConsumer;
import monasca.persister.consumer.MetricsConsumerFactory;
import monasca.persister.dbi.DBIProvider;
import monasca.persister.pipeline.AlarmStateTransitionPipeline;
import monasca.persister.pipeline.AlarmStateTransitionPipelineFactory;
import monasca.persister.pipeline.MetricPipeline;
import monasca.persister.pipeline.MetricPipelineFactory;
import monasca.persister.pipeline.event.AlarmStateTransitionedEventHandler;
import monasca.persister.pipeline.event.AlarmStateTransitionedEventHandlerFactory;
import monasca.persister.pipeline.event.MetricHandler;
import monasca.persister.pipeline.event.MetricHandlerFactory;
import monasca.persister.repository.AlarmRepository;
import monasca.persister.repository.InfluxDBAlarmRepository;
import monasca.persister.repository.InfluxDBMetricRepository;
import monasca.persister.repository.MetricRepository;
import monasca.persister.repository.VerticaAlarmRepository;
import monasca.persister.repository.VerticaMetricRepository;
import com.google.inject.AbstractModule;
import com.google.inject.Scopes;

2
src/main/java/com/hpcloud/mon/persister/configuration/KafkaConfiguration.java → src/main/java/monasca/persister/configuration/KafkaConfiguration.java
View File

@ -18,7 +18,7 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.configuration;
package monasca.persister.configuration;
import com.fasterxml.jackson.annotation.JsonProperty;

2
src/main/java/com/hpcloud/mon/persister/configuration/MonPersisterConfiguration.java → src/main/java/monasca/persister/configuration/MonPersisterConfiguration.java
View File

@ -18,7 +18,7 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.configuration;
package monasca.persister.configuration;
import com.fasterxml.jackson.annotation.JsonProperty;

2
src/main/java/com/hpcloud/mon/persister/configuration/PipelineConfiguration.java → src/main/java/monasca/persister/configuration/PipelineConfiguration.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.configuration;
package monasca.persister.configuration;
import com.fasterxml.jackson.annotation.JsonProperty;

2
src/main/java/com/hpcloud/mon/persister/configuration/VerticaMetricRepositoryConfiguration.java → src/main/java/monasca/persister/configuration/VerticaMetricRepositoryConfiguration.java
View File

@ -18,7 +18,7 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.configuration;
package monasca.persister.configuration;
import com.fasterxml.jackson.annotation.JsonProperty;

4
src/main/java/com/hpcloud/mon/persister/consumer/AlarmStateTransitionConsumer.java → src/main/java/monasca/persister/consumer/AlarmStateTransitionConsumer.java
View File

@ -15,10 +15,10 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.consumer;
package monasca.persister.consumer;
import com.hpcloud.mon.common.event.AlarmStateTransitionedEvent;
import com.hpcloud.mon.persister.pipeline.AlarmStateTransitionPipeline;
import monasca.persister.pipeline.AlarmStateTransitionPipeline;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;

4
src/main/java/com/hpcloud/mon/persister/consumer/AlarmStateTransitionConsumerFactory.java → src/main/java/monasca/persister/consumer/AlarmStateTransitionConsumerFactory.java
View File

@ -15,9 +15,9 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.consumer;
package monasca.persister.consumer;
import com.hpcloud.mon.persister.pipeline.AlarmStateTransitionPipeline;
import monasca.persister.pipeline.AlarmStateTransitionPipeline;
public interface AlarmStateTransitionConsumerFactory {
AlarmStateTransitionConsumer create(KafkaAlarmStateTransitionConsumer kafkaConsumer,

4
src/main/java/com/hpcloud/mon/persister/consumer/Consumer.java → src/main/java/monasca/persister/consumer/Consumer.java
View File

@ -15,9 +15,9 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.consumer;
package monasca.persister.consumer;
import com.hpcloud.mon.persister.pipeline.ManagedPipeline;
import monasca.persister.pipeline.ManagedPipeline;
import com.google.inject.Inject;

4
src/main/java/com/hpcloud/mon/persister/consumer/KafkaAlarmStateTransitionConsumer.java → src/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumer.java
View File

@ -15,10 +15,10 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.consumer;
package monasca.persister.consumer;
import com.hpcloud.mon.common.event.AlarmStateTransitionedEvent;
import com.hpcloud.mon.persister.pipeline.AlarmStateTransitionPipeline;
import monasca.persister.pipeline.AlarmStateTransitionPipeline;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;

4
src/main/java/com/hpcloud/mon/persister/consumer/KafkaAlarmStateTransitionConsumerFactory.java → src/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumerFactory.java
View File

@ -15,9 +15,9 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.consumer;
package monasca.persister.consumer;
import com.hpcloud.mon.persister.pipeline.AlarmStateTransitionPipeline;
import monasca.persister.pipeline.AlarmStateTransitionPipeline;
public interface KafkaAlarmStateTransitionConsumerFactory {
KafkaAlarmStateTransitionConsumer create(KafkaChannel kafkaChannel, int threadNum,

4
src/main/java/com/hpcloud/mon/persister/consumer/KafkaAlarmStateTransitionConsumerRunnableBasic.java → src/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumerRunnableBasic.java
View File

@ -15,10 +15,10 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.consumer;
package monasca.persister.consumer;
import com.hpcloud.mon.common.event.AlarmStateTransitionedEvent;
import com.hpcloud.mon.persister.pipeline.AlarmStateTransitionPipeline;
import monasca.persister.pipeline.AlarmStateTransitionPipeline;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;

4
src/main/java/com/hpcloud/mon/persister/consumer/KafkaAlarmStateTransitionConsumerRunnableBasicFactory.java → src/main/java/monasca/persister/consumer/KafkaAlarmStateTransitionConsumerRunnableBasicFactory.java
View File

@ -15,9 +15,9 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.consumer;
package monasca.persister.consumer;
import com.hpcloud.mon.persister.pipeline.AlarmStateTransitionPipeline;
import monasca.persister.pipeline.AlarmStateTransitionPipeline;
public interface KafkaAlarmStateTransitionConsumerRunnableBasicFactory {
KafkaAlarmStateTransitionConsumerRunnableBasic create(AlarmStateTransitionPipeline pipeline, KafkaChannel kafkaChannel,

8
src/main/java/com/hpcloud/mon/persister/consumer/KafkaChannel.java → src/main/java/monasca/persister/consumer/KafkaChannel.java
View File

@ -15,11 +15,11 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.consumer;
package monasca.persister.consumer;
import com.hpcloud.mon.persister.configuration.KafkaConfiguration;
import com.hpcloud.mon.persister.configuration.MonPersisterConfiguration;
import com.hpcloud.mon.persister.configuration.PipelineConfiguration;
import monasca.persister.configuration.KafkaConfiguration;
import monasca.persister.configuration.MonPersisterConfiguration;
import monasca.persister.configuration.PipelineConfiguration;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;

6
src/main/java/com/hpcloud/mon/persister/consumer/KafkaChannelFactory.java → src/main/java/monasca/persister/consumer/KafkaChannelFactory.java
View File

@ -15,10 +15,10 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.consumer;
package monasca.persister.consumer;
import com.hpcloud.mon.persister.configuration.MonPersisterConfiguration;
import com.hpcloud.mon.persister.configuration.PipelineConfiguration;
import monasca.persister.configuration.MonPersisterConfiguration;
import monasca.persister.configuration.PipelineConfiguration;
public interface KafkaChannelFactory {
KafkaChannel create(MonPersisterConfiguration configuration,

2
src/main/java/com/hpcloud/mon/persister/consumer/KafkaConsumer.java → src/main/java/monasca/persister/consumer/KafkaConsumer.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.consumer;
package monasca.persister.consumer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

4
src/main/java/com/hpcloud/mon/persister/consumer/KafkaConsumerRunnableBasic.java → src/main/java/monasca/persister/consumer/KafkaConsumerRunnableBasic.java
View File

@ -15,9 +15,9 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.consumer;
package monasca.persister.consumer;
import com.hpcloud.mon.persister.pipeline.ManagedPipeline;
import monasca.persister.pipeline.ManagedPipeline;
import kafka.consumer.ConsumerIterator;

4
src/main/java/com/hpcloud/mon/persister/consumer/KafkaMetricsConsumer.java → src/main/java/monasca/persister/consumer/KafkaMetricsConsumer.java
View File

@ -15,10 +15,10 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.consumer;
package monasca.persister.consumer;
import com.hpcloud.mon.common.model.metric.MetricEnvelope;
import com.hpcloud.mon.persister.pipeline.MetricPipeline;
import monasca.persister.pipeline.MetricPipeline;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;

4
src/main/java/com/hpcloud/mon/persister/consumer/KafkaMetricsConsumerFactory.java → src/main/java/monasca/persister/consumer/KafkaMetricsConsumerFactory.java
View File

@ -15,9 +15,9 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.consumer;
package monasca.persister.consumer;
import com.hpcloud.mon.persister.pipeline.MetricPipeline;
import monasca.persister.pipeline.MetricPipeline;
public interface KafkaMetricsConsumerFactory {
public KafkaMetricsConsumer create(KafkaChannel kafkaChannel, int threadNum,

4
src/main/java/com/hpcloud/mon/persister/consumer/KafkaMetricsConsumerRunnableBasic.java → src/main/java/monasca/persister/consumer/KafkaMetricsConsumerRunnableBasic.java
View File

@ -15,10 +15,10 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.consumer;
package monasca.persister.consumer;
import com.hpcloud.mon.common.model.metric.MetricEnvelope;
import com.hpcloud.mon.persister.pipeline.MetricPipeline;
import monasca.persister.pipeline.MetricPipeline;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;

4
src/main/java/com/hpcloud/mon/persister/consumer/KafkaMetricsConsumerRunnableBasicFactory.java → src/main/java/monasca/persister/consumer/KafkaMetricsConsumerRunnableBasicFactory.java
View File

@ -15,9 +15,9 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.consumer;
package monasca.persister.consumer;
import com.hpcloud.mon.persister.pipeline.MetricPipeline;
import monasca.persister.pipeline.MetricPipeline;
public interface KafkaMetricsConsumerRunnableBasicFactory {
KafkaMetricsConsumerRunnableBasic create(MetricPipeline pipeline, KafkaChannel kafkaChannel, int threadNumber);

4
src/main/java/com/hpcloud/mon/persister/consumer/MetricsConsumer.java → src/main/java/monasca/persister/consumer/MetricsConsumer.java
View File

@ -15,10 +15,10 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.consumer;
package monasca.persister.consumer;
import com.hpcloud.mon.common.model.metric.MetricEnvelope;
import com.hpcloud.mon.persister.pipeline.MetricPipeline;
import monasca.persister.pipeline.MetricPipeline;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;

4
src/main/java/com/hpcloud/mon/persister/consumer/MetricsConsumerFactory.java → src/main/java/monasca/persister/consumer/MetricsConsumerFactory.java
View File

@ -12,9 +12,9 @@
* the License.
*/
package com.hpcloud.mon.persister.consumer;
package monasca.persister.consumer;
import com.hpcloud.mon.persister.pipeline.MetricPipeline;
import monasca.persister.pipeline.MetricPipeline;
public interface MetricsConsumerFactory {
MetricsConsumer create(KafkaMetricsConsumer kafkaConsumer, MetricPipeline pipeline);

4
src/main/java/com/hpcloud/mon/persister/dbi/DBIProvider.java → src/main/java/monasca/persister/dbi/DBIProvider.java
View File

@ -15,9 +15,9 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.dbi;
package monasca.persister.dbi;
import com.hpcloud.mon.persister.configuration.MonPersisterConfiguration;
import monasca.persister.configuration.MonPersisterConfiguration;
import com.google.inject.ProvisionException;

2
src/main/java/com/hpcloud/mon/persister/healthcheck/SimpleHealthCheck.java → src/main/java/monasca/persister/healthcheck/SimpleHealthCheck.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.healthcheck;
package monasca.persister.healthcheck;
import com.codahale.metrics.health.HealthCheck;

4
src/main/java/com/hpcloud/mon/persister/pipeline/AlarmStateTransitionPipeline.java → src/main/java/monasca/persister/pipeline/AlarmStateTransitionPipeline.java
View File

@ -15,10 +15,10 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.pipeline;
package monasca.persister.pipeline;
import com.hpcloud.mon.common.event.AlarmStateTransitionedEvent;
import com.hpcloud.mon.persister.pipeline.event.AlarmStateTransitionedEventHandler;
import monasca.persister.pipeline.event.AlarmStateTransitionedEventHandler;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;

4
src/main/java/com/hpcloud/mon/persister/pipeline/AlarmStateTransitionPipelineFactory.java → src/main/java/monasca/persister/pipeline/AlarmStateTransitionPipelineFactory.java
View File

@ -15,9 +15,9 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.pipeline;
package monasca.persister.pipeline;
import com.hpcloud.mon.persister.pipeline.event.AlarmStateTransitionedEventHandler;
import monasca.persister.pipeline.event.AlarmStateTransitionedEventHandler;
public interface AlarmStateTransitionPipelineFactory {
AlarmStateTransitionPipeline create(AlarmStateTransitionedEventHandler handler);

4
src/main/java/com/hpcloud/mon/persister/pipeline/ManagedPipeline.java → src/main/java/monasca/persister/pipeline/ManagedPipeline.java
View File

@ -15,9 +15,9 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.pipeline;
package monasca.persister.pipeline;
import com.hpcloud.mon.persister.pipeline.event.FlushableHandler;
import monasca.persister.pipeline.event.FlushableHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

4
src/main/java/com/hpcloud/mon/persister/pipeline/MetricPipeline.java → src/main/java/monasca/persister/pipeline/MetricPipeline.java
View File

@ -15,10 +15,10 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.pipeline;
package monasca.persister.pipeline;
import com.hpcloud.mon.common.model.metric.MetricEnvelope;
import com.hpcloud.mon.persister.pipeline.event.MetricHandler;
import monasca.persister.pipeline.event.MetricHandler;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;

4
src/main/java/com/hpcloud/mon/persister/pipeline/MetricPipelineFactory.java → src/main/java/monasca/persister/pipeline/MetricPipelineFactory.java
View File

@ -15,9 +15,9 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.pipeline;
package monasca.persister.pipeline;
import com.hpcloud.mon.persister.pipeline.event.MetricHandler;
import monasca.persister.pipeline.event.MetricHandler;
public interface MetricPipelineFactory {
MetricPipeline create(MetricHandler metricHandler);

6
src/main/java/com/hpcloud/mon/persister/pipeline/event/AlarmStateTransitionedEventHandler.java → src/main/java/monasca/persister/pipeline/event/AlarmStateTransitionedEventHandler.java
View File

@ -15,11 +15,11 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.pipeline.event;
package monasca.persister.pipeline.event;
import com.hpcloud.mon.common.event.AlarmStateTransitionedEvent;
import com.hpcloud.mon.persister.configuration.PipelineConfiguration;
import com.hpcloud.mon.persister.repository.AlarmRepository;
import monasca.persister.configuration.PipelineConfiguration;
import monasca.persister.repository.AlarmRepository;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;

4
src/main/java/com/hpcloud/mon/persister/pipeline/event/AlarmStateTransitionedEventHandlerFactory.java → src/main/java/monasca/persister/pipeline/event/AlarmStateTransitionedEventHandlerFactory.java
View File

@ -15,9 +15,9 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.pipeline.event;
package monasca.persister.pipeline.event;
import com.hpcloud.mon.persister.configuration.PipelineConfiguration;
import monasca.persister.configuration.PipelineConfiguration;
import com.google.inject.assistedinject.Assisted;

4
src/main/java/com/hpcloud/mon/persister/pipeline/event/FlushableHandler.java → src/main/java/monasca/persister/pipeline/event/FlushableHandler.java
View File

@ -15,9 +15,9 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.pipeline.event;
package monasca.persister.pipeline.event;
import com.hpcloud.mon.persister.configuration.PipelineConfiguration;
import monasca.persister.configuration.PipelineConfiguration;
import com.codahale.metrics.Meter;
import com.codahale.metrics.Timer;

10
src/main/java/com/hpcloud/mon/persister/pipeline/event/MetricHandler.java → src/main/java/monasca/persister/pipeline/event/MetricHandler.java
View File

@ -15,15 +15,15 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.pipeline.event;
package monasca.persister.pipeline.event;
import static com.hpcloud.mon.persister.repository.VerticaMetricsConstants.MAX_COLUMN_LENGTH;
import static monasca.persister.repository.VerticaMetricsConstants.MAX_COLUMN_LENGTH;
import com.hpcloud.mon.common.model.metric.Metric;
import com.hpcloud.mon.common.model.metric.MetricEnvelope;
import com.hpcloud.mon.persister.configuration.PipelineConfiguration;
import com.hpcloud.mon.persister.repository.MetricRepository;
import com.hpcloud.mon.persister.repository.Sha1HashId;
import monasca.persister.configuration.PipelineConfiguration;
import monasca.persister.repository.MetricRepository;
import monasca.persister.repository.Sha1HashId;
import com.codahale.metrics.Counter;
import com.google.inject.Inject;

4
src/main/java/com/hpcloud/mon/persister/pipeline/event/MetricHandlerFactory.java → src/main/java/monasca/persister/pipeline/event/MetricHandlerFactory.java
View File

@ -15,9 +15,9 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.pipeline.event;
package monasca.persister.pipeline.event;
import com.hpcloud.mon.persister.configuration.PipelineConfiguration;
import monasca.persister.configuration.PipelineConfiguration;
import com.google.inject.assistedinject.Assisted;

2
src/main/java/com/hpcloud/mon/persister/repository/AlarmRepository.java → src/main/java/monasca/persister/repository/AlarmRepository.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.repository;
package monasca.persister.repository;
import com.hpcloud.mon.common.event.AlarmStateTransitionedEvent;

4
src/main/java/com/hpcloud/mon/persister/repository/InfluxDBAlarmRepository.java → src/main/java/monasca/persister/repository/InfluxDBAlarmRepository.java
View File

@ -15,10 +15,10 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.repository;
package monasca.persister.repository;
import com.hpcloud.mon.common.event.AlarmStateTransitionedEvent;
import com.hpcloud.mon.persister.configuration.MonPersisterConfiguration;
import monasca.persister.configuration.MonPersisterConfiguration;
import com.codahale.metrics.Meter;
import com.codahale.metrics.Timer;

4
src/main/java/com/hpcloud/mon/persister/repository/InfluxDBMetricRepository.java → src/main/java/monasca/persister/repository/InfluxDBMetricRepository.java
View File

@ -15,9 +15,9 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.repository;
package monasca.persister.repository;
import com.hpcloud.mon.persister.configuration.MonPersisterConfiguration;
import monasca.persister.configuration.MonPersisterConfiguration;
import com.codahale.metrics.Meter;
import com.codahale.metrics.Timer;

4
src/main/java/com/hpcloud/mon/persister/repository/InfluxRepository.java → src/main/java/monasca/persister/repository/InfluxRepository.java
View File

@ -15,9 +15,9 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.repository;
package monasca.persister.repository;
import com.hpcloud.mon.persister.configuration.MonPersisterConfiguration;
import monasca.persister.configuration.MonPersisterConfiguration;
import io.dropwizard.setup.Environment;

2
src/main/java/com/hpcloud/mon/persister/repository/MetricRepository.java → src/main/java/monasca/persister/repository/MetricRepository.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.repository;
package monasca.persister.repository;
public interface MetricRepository {
void addMetricToBatch(Sha1HashId defDimsId, String timeStamp, double value);

2
src/main/java/com/hpcloud/mon/persister/repository/Sha1HashId.java → src/main/java/monasca/persister/repository/Sha1HashId.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.repository;
package monasca.persister.repository;
import org.apache.commons.codec.binary.Hex;

4
src/main/java/com/hpcloud/mon/persister/repository/VerticaAlarmRepository.java → src/main/java/monasca/persister/repository/VerticaAlarmRepository.java
View File

@ -15,10 +15,10 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.repository;
package monasca.persister.repository;
import com.hpcloud.mon.common.event.AlarmStateTransitionedEvent;
import com.hpcloud.mon.persister.configuration.MonPersisterConfiguration;
import monasca.persister.configuration.MonPersisterConfiguration;
import com.codahale.metrics.Timer;

4
src/main/java/com/hpcloud/mon/persister/repository/VerticaMetricRepository.java → src/main/java/monasca/persister/repository/VerticaMetricRepository.java
View File

@ -15,9 +15,9 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.repository;
package monasca.persister.repository;
import com.hpcloud.mon.persister.configuration.MonPersisterConfiguration;
import monasca.persister.configuration.MonPersisterConfiguration;
import com.codahale.metrics.Meter;
import com.codahale.metrics.Timer;

2
src/main/java/com/hpcloud/mon/persister/repository/VerticaMetricsConstants.java → src/main/java/monasca/persister/repository/VerticaMetricsConstants.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.repository;
package monasca.persister.repository;
public final class VerticaMetricsConstants {
public static final int MAX_COLUMN_LENGTH = 255;

2
src/main/java/com/hpcloud/mon/persister/repository/VerticaRepository.java → src/main/java/monasca/persister/repository/VerticaRepository.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.repository;
package monasca.persister.repository;
import org.skife.jdbi.v2.DBI;
import org.skife.jdbi.v2.Handle;

2
src/main/java/com/hpcloud/mon/persister/resource/PlaceHolder.java → src/main/java/monasca/persister/resource/PlaceHolder.java
View File

@ -18,7 +18,7 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister.resource;
package monasca.persister.resource;
public class PlaceHolder {
private final String content;

2
src/main/java/com/hpcloud/mon/persister/resource/Resource.java → src/main/java/monasca/persister/resource/Resource.java
View File

@ -15,7 +15,7 @@
* the License.
*/
package com.hpcloud.mon.persister.resource;
package monasca.persister.resource;
import javax.ws.rs.GET;
import javax.ws.rs.Path;

16
src/main/resources/mon-persister-config.yml → src/main/resources/persister-config.yml
View File

@ -1,4 +1,4 @@
name: mon-persister
name: monasca-persister
alarmHistoryConfiguration:
batchSize: 100
@ -57,7 +57,7 @@ influxDbConfiguration:
#dataSourceFactory:
# driverClass: com.vertica.jdbc.Driver
## url: jdbc:vertica://mon-aw1rdd1-vertica0001.rndd.aw1.hpcloud.net:5433/som
## url: jdbc:vertica://mini-mon:5433/monasca
# # my Vertica DB in the cloud
# #url: jdbc:vertica://15.185.94.245:5433/som
# url: jdbc:vertica://192.168.10.4:5433/mon
@ -100,8 +100,8 @@ logging:
# Sets the level for 'com.example.app' to DEBUG.
com.example.app: DEBUG
com.hpcloud: debug
# com.hpcloud.mon.persister.repository: DEBUG
monasca: DEBUG
# monasca.persister.repository: DEBUG
appenders:
- type: console
@ -112,18 +112,18 @@ logging:
- type: file
threshold: DEBUG
archive: true
currentLogFilename: ./logs/mon-persister.log
archivedLogFilenamePattern: ./logs/mon-persister-%d.log.gz
currentLogFilename: ./logs/monasca-persister.log
archivedLogFilenamePattern: ./logs/monasca-persister-%d.log.gz
archivedFileCount: 5
- type: file
# The file to which current statements will be logged.
currentLogFilename: ./logs/mon-persister.log
currentLogFilename: ./logs/monasca-persister.log
# When the log file rotates, the archived log will be renamed to this and gzipped. The
# %d is replaced with the previous day (yyyy-MM-dd). Custom rolling windows can be created
# by passing a SimpleDateFormat-compatible format as an argument: "%d{yyyy-MM-dd-hh}".
archivedLogFilenamePattern: ./logs/mon-persister-%d.log.gz
archivedLogFilenamePattern: ./logs/monasca-persister-%d.log.gz
# The number of archived files to keep.
archivedFileCount: 5

10
src/test/java/com/hpcloud/mon/persister/MonPersisterConsumerTest.java → src/test/java/monasca/persister/MonPersisterConsumerTest.java
View File

@ -15,12 +15,12 @@
* limitations under the License.
*/
package com.hpcloud.mon.persister;
package monasca.persister;
import com.hpcloud.mon.persister.consumer.KafkaMetricsConsumer;
import com.hpcloud.mon.persister.consumer.MetricsConsumer;
import com.hpcloud.mon.persister.pipeline.MetricPipeline;
import com.hpcloud.mon.persister.pipeline.event.MetricHandler;
import monasca.persister.consumer.KafkaMetricsConsumer;
import monasca.persister.consumer.MetricsConsumer;
import monasca.persister.pipeline.MetricPipeline;
import monasca.persister.pipeline.event.MetricHandler;
import org.junit.Before;
import org.junit.Test;