diff options
author | vkalintiris <vasilis@netdata.cloud> | 2022-11-09 11:02:57 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-09 11:02:57 +0200 |
commit | 44a75ea996268466c38b596294677f3b80350103 (patch) | |
tree | 65cc6a32a03e38573232fd4523b913a9aaec9aec /database | |
parent | 9d80f78817916fcf163b081e750dc0b13e8a5a7e (diff) |
Remove anomaly rates chart. (#13763)
Diffstat (limited to 'database')
-rw-r--r-- | database/rrd.h | 11 | ||||
-rw-r--r-- | database/rrdcontext.c | 7 | ||||
-rw-r--r-- | database/rrdcontext.h | 1 | ||||
-rw-r--r-- | database/rrddim.c | 22 | ||||
-rw-r--r-- | database/rrdset.c | 10 |
5 files changed, 15 insertions, 36 deletions
diff --git a/database/rrd.h b/database/rrd.h index b57df223b1..234fe5fda3 100644 --- a/database/rrd.h +++ b/database/rrd.h @@ -529,21 +529,18 @@ typedef enum rrdset_flags { RRDSET_FLAG_INDEXED_ID = (1 << 19), // the rrdset is indexed by its id RRDSET_FLAG_INDEXED_NAME = (1 << 20), // the rrdset is indexed by its name - RRDSET_FLAG_ANOMALY_RATE_CHART = (1 << 21), // the rrdset is for storing anomaly rates for all dimensions - RRDSET_FLAG_PENDING_HEALTH_INITIALIZATION = (1 << 22), + RRDSET_FLAG_PENDING_HEALTH_INITIALIZATION = (1 << 21), - RRDSET_FLAG_SENDER_REPLICATION_FINISHED = (1 << 23), // the sending side has completed replication - RRDSET_FLAG_RECEIVER_REPLICATION_FINISHED = (1 << 24), // the receiving side has completed replication + RRDSET_FLAG_SENDER_REPLICATION_FINISHED = (1 << 22), // the sending side has completed replication + RRDSET_FLAG_RECEIVER_REPLICATION_FINISHED = (1 << 23), // the receiving side has completed replication - RRDSET_FLAG_UPSTREAM_SEND_VARIABLES = (1 << 25), // a custom variable has been updated and needs to be exposed to parent + RRDSET_FLAG_UPSTREAM_SEND_VARIABLES = (1 << 24), // a custom variable has been updated and needs to be exposed to parent } RRDSET_FLAGS; #define rrdset_flag_check(st, flag) (__atomic_load_n(&((st)->flags), __ATOMIC_SEQ_CST) & (flag)) #define rrdset_flag_set(st, flag) __atomic_or_fetch(&((st)->flags), flag, __ATOMIC_SEQ_CST) #define rrdset_flag_clear(st, flag) __atomic_and_fetch(&((st)->flags), ~(flag), __ATOMIC_SEQ_CST) -#define rrdset_is_ar_chart(st) rrdset_flag_check(st, RRDSET_FLAG_ANOMALY_RATE_CHART) - struct rrdset { uuid_t chart_uuid; // the global UUID for this chart diff --git a/database/rrdcontext.c b/database/rrdcontext.c index cc43c9d96e..fb283d93f3 100644 --- a/database/rrdcontext.c +++ b/database/rrdcontext.c @@ -768,7 +768,7 @@ static void rrdinstance_insert_callback(const DICTIONARY_ITEM *item __maybe_unus } if(ri->rrdset) { - if(unlikely((rrdset_flag_check(ri->rrdset, RRDSET_FLAG_HIDDEN)) || rrdset_is_ar_chart(ri->rrdset))) + if(unlikely(rrdset_flag_check(ri->rrdset, RRDSET_FLAG_HIDDEN))) ri->flags |= RRD_FLAG_HIDDEN; // no need of atomics at the constructor else ri->flags &= ~RRD_FLAG_HIDDEN; // no need of atomics at the constructor @@ -876,7 +876,7 @@ static bool rrdinstance_conflict_callback(const DICTIONARY_ITEM *item __maybe_un } if(ri->rrdset) { - if(unlikely((rrdset_flag_check(ri->rrdset, RRDSET_FLAG_HIDDEN)) || rrdset_is_ar_chart(ri->rrdset))) + if(unlikely(rrdset_flag_check(ri->rrdset, RRDSET_FLAG_HIDDEN))) rrd_flag_set(ri, RRD_FLAG_HIDDEN); else rrd_flag_clear(ri, RRD_FLAG_HIDDEN); @@ -2209,9 +2209,6 @@ DICTIONARY *rrdcontext_all_metrics_to_dict(RRDHOST *host, SIMPLE_PATTERN *contex if(rrd_flag_is_deleted(ri)) continue; - if(ri->rrdset && rrdset_is_ar_chart(ri->rrdset)) - continue; - RRDMETRIC *rm; dfe_start_read(ri->rrdmetrics, rm) { if(rrd_flag_is_deleted(rm)) diff --git a/database/rrdcontext.h b/database/rrdcontext.h index 6ddfa2e602..68736d4fdc 100644 --- a/database/rrdcontext.h +++ b/database/rrdcontext.h @@ -164,7 +164,6 @@ typedef struct query_target_request { time_t before; // the requested timeframe size_t points; // the requested number of points time_t timeout; // the timeout of the query in seconds - int max_anomaly_rates; // it only applies to anomaly rates chart - TODO - remove it uint32_t format; // DATASOURCE_FORMAT RRDR_OPTIONS options; RRDR_GROUPING group_method; diff --git a/database/rrddim.c b/database/rrddim.c index ff6c83aefe..17e65991f0 100644 --- a/database/rrddim.c +++ b/database/rrddim.c @@ -147,11 +147,9 @@ static void rrddim_insert_callback(const DICTIONARY_ITEM *item __maybe_unused, v } } - if(!rrdset_is_ar_chart(st)) { - rrddim_flag_set(rd, RRDDIM_FLAG_PENDING_HEALTH_INITIALIZATION); - rrdset_flag_set(rd->rrdset, RRDSET_FLAG_PENDING_HEALTH_INITIALIZATION); - rrdhost_flag_set(rd->rrdset->rrdhost, RRDHOST_FLAG_PENDING_HEALTH_INITIALIZATION); - } + rrddim_flag_set(rd, RRDDIM_FLAG_PENDING_HEALTH_INITIALIZATION); + rrdset_flag_set(rd->rrdset, RRDSET_FLAG_PENDING_HEALTH_INITIALIZATION); + rrdhost_flag_set(rd->rrdset->rrdhost, RRDHOST_FLAG_PENDING_HEALTH_INITIALIZATION); // let the chart resync rrdset_flag_set(st, RRDSET_FLAG_SYNC_CLOCK); @@ -251,11 +249,10 @@ static bool rrddim_conflict_callback(const DICTIONARY_ITEM *item __maybe_unused, if(rrddim_flag_check(rd, RRDDIM_FLAG_ARCHIVED)) { rrddim_flag_clear(rd, RRDDIM_FLAG_ARCHIVED); - if(!rrdset_is_ar_chart(st)) { - rrddim_flag_set(rd, RRDDIM_FLAG_PENDING_HEALTH_INITIALIZATION); - rrdset_flag_set(rd->rrdset, RRDSET_FLAG_PENDING_HEALTH_INITIALIZATION); - rrdhost_flag_set(rd->rrdset->rrdhost, RRDHOST_FLAG_PENDING_HEALTH_INITIALIZATION); - } + + rrddim_flag_set(rd, RRDDIM_FLAG_PENDING_HEALTH_INITIALIZATION); + rrdset_flag_set(rd->rrdset, RRDSET_FLAG_PENDING_HEALTH_INITIALIZATION); + rrdhost_flag_set(rd->rrdset->rrdhost, RRDHOST_FLAG_PENDING_HEALTH_INITIALIZATION); } if(unlikely(rc)) @@ -357,14 +354,11 @@ inline int rrddim_reset_name(RRDSET *st, RRDDIM *rd, const char *name) { rd->name = rrd_string_strdupz(name); string_freez(old); - if (!rrdset_is_ar_chart(st)) - rrddimvar_rename_all(rd); + rrddimvar_rename_all(rd); rd->exposed = 0; rrdset_flag_clear(st, RRDSET_FLAG_UPSTREAM_EXPOSED); - ml_dimension_update_name(st, rd, name); - return 1; } diff --git a/database/rrdset.c b/database/rrdset.c index f17c955adb..53b15d213f 100644 --- a/database/rrdset.c +++ b/database/rrdset.c @@ -100,11 +100,6 @@ struct rrdset_constructor { // the constructor - the dictionary is write locked while this runs static void rrdset_insert_callback(const DICTIONARY_ITEM *item __maybe_unused, void *rrdset, void *constructor_data) { - static STRING *anomaly_rates_chart = NULL; - - if(unlikely(!anomaly_rates_chart)) - anomaly_rates_chart = string_strdupz(ML_ANOMALY_RATES_CHART_ID); - struct rrdset_constructor *ctr = constructor_data; RRDHOST *host = ctr->host; RRDSET *st = rrdset; @@ -145,9 +140,6 @@ static void rrdset_insert_callback(const DICTIONARY_ITEM *item __maybe_unused, v if(host == localhost || !host->receiver || !stream_has_capability(host->receiver, STREAM_CAP_REPLICATION)) st->flags |= RRDSET_FLAG_RECEIVER_REPLICATION_FINISHED; - if(unlikely(st->id == anomaly_rates_chart)) - st->flags |= RRDSET_FLAG_ANOMALY_RATE_CHART; - netdata_rwlock_init(&st->alerts.rwlock); if(st->rrd_memory_mode == RRD_MEMORY_MODE_SAVE || st->rrd_memory_mode == RRD_MEMORY_MODE_MAP) { @@ -355,7 +347,7 @@ static void rrdset_react_callback(const DICTIONARY_ITEM *item __maybe_unused, vo st->last_accessed_time = now_realtime_sec(); - if((host->health_enabled && (ctr->react_action & (RRDSET_REACT_NEW | RRDSET_REACT_CHART_ACTIVATED))) && !rrdset_is_ar_chart(st)) { + if(host->health_enabled && (ctr->react_action & (RRDSET_REACT_NEW | RRDSET_REACT_CHART_ACTIVATED))) { rrdset_flag_set(st, RRDSET_FLAG_PENDING_HEALTH_INITIALIZATION); rrdhost_flag_set(st->rrdhost, RRDHOST_FLAG_PENDING_HEALTH_INITIALIZATION); } |