Skip to content

Commit

Permalink
HWKALERTS-173 The filtering of ExternalCondition dataIds was valid when
Browse files Browse the repository at this point in the history
we were filtering inside Hmetrics, because the ids were not metrics-based,
but it is not valid to filter out all ExternalCondition dataIds now that
we're doing front-line filtering.
  • Loading branch information
jshaughn committed Oct 4, 2016
1 parent 0968888 commit b4cb707
Showing 1 changed file with 0 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@

import org.hawkular.alerts.api.model.condition.CompareCondition;
import org.hawkular.alerts.api.model.condition.Condition;
import org.hawkular.alerts.api.model.condition.ExternalCondition;
import org.hawkular.alerts.api.model.data.CacheKey;
import org.hawkular.alerts.api.services.DefinitionsService;
import org.hawkular.alerts.api.services.PropertiesService;
Expand Down Expand Up @@ -106,12 +105,6 @@ private synchronized void updateActiveIds() {
Collection<Condition> conditions = definitions.getAllConditions();
final Set<CacheKey> activeKeys = new HashSet<>();
for (Condition c : conditions) {
// external conditions are evaluated by the relevant external alerter. Data is not metrics-based
// so don't waste energy adding it to the publishing cache.
if (c instanceof ExternalCondition) {
continue;
}

CacheKey cacheKey = new CacheKey(c.getTenantId(), c.getDataId());
if (!activeKeys.contains(cacheKey)) {
activeKeys.add(cacheKey);
Expand Down

0 comments on commit b4cb707

Please sign in to comment.