openstack
/
monasca-thresh
Code Issues Proposed changes

Test fixes

This commit is contained in:
Jonathan Halterman 2013-04-25 00:57:50 -07:00
parent 2c4ae741af
commit dd4a10b1d5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/hpcloud/maas/TopologyModule.java
View File

@ -102,7 +102,8 @@ public class TopologyModule extends AbstractModule {
.setNumTasks(config.eventBoltTasks);
// Metrics / Event -> Aggregation
builder.setBolt("aggregation-bolt", new MetricAggregationBolt(), config.aggregationBoltThreads)
builder.setBolt("aggregation-bolt", new MetricAggregationBolt(config.database),
config.aggregationBoltThreads)
.fieldsGrouping("collectd-metrics-spout", new Fields("metricDefinition"))
.fieldsGrouping("maas-metrics-spout", new Fields("metricDefinition"))
.fieldsGrouping("event-bolt", EventProcessingBolt.METRIC_SUB_ALARM_EVENT_STREAM_ID,
@ -112,7 +113,8 @@ public class TopologyModule extends AbstractModule {
.setNumTasks(config.aggregationBoltTasks);
// Aggregation / Event -> Thresholding
builder.setBolt("thresholding-bolt", new AlarmThresholdingBolt(),
builder.setBolt("thresholding-bolt",
new AlarmThresholdingBolt(config.database, config.externalRabbit),
config.thresholdingBoltThreads)
.fieldsGrouping("aggregation-bolt", new Fields("alarmId"))
.fieldsGrouping("event-bolt", EventProcessingBolt.ALARM_EVENT_STREAM_ID,