openstack/monasca-thresh
Code Issues Proposed changes

Change packages to monasca.thresh

Browse Source 
The diffs are going to be very hard to read on this change, but
basically the change is from com.hpcloud.mon to monasca.thresh.

Since monasca-common packages haven't changed, yet, they are still
referenced as com.hpcloud.mon, but everything else has changed to
monasca.thresh.

The init script has also been changed to invoke the new package path.

Change-Id: I5aad9302a8f5b11ed1b9874160f0d7a9882c5b2d
This commit is contained in:
Craig Bryant 2014-08-05 22:03:47 -06:00
parent e9da888ac5
commit f72caef55f
56 changed files with 175 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
thresh/pom.xml
View File

@ -228,7 +228,7 @@
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>com.hpcloud.mon.ThresholdingEngine</mainClass>
<mainClass>monasca.thresh.ThresholdingEngine</mainClass>
</transformer>
</transformers>
<shadedArtifactAttached>true</shadedArtifactAttached>

2
thresh/src/deb/etc/mon-thresh-config.yml-sample
View File

@ -63,7 +63,7 @@ sporadicMetricNamespaces:
database:
driverClass: com.vertica.jdbc.Driver
url: jdbc:vertica://mon-aw1rdd1-vertica0001.rndd.aw1.hpcloud.net:5433/som
url: jdbc:vertica://mini-mon:5433/monasca
user: thresh
password: password
properties:

2
thresh/src/deb/init/mon-thresh
View File

@ -13,7 +13,7 @@ case "$1" in
start)
$0 status
if [ $? -ne 0 ]; then
sudo -Hu thresh /opt/storm/current/bin/storm jar /opt/mon/mon-thresh.jar com.hpcloud.mon.ThresholdingEngine /etc/mon/mon-thresh-config.yml thresh-cluster
sudo -Hu thresh /opt/storm/current/bin/storm jar /opt/mon/mon-thresh.jar monasca.thresh.ThresholdingEngine /etc/mon/mon-thresh-config.yml thresh-cluster
else
echo "Mon-thresh is already running"
fi

