diff options
| author | Emmanuel Vasilakis <mrzammler@mm.st> | 2022-05-17 12:00:44 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-17 12:00:44 +0300 |
| commit | 6c6997da0952f6d87806132322a84483816e15f1 (patch) | |
| tree | a3d4b7f481148de70444e34e915cf35927e3fc61 | |
| parent | 22366268362e67e37a64715b5a34ed04c4db05a8 (diff) | |
Adjust alarms count (#12896)
* check for is_available when counting
* remove empty line
| -rw-r--r-- | health/health_json.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/health/health_json.c b/health/health_json.c index 56318472b7..8d08407b98 100644 --- a/health/health_json.c +++ b/health/health_json.c @@ -340,6 +340,8 @@ void health_aggregate_alarms(RRDHOST *host, BUFFER *wb, BUFFER* contexts, RRDCAL for(rc = host->alarms; rc ; rc = rc->next) { if(unlikely(!rc->rrdset || !rc->rrdset->last_collected_time.tv_sec)) continue; + if (unlikely(!rrdset_is_available_for_exporting_and_alarms(rc->rrdset))) + continue; if(unlikely(rc->rrdset && rc->rrdset->hash_context == simple_hash(tok) && !strcmp(rc->rrdset->context, tok) && ((status==RRDCALC_STATUS_RAISED)?(rc->status >= RRDCALC_STATUS_WARNING):rc->status == status))) @@ -351,7 +353,8 @@ void health_aggregate_alarms(RRDHOST *host, BUFFER *wb, BUFFER* contexts, RRDCAL for(rc = host->alarms; rc ; rc = rc->next) { if(unlikely(!rc->rrdset || !rc->rrdset->last_collected_time.tv_sec)) continue; - + if (unlikely(!rrdset_is_available_for_exporting_and_alarms(rc->rrdset))) + continue; if(unlikely((status==RRDCALC_STATUS_RAISED)?(rc->status >= RRDCALC_STATUS_WARNING):rc->status == status)) numberOfAlarms++; } |