Added release notes

README.md

@@ -123,6 +123,10 @@ When creating or editing a rule, the schedule(s) for generating report(s) can be
 - Moved report subscriber option to the Report Schedules screen
 - Introduced alerting via the native Graylog Alarm Callbacks (Notifications)
 
+2.2.1
+-----
+
+- Bugfix: fixed NullPointerException in AggregatesMaintenance when rule has no alertConditionId. Also log a warning when this is the case.
 
 
 

src/main/java/org/graylog/plugins/aggregates/maintenance/AggregatesMaintenance.java

@@ -114,6 +114,10 @@ private void resolveOrphanedAlerts() {
             if (rule.getAlertConditionId() != null && !streamIds.contains(rule.getStreamId())) {
                 streamIds.add(rule.getStreamId());
             }
+
+            if (rule.getAlertConditionId() == null){
+                LOG.warn("Rule [{}] has no associated AlertCondition, perhaps it was created with an old version of the plugin. Please re-create it to be able to generate alerts.", rule.getName());
+            }
         }
 
         LOG.info("Removing Aggregate Alert Conditions that don't have associated rule.");
@@ -166,7 +170,7 @@ private void resolveOrphanedAlerts() {
                 if (streamService.getAlertCondition(triggeredStream, alertConditionId).getType().equals(AggregatesUtil.ALERT_CONDITION_TYPE)) {
                     Rule foundRule = null;
                     for (Rule rule : rules) {
-                        if (rule.getAlertConditionId().equals(alertConditionId)) {
+                        if (alertConditionId.equals(rule.getAlertConditionId())) {
                             foundRule = rule;
                             break;
                         }