2
thresh/src/main/java/com/hpcloud/mon/EventSpoutConfig.java → thresh/src/main/java/monasca/thresh/EventSpoutConfig.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon;
package monasca.thresh;
public class EventSpoutConfig extends KafkaSpoutConfig {

2
thresh/src/main/java/com/hpcloud/mon/KafkaSpoutConfig.java → thresh/src/main/java/monasca/thresh/KafkaSpoutConfig.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon;
package monasca.thresh;
import com.hpcloud.configuration.KafkaConsumerConfiguration;

2
thresh/src/main/java/com/hpcloud/mon/MetricSpoutConfig.java → thresh/src/main/java/monasca/thresh/MetricSpoutConfig.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon;
package monasca.thresh;
public class MetricSpoutConfig extends KafkaSpoutConfig {

4
thresh/src/main/java/com/hpcloud/mon/ThresholdingConfiguration.java → thresh/src/main/java/monasca/thresh/ThresholdingConfiguration.java
View File

@ -15,10 +15,10 @@
* limitations under the License.
*/
package com.hpcloud.mon;
package monasca.thresh;
import com.hpcloud.configuration.KafkaProducerConfiguration;
import com.hpcloud.mon.infrastructure.thresholding.DataSourceFactory;
import monasca.thresh.infrastructure.thresholding.DataSourceFactory;
import org.hibernate.validator.constraints.NotEmpty;

4
thresh/src/main/java/com/hpcloud/mon/ThresholdingEngine.java → thresh/src/main/java/monasca/thresh/ThresholdingEngine.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon;
package monasca.thresh;
import ch.qos.logback.classic.LoggerContext;
import ch.qos.logback.core.util.StatusPrinter;
@ -83,7 +83,7 @@ public class ThresholdingEngine {
protected void run() throws Exception {
Config config = Injector.getInstance(Config.class);
StormTopology topology = Injector.getInstance(StormTopology.class);
config.registerSerialization(com.hpcloud.mon.domain.model.SubAlarm.class);
config.registerSerialization(monasca.thresh.domain.model.SubAlarm.class);
if (local) {
logger.info("submitting topology {} to local storm cluster", topologyName);

16
thresh/src/main/java/com/hpcloud/mon/TopologyModule.java → thresh/src/main/java/monasca/thresh/TopologyModule.java
View File

@ -15,15 +15,15 @@
* limitations under the License.
*/
package com.hpcloud.mon;
package monasca.thresh;
import com.hpcloud.mon.infrastructure.thresholding.AlarmThresholdingBolt;
import com.hpcloud.mon.infrastructure.thresholding.EventProcessingBolt;
import com.hpcloud.mon.infrastructure.thresholding.EventSpout;
import com.hpcloud.mon.infrastructure.thresholding.MetricAggregationBolt;
import com.hpcloud.mon.infrastructure.thresholding.MetricFilteringBolt;
import com.hpcloud.mon.infrastructure.thresholding.MetricSpout;
import com.hpcloud.mon.infrastructure.thresholding.deserializer.EventDeserializer;
import monasca.thresh.infrastructure.thresholding.AlarmThresholdingBolt;
import monasca.thresh.infrastructure.thresholding.EventProcessingBolt;
import monasca.thresh.infrastructure.thresholding.EventSpout;
import monasca.thresh.infrastructure.thresholding.MetricAggregationBolt;
import monasca.thresh.infrastructure.thresholding.MetricFilteringBolt;
import monasca.thresh.infrastructure.thresholding.MetricSpout;
import monasca.thresh.infrastructure.thresholding.deserializer.EventDeserializer;
import com.hpcloud.util.Injector;
import backtype.storm.Config;

2
thresh/src/main/java/com/hpcloud/mon/domain/model/Alarm.java → thresh/src/main/java/monasca/thresh/domain/model/Alarm.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon.domain.model;
package monasca.thresh.domain.model;
import com.hpcloud.mon.common.model.alarm.AlarmExpression;
import com.hpcloud.mon.common.model.alarm.AlarmState;

2
thresh/src/main/java/com/hpcloud/mon/domain/model/MetricDefinitionAndTenantId.java → thresh/src/main/java/monasca/thresh/domain/model/MetricDefinitionAndTenantId.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon.domain.model;
package monasca.thresh.domain.model;
import com.hpcloud.mon.common.model.metric.MetricDefinition;

2
thresh/src/main/java/com/hpcloud/mon/domain/model/MetricDefinitionAndTenantIdMatcher.java → thresh/src/main/java/monasca/thresh/domain/model/MetricDefinitionAndTenantIdMatcher.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon.domain.model;
package monasca.thresh.domain.model;
import com.hpcloud.mon.common.model.metric.MetricDefinition;

2
thresh/src/main/java/com/hpcloud/mon/domain/model/SubAlarm.java → thresh/src/main/java/monasca/thresh/domain/model/SubAlarm.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon.domain.model;
package monasca.thresh.domain.model;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;

2
thresh/src/main/java/com/hpcloud/mon/domain/model/SubAlarmStats.java → thresh/src/main/java/monasca/thresh/domain/model/SubAlarmStats.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon.domain.model;
package monasca.thresh.domain.model;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.util.stats.SlidingWindowStats;

4
thresh/src/main/java/com/hpcloud/mon/domain/service/AlarmDAO.java → thresh/src/main/java/monasca/thresh/domain/service/AlarmDAO.java
View File

@ -15,10 +15,10 @@
* limitations under the License.
*/
package com.hpcloud.mon.domain.service;
package monasca.thresh.domain.service;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.domain.model.Alarm;
import monasca.thresh.domain.model.Alarm;
/**
* Alarm DAO.

2
thresh/src/main/java/com/hpcloud/mon/domain/service/MetricDefinitionDAO.java → thresh/src/main/java/monasca/thresh/domain/service/MetricDefinitionDAO.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon.domain.service;
package monasca.thresh.domain.service;
import java.util.List;

6
thresh/src/main/java/com/hpcloud/mon/domain/service/SubAlarmDAO.java → thresh/src/main/java/monasca/thresh/domain/service/SubAlarmDAO.java
View File

@ -15,10 +15,10 @@
* limitations under the License.
*/
package com.hpcloud.mon.domain.service;
package monasca.thresh.domain.service;
import com.hpcloud.mon.domain.model.MetricDefinitionAndTenantId;
import com.hpcloud.mon.domain.model.SubAlarm;
import monasca.thresh.domain.model.MetricDefinitionAndTenantId;
import monasca.thresh.domain.model.SubAlarm;
import java.util.List;

4
thresh/src/main/java/com/hpcloud/mon/domain/service/SubAlarmMetricDefinition.java → thresh/src/main/java/monasca/thresh/domain/service/SubAlarmMetricDefinition.java
View File

@ -15,9 +15,9 @@
* limitations under the License.
*/
package com.hpcloud.mon.domain.service;
package monasca.thresh.domain.service;
import com.hpcloud.mon.domain.model.MetricDefinitionAndTenantId;
import monasca.thresh.domain.model.MetricDefinitionAndTenantId;
public class SubAlarmMetricDefinition {
private final String subAlarmId;

6
thresh/src/main/java/com/hpcloud/mon/domain/service/SubAlarmStatsRepository.java → thresh/src/main/java/monasca/thresh/domain/service/SubAlarmStatsRepository.java
View File

@ -15,10 +15,10 @@
* limitations under the License.
*/
package com.hpcloud.mon.domain.service;
package monasca.thresh.domain.service;
import com.hpcloud.mon.domain.model.SubAlarm;
import com.hpcloud.mon.domain.model.SubAlarmStats;
import monasca.thresh.domain.model.SubAlarm;
import monasca.thresh.domain.model.SubAlarmStats;
import java.util.Collection;
import java.util.HashMap;

8
thresh/src/main/java/com/hpcloud/mon/infrastructure/persistence/AlarmDAOImpl.java → thresh/src/main/java/monasca/thresh/infrastructure/persistence/AlarmDAOImpl.java
View File

@ -15,16 +15,16 @@
* limitations under the License.
*/
package com.hpcloud.mon.infrastructure.persistence;
package monasca.thresh.infrastructure.persistence;
import com.hpcloud.mon.common.model.alarm.AggregateFunction;
import com.hpcloud.mon.common.model.alarm.AlarmOperator;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import com.hpcloud.mon.domain.model.Alarm;
import com.hpcloud.mon.domain.model.SubAlarm;
import com.hpcloud.mon.domain.service.AlarmDAO;
import monasca.thresh.domain.model.Alarm;
import monasca.thresh.domain.model.SubAlarm;
import monasca.thresh.domain.service.AlarmDAO;
import com.hpcloud.persistence.BeanMapper;
import com.hpcloud.persistence.SqlQueries;

8
thresh/src/main/java/com/hpcloud/mon/infrastructure/persistence/MetricDefinitionDAOImpl.java → thresh/src/main/java/monasca/thresh/infrastructure/persistence/MetricDefinitionDAOImpl.java
View File

@ -15,12 +15,12 @@
* limitations under the License.
*/
package com.hpcloud.mon.infrastructure.persistence;
package monasca.thresh.infrastructure.persistence;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import com.hpcloud.mon.domain.model.MetricDefinitionAndTenantId;
import com.hpcloud.mon.domain.service.MetricDefinitionDAO;
import com.hpcloud.mon.domain.service.SubAlarmMetricDefinition;
import monasca.thresh.domain.model.MetricDefinitionAndTenantId;
import monasca.thresh.domain.service.MetricDefinitionDAO;
import monasca.thresh.domain.service.SubAlarmMetricDefinition;
import org.skife.jdbi.v2.DBI;
import org.skife.jdbi.v2.Handle;

10
thresh/src/main/java/com/hpcloud/mon/infrastructure/persistence/PersistenceModule.java → thresh/src/main/java/monasca/thresh/infrastructure/persistence/PersistenceModule.java
View File

@ -15,12 +15,12 @@
* limitations under the License.
*/
package com.hpcloud.mon.infrastructure.persistence;
package monasca.thresh.infrastructure.persistence;
import com.hpcloud.mon.domain.service.AlarmDAO;
import com.hpcloud.mon.domain.service.MetricDefinitionDAO;
import com.hpcloud.mon.domain.service.SubAlarmDAO;
import com.hpcloud.mon.infrastructure.thresholding.DataSourceFactory;
import monasca.thresh.domain.service.AlarmDAO;
import monasca.thresh.domain.service.MetricDefinitionDAO;
import monasca.thresh.domain.service.SubAlarmDAO;
import monasca.thresh.infrastructure.thresholding.DataSourceFactory;
import com.google.inject.AbstractModule;
import com.google.inject.Provides;

8
thresh/src/main/java/com/hpcloud/mon/infrastructure/persistence/SubAlarmDAOImpl.java → thresh/src/main/java/monasca/thresh/infrastructure/persistence/SubAlarmDAOImpl.java
View File

@ -15,15 +15,15 @@
* limitations under the License.
*/
package com.hpcloud.mon.infrastructure.persistence;
package monasca.thresh.infrastructure.persistence;
import com.hpcloud.mon.common.model.alarm.AggregateFunction;
import com.hpcloud.mon.common.model.alarm.AlarmOperator;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import com.hpcloud.mon.domain.model.MetricDefinitionAndTenantId;
import com.hpcloud.mon.domain.model.SubAlarm;
import com.hpcloud.mon.domain.service.SubAlarmDAO;
import monasca.thresh.domain.model.MetricDefinitionAndTenantId;
import monasca.thresh.domain.model.SubAlarm;
import monasca.thresh.domain.service.SubAlarmDAO;
import com.hpcloud.persistence.SqlStatements;
import org.skife.jdbi.v2.DBI;

2
thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/AlarmEventForwarder.java → thresh/src/main/java/monasca/thresh/infrastructure/thresholding/AlarmEventForwarder.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon.infrastructure.thresholding;
package monasca.thresh.infrastructure.thresholding;
public interface AlarmEventForwarder {

12
thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/AlarmThresholdingBolt.java → thresh/src/main/java/monasca/thresh/infrastructure/thresholding/AlarmThresholdingBolt.java
View File

@ -15,18 +15,18 @@
* limitations under the License.
*/
package com.hpcloud.mon.infrastructure.thresholding;
package monasca.thresh.infrastructure.thresholding;
import com.hpcloud.configuration.KafkaProducerConfiguration;
import com.hpcloud.mon.ThresholdingConfiguration;
import monasca.thresh.ThresholdingConfiguration;
import com.hpcloud.mon.common.event.AlarmStateTransitionedEvent;
import com.hpcloud.mon.common.event.AlarmUpdatedEvent;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import com.hpcloud.mon.domain.model.Alarm;
import com.hpcloud.mon.domain.model.SubAlarm;
import com.hpcloud.mon.domain.service.AlarmDAO;
import com.hpcloud.mon.infrastructure.persistence.PersistenceModule;
import monasca.thresh.domain.model.Alarm;
import monasca.thresh.domain.model.SubAlarm;
import monasca.thresh.domain.service.AlarmDAO;
import monasca.thresh.infrastructure.persistence.PersistenceModule;
import com.hpcloud.streaming.storm.Logging;
import com.hpcloud.streaming.storm.Streams;
import com.hpcloud.util.Injector;

2
thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/DataSourceFactory.java → thresh/src/main/java/monasca/thresh/infrastructure/thresholding/DataSourceFactory.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon.infrastructure.thresholding;
package monasca.thresh.infrastructure.thresholding;
import java.io.Serializable;
import java.util.Properties;

6
thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/EventProcessingBolt.java → thresh/src/main/java/monasca/thresh/infrastructure/thresholding/EventProcessingBolt.java
View File

@ -15,15 +15,15 @@
* limitations under the License.
*/
package com.hpcloud.mon.infrastructure.thresholding;
package monasca.thresh.infrastructure.thresholding;
import com.hpcloud.mon.common.event.AlarmCreatedEvent;
import com.hpcloud.mon.common.event.AlarmDeletedEvent;
import com.hpcloud.mon.common.event.AlarmUpdatedEvent;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import com.hpcloud.mon.domain.model.MetricDefinitionAndTenantId;
import com.hpcloud.mon.domain.model.SubAlarm;
import monasca.thresh.domain.model.MetricDefinitionAndTenantId;
import monasca.thresh.domain.model.SubAlarm;
import com.hpcloud.streaming.storm.Logging;
import backtype.storm.task.OutputCollector;

6
thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/EventSpout.java → thresh/src/main/java/monasca/thresh/infrastructure/thresholding/EventSpout.java
View File

@ -15,10 +15,10 @@
* limitations under the License.
*/
package com.hpcloud.mon.infrastructure.thresholding;
package monasca.thresh.infrastructure.thresholding;
import com.hpcloud.mon.EventSpoutConfig;
import com.hpcloud.mon.infrastructure.thresholding.deserializer.EventDeserializer;
import monasca.thresh.EventSpoutConfig;
import monasca.thresh.infrastructure.thresholding.deserializer.EventDeserializer;
import backtype.storm.spout.SpoutOutputCollector;
import backtype.storm.topology.OutputFieldsDeclarer;

2
thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/KafkaAlarmEventForwarder.java → thresh/src/main/java/monasca/thresh/infrastructure/thresholding/KafkaAlarmEventForwarder.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon.infrastructure.thresholding;
package monasca.thresh.infrastructure.thresholding;
import com.hpcloud.configuration.KafkaProducerConfiguration;
import com.hpcloud.configuration.KafkaProducerProperties;

4
thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/KafkaSpout.java → thresh/src/main/java/monasca/thresh/infrastructure/thresholding/KafkaSpout.java
View File

@ -15,10 +15,10 @@
* limitations under the License.
*/
package com.hpcloud.mon.infrastructure.thresholding;
package monasca.thresh.infrastructure.thresholding;
import com.hpcloud.configuration.KafkaConsumerProperties;
import com.hpcloud.mon.KafkaSpoutConfig;
import monasca.thresh.KafkaSpoutConfig;
import backtype.storm.spout.SpoutOutputCollector;
import backtype.storm.task.TopologyContext;

16
thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/MetricAggregationBolt.java → thresh/src/main/java/monasca/thresh/infrastructure/thresholding/MetricAggregationBolt.java
View File

@ -15,15 +15,15 @@
* limitations under the License.
*/
package com.hpcloud.mon.infrastructure.thresholding;
package monasca.thresh.infrastructure.thresholding;
import com.hpcloud.mon.common.model.metric.Metric;
import com.hpcloud.mon.domain.model.MetricDefinitionAndTenantId;
import com.hpcloud.mon.domain.model.SubAlarm;
import com.hpcloud.mon.domain.model.SubAlarmStats;
import com.hpcloud.mon.domain.service.SubAlarmDAO;
import com.hpcloud.mon.domain.service.SubAlarmStatsRepository;
import com.hpcloud.mon.infrastructure.persistence.PersistenceModule;
import monasca.thresh.domain.model.MetricDefinitionAndTenantId;
import monasca.thresh.domain.model.SubAlarm;
import monasca.thresh.domain.model.SubAlarmStats;
import monasca.thresh.domain.service.SubAlarmDAO;
import monasca.thresh.domain.service.SubAlarmStatsRepository;
import monasca.thresh.infrastructure.persistence.PersistenceModule;
import com.hpcloud.streaming.storm.Logging;
import com.hpcloud.streaming.storm.Streams;
import com.hpcloud.streaming.storm.Tuples;
@ -66,7 +66,7 @@ import java.util.Set;
*/
public class MetricAggregationBolt extends BaseRichBolt {
private static final long serialVersionUID = 5624314196838090726L;
public static final String TICK_TUPLE_SECONDS_KEY = "com.hpcloud.mon.aggregation.tick.seconds";
public static final String TICK_TUPLE_SECONDS_KEY = "monasca.thresh.aggregation.tick.seconds";
public static final String[] FIELDS = new String[] {"alarmId", "subAlarm"};
public static final String METRIC_AGGREGATION_CONTROL_STREAM = "MetricAggregationControl";
public static final String[] METRIC_AGGREGATION_CONTROL_FIELDS = new String[] {"directive"};

22
thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/MetricFilteringBolt.java → thresh/src/main/java/monasca/thresh/infrastructure/thresholding/MetricFilteringBolt.java
View File

@ -15,16 +15,16 @@
* limitations under the License.
*/
package com.hpcloud.mon.infrastructure.thresholding;
package monasca.thresh.infrastructure.thresholding;
import com.hpcloud.mon.common.model.metric.Metric;
import com.hpcloud.mon.domain.model.MetricDefinitionAndTenantId;
import com.hpcloud.mon.domain.model.MetricDefinitionAndTenantIdMatcher;
import com.hpcloud.mon.domain.model.SubAlarm;
import com.hpcloud.mon.domain.service.MetricDefinitionDAO;
import com.hpcloud.mon.domain.service.SubAlarmDAO;
import com.hpcloud.mon.domain.service.SubAlarmMetricDefinition;
import com.hpcloud.mon.infrastructure.persistence.PersistenceModule;
import monasca.thresh.domain.model.MetricDefinitionAndTenantId;
import monasca.thresh.domain.model.MetricDefinitionAndTenantIdMatcher;
import monasca.thresh.domain.model.SubAlarm;
import monasca.thresh.domain.service.MetricDefinitionDAO;
import monasca.thresh.domain.service.SubAlarmDAO;
import monasca.thresh.domain.service.SubAlarmMetricDefinition;
import monasca.thresh.infrastructure.persistence.PersistenceModule;
import com.hpcloud.streaming.storm.Logging;
import com.hpcloud.streaming.storm.Streams;
import com.hpcloud.util.Injector;
@ -77,11 +77,11 @@ import java.util.concurrent.ConcurrentHashMap;
public class MetricFilteringBolt extends BaseRichBolt {
private static final long serialVersionUID = 1096706128973976599L;
public static final String MIN_LAG_VALUE_KEY = "com.hpcloud.mon.filtering.minLagValue";
public static final String MIN_LAG_VALUE_KEY = "monasca.thresh.filtering.minLagValue";
public static final int MIN_LAG_VALUE_DEFAULT = 10;
public static final String MAX_LAG_MESSAGES_KEY = "com.hpcloud.mon.filtering.maxLagMessages";
public static final String MAX_LAG_MESSAGES_KEY = "monasca.thresh.filtering.maxLagMessages";
public static final int MAX_LAG_MESSAGES_DEFAULT = 10;
public static final String LAG_MESSAGE_PERIOD_KEY = "com.hpcloud.mon.filtering.lagMessagePeriod";
public static final String LAG_MESSAGE_PERIOD_KEY = "monasca.thresh.filtering.lagMessagePeriod";
public static final int LAG_MESSAGE_PERIOD_DEFAULT = 30;
public static final String[] FIELDS = new String[] {"metricDefinitionAndTenantId", "metric"};

6
thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/MetricSpout.java → thresh/src/main/java/monasca/thresh/infrastructure/thresholding/MetricSpout.java
View File

@ -15,12 +15,12 @@
* limitations under the License.
*/
package com.hpcloud.mon.infrastructure.thresholding;
package monasca.thresh.infrastructure.thresholding;
import com.hpcloud.mon.MetricSpoutConfig;
import monasca.thresh.MetricSpoutConfig;
import com.hpcloud.mon.common.model.metric.MetricEnvelope;
import com.hpcloud.mon.common.model.metric.MetricEnvelopes;
import com.hpcloud.mon.domain.model.MetricDefinitionAndTenantId;
import monasca.thresh.domain.model.MetricDefinitionAndTenantId;
import backtype.storm.spout.SpoutOutputCollector;
import backtype.storm.topology.OutputFieldsDeclarer;

2
thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/ProducerModule.java → thresh/src/main/java/monasca/thresh/infrastructure/thresholding/ProducerModule.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon.infrastructure.thresholding;
package monasca.thresh.infrastructure.thresholding;
import com.hpcloud.configuration.KafkaProducerConfiguration;

2
thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/PropertyFinder.java → thresh/src/main/java/monasca/thresh/infrastructure/thresholding/PropertyFinder.java
View File

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

2
thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/deserializer/EventDeserializer.java → thresh/src/main/java/monasca/thresh/infrastructure/thresholding/deserializer/EventDeserializer.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon.infrastructure.thresholding.deserializer;
package monasca.thresh.infrastructure.thresholding.deserializer;
import com.hpcloud.mon.common.event.AlarmCreatedEvent;
import com.hpcloud.mon.common.event.AlarmDeletedEvent;

4
thresh/src/main/resources/logback.xml
View File

@ -17,10 +17,10 @@
</appender>
<logger name="com.hpcloud" level = "info"/>
<logger name="monasca" level = "info"/>
<root level="info">
<appender-ref ref="STDOUT" />
<appender-ref ref="FILE" />
</root>
</configuration>
</configuration>

2
thresh/src/test/java/com/hpcloud/mon/Assert.java → thresh/src/test/java/monasca/thresh/Assert.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon;
package monasca.thresh;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.fail;

26
thresh/src/test/java/com/hpcloud/mon/ThresholdingEngineAlarmTest.java → thresh/src/test/java/monasca/thresh/ThresholdingEngineAlarmTest.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon;
package monasca.thresh;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
@ -33,18 +33,18 @@ import com.hpcloud.mon.common.model.alarm.AlarmExpression;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import com.hpcloud.mon.common.model.metric.Metric;
import com.hpcloud.mon.domain.model.Alarm;
import com.hpcloud.mon.domain.model.MetricDefinitionAndTenantId;
import com.hpcloud.mon.domain.model.SubAlarm;
import com.hpcloud.mon.domain.service.AlarmDAO;
import com.hpcloud.mon.domain.service.MetricDefinitionDAO;
import com.hpcloud.mon.domain.service.SubAlarmDAO;
import com.hpcloud.mon.domain.service.SubAlarmMetricDefinition;
import com.hpcloud.mon.infrastructure.thresholding.AlarmEventForwarder;
import com.hpcloud.mon.infrastructure.thresholding.EventProcessingBoltTest;
import com.hpcloud.mon.infrastructure.thresholding.MetricAggregationBolt;
import com.hpcloud.mon.infrastructure.thresholding.MetricSpout;
import com.hpcloud.mon.infrastructure.thresholding.ProducerModule;
import monasca.thresh.domain.model.Alarm;
import monasca.thresh.domain.model.MetricDefinitionAndTenantId;
import monasca.thresh.domain.model.SubAlarm;
import monasca.thresh.domain.service.AlarmDAO;
import monasca.thresh.domain.service.MetricDefinitionDAO;
import monasca.thresh.domain.service.SubAlarmDAO;
import monasca.thresh.domain.service.SubAlarmMetricDefinition;
import monasca.thresh.infrastructure.thresholding.AlarmEventForwarder;
import monasca.thresh.infrastructure.thresholding.EventProcessingBoltTest;
import monasca.thresh.infrastructure.thresholding.MetricAggregationBolt;
import monasca.thresh.infrastructure.thresholding.MetricSpout;
import monasca.thresh.infrastructure.thresholding.ProducerModule;
import com.hpcloud.streaming.storm.TopologyTestCase;
import com.hpcloud.util.Injector;
import com.hpcloud.util.Serialization;

4
thresh/src/test/java/com/hpcloud/mon/ThresholdingEngineRunner.java → thresh/src/test/java/monasca/thresh/ThresholdingEngineRunner.java
View File

@ -15,9 +15,9 @@
* limitations under the License.
*/
package com.hpcloud.mon;
package monasca.thresh;
import com.hpcloud.mon.ThresholdingEngine;
import monasca.thresh.ThresholdingEngine;
public class ThresholdingEngineRunner {
public static void main(String... args) throws Exception {

22
thresh/src/test/java/com/hpcloud/mon/ThresholdingEngineTest.java → thresh/src/test/java/monasca/thresh/ThresholdingEngineTest.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon;
package monasca.thresh;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
@ -31,16 +31,16 @@ import com.hpcloud.mon.common.model.alarm.AlarmExpression;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.metric.Metric;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import com.hpcloud.mon.domain.model.Alarm;
import com.hpcloud.mon.domain.model.MetricDefinitionAndTenantId;
import com.hpcloud.mon.domain.model.SubAlarm;
import com.hpcloud.mon.domain.service.AlarmDAO;
import com.hpcloud.mon.domain.service.MetricDefinitionDAO;
import com.hpcloud.mon.domain.service.SubAlarmDAO;
import com.hpcloud.mon.domain.service.SubAlarmMetricDefinition;
import com.hpcloud.mon.infrastructure.thresholding.AlarmEventForwarder;
import com.hpcloud.mon.infrastructure.thresholding.MetricSpout;
import com.hpcloud.mon.infrastructure.thresholding.ProducerModule;
import monasca.thresh.domain.model.Alarm;
import monasca.thresh.domain.model.MetricDefinitionAndTenantId;
import monasca.thresh.domain.model.SubAlarm;
import monasca.thresh.domain.service.AlarmDAO;
import monasca.thresh.domain.service.MetricDefinitionDAO;
import monasca.thresh.domain.service.SubAlarmDAO;
import monasca.thresh.domain.service.SubAlarmMetricDefinition;
import monasca.thresh.infrastructure.thresholding.AlarmEventForwarder;
import monasca.thresh.infrastructure.thresholding.MetricSpout;
import monasca.thresh.infrastructure.thresholding.ProducerModule;
import com.hpcloud.streaming.storm.TopologyTestCase;
import com.hpcloud.util.Injector;
import com.hpcloud.util.Serialization;

24
thresh/src/test/java/com/hpcloud/mon/ThresholdingEngineTest1.java → thresh/src/test/java/monasca/thresh/ThresholdingEngineTest1.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon;
package monasca.thresh;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
@ -29,17 +29,17 @@ import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import com.hpcloud.mon.common.model.metric.Metric;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import com.hpcloud.mon.domain.model.Alarm;
import com.hpcloud.mon.domain.model.MetricDefinitionAndTenantId;
import com.hpcloud.mon.domain.model.SubAlarm;
import com.hpcloud.mon.domain.service.AlarmDAO;
import com.hpcloud.mon.domain.service.MetricDefinitionDAO;
import com.hpcloud.mon.domain.service.SubAlarmDAO;
import com.hpcloud.mon.domain.service.SubAlarmMetricDefinition;
import com.hpcloud.mon.infrastructure.thresholding.AlarmEventForwarder;
import com.hpcloud.mon.infrastructure.thresholding.MetricAggregationBolt;
import com.hpcloud.mon.infrastructure.thresholding.MetricSpout;
import com.hpcloud.mon.infrastructure.thresholding.ProducerModule;
import monasca.thresh.domain.model.Alarm;
import monasca.thresh.domain.model.MetricDefinitionAndTenantId;
import monasca.thresh.domain.model.SubAlarm;
import monasca.thresh.domain.service.AlarmDAO;
import monasca.thresh.domain.service.MetricDefinitionDAO;
import monasca.thresh.domain.service.SubAlarmDAO;
import monasca.thresh.domain.service.SubAlarmMetricDefinition;
import monasca.thresh.infrastructure.thresholding.AlarmEventForwarder;
import monasca.thresh.infrastructure.thresholding.MetricAggregationBolt;
import monasca.thresh.infrastructure.thresholding.MetricSpout;
import monasca.thresh.infrastructure.thresholding.ProducerModule;
import com.hpcloud.streaming.storm.TopologyTestCase;
import com.hpcloud.util.Injector;

2
thresh/src/test/java/com/hpcloud/mon/domain/model/AlarmTest.java → thresh/src/test/java/monasca/thresh/domain/model/AlarmTest.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon.domain.model;
package monasca.thresh.domain.model;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;

6
thresh/src/test/java/com/hpcloud/mon/domain/model/MetricDefinitionAndTenantIdMatcherTest.java → thresh/src/test/java/monasca/thresh/domain/model/MetricDefinitionAndTenantIdMatcherTest.java
View File

@ -15,14 +15,14 @@
* limitations under the License.
*/
package com.hpcloud.mon.domain.model;
package monasca.thresh.domain.model;
import static org.testng.Assert.assertEqualsNoOrder;
import static org.testng.Assert.assertTrue;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import com.hpcloud.mon.domain.model.MetricDefinitionAndTenantIdMatcher.DimensionPair;
import com.hpcloud.mon.domain.model.MetricDefinitionAndTenantIdMatcher.DimensionSet;
import monasca.thresh.domain.model.MetricDefinitionAndTenantIdMatcher.DimensionPair;
import monasca.thresh.domain.model.MetricDefinitionAndTenantIdMatcher.DimensionSet;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;

2
thresh/src/test/java/com/hpcloud/mon/domain/model/SubAlarmStatsTest.java → thresh/src/test/java/monasca/thresh/domain/model/SubAlarmStatsTest.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon.domain.model;
package monasca.thresh.domain.model;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;

8
thresh/src/test/java/com/hpcloud/mon/infrastructure/persistence/AlarmDAOImplTest.java → thresh/src/test/java/monasca/thresh/infrastructure/persistence/AlarmDAOImplTest.java
View File

@ -15,16 +15,16 @@
* limitations under the License.
*/
package com.hpcloud.mon.infrastructure.persistence;
package monasca.thresh.infrastructure.persistence;
import static org.testng.Assert.assertEquals;
import com.hpcloud.mon.common.model.alarm.AlarmExpression;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import com.hpcloud.mon.domain.model.Alarm;
import com.hpcloud.mon.domain.model.SubAlarm;
import com.hpcloud.mon.domain.service.AlarmDAO;
import monasca.thresh.domain.model.Alarm;
import monasca.thresh.domain.model.SubAlarm;
import monasca.thresh.domain.service.AlarmDAO;
import com.google.common.io.Resources;

8
thresh/src/test/java/com/hpcloud/mon/infrastructure/persistence/MetricDefinitionDAOImplTest.java → thresh/src/test/java/monasca/thresh/infrastructure/persistence/MetricDefinitionDAOImplTest.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon.infrastructure.persistence;
package monasca.thresh.infrastructure.persistence;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.assertFalse;
@ -32,9 +32,9 @@ import org.testng.annotations.Test;
import com.google.common.collect.ImmutableMap;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import com.hpcloud.mon.domain.model.MetricDefinitionAndTenantId;
import com.hpcloud.mon.domain.service.MetricDefinitionDAO;
import com.hpcloud.mon.domain.service.SubAlarmMetricDefinition;
import monasca.thresh.domain.model.MetricDefinitionAndTenantId;
import monasca.thresh.domain.service.MetricDefinitionDAO;
import monasca.thresh.domain.service.SubAlarmMetricDefinition;
/**
* Note: MySQL dependent test because of the group_concat() used in the SQL in

8
thresh/src/test/java/com/hpcloud/mon/infrastructure/persistence/SubAlarmDAOImplTest.java → thresh/src/test/java/monasca/thresh/infrastructure/persistence/SubAlarmDAOImplTest.java
View File

@ -15,16 +15,16 @@
* limitations under the License.
*/
package com.hpcloud.mon.infrastructure.persistence;
package monasca.thresh.infrastructure.persistence;
import static org.testng.Assert.assertEquals;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import com.hpcloud.mon.domain.model.MetricDefinitionAndTenantId;
import com.hpcloud.mon.domain.model.SubAlarm;
import com.hpcloud.mon.domain.service.SubAlarmDAO;
import monasca.thresh.domain.model.MetricDefinitionAndTenantId;
import monasca.thresh.domain.model.SubAlarm;
import monasca.thresh.domain.service.SubAlarmDAO;
import com.google.common.io.Resources;

10
thresh/src/test/java/com/hpcloud/mon/infrastructure/thresholding/AlarmThresholdingBoltTest.java → thresh/src/test/java/monasca/thresh/infrastructure/thresholding/AlarmThresholdingBoltTest.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon.infrastructure.thresholding;
package monasca.thresh.infrastructure.thresholding;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
@ -23,14 +23,14 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.testng.Assert.assertEquals;
import com.hpcloud.mon.ThresholdingConfiguration;
import monasca.thresh.ThresholdingConfiguration;
import com.hpcloud.mon.common.event.AlarmUpdatedEvent;
import com.hpcloud.mon.common.model.alarm.AlarmExpression;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import com.hpcloud.mon.domain.model.Alarm;
import com.hpcloud.mon.domain.model.SubAlarm;
import com.hpcloud.mon.domain.service.AlarmDAO;
import monasca.thresh.domain.model.Alarm;
import monasca.thresh.domain.model.SubAlarm;
import monasca.thresh.domain.service.AlarmDAO;
import com.hpcloud.streaming.storm.Streams;
import backtype.storm.Testing;

8
thresh/src/test/java/com/hpcloud/mon/infrastructure/thresholding/EventProcessingBoltTest.java → thresh/src/test/java/monasca/thresh/infrastructure/thresholding/EventProcessingBoltTest.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon.infrastructure.thresholding;
package monasca.thresh.infrastructure.thresholding;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
@ -28,9 +28,9 @@ import com.hpcloud.mon.common.model.alarm.AlarmExpression;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import com.hpcloud.mon.domain.model.Alarm;
import com.hpcloud.mon.domain.model.MetricDefinitionAndTenantId;
import com.hpcloud.mon.domain.model.SubAlarm;
import monasca.thresh.domain.model.Alarm;
import monasca.thresh.domain.model.MetricDefinitionAndTenantId;
import monasca.thresh.domain.model.SubAlarm;
import com.hpcloud.streaming.storm.Streams;
import backtype.storm.Testing;

12
thresh/src/test/java/com/hpcloud/mon/infrastructure/thresholding/MetricAggregationBoltTest.java → thresh/src/test/java/monasca/thresh/infrastructure/thresholding/MetricAggregationBoltTest.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon.infrastructure.thresholding;
package monasca.thresh.infrastructure.thresholding;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
@ -35,11 +35,11 @@ import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import com.hpcloud.mon.common.model.metric.Metric;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import com.hpcloud.mon.domain.model.MetricDefinitionAndTenantId;
import com.hpcloud.mon.domain.model.SubAlarm;
import com.hpcloud.mon.domain.model.SubAlarmStats;
import com.hpcloud.mon.domain.service.SubAlarmDAO;
import com.hpcloud.mon.domain.service.SubAlarmStatsRepository;
import monasca.thresh.domain.model.MetricDefinitionAndTenantId;
import monasca.thresh.domain.model.SubAlarm;
import monasca.thresh.domain.model.SubAlarmStats;
import monasca.thresh.domain.service.SubAlarmDAO;
import monasca.thresh.domain.service.SubAlarmStatsRepository;
import com.hpcloud.streaming.storm.Streams;
import backtype.storm.Constants;

10
thresh/src/test/java/com/hpcloud/mon/infrastructure/thresholding/MetricFilteringBoltTest.java → thresh/src/test/java/monasca/thresh/infrastructure/thresholding/MetricFilteringBoltTest.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon.infrastructure.thresholding;
package monasca.thresh.infrastructure.thresholding;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
@ -28,10 +28,10 @@ import com.hpcloud.mon.common.model.alarm.AlarmExpression;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import com.hpcloud.mon.common.model.metric.Metric;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import com.hpcloud.mon.domain.model.MetricDefinitionAndTenantId;
import com.hpcloud.mon.domain.model.SubAlarm;
import com.hpcloud.mon.domain.service.MetricDefinitionDAO;
import com.hpcloud.mon.domain.service.SubAlarmMetricDefinition;
import monasca.thresh.domain.model.MetricDefinitionAndTenantId;
import monasca.thresh.domain.model.SubAlarm;
import monasca.thresh.domain.service.MetricDefinitionDAO;
import monasca.thresh.domain.service.SubAlarmMetricDefinition;
import com.hpcloud.streaming.storm.Streams;
import backtype.storm.Testing;

4
thresh/src/test/java/com/hpcloud/mon/infrastructure/thresholding/PropertyFinderTest.java → thresh/src/test/java/monasca/thresh/infrastructure/thresholding/PropertyFinderTest.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon.infrastructure.thresholding;
package monasca.thresh.infrastructure.thresholding;
import static org.testng.Assert.assertEquals;
@ -25,7 +25,7 @@ import org.testng.annotations.Test;
@Test
public class PropertyFinderTest {
private static String PROPERTY_NAME = "com.hpcloud.mon.infrastructure.thresholding.Prop";
private static String PROPERTY_NAME = "monasca.thresh.infrastructure.thresholding.Prop";
@BeforeMethod
public void beforeMethod() {

2
thresh/src/test/java/com/hpcloud/mon/infrastructure/thresholding/deserializer/EventDeserializerTest.java → thresh/src/test/java/monasca/thresh/infrastructure/thresholding/deserializer/EventDeserializerTest.java
View File

@ -15,7 +15,7 @@
* limitations under the License.
*/
package com.hpcloud.mon.infrastructure.thresholding.deserializer;
package monasca.thresh.infrastructure.thresholding.deserializer;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNull;

2
thresh/src/test/resources/logback.xml
View File

@ -17,7 +17,7 @@
</appender>
<logger name="com.hpcloud" level = "debug"/>
<logger name="monasca" level = "debug"/>
<root level="info">
<appender-ref ref="STDOUT" />

0
thresh/src/test/resources/com/hpcloud/mon/infrastructure/persistence/alarm.sql → thresh/src/test/resources/monasca/thresh/infrastructure/persistence/alarm.sql
View File