Remove chart specific configuration from netdata.conf except enabled (#12209)
Stelios Fragkakis committed
Feb 22, 2022 at 18:23 UTC
a330a27a62a4fc945044216516367962ce275952
3 files changed
+21
-35
database/rrd.c
+2
-1
@@ -140,6 +140,7 @@ const char *rrdset_type_name(RRDSET_TYPE chart_type) {
140
// RRD - cache directory
141
142
char *rrdset_cache_dir(RRDHOST *host, const char *id, const char *config_section) {
143
+ UNUSED(config_section);
144
char *ret = NULL;
145
146
char b[FILENAME_MAX + 1];
@@ -147,7 +148,7 @@ char *rrdset_cache_dir(RRDHOST *host, const char *id, const char *config_section
148
rrdset_strncpyz_name(b, id, FILENAME_MAX);
149
150
snprintfz(n, FILENAME_MAX, "%s/%s", host->cache_dir, b);
150
- ret = config_get(config_section, "cache directory", n);
151
+ ret = strdupz(n);
152
153
if(host->rrd_memory_mode == RRD_MEMORY_MODE_MAP || host->rrd_memory_mode == RRD_MEMORY_MODE_SAVE) {
154
int r = mkdir(ret, 0775);
database/rrddim.c
+4
-9
@@ -252,7 +252,6 @@ RRDDIM *rrddim_add_custom(RRDSET *st, const char *id, const char *name, collecte
252
char filename[FILENAME_MAX + 1];
253
char fullfilename[FILENAME_MAX + 1];
254
255
- char varname[CONFIG_MAX_NAME + 1];
255
unsigned long size = sizeof(RRDDIM) + (st->entries * sizeof(storage_number));
256
257
debug(D_RRD_CALLS, "Adding dimension '%s/%s'.", st->id, id);
@@ -350,18 +349,14 @@ RRDDIM *rrddim_add_custom(RRDSET *st, const char *id, const char *name, collecte
349
350
rd->cache_filename = strdupz(fullfilename);
351
353
- snprintfz(varname, CONFIG_MAX_NAME, "dim %s name", rd->id);
354
- rd->name = config_get(st->config_section, varname, (name && *name)?name:rd->id);
352
+ rd->name = (name && *name)?strdupz(name):strdupz(rd->id);
353
rd->hash_name = simple_hash(rd->name);
354
357
- snprintfz(varname, CONFIG_MAX_NAME, "dim %s algorithm", rd->id);
358
- rd->algorithm = rrd_algorithm_id(config_get(st->config_section, varname, rrd_algorithm_name(algorithm)));
355
+ rd->algorithm = algorithm;
356
360
- snprintfz(varname, CONFIG_MAX_NAME, "dim %s multiplier", rd->id);
361
- rd->multiplier = config_get_number(st->config_section, varname, multiplier);
357
+ rd->multiplier = multiplier;
358
363
- snprintfz(varname, CONFIG_MAX_NAME, "dim %s divisor", rd->id);
364
- rd->divisor = config_get_number(st->config_section, varname, divisor);
359
+ rd->divisor = divisor;
360
if(!rd->divisor) rd->divisor = 1;
361
362
rd->entries = st->entries;
database/rrdset.c
+15
-25
@@ -170,12 +170,12 @@ int rrdset_set_name(RRDSET *st, const char *name) {
170
171
if(st->name) {
172
rrdset_index_del_name(host, st);
173
- st->name = config_set_default(st->config_section, "name", new_name);
173
+ st->name = strdupz(new_name);
174
st->hash_name = simple_hash(st->name);
175
rrdsetvar_rename_all(st);
176
}
177
else {
178
- st->name = config_get(st->config_section, "name", new_name);
178
+ st->name = strdupz(new_name);
179
st->hash_name = simple_hash(st->name);
180
}
181
@@ -630,10 +630,8 @@ RRDSET *rrdset_create_custom(
630
mark_rebuild |= META_CHART_UPDATED;
631
}
632
633
- RRDSET_TYPE new_chart_type =
634
- rrdset_type_id(config_get(st->config_section, "chart type", rrdset_type_name(chart_type)));
635
- if (st->chart_type != new_chart_type) {
636
- st->chart_type = new_chart_type;
633
+ if (st->chart_type != chart_type) {
634
+ st->chart_type = chart_type;
635
mark_rebuild |= META_CHART_UPDATED;
636
}
637
@@ -722,19 +720,11 @@ RRDSET *rrdset_create_custom(
720
// get the options from the config, we need to create it
721
722
long entries;
725
- if(memory_mode == RRD_MEMORY_MODE_DBENGINE) {
726
- // only sets it the first time
727
- entries = config_get_number(config_section, "history", 5);
728
- } else {
729
- long rentries = config_get_number(config_section, "history", history_entries);
730
- entries = align_entries_to_pagesize(memory_mode, rentries);
731
- if (entries != rentries) entries = config_set_number(config_section, "history", entries);
732
-
733
- if (memory_mode == RRD_MEMORY_MODE_NONE && entries != rentries)
734
- entries = config_set_number(config_section, "history", 10);
735
- }
723
int enabled = config_get_boolean(config_section, "enabled", 1);
737
- if(!enabled) entries = 5;
724
+ if(!enabled || memory_mode == RRD_MEMORY_MODE_DBENGINE)
725
+ entries = 5;
726
+ else
727
+ entries = align_entries_to_pagesize(memory_mode, history_entries);
728
729
unsigned long size = sizeof(RRDSET);
730
char *cache_dir = rrdset_cache_dir(host, fullid, config_section);
@@ -853,22 +843,22 @@ RRDSET *rrdset_create_custom(
843
844
st->cache_dir = cache_dir;
845
856
- st->chart_type = rrdset_type_id(config_get(st->config_section, "chart type", rrdset_type_name(chart_type)));
857
- st->type = config_get(st->config_section, "type", type);
846
+ st->chart_type = chart_type;
847
+ st->type = strdupz(type);
848
849
st->state = callocz(1, sizeof(*st->state));
860
- st->family = config_get(st->config_section, "family", family?family:st->type);
850
+ st->family = family ? strdupz(family) : strdupz(st->type);
851
json_fix_string(st->family);
852
863
- st->units = config_get(st->config_section, "units", units?units:"");
853
+ st->units = units ? strdupz(units) : strdupz("");
854
json_fix_string(st->units);
855
866
- st->context = config_get(st->config_section, "context", context?context:st->id);
856
+ st->context = context ? strdupz(context) : strdupz(st->id);
857
st->state->old_context = strdupz(st->context);
858
json_fix_string(st->context);
859
st->hash_context = simple_hash(st->context);
860
871
- st->priority = config_get_number(st->config_section, "priority", priority);
861
+ st->priority = priority;
862
if(enabled)
863
rrdset_flag_set(st, RRDSET_FLAG_ENABLED);
864
else
@@ -918,7 +908,7 @@ RRDSET *rrdset_create_custom(
908
// could not use the name, use the id
909
rrdset_set_name(st, id);
910
921
- st->title = config_get(st->config_section, "title", title);
911
+ st->title = strdupz(title);
912
st->state->old_title = strdupz(st->title);
913
json_fix_string(st->title);
914