diff options
| author | Markos Fountoulakis <44345837+mfundul@users.noreply.github.com> | 2020-07-11 17:27:37 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-11 17:27:37 +0300 |
| commit | 822880265e88a8f6a6d35d00eb0d0b5072d7ac1c (patch) | |
| tree | 1c5b20ec1ee9af929dd6a98c0072fb05d75f7cbb /database/rrddim.c | |
| parent | 04b7e098810aeb8d1b708d0da2e1ae8153dedf0e (diff) | |
Remove health from archived metrics (#9520)
* Disassociate health variables and alarms from archived charts and dimensions.
* Ignore archived charts during health reload.
Diffstat (limited to 'database/rrddim.c')
| -rw-r--r-- | database/rrddim.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/database/rrddim.c b/database/rrddim.c index bb76e332f6..05eb46040c 100644 --- a/database/rrddim.c +++ b/database/rrddim.c @@ -209,6 +209,9 @@ RRDDIM *rrddim_add_custom(RRDSET *st, const char *id, const char *name, collecte if (!is_archived && rrddim_flag_check(rd, RRDDIM_FLAG_ARCHIVED)) { rd->state->collect_ops.init(rd); rrddim_flag_clear(rd, RRDDIM_FLAG_ARCHIVED); + rrddimvar_create(rd, RRDVAR_TYPE_CALCULATED, NULL, NULL, &rd->last_stored_value, RRDVAR_OPTION_DEFAULT); + rrddimvar_create(rd, RRDVAR_TYPE_COLLECTED, NULL, "_raw", &rd->last_collected_value, RRDVAR_OPTION_DEFAULT); + rrddimvar_create(rd, RRDVAR_TYPE_TIME_T, NULL, "_last_collected_t", &rd->last_collected_time.tv_sec, RRDVAR_OPTION_DEFAULT); } // DBENGINE available and activated? #ifdef ENABLE_DBENGINE @@ -413,7 +416,7 @@ RRDDIM *rrddim_add_custom(RRDSET *st, const char *id, const char *name, collecte td->next = rd; } - if(host->health_enabled) { + if(host->health_enabled && !is_archived) { rrddimvar_create(rd, RRDVAR_TYPE_CALCULATED, NULL, NULL, &rd->last_stored_value, RRDVAR_OPTION_DEFAULT); rrddimvar_create(rd, RRDVAR_TYPE_COLLECTED, NULL, "_raw", &rd->last_collected_value, RRDVAR_OPTION_DEFAULT); rrddimvar_create(rd, RRDVAR_TYPE_TIME_T, NULL, "_last_collected_t", &rd->last_collected_time.tv_sec, RRDVAR_OPTION_DEFAULT); |