3f6a75250 · cryptotaxi247/netdata-1

aclk/aclk.c

+1 -1

@@ -1231,7 +1231,7 @@ char *aclk_state_json(void)

1231 }

1232

1233 void add_aclk_host_labels(void) {

1234 - DICTIONARY *labels = localhost->host_labels;

1234 + DICTIONARY *labels = localhost->rrdlabels;

1235

1236 #ifdef ENABLE_ACLK

1237 rrdlabels_add(labels, "_aclk_available", "true", RRDLABEL_SRC_AUTO|RRDLABEL_SRC_ACLK);

collectors/plugins.d/pluginsd_parser.c

+3 -3

@@ -197,10 +197,10 @@ PARSER_RC pluginsd_overwrite_action(void *user, RRDHOST *host, DICTIONARY *new_h

197 {

198 UNUSED(user);

199

200 - if(!host->host_labels)

201 - host->host_labels = rrdlabels_create();

200 + if(!host->rrdlabels)

201 + host->rrdlabels = rrdlabels_create();

202

203 - rrdlabels_migrate_to_these(host->host_labels, new_host_labels);

203 + rrdlabels_migrate_to_these(host->rrdlabels, new_host_labels);

204 sql_store_host_labels(host);

205

206 return PARSER_RC_OK;

collectors/proc.plugin/proc_diskstats.c

+6 -6

@@ -853,25 +853,25 @@ static struct disk *get_disk(unsigned long major, unsigned long minor, char *dis

853 }

854

855 static void add_labels_to_disk(struct disk *d, RRDSET *st) {

856 - rrdlabels_add(st->state->chart_labels, "device", d->disk, RRDLABEL_SRC_AUTO);

857 - rrdlabels_add(st->state->chart_labels, "mount_point", d->mount_point, RRDLABEL_SRC_AUTO);

856 + rrdlabels_add(st->rrdlabels, "device", d->disk, RRDLABEL_SRC_AUTO);

857 + rrdlabels_add(st->rrdlabels, "mount_point", d->mount_point, RRDLABEL_SRC_AUTO);

858

859 switch (d->type) {

860 default:

861 case DISK_TYPE_UNKNOWN:

862 - rrdlabels_add(st->state->chart_labels, "device_type", "unknown", RRDLABEL_SRC_AUTO);

862 + rrdlabels_add(st->rrdlabels, "device_type", "unknown", RRDLABEL_SRC_AUTO);

863 break;

864

865 case DISK_TYPE_PHYSICAL:

866 - rrdlabels_add(st->state->chart_labels, "device_type", "physical", RRDLABEL_SRC_AUTO);

866 + rrdlabels_add(st->rrdlabels, "device_type", "physical", RRDLABEL_SRC_AUTO);

867 break;

868

869 case DISK_TYPE_PARTITION:

870 - rrdlabels_add(st->state->chart_labels, "device_type", "partition", RRDLABEL_SRC_AUTO);

870 + rrdlabels_add(st->rrdlabels, "device_type", "partition", RRDLABEL_SRC_AUTO);

871 break;

872

873 case DISK_TYPE_VIRTUAL:

874 - rrdlabels_add(st->state->chart_labels, "device_type", "virtual", RRDLABEL_SRC_AUTO);

874 + rrdlabels_add(st->rrdlabels, "device_type", "virtual", RRDLABEL_SRC_AUTO);

875 break;

876 }

877

collectors/proc.plugin/proc_interrupts.c

+1 -1

@@ -228,7 +228,7 @@ int do_proc_interrupts(int update_every, usec_t dt) {

228

229 char core[50+1];

230 snprintfz(core, 50, "cpu%d", c);

231 - rrdlabels_add(core_st[c]->state->chart_labels, "cpu", core, RRDLABEL_SRC_AUTO);

231 + rrdlabels_add(core_st[c]->rrdlabels, "cpu", core, RRDLABEL_SRC_AUTO);

232 }

233 else rrdset_next(core_st[c]);

234

collectors/proc.plugin/proc_mdstat.c

+2 -2

@@ -78,8 +78,8 @@ static inline void make_chart_obsolete(char *name, const char *id_modifier)

78 }

79

80 static void add_labels_to_mdstat(struct raid *raid, RRDSET *st) {

81 - rrdlabels_add(st->state->chart_labels, "device", raid->name, RRDLABEL_SRC_AUTO);

82 - rrdlabels_add(st->state->chart_labels, "raid_level", raid->level, RRDLABEL_SRC_AUTO);

81 + rrdlabels_add(st->rrdlabels, "device", raid->name, RRDLABEL_SRC_AUTO);

82 + rrdlabels_add(st->rrdlabels, "raid_level", raid->level, RRDLABEL_SRC_AUTO);

83 rrdcalc_update_rrdlabels(st);

84 }

85

collectors/proc.plugin/proc_net_wireless.c

+1 -1

@@ -199,7 +199,7 @@ static void configure_device(int do_status, int do_quality, int do_discarded_pac

199 }

200

201 static void add_labels_to_wireless(struct netwireless *w, RRDSET *st) {

202 - rrdlabels_add(st->state->chart_labels, "device", w->name, RRDLABEL_SRC_AUTO);

202 + rrdlabels_add(st->rrdlabels, "device", w->name, RRDLABEL_SRC_AUTO);

203 rrdcalc_update_rrdlabels(st);

204 }

205

collectors/proc.plugin/proc_pagetypeinfo.c

+3 -3

@@ -261,9 +261,9 @@ int do_proc_pagetypeinfo(int update_every, usec_t dt) {

261

262 char node[50+1];

263 snprintfz(node, 50, "node%d", pgl->node);

264 - rrdlabels_add(st_nodezonetype[p]->state->chart_labels, "node_id", node, RRDLABEL_SRC_AUTO);

265 - rrdlabels_add(st_nodezonetype[p]->state->chart_labels, "node_zone", pgl->zone, RRDLABEL_SRC_AUTO);

266 - rrdlabels_add(st_nodezonetype[p]->state->chart_labels, "node_type", pgl->type, RRDLABEL_SRC_AUTO);

264 + rrdlabels_add(st_nodezonetype[p]->rrdlabels, "node_id", node, RRDLABEL_SRC_AUTO);

265 + rrdlabels_add(st_nodezonetype[p]->rrdlabels, "node_zone", pgl->zone, RRDLABEL_SRC_AUTO);

266 + rrdlabels_add(st_nodezonetype[p]->rrdlabels, "node_type", pgl->type, RRDLABEL_SRC_AUTO);

267

268 for (o = 0; o < pageorders_cnt; o++) {

269 char dimid[3+1];

collectors/proc.plugin/proc_softirqs.c

+1 -1

@@ -220,7 +220,7 @@ int do_proc_softirqs(int update_every, usec_t dt) {

220

221 char core[50+1];

222 snprintfz(core, 50, "cpu%d", c);

223 - rrdlabels_add(core_st[c]->state->chart_labels, "cpu", core, RRDLABEL_SRC_AUTO);

223 + rrdlabels_add(core_st[c]->rrdlabels, "cpu", core, RRDLABEL_SRC_AUTO);

224 }

225 else

226 rrdset_next(core_st[c]);

collectors/proc.plugin/proc_stat.c

+1 -1

@@ -1041,7 +1041,7 @@ int do_proc_stat(int update_every, usec_t dt) {

1041

1042 char corebuf[50+1];

1043 snprintfz(corebuf, 50, "cpu%zu", core);

1044 - rrdlabels_add(cpuidle_charts[core].st->state->chart_labels, "cpu", corebuf, RRDLABEL_SRC_AUTO);

1044 + rrdlabels_add(cpuidle_charts[core].st->rrdlabels, "cpu", corebuf, RRDLABEL_SRC_AUTO);

1045

1046 char cpuidle_dim_id[RRD_ID_LENGTH_MAX + 1];

1047 cpuidle_charts[core].active_time_rd = rrddim_add(cpuidle_charts[core].st, "active", "C0 (active)", 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);

collectors/proc.plugin/sys_block_zram.c

+4 -4

@@ -75,7 +75,7 @@ static inline void init_rrd(const char *name, ZRAM_DEVICE *d, int update_every)

75 , RRDSET_TYPE_AREA);

76 d->rd_compr_data_size = rrddim_add(d->st_usage, "compressed", NULL, 1, 1024 * 1024, RRD_ALGORITHM_ABSOLUTE);

77 d->rd_metadata_size = rrddim_add(d->st_usage, "metadata", NULL, 1, 1024 * 1024, RRD_ALGORITHM_ABSOLUTE);

78 - rrdlabels_add(d->st_usage->state->chart_labels, "device", name, RRDLABEL_SRC_AUTO);

78 + rrdlabels_add(d->st_usage->rrdlabels, "device", name, RRDLABEL_SRC_AUTO);

79

80 snprintfz(chart_name, RRD_ID_LENGTH_MAX, "zram_savings.%s", name);

81 d->st_savings = rrdset_create_localhost(

@@ -93,7 +93,7 @@ static inline void init_rrd(const char *name, ZRAM_DEVICE *d, int update_every)

93 , RRDSET_TYPE_AREA);

94 d->rd_savings_size = rrddim_add(d->st_savings, "savings", NULL, 1, 1024 * 1024, RRD_ALGORITHM_ABSOLUTE);

95 d->rd_original_size = rrddim_add(d->st_savings, "original", NULL, 1, 1024 * 1024, RRD_ALGORITHM_ABSOLUTE);

96 - rrdlabels_add(d->st_savings->state->chart_labels, "device", name, RRDLABEL_SRC_AUTO);

96 + rrdlabels_add(d->st_savings->rrdlabels, "device", name, RRDLABEL_SRC_AUTO);

97

98 snprintfz(chart_name, RRD_ID_LENGTH_MAX, "zram_ratio.%s", name);

99 d->st_comp_ratio = rrdset_create_localhost(

@@ -110,7 +110,7 @@ static inline void init_rrd(const char *name, ZRAM_DEVICE *d, int update_every)

110 , update_every

111 , RRDSET_TYPE_LINE);

112 d->rd_comp_ratio = rrddim_add(d->st_comp_ratio, "ratio", NULL, 1, 100, RRD_ALGORITHM_ABSOLUTE);

113 - rrdlabels_add(d->st_comp_ratio->state->chart_labels, "device", name, RRDLABEL_SRC_AUTO);

113 + rrdlabels_add(d->st_comp_ratio->rrdlabels, "device", name, RRDLABEL_SRC_AUTO);

114

115 snprintfz(chart_name, RRD_ID_LENGTH_MAX, "zram_efficiency.%s", name);

116 d->st_alloc_efficiency = rrdset_create_localhost(

@@ -127,7 +127,7 @@ static inline void init_rrd(const char *name, ZRAM_DEVICE *d, int update_every)

127 , update_every

128 , RRDSET_TYPE_LINE);

129 d->rd_alloc_efficiency = rrddim_add(d->st_alloc_efficiency, "percent", NULL, 1, 10000, RRD_ALGORITHM_ABSOLUTE);

130 - rrdlabels_add(d->st_alloc_efficiency->state->chart_labels, "device", name, RRDLABEL_SRC_AUTO);

130 + rrdlabels_add(d->st_alloc_efficiency->rrdlabels, "device", name, RRDLABEL_SRC_AUTO);

131 }

132

133 static int init_devices(DICTIONARY *devices, unsigned int zram_id, int update_every) {

collectors/proc.plugin/sys_class_power_supply.c

+1 -1

@@ -113,7 +113,7 @@ void power_supply_free(struct power_supply *ps) {

113 }

114

115 static void add_labels_to_power_supply(struct power_supply *ps, RRDSET *st) {

116 - rrdlabels_add(st->state->chart_labels, "device", ps->name, RRDLABEL_SRC_AUTO);

116 + rrdlabels_add(st->rrdlabels, "device", ps->name, RRDLABEL_SRC_AUTO);

117 rrdcalc_update_rrdlabels(st);

118 }

119

collectors/proc.plugin/sys_devices_system_node.c

+1 -1

@@ -115,7 +115,7 @@ int do_proc_sys_devices_system_node(int update_every, usec_t dt) {

115 , RRDSET_TYPE_LINE

116 );

117

118 - rrdlabels_add(m->numastat_st->state->chart_labels, "numa_node", m->name, RRDLABEL_SRC_AUTO);

118 + rrdlabels_add(m->numastat_st->rrdlabels, "numa_node", m->name, RRDLABEL_SRC_AUTO);

119

120 rrdset_flag_set(m->numastat_st, RRDSET_FLAG_DETAIL);

121

collectors/proc.plugin/sys_fs_btrfs.c

+2 -2

@@ -449,8 +449,8 @@ static inline int find_all_btrfs_pools(const char *path) {

449 }

450

451 static void add_labels_to_btrfs(BTRFS_NODE *n, RRDSET *st) {

452 - rrdlabels_add(st->state->chart_labels, "device", n->id, RRDLABEL_SRC_AUTO);

453 - rrdlabels_add(st->state->chart_labels, "device_label", n->label, RRDLABEL_SRC_AUTO);

452 + rrdlabels_add(st->rrdlabels, "device", n->id, RRDLABEL_SRC_AUTO);

453 + rrdlabels_add(st->rrdlabels, "device_label", n->label, RRDLABEL_SRC_AUTO);

454 rrdcalc_update_rrdlabels(st);

455 }

456

daemon/commands.c

+1 -1

@@ -217,7 +217,7 @@ static cmd_status_t cmd_reload_labels_execute(char *args, char **message)

217 reload_host_labels();

218

219 BUFFER *wb = buffer_create(10);

220 - rrdlabels_log_to_buffer(localhost->host_labels, wb);

220 + rrdlabels_log_to_buffer(localhost->rrdlabels, wb);

221 (*message)=strdupz(buffer_tostring(wb));

222 buffer_free(wb);

223

database/rrd.h

+14 -17

@@ -444,14 +444,6 @@ struct rrddim_tier {

444

445 extern void rrdr_fill_tier_gap_from_smaller_tiers(RRDDIM *rd, int tier, time_t now);

446

447 -// ----------------------------------------------------------------------------

448 -// volatile state per chart

449 -struct rrdset_volatile {

450 - uuid_t hash_id;

451 - DICTIONARY *chart_labels;

452 - bool is_ar_chart;

453 -};

454 -

447 // ----------------------------------------------------------------------------

448 // these loop macros make sure the linked list is accessed with the right lock

449

@@ -491,15 +483,21 @@ typedef enum rrdset_flags {

483 RRDSET_FLAG_ACLK = (1 << 16),

484 RRDSET_FLAG_PENDING_FOREACH_ALARMS = (1 << 17), // contains dims with uninitialized foreach alarms

485 RRDSET_FLAG_ANOMALY_DETECTION = (1 << 18), // flag to identify anomaly detection charts.

494 - RRDSET_FLAG_INDEXED_ID = (1 << 19),

495 - RRDSET_FLAG_INDEXED_NAME = (1 << 20),

486 + RRDSET_FLAG_INDEXED_ID = (1 << 19), // the rrdset is indexed by its id

487 + RRDSET_FLAG_INDEXED_NAME = (1 << 20), // the rrdset is indexed by its name

488 +

489 + RRDSET_FLAG_ANOMALY_RATE_CHART = (1 << 21), // the rrdset is for storing anomaly rates for all dimensions

490 } RRDSET_FLAGS;

491

492 #define rrdset_flag_check(st, flag) (__atomic_load_n(&((st)->flags), __ATOMIC_SEQ_CST) & (flag))

493 #define rrdset_flag_set(st, flag) __atomic_or_fetch(&((st)->flags), flag, __ATOMIC_SEQ_CST)

494 #define rrdset_flag_clear(st, flag) __atomic_and_fetch(&((st)->flags), ~(flag), __ATOMIC_SEQ_CST)

495

496 +#define rrdset_is_ar_chart(st) rrdset_flag_check(st, RRDSET_FLAG_ANOMALY_RATE_CHART)

497 +

498 struct rrdset {

499 + uuid_t uuid;

500 +

501 // ------------------------------------------------------------------------

502 // the set configuration

503

@@ -550,8 +548,6 @@ struct rrdset {

548

549 uuid_t *chart_uuid; // Store the global GUID for this chart

550 // this object.

553 - struct rrdset_volatile *state; // volatile state that is not persistently stored

554 -

551 size_t rrddim_page_alignment; // keeps metric pages in alignment when using dbengine

552

553 usec_t usec_since_last_update; // the time in microseconds since the last collection of data

@@ -584,6 +580,11 @@ struct rrdset {

580 unsigned long memsize; // how much mem we have allocated for this (without dimensions)

581 void *st_on_file; // compatibility with V019 RRDSET files

582

583 + // ------------------------------------------------------------------------

584 + // chart labels

585 +

586 + DICTIONARY *rrdlabels;

587 +

588 // ------------------------------------------------------------------------

589 // the dimensions

590

@@ -638,7 +639,6 @@ typedef enum rrdhost_flags {

639 RRDHOST_FLAG_EXPORTING_SEND = (1 << 3), // send it to external databases

640 RRDHOST_FLAG_EXPORTING_DONT_SEND = (1 << 4), // don't send it to external databases

641 RRDHOST_FLAG_ARCHIVED = (1 << 5), // The host is archived, no collected charts yet

641 - RRDHOST_FLAG_MULTIHOST = (1 << 6), // Host belongs to localhost/megadb

642 RRDHOST_FLAG_PENDING_FOREACH_ALARMS = (1 << 7), // contains dims with uninitialized foreach alarms

643 RRDHOST_FLAG_STREAM_LABELS_UPDATE = (1 << 8),

644 RRDHOST_FLAG_STREAM_LABELS_STOP = (1 << 9),

@@ -842,9 +842,6 @@ struct rrdhost {

842 // ------------------------------------------------------------------------

843 // streaming of data from remote hosts - rrdpush

844

845 - volatile size_t connected_senders; // when remote hosts are streaming to this

846 - // host, this is the counter of connected clients

847 -

845 time_t senders_connect_time; // the time the last sender was connected

846 time_t senders_last_chart_command; // the time of the last CHART streaming command

847 time_t senders_disconnected_time; // the time the last sender was disconnected

@@ -903,7 +900,7 @@ struct rrdhost {

900

901 // ------------------------------------------------------------------------

902 // Support for host-level labels

906 - DICTIONARY *host_labels;

903 + DICTIONARY *rrdlabels;

904

905 // ------------------------------------------------------------------------

906 // indexes

database/rrdcalc.c

+5 -5

@@ -67,8 +67,8 @@ static STRING *rrdcalc_replace_variables(const char *line, RRDCALC *rc) {

67 temp = buf;

68 }

69 else if (!strncmp(var, RRDCALC_VAR_LABEL, RRDCALC_VAR_LABEL_LEN)) {

70 - if(likely(rc->rrdset && rc->rrdset->state && rc->rrdset->state->chart_labels)) {

71 - rrdlabels_get_value_to_char_or_null(rc->rrdset->state->chart_labels, &lbl_value, var+RRDCALC_VAR_LABEL_LEN);

70 + if(likely(rc->rrdset && rc->rrdset->rrdlabels)) {

71 + rrdlabels_get_value_to_char_or_null(rc->rrdset->rrdlabels, &lbl_value, var+RRDCALC_VAR_LABEL_LEN);

72 if (lbl_value) {

73 char *buf = find_and_replace(temp, var, lbl_value, m);

74 freez(temp);

@@ -191,7 +191,7 @@ static inline int rrdcalc_is_matching_rrdset(RRDCALC *rc, RRDSET *st) {

191 if (rc->plugin_pattern && !simple_pattern_matches(rc->plugin_pattern, rrdset_plugin_name(st)))

192 return 0;

193

194 - if (st->rrdhost->host_labels && rc->host_labels_pattern && !rrdlabels_match_simple_pattern_parsed(st->rrdhost->host_labels, rc->host_labels_pattern, '='))

194 + if (st->rrdhost->rrdlabels && rc->host_labels_pattern && !rrdlabels_match_simple_pattern_parsed(st->rrdhost->rrdlabels, rc->host_labels_pattern, '='))

195 return 0;

196

197 return 1;

@@ -672,7 +672,7 @@ static void rrdcalc_labels_unlink_alarm_loop(RRDHOST *host, RRDCALC *alarms) {

672 continue;

673 }

674

675 - if(!rrdlabels_match_simple_pattern_parsed(host->host_labels, rc->host_labels_pattern, '=')) {

675 + if(!rrdlabels_match_simple_pattern_parsed(host->rrdlabels, rc->host_labels_pattern, '=')) {

676 info("Health configuration for alarm '%s' cannot be applied, because the host %s does not have the label(s) '%s'",

677 rrdcalc_name(rc),

678 rrdhost_hostname(host),

@@ -700,7 +700,7 @@ void rrdcalc_labels_unlink() {

700 if (unlikely(!host->health_enabled))

701 continue;

702

703 - if (host->host_labels) {

703 + if (host->rrdlabels) {

704 rrdhost_wrlock(host);

705

706 rrdcalc_labels_unlink_alarm_from_host(host);

database/rrdcalctemplate.c

+1 -1

@@ -27,7 +27,7 @@ void rrdcalctemplate_check_conditions_and_link(RRDCALCTEMPLATE *rt, RRDSET *st,

27 if (rt->plugin_pattern && !simple_pattern_matches(rt->plugin_pattern, rrdset_plugin_name(st)))

28 return;

29

30 - if(host->host_labels && rt->host_labels_pattern && !rrdlabels_match_simple_pattern_parsed(host->host_labels, rt->host_labels_pattern, '='))

30 + if(host->rrdlabels && rt->host_labels_pattern && !rrdlabels_match_simple_pattern_parsed(host->rrdlabels, rt->host_labels_pattern, '='))

31 return;

32

33 RRDCALC *rc = rrdcalc_create_from_template(host, rt, rrdset_id(st));

database/rrdcontext.c

+8 -8

@@ -268,7 +268,7 @@ typedef struct rrdinstance {

268 int update_every; // data collection frequency

269 RRDSET *rrdset; // pointer to RRDSET when collected, or NULL

270

271 - DICTIONARY *rrdlabels; // linked to RRDSET->state->chart_labels or own version

271 + DICTIONARY *rrdlabels; // linked to RRDSET->chart_labels or own version

272

273 struct rrdcontext *rc;

274 DICTIONARY *rrdmetrics;

@@ -705,8 +705,8 @@ static void rrdinstance_insert_callback(const char *id __maybe_unused, void *val

705 if(!ri->name)

706 ri->name = string_dup(ri->id);

707

708 - if(ri->rrdset && ri->rrdset->state) {

709 - ri->rrdlabels = ri->rrdset->state->chart_labels;

708 + if(ri->rrdset) {

709 + ri->rrdlabels = ri->rrdset->rrdlabels;

710 ri->flags &= ~RRD_FLAG_OWN_LABELS; // no need of atomics at the constructor

711 }

712 else {

@@ -715,7 +715,7 @@ static void rrdinstance_insert_callback(const char *id __maybe_unused, void *val

715 }

716

717 if(ri->rrdset) {

718 - if(unlikely((rrdset_flag_check(ri->rrdset, RRDSET_FLAG_HIDDEN)) || (ri->rrdset->state && ri->rrdset->state->is_ar_chart)))

718 + if(unlikely((rrdset_flag_check(ri->rrdset, RRDSET_FLAG_HIDDEN)) || rrdset_is_ar_chart(ri->rrdset)))

719 ri->flags |= RRD_FLAG_HIDDEN; // no need of atomics at the constructor

720 else

721 ri->flags &= ~RRD_FLAG_HIDDEN; // no need of atomics at the constructor

@@ -814,7 +814,7 @@ static void rrdinstance_conflict_callback(const char *id __maybe_unused, void *o

814

815 if(ri->rrdset && rrd_flag_check(ri, RRD_FLAG_OWN_LABELS)) {

816 DICTIONARY *old = ri->rrdlabels;

817 - ri->rrdlabels = ri->rrdset->state->chart_labels;

817 + ri->rrdlabels = ri->rrdset->rrdlabels;

818 rrd_flag_clear(ri, RRD_FLAG_OWN_LABELS);

819 rrdlabels_destroy(old);

820 }

@@ -825,7 +825,7 @@ static void rrdinstance_conflict_callback(const char *id __maybe_unused, void *o

825 }

826

827 if(ri->rrdset) {

828 - if(unlikely((rrdset_flag_check(ri->rrdset, RRDSET_FLAG_HIDDEN)) || (ri->rrdset->state && ri->rrdset->state->is_ar_chart)))

828 + if(unlikely((rrdset_flag_check(ri->rrdset, RRDSET_FLAG_HIDDEN)) || rrdset_is_ar_chart(ri->rrdset)))

829 rrd_flag_set(ri, RRD_FLAG_HIDDEN);

830 else

831 rrd_flag_clear(ri, RRD_FLAG_HIDDEN);

@@ -1034,7 +1034,7 @@ static inline void rrdinstance_rrdset_is_freed(RRDSET *st) {

1034

1035 if(!rrd_flag_check(ri, RRD_FLAG_OWN_LABELS)) {

1036 ri->rrdlabels = rrdlabels_create();

1037 - rrdlabels_copy(ri->rrdlabels, st->state->chart_labels);

1037 + rrdlabels_copy(ri->rrdlabels, st->rrdlabels);

1038 rrd_flag_set(ri, RRD_FLAG_OWN_LABELS);

1039 }

1040

@@ -1995,7 +1995,7 @@ int rrdcontexts_to_json(RRDHOST *host, BUFFER *wb, time_t after, time_t before,

1995

1996 if(options & RRDCONTEXT_OPTION_SHOW_LABELS) {

1997 buffer_sprintf(wb, ",\n\t\"host_labels\": {\n");

1998 - rrdlabels_to_buffer(host->host_labels, wb, "\t\t", ":", "\"", ",\n", NULL, NULL, NULL, NULL);

1998 + rrdlabels_to_buffer(host->rrdlabels, wb, "\t\t", ":", "\"", ",\n", NULL, NULL, NULL, NULL);

1999 buffer_strcat(wb, "\n\t}");

2000 }

2001

database/rrddim.c

+2 -2

@@ -64,7 +64,7 @@ inline int rrddim_set_name(RRDSET *st, RRDDIM *rd, const char *name) {

64 string_freez(rd->name);

65 rd->name = rrd_string_strdupz(name);

66

67 - if (!st->state->is_ar_chart)

67 + if (!rrdset_is_ar_chart(st))

68 rrddimvar_rename_all(rd);

69

70 rd->exposed = 0;

@@ -340,7 +340,7 @@ RRDDIM *rrddim_add_custom(RRDSET *st

340 // append this dimension

341 DOUBLE_LINKED_LIST_APPEND_UNSAFE(st->dimensions, rd, prev, next);

342

343 - if(host->health_enabled && !st->state->is_ar_chart) {

343 + if(host->health_enabled && !rrdset_is_ar_chart(st)) {

344 rrddimvar_create(rd, RRDVAR_TYPE_CALCULATED, NULL, NULL, &rd->last_stored_value, RRDVAR_OPTION_DEFAULT);

345 rrddimvar_create(rd, RRDVAR_TYPE_COLLECTED, NULL, "_raw", &rd->last_collected_value, RRDVAR_OPTION_DEFAULT);

346 rrddimvar_create(rd, RRDVAR_TYPE_TIME_T, NULL, "_last_collected_t", &rd->last_collected_time.tv_sec, RRDVAR_OPTION_DEFAULT);

database/rrdhost.c

+9 -9

@@ -274,7 +274,7 @@ RRDHOST *rrdhost_create(const char *hostname,

274 #endif

275

276 netdata_rwlock_init(&host->rrdhost_rwlock);

277 - host->host_labels = rrdlabels_create();

277 + host->rrdlabels = rrdlabels_create();

278

279 netdata_mutex_init(&host->aclk_state_lock);

280

@@ -1182,7 +1182,7 @@ void rrdhost_free(RRDHOST *host, bool force) {

1182 freez(host->aclk_state.claimed_id);

1183 freez(host->aclk_state.prev_claimed_id);

1184 string_freez(host->tags);

1185 - rrdlabels_destroy(host->host_labels);

1185 + rrdlabels_destroy(host->rrdlabels);

1186 string_freez(host->os);

1187 string_freez(host->timezone);

1188 string_freez(host->abbrev_timezone);

@@ -1262,7 +1262,7 @@ void rrdhost_save_charts(RRDHOST *host) {

1262 }

1263

1264 static void rrdhost_load_auto_labels(void) {

1265 - DICTIONARY *labels = localhost->host_labels;

1265 + DICTIONARY *labels = localhost->rrdlabels;

1266

1267 if (localhost->system_info->cloud_provider_type)

1268 rrdlabels_add(labels, "_cloud_provider_type", localhost->system_info->cloud_provider_type, RRDLABEL_SRC_AUTO);

@@ -1343,7 +1343,7 @@ static void rrdhost_load_config_labels(void) {

1343 config_section_wrlock(co);

1344 struct config_option *cv;

1345 for(cv = co->values; cv ; cv = cv->next) {

1346 - rrdlabels_add(localhost->host_labels, cv->name, cv->value, RRDLABEL_SRC_CONFIG);

1346 + rrdlabels_add(localhost->rrdlabels, cv->name, cv->value, RRDLABEL_SRC_CONFIG);

1347 cv->flags |= CONFIG_VALUE_USED;

1348 }

1349 config_section_unlock(co);

@@ -1367,7 +1367,7 @@ static void rrdhost_load_kubernetes_labels(void) {

1367

1368 char buffer[1000 + 1];

1369 while (fgets(buffer, 1000, fp) != NULL)

1370 - rrdlabels_add_pair(localhost->host_labels, buffer, RRDLABEL_SRC_AUTO|RRDLABEL_SRC_K8S);

1370 + rrdlabels_add_pair(localhost->rrdlabels, buffer, RRDLABEL_SRC_AUTO|RRDLABEL_SRC_K8S);

1371

1372 // Non-zero exit code means that all the script output is error messages. We've shown already any message that didn't include a ':'

1373 // Here we'll inform with an ERROR that the script failed, show whatever (if anything) was added to the list of labels, free the memory and set the return to null

@@ -1376,17 +1376,17 @@ static void rrdhost_load_kubernetes_labels(void) {

1376 }

1377

1378 void reload_host_labels(void) {

1379 - if(!localhost->host_labels)

1380 - localhost->host_labels = rrdlabels_create();

1379 + if(!localhost->rrdlabels)

1380 + localhost->rrdlabels = rrdlabels_create();

1381

1382 - rrdlabels_unmark_all(localhost->host_labels);

1382 + rrdlabels_unmark_all(localhost->rrdlabels);

1383

1384 // priority is important here

1385 rrdhost_load_config_labels();

1386 rrdhost_load_kubernetes_labels();

1387 rrdhost_load_auto_labels();

1388

1389 - rrdlabels_remove_all_unmarked(localhost->host_labels);

1389 + rrdlabels_remove_all_unmarked(localhost->rrdlabels);

1390 sql_store_host_labels(localhost);

1391

1392 health_label_log_save(localhost);

database/rrdlabels.c

+4 -4

@@ -955,11 +955,11 @@ static int chart_label_store_to_sql_callback(const char *name, const char *value

955 }

956

957 void rrdset_update_rrdlabels(RRDSET *st, DICTIONARY *new_rrdlabels) {

958 - if(!st->state->chart_labels)

959 - st->state->chart_labels = rrdlabels_create();

958 + if(!st->rrdlabels)

959 + st->rrdlabels = rrdlabels_create();

960

961 if (new_rrdlabels)

962 - rrdlabels_migrate_to_these(st->state->chart_labels, new_rrdlabels);

962 + rrdlabels_migrate_to_these(st->rrdlabels, new_rrdlabels);

963

964 rrdcalc_update_rrdlabels(st);

965

@@ -967,7 +967,7 @@ void rrdset_update_rrdlabels(RRDSET *st, DICTIONARY *new_rrdlabels) {

967 BUFFER *sql_buf = buffer_create(1024);

968 struct label_str tmp = {.sql = sql_buf, .count = 0 };

969 uuid_unparse_lower(*st->chart_uuid, tmp.uuid_str);

970 - rrdlabels_walkthrough_read(st->state->chart_labels, chart_label_store_to_sql_callback, &tmp);

970 + rrdlabels_walkthrough_read(st->rrdlabels, chart_label_store_to_sql_callback, &tmp);

971 db_execute(buffer_tostring(sql_buf));

972 buffer_free(sql_buf);

973 }

database/rrdset.c

+10 -11

@@ -373,7 +373,7 @@ void rrdset_free(RRDSET *st) {

373 netdata_rwlock_destroy(&st->rrdset_rwlock);

374

375 rrdset_memory_file_free(st);

376 - rrdlabels_destroy(st->state->chart_labels);

376 + rrdlabels_destroy(st->rrdlabels);

377

378 // free directly allocated members

379

@@ -391,7 +391,6 @@ void rrdset_free(RRDSET *st) {

391 string_freez(st->module_name);

392

393 freez(st->cache_dir);

394 - freez(st->state);

394 freez(st->chart_uuid);

395

396 freez(st);

@@ -469,11 +468,11 @@ static inline RRDSET *rrdset_find_on_create(RRDHOST *host, const char *fullid) {

468 }

469

470 static inline void rrdset_update_permanent_labels(RRDSET *st) {

472 - if(!st->state || !st->state->chart_labels) return;

471 + if(!st->rrdlabels) return;

472

474 - rrdlabels_add(st->state->chart_labels, "_collect_plugin", rrdset_plugin_name(st), RRDLABEL_SRC_AUTO| RRDLABEL_FLAG_PERMANENT);

475 - rrdlabels_add(st->state->chart_labels, "_collect_module", rrdset_module_name(st), RRDLABEL_SRC_AUTO| RRDLABEL_FLAG_PERMANENT);

476 - rrdlabels_add(st->state->chart_labels, "_instance_family",rrdset_family(st), RRDLABEL_SRC_AUTO| RRDLABEL_FLAG_PERMANENT);

473 + rrdlabels_add(st->rrdlabels, "_collect_plugin", rrdset_plugin_name(st), RRDLABEL_SRC_AUTO| RRDLABEL_FLAG_PERMANENT);

474 + rrdlabels_add(st->rrdlabels, "_collect_module", rrdset_module_name(st), RRDLABEL_SRC_AUTO| RRDLABEL_FLAG_PERMANENT);

475 + rrdlabels_add(st->rrdlabels, "_instance_family",rrdset_family(st), RRDLABEL_SRC_AUTO| RRDLABEL_FLAG_PERMANENT);

476 }

477

478 RRDSET *rrdset_create_custom(

@@ -667,7 +666,6 @@ RRDSET *rrdset_create_custom(

666 debug(D_RRD_CALLS, "Creating RRD_STATS for '%s.%s'.", type, id);

667

668 st = callocz(1, sizeof(RRDSET));

670 - st->state = callocz(1, sizeof(*st->state));

669

670 st->id = string_strdupz(fullid); // fullid is already json_fix'ed

671

@@ -690,7 +688,8 @@ RRDSET *rrdset_create_custom(

688 st->type = rrd_string_strdupz(type);

689 st->family = family ? rrd_string_strdupz(family) : string_dup(st->type);

690

693 - st->state->is_ar_chart = strcmp(rrdset_id(st), ML_ANOMALY_RATES_CHART_ID) == 0;

691 + if(strcmp(rrdset_id(st), ML_ANOMALY_RATES_CHART_ID) == 0)

692 + rrdset_flag_set(st, RRDSET_FLAG_ANOMALY_RATE_CHART);

693

694 st->units = rrd_string_strdupz(units);

695

@@ -718,7 +717,7 @@ RRDSET *rrdset_create_custom(

717 );

718

719 netdata_rwlock_init(&st->rrdset_rwlock);

721 - st->state->chart_labels = rrdlabels_create();

720 + st->rrdlabels = rrdlabels_create();

721 rrdset_update_permanent_labels(st);

722

723 if(name && *name && rrdset_set_name(st, name))

@@ -1264,7 +1263,7 @@ void rrdset_done(RRDSET *st) {

1263 rrdset_rdlock(st);

1264

1265 #ifdef ENABLE_ACLK

1267 - if (likely(!st->state->is_ar_chart)) {

1266 + if (likely(!rrdset_is_ar_chart(st))) {

1267 if (unlikely(!rrdset_flag_check(st, RRDSET_FLAG_ACLK))) {

1268 if (likely(st->dimensions && st->counter_done && !queue_chart_to_aclk(st))) {

1269 rrdset_flag_set(st, RRDSET_FLAG_ACLK);

@@ -1693,7 +1692,7 @@ after_second_database_work:

1692 continue;

1693

1694 #ifdef ENABLE_ACLK

1696 - if (likely(!st->state->is_ar_chart)) {

1695 + if (likely(!rrdset_is_ar_chart(st))) {

1696 if (!rrddim_flag_check(rd, RRDDIM_FLAG_HIDDEN) && likely(rrdset_flag_check(st, RRDSET_FLAG_ACLK)))

1697 queue_dimension_to_aclk(rd, calc_dimension_liveness(rd, mark));

1698 }

database/sqlite/sqlite_aclk.c

+1 -1

@@ -313,7 +313,7 @@ static int create_host_callback(void *data, int argc, char **argv, char **column

313 , 1

314 );

315 if (likely(host))

316 - host->host_labels = sql_load_host_labels((uuid_t *)argv[IDX_HOST_ID]);

316 + host->rrdlabels = sql_load_host_labels((uuid_t *)argv[IDX_HOST_ID]);

317

318 #ifdef NETDATA_INTERNAL_CHECKS

319 char node_str[UUID_STR_LEN] = "<none>";

database/sqlite/sqlite_aclk_chart.c

+3 -3

@@ -150,7 +150,7 @@ int aclk_add_chart_event(struct aclk_database_worker_config *wc, struct aclk_dat

150 if (likely(claim_id)) {

151 struct chart_instance_updated chart_payload;

152 memset(&chart_payload, 0, sizeof(chart_payload));

153 - chart_payload.config_hash = get_str_from_uuid(&st->state->hash_id);

153 + chart_payload.config_hash = get_str_from_uuid(&st->uuid);

154 chart_payload.update_every = st->update_every;

155 chart_payload.memory_mode = st->rrd_memory_mode;

156 chart_payload.name = (char *)rrdset_name(st);

@@ -159,7 +159,7 @@ int aclk_add_chart_event(struct aclk_database_worker_config *wc, struct aclk_dat

159 chart_payload.id = strdupz(rrdset_id(st));

160

161 chart_payload.chart_labels = rrdlabels_create();

162 - rrdlabels_copy(chart_payload.chart_labels, st->state->chart_labels);

162 + rrdlabels_copy(chart_payload.chart_labels, st->rrdlabels);

163

164 size_t size;

165 char *payload = generate_chart_instance_updated(&size, &chart_payload);

@@ -1265,7 +1265,7 @@ struct aclk_chart_sync_stats *aclk_get_chart_sync_stats(RRDHOST *host)

1265 void sql_check_chart_liveness(RRDSET *st) {

1266 RRDDIM *rd;

1267

1268 - if (unlikely(st->state->is_ar_chart))

1268 + if (unlikely(rrdset_is_ar_chart(st)))

1269 return;

1270

1271 rrdset_rdlock(st);

database/sqlite/sqlite_aclk_node.c

+1 -1

@@ -123,7 +123,7 @@ void sql_build_node_info(struct aclk_database_worker_config *wc, struct aclk_dat

123 node_info.data.ml_info.ml_capable = host->system_info->ml_capable;

124 node_info.data.ml_info.ml_enabled = host->system_info->ml_enabled;

125

126 - node_info.data.host_labels_ptr = host->host_labels;

126 + node_info.data.host_labels_ptr = host->rrdlabels;

127

128 aclk_update_node_info(&node_info);

129 log_access("ACLK RES [%s (%s)]: NODE INFO SENT for guid [%s] (%s)", wc->node_id, rrdhost_hostname(wc->host), wc->host_guid, wc->host == localhost ? "parent" : "child");

database/sqlite/sqlite_functions.c

+2 -2

@@ -2122,7 +2122,7 @@ void compute_chart_hash(RRDSET *st)

2122 char uuid_str[GUID_LEN + 1];

2123 uuid_unparse_lower(*((uuid_t *) &hash_value), uuid_str);

2124 //info("Calculating HASH %s for chart %s", uuid_str, st->name);

2125 - uuid_copy(st->state->hash_id, *((uuid_t *) &hash_value));

2125 + uuid_copy(st->uuid, *((uuid_t *) &hash_value));

2126

2127 (void)sql_store_chart_hash(

2128 (uuid_t *)&hash_value,

@@ -2710,7 +2710,7 @@ void sql_store_host_labels(RRDHOST *host)

2710 if (rc != SQLITE_OK)

2711 error_report("Failed to remove old host labels for host %s", rrdhost_hostname(host));

2712

2713 - rrdlabels_walkthrough_read(host->host_labels, save_host_label_callback, host);

2713 + rrdlabels_walkthrough_read(host->rrdlabels, save_host_label_callback, host);

2714 }

2715

2716 #define SELECT_HOST_LABELS "SELECT label_key, label_value, source_type FROM host_label WHERE host_id = @host_id " \

exporting/check_filters.c

+1 -1

@@ -56,7 +56,7 @@ int rrdset_is_exportable(struct instance *instance, RRDSET *st)

56 #endif

57

58 // Do not export anomaly rates charts.

59 - if (st->state && st->state->is_ar_chart)

59 + if (rrdset_is_ar_chart(st))

60 return 0;

61

62 if (st->exporting_flags == NULL)

exporting/graphite/graphite.c

+1 -1

@@ -101,7 +101,7 @@ int format_host_labels_graphite_plaintext(struct instance *instance, RRDHOST *ho

101 if (unlikely(!sending_labels_configured(instance)))

102 return 0;

103

104 - rrdlabels_to_buffer(host->host_labels, instance->labels_buffer, ";", "=", "", "",

104 + rrdlabels_to_buffer(host->rrdlabels, instance->labels_buffer, ";", "=", "", "",

105 exporting_labels_filter_callback, instance,

106 NULL, sanitize_graphite_label_value);

107

exporting/json/json.c

+1 -1

@@ -125,7 +125,7 @@ int format_host_labels_json_plaintext(struct instance *instance, RRDHOST *host)

125 return 0;

126

127 buffer_strcat(instance->labels_buffer, "\"labels\":{");

128 - rrdlabels_to_buffer(host->host_labels, instance->labels_buffer, "", ":", "\"", ",",

128 + rrdlabels_to_buffer(host->rrdlabels, instance->labels_buffer, "", ":", "\"", ",",

129 exporting_labels_filter_callback, instance,

130 NULL, sanitize_json_string);

131 buffer_strcat(instance->labels_buffer, "},");

exporting/opentsdb/opentsdb.c

+2 -2

@@ -156,7 +156,7 @@ int format_host_labels_opentsdb_telnet(struct instance *instance, RRDHOST *host)

156 return 0;

157

158 buffer_strcat(instance->labels_buffer, " ");

159 - rrdlabels_to_buffer(host->host_labels, instance->labels_buffer, "", "=", "", " ",

159 + rrdlabels_to_buffer(host->rrdlabels, instance->labels_buffer, "", "=", "", " ",

160 exporting_labels_filter_callback, instance,

161 NULL, sanitize_opentsdb_label_value);

162 return 0;

@@ -288,7 +288,7 @@ int format_host_labels_opentsdb_http(struct instance *instance, RRDHOST *host) {

288 if (unlikely(!sending_labels_configured(instance)))

289 return 0;

290

291 - rrdlabels_to_buffer(host->host_labels, instance->labels_buffer, ",", ":", "\"", "",

291 + rrdlabels_to_buffer(host->rrdlabels, instance->labels_buffer, ",", ":", "\"", "",

292 exporting_labels_filter_callback, instance,

293 NULL, sanitize_opentsdb_label_value);

294 return 0;

exporting/prometheus/prometheus.c

+2 -2

@@ -29,7 +29,7 @@ inline int can_send_rrdset(struct instance *instance, RRDSET *st, SIMPLE_PATTERN

29 #endif

30

31 // Do not send anomaly rates charts.

32 - if (st->state && st->state->is_ar_chart)

32 + if (rrdset_is_ar_chart(st))

33 return 0;

34

35 if (unlikely(rrdset_flag_check(st, RRDSET_FLAG_EXPORTING_IGNORE)))

@@ -327,7 +327,7 @@ void format_host_labels_prometheus(struct instance *instance, RRDHOST *host)

327 .instance = instance,

328 .count = 0

329 };

330 - rrdlabels_walkthrough_read(host->host_labels, format_prometheus_label_callback, &tmp);

330 + rrdlabels_walkthrough_read(host->rrdlabels, format_prometheus_label_callback, &tmp);

331 }

332

333 struct host_variables_callback_options {

exporting/prometheus/remote_write/remote_write.c

+1 -1

@@ -183,7 +183,7 @@ int format_host_prometheus_remote_write(struct instance *instance, RRDHOST *host

183 .write_request = connector_specific_data->write_request,

184 .instance = instance

185 };

186 - rrdlabels_walkthrough_read(host->host_labels, format_remote_write_label_callback, &tmp);

186 + rrdlabels_walkthrough_read(host->rrdlabels, format_remote_write_label_callback, &tmp);

187 }

188

189 return 0;

exporting/tests/exporting_fixtures.c

+4 -4

@@ -41,9 +41,9 @@ int setup_rrdhost()

41

42 localhost->tags = string_strdupz("TAG1=VALUE1 TAG2=VALUE2");

43

44 - localhost->host_labels = rrdlabels_create();

45 - rrdlabels_add(localhost->host_labels, "key1", "value1", RRDLABEL_SRC_CONFIG);

46 - rrdlabels_add(localhost->host_labels, "key2", "value2", RRDLABEL_SRC_CONFIG);

44 + localhost->rrdlabels = rrdlabels_create();

45 + rrdlabels_add(localhost->rrdlabels, "key1", "value1", RRDLABEL_SRC_CONFIG);

46 + rrdlabels_add(localhost->rrdlabels, "key2", "value2", RRDLABEL_SRC_CONFIG);

47

48 localhost->rrdset_root = calloc(1, sizeof(RRDSET));

49 RRDSET *st = localhost->rrdset_root;

@@ -86,7 +86,7 @@ int teardown_rrdhost()

86 string_freez(st->name);

87 free(st);

88

89 - rrdlabels_destroy(localhost->host_labels);

89 + rrdlabels_destroy(localhost->rrdlabels);

90

91 string_freez(localhost->tags);

92 free(localhost);

health/health_log.c

+1 -1

@@ -75,7 +75,7 @@ inline void health_label_log_save(RRDHOST *host) {

75 if(unlikely(host->health_log_fp)) {

76 BUFFER *wb = buffer_create(1024);

77

78 - rrdlabels_to_buffer(localhost->host_labels, wb, "", "=", "", "\t ", NULL, NULL, NULL, NULL);

78 + rrdlabels_to_buffer(localhost->rrdlabels, wb, "", "=", "", "\t ", NULL, NULL, NULL, NULL);

79 char *write = (char *) buffer_tostring(wb);

80

81 if (unlikely(fprintf(host->health_log_fp, "L\t%s", write) < 0))

streaming/rrdpush.c

+5 -5

@@ -131,7 +131,7 @@ unsigned int remote_clock_resync_iterations = 60;

131

132 static inline int should_send_chart_matching(RRDSET *st) {

133 // Do not stream anomaly rates charts.

134 - if (unlikely(st->state->is_ar_chart))

134 + if (unlikely(rrdset_is_ar_chart(st)))

135 return false;

136

137 if (rrdset_flag_check(st, RRDSET_FLAG_ANOMALY_DETECTION))

@@ -197,8 +197,8 @@ static int send_clabels_callback(const char *name, const char *value, RRDLABEL_S

197 return 1;

198 }

199 void rrdpush_send_clabels(RRDHOST *host, RRDSET *st) {

200 - if (st->state && st->state->chart_labels) {

201 - if(rrdlabels_walkthrough_read(st->state->chart_labels, send_clabels_callback, host->sender->build) > 0)

200 + if (st->rrdlabels) {

201 + if(rrdlabels_walkthrough_read(st->rrdlabels, send_clabels_callback, host->sender->build) > 0)

202 buffer_sprintf(host->sender->build,"CLABEL_COMMIT\n");

203 }

204 }

@@ -406,12 +406,12 @@ static int send_labels_callback(const char *name, const char *value, RRDLABEL_SR

406 return 1;

407 }

408 void rrdpush_send_labels(RRDHOST *host) {

409 - if (!host->host_labels || !rrdhost_flag_check(host, RRDHOST_FLAG_STREAM_LABELS_UPDATE) || (rrdhost_flag_check(host, RRDHOST_FLAG_STREAM_LABELS_STOP)))

409 + if (!host->rrdlabels || !rrdhost_flag_check(host, RRDHOST_FLAG_STREAM_LABELS_UPDATE) || (rrdhost_flag_check(host, RRDHOST_FLAG_STREAM_LABELS_STOP)))

410 return;

411

412 sender_start(host->sender);

413

414 - rrdlabels_walkthrough_read(host->host_labels, send_labels_callback, host->sender->build);

414 + rrdlabels_walkthrough_read(host->rrdlabels, send_labels_callback, host->sender->build);

415 buffer_sprintf(host->sender->build, "OVERWRITE %s\n", "labels");

416 sender_commit(host->sender);

417

web/api/formatters/json_wrapper.c

+3 -3

@@ -174,8 +174,8 @@ void rrdr_json_wrapper_begin(RRDR *r, BUFFER *wb, uint32_t format, RRDR_OPTIONS

174 dict = dictionary_create(DICTIONARY_FLAG_SINGLE_THREADED);

175 for (i = 0, rd = temp_rd ? temp_rd : r->st->dimensions; rd; rd = rd->next) {

176 st = rd->rrdset;

177 - if (st->state && st->state->chart_labels)

178 - rrdlabels_walkthrough_read(st->state->chart_labels, fill_formatted_callback, dict);

177 + if (st->rrdlabels)

178 + rrdlabels_walkthrough_read(st->rrdlabels, fill_formatted_callback, dict);

179 }

180 dictionary_walkthrough_read(dict, value_list_output, &co);

181 dictionary_destroy(dict);

@@ -231,7 +231,7 @@ void rrdr_json_wrapper_begin(RRDR *r, BUFFER *wb, uint32_t format, RRDR_OPTIONS

231 if (i)

232 buffer_strcat(wb, ", ");

233

234 - rrdlabels_get_value_to_buffer_or_null(rd->rrdset->state->chart_labels, wb, label_key, sq, "null");

234 + rrdlabels_get_value_to_buffer_or_null(rd->rrdset->rrdlabels, wb, label_key, sq, "null");

235 i++;

236 }

237 if (!i) {

web/api/formatters/rrd2json.c

+1 -1

@@ -300,7 +300,7 @@ int rrdset2anything_api_v1(

300 return HTTP_RESP_BACKEND_FETCH_FAILED;

301 }

302

303 - if (st->state && st->state->is_ar_chart)

303 + if (rrdset_is_ar_chart(st))

304 ml_process_rrdr(r, query_params->max_anomaly_rates);

305

306 RRDDIM *temp_rd = query_params->context_param_list ? query_params->context_param_list->rd : NULL;

web/api/formatters/rrdset2json.c

+2 -2

@@ -4,7 +4,7 @@

4

5 void chart_labels2json(RRDSET *st, BUFFER *wb, size_t indentation)

6 {

7 - if(unlikely(!st->state || !st->state->chart_labels))

7 + if(unlikely(!st->rrdlabels))

8 return;

9

10 char tabs[11];

@@ -18,7 +18,7 @@ void chart_labels2json(RRDSET *st, BUFFER *wb, size_t indentation)

18 indentation--;

19 }

20

21 - rrdlabels_to_buffer(st->state->chart_labels, wb, tabs, ":", "\"", ",\n", NULL, NULL, NULL, NULL);

21 + rrdlabels_to_buffer(st->rrdlabels, wb, tabs, ":", "\"", ",\n", NULL, NULL, NULL, NULL);

22 buffer_strcat(wb, "\n");

23 }

24

web/api/web_api_v1.c

+3 -3

@@ -713,8 +713,8 @@ inline int web_client_api_request_v1_data(RRDHOST *host, struct web_client *w, c

713 rrdhost_rdlock(host);

714 rrdset_foreach_read(st1, host) {

715 if (st1->context == context_string &&

716 - (!chart_label_key_pattern || rrdlabels_match_simple_pattern_parsed(st1->state->chart_labels, chart_label_key_pattern, ':')) &&

717 - (!chart_labels_filter_pattern || rrdlabels_match_simple_pattern_parsed(st1->state->chart_labels, chart_labels_filter_pattern, ':')))

716 + (!chart_label_key_pattern || rrdlabels_match_simple_pattern_parsed(st1->rrdlabels, chart_label_key_pattern, ':')) &&

717 + (!chart_labels_filter_pattern || rrdlabels_match_simple_pattern_parsed(st1->rrdlabels, chart_labels_filter_pattern, ':')))

718 build_context_param_list(owa, &context_param_list, st1);

719 }

720 rrdhost_unlock(host);

@@ -1140,7 +1140,7 @@ inline void host_labels2json(RRDHOST *host, BUFFER *wb, size_t indentation) {

1140 indentation--;

1141 }

1142

1143 - rrdlabels_to_buffer(host->host_labels, wb, tabs, ":", "\"", ",\n", NULL, NULL, NULL, NULL);

1143 + rrdlabels_to_buffer(host->rrdlabels, wb, tabs, ":", "\"", ",\n", NULL, NULL, NULL, NULL);

1144 buffer_strcat(wb, "\n");

1145 }

1146

Obsolete RRDSET state (#13635)