@cryptotaxi247 / netdata-1 / commits / e660d3e15

appconfig now supports different multiple configurations - added support for stream config

Costa Tsaousis (ktsaou) committed Feb 22, 2017 at 02:07 UTC e660d3e15b274066157947ab0f4f8f3686dcaecd
18 files changed +589 -549
src/appconfig.c
+123 -112
@@ -2,8 +2,6 @@
2
3 #define CONFIG_FILE_LINE_MAX ((CONFIG_MAX_NAME + CONFIG_MAX_VALUE + 1024) * 2)
4
5 -pthread_mutex_t config_mutex = PTHREAD_MUTEX_INITIALIZER;
6 -
5 // ----------------------------------------------------------------------------
6 // definitions
7
@@ -12,7 +10,7 @@ pthread_mutex_t config_mutex = PTHREAD_MUTEX_INITIALIZER;
10 #define CONFIG_VALUE_CHANGED 0x04 // has been changed from the loaded value
11 #define CONFIG_VALUE_CHECKED 0x08 // has been checked if the value is different from the default
12
15 -struct config_value {
13 +struct config_option {
14 avl avl; // the index - this has to be first!
15
16 uint8_t flags;
@@ -22,10 +20,10 @@ struct config_value {
20 char *name;
21 char *value;
22
25 - struct config_value *next; // config->mutex protects just this
23 + struct config_option *next; // config->mutex protects just this
24 };
25
28 -struct config {
26 +struct section {
27 avl avl;
28
29 uint32_t hash; // a simple hash to speed up searching
@@ -33,32 +31,51 @@ struct config {
31
32 char *name;
33
36 - struct config *next; // gloabl config_mutex protects just this
34 + struct section *next; // gloabl config_mutex protects just this
35
38 - struct config_value *values;
36 + struct config_option *values;
37 avl_tree_lock values_index;
38
39 pthread_mutex_t mutex; // this locks only the writers, to ensure atomic updates
40 // readers are protected using the rwlock in avl_tree_lock
43 -} *config_root = NULL;
41 +};
42 +
43 +static int appconfig_section_compare(void *a, void *b);
44
45 +struct config netdata_config = {
46 + .sections = NULL,
47 + .mutex = PTHREAD_MUTEX_INITIALIZER,
48 + .index = {
49 + { NULL, appconfig_section_compare },
50 + AVL_LOCK_INITIALIZER
51 + }
52 +};
53 +
54 +struct config stream_config = {
55 + .sections = NULL,
56 + .mutex = PTHREAD_MUTEX_INITIALIZER,
57 + .index = {
58 + { NULL, appconfig_section_compare },
59 + AVL_LOCK_INITIALIZER
60 + }
61 +};
62
63 // ----------------------------------------------------------------------------
64 // locking
65
49 -static inline void config_global_write_lock(void) {
50 - pthread_mutex_lock(&config_mutex);
66 +static inline void appconfig_wrlock(struct config *root) {
67 + pthread_mutex_lock(&root->mutex);
68 }
69
53 -static inline void config_global_unlock(void) {
54 - pthread_mutex_unlock(&config_mutex);
70 +static inline void appconfig_unlock(struct config *root) {
71 + pthread_mutex_unlock(&root->mutex);
72 }
73
57 -static inline void config_section_write_lock(struct config *co) {
74 +static inline void config_section_wrlock(struct section *co) {
75 pthread_mutex_lock(&co->mutex);
76 }
77
61 -static inline void config_section_unlock(struct config *co) {
78 +static inline void config_section_unlock(struct section *co) {
79 pthread_mutex_unlock(&co->mutex);
80 }
81
@@ -66,78 +83,72 @@ static inline void config_section_unlock(struct config *co) {
83 // ----------------------------------------------------------------------------
84 // config name-value index
85
69 -static int config_value_compare(void* a, void* b) {
70 - if(((struct config_value *)a)->hash < ((struct config_value *)b)->hash) return -1;
71 - else if(((struct config_value *)a)->hash > ((struct config_value *)b)->hash) return 1;
72 - else return strcmp(((struct config_value *)a)->name, ((struct config_value *)b)->name);
86 +static int appconfig_option_compare(void *a, void *b) {
87 + if(((struct config_option *)a)->hash < ((struct config_option *)b)->hash) return -1;
88 + else if(((struct config_option *)a)->hash > ((struct config_option *)b)->hash) return 1;
89 + else return strcmp(((struct config_option *)a)->name, ((struct config_option *)b)->name);
90 }
91
75 -#define config_value_index_add(co, cv) (struct config_value *)avl_insert_lock(&((co)->values_index), (avl *)(cv))
76 -#define config_value_index_del(co, cv) (struct config_value *)avl_remove_lock(&((co)->values_index), (avl *)(cv))
92 +#define appconfig_option_index_add(co, cv) (struct config_option *)avl_insert_lock(&((co)->values_index), (avl *)(cv))
93 +#define appconfig_option_index_del(co, cv) (struct config_option *)avl_remove_lock(&((co)->values_index), (avl *)(cv))
94
78 -static struct config_value *config_value_index_find(struct config *co, const char *name, uint32_t hash) {
79 - struct config_value tmp;
95 +static struct config_option *appconfig_option_index_find(struct section *co, const char *name, uint32_t hash) {
96 + struct config_option tmp;
97 tmp.hash = (hash)?hash:simple_hash(name);
98 tmp.name = (char *)name;
99
83 - return (struct config_value *)avl_search_lock(&(co->values_index), (avl *) &tmp);
100 + return (struct config_option *)avl_search_lock(&(co->values_index), (avl *) &tmp);
101 }
102
103
104 // ----------------------------------------------------------------------------
105 // config sections index
106
90 -static int config_compare(void* a, void* b) {
91 - if(((struct config *)a)->hash < ((struct config *)b)->hash) return -1;
92 - else if(((struct config *)a)->hash > ((struct config *)b)->hash) return 1;
93 - else return strcmp(((struct config *)a)->name, ((struct config *)b)->name);
107 +static int appconfig_section_compare(void *a, void *b) {
108 + if(((struct section *)a)->hash < ((struct section *)b)->hash) return -1;
109 + else if(((struct section *)a)->hash > ((struct section *)b)->hash) return 1;
110 + else return strcmp(((struct section *)a)->name, ((struct section *)b)->name);
111 }
112
96 -avl_tree_lock config_root_index = {
97 - { NULL, config_compare },
98 - AVL_LOCK_INITIALIZER
99 -};
113 +#define appconfig_index_add(root, cfg) (struct section *)avl_insert_lock(&root->index, (avl *)(cfg))
114 +#define appconfig_index_del(root, cfg) (struct section *)avl_remove_lock(&root->index, (avl *)(cfg))
115
101 -#define config_index_add(cfg) (struct config *)avl_insert_lock(&config_root_index, (avl *)(cfg))
102 -#define config_index_del(cfg) (struct config *)avl_remove_lock(&config_root_index, (avl *)(cfg))
103 -
104 -static struct config *config_index_find(const char *name, uint32_t hash) {
105 - struct config tmp;
116 +static struct section *appconfig_index_find(struct config *root, const char *name, uint32_t hash) {
117 + struct section tmp;
118 tmp.hash = (hash)?hash:simple_hash(name);
119 tmp.name = (char *)name;
120
109 - return (struct config *)avl_search_lock(&config_root_index, (avl *) &tmp);
121 + return (struct section *)avl_search_lock(&root->index, (avl *) &tmp);
122 }
123
124
125 // ----------------------------------------------------------------------------
126 // config section methods
127
116 -static inline struct config *config_section_find(const char *section) {
117 - return config_index_find(section, 0);
128 +static inline struct section *appconfig_section_find(struct config *root, const char *section) {
129 + return appconfig_index_find(root, section, 0);
130 }
131
120 -static inline struct config *config_section_create(const char *section)
121 -{
132 +static inline struct section *appconfig_section_create(struct config *root, const char *section) {
133 debug(D_CONFIG, "Creating section '%s'.", section);
134
124 - struct config *co = callocz(1, sizeof(struct config));
135 + struct section *co = callocz(1, sizeof(struct section));
136 co->name = strdupz(section);
137 co->hash = simple_hash(co->name);
138
128 - avl_init_lock(&co->values_index, config_value_compare);
139 + avl_init_lock(&co->values_index, appconfig_option_compare);
140
130 - if(unlikely(config_index_add(co) != co))
141 + if(unlikely(appconfig_index_add(root, co) != co))
142 error("INTERNAL ERROR: indexing of section '%s', already exists.", co->name);
143
133 - config_global_write_lock();
134 - struct config *co2 = config_root;
144 + appconfig_wrlock(root);
145 + struct section *co2 = root->sections;
146 if(co2) {
147 while (co2->next) co2 = co2->next;
148 co2->next = co;
149 }
139 - else config_root = co;
140 - config_global_unlock();
150 + else root->sections = co;
151 + appconfig_unlock(root);
152
153 return co;
154 }
@@ -146,20 +157,20 @@ static inline struct config *config_section_create(const char *section)
157 // ----------------------------------------------------------------------------
158 // config name-value methods
159
149 -static inline struct config_value *config_value_create(struct config *co, const char *name, const char *value)
160 +static inline struct config_option *appconfig_value_create(struct section *co, const char *name, const char *value)
161 {
162 debug(D_CONFIG, "Creating config entry for name '%s', value '%s', in section '%s'.", name, value, co->name);
163
153 - struct config_value *cv = callocz(1, sizeof(struct config_value));
164 + struct config_option *cv = callocz(1, sizeof(struct config_option));
165 cv->name = strdupz(name);
166 cv->hash = simple_hash(cv->name);
167 cv->value = strdupz(value);
168
158 - if(unlikely(config_value_index_add(co, cv) != cv))
169 + if(unlikely(appconfig_option_index_add(co, cv) != cv))
170 error("INTERNAL ERROR: indexing of config '%s' in section '%s': already exists.", cv->name, co->name);
171
161 - config_section_write_lock(co);
162 - struct config_value *cv2 = co->values;
172 + config_section_wrlock(co);
173 + struct config_option *cv2 = co->values;
174 if(cv2) {
175 while (cv2->next) cv2 = cv2->next;
176 cv2->next = cv;
@@ -170,43 +181,43 @@ static inline struct config_value *config_value_create(struct config *co, const
181 return cv;
182 }
183
173 -int config_exists(const char *section, const char *name) {
174 - struct config_value *cv;
184 +int appconfig_exists(struct config *root, const char *section, const char *name) {
185 + struct config_option *cv;
186
187 debug(D_CONFIG, "request to get config in section '%s', name '%s'", section, name);
188
178 - struct config *co = config_section_find(section);
189 + struct section *co = appconfig_section_find(root, section);
190 if(!co) return 0;
191
181 - cv = config_value_index_find(co, name, 0);
192 + cv = appconfig_option_index_find(co, name, 0);
193 if(!cv) return 0;
194
195 return 1;
196 }
197
187 -int config_rename(const char *section, const char *old, const char *new) {
188 - struct config_value *cv, *cv2;
198 +int appconfig_rename(struct config *root, const char *section, const char *old, const char *new) {
199 + struct config_option *cv, *cv2;
200
201 debug(D_CONFIG, "request to rename config in section '%s', old name '%s', new name '%s'", section, old, new);
202
192 - struct config *co = config_section_find(section);
203 + struct section *co = appconfig_section_find(root, section);
204 if(!co) return -1;
205
195 - config_section_write_lock(co);
206 + config_section_wrlock(co);
207
197 - cv = config_value_index_find(co, old, 0);
208 + cv = appconfig_option_index_find(co, old, 0);
209 if(!cv) goto cleanup;
210
200 - cv2 = config_value_index_find(co, new, 0);
211 + cv2 = appconfig_option_index_find(co, new, 0);
212 if(cv2) goto cleanup;
213
203 - if(unlikely(config_value_index_del(co, cv) != cv))
214 + if(unlikely(appconfig_option_index_del(co, cv) != cv))
215 error("INTERNAL ERROR: deletion of config '%s' from section '%s', deleted tge wrong config entry.", cv->name, co->name);
216
217 freez(cv->name);
218 cv->name = strdupz(new);
219 cv->hash = simple_hash(cv->name);
209 - if(unlikely(config_value_index_add(co, cv) != cv))
220 + if(unlikely(appconfig_option_index_add(co, cv) != cv))
221 error("INTERNAL ERROR: indexing of config '%s' in section '%s', already exists.", cv->name, co->name);
222
223 config_section_unlock(co);
@@ -218,18 +229,18 @@ cleanup:
229 return -1;
230 }
231
221 -char *config_get(const char *section, const char *name, const char *default_value)
232 +char *appconfig_get(struct config *root, const char *section, const char *name, const char *default_value)
233 {
223 - struct config_value *cv;
234 + struct config_option *cv;
235
236 debug(D_CONFIG, "request to get config in section '%s', name '%s', default_value '%s'", section, name, default_value);
237
227 - struct config *co = config_section_find(section);
228 - if(!co) co = config_section_create(section);
238 + struct section *co = appconfig_section_find(root, section);
239 + if(!co) co = appconfig_section_create(root, section);
240
230 - cv = config_value_index_find(co, name, 0);
241 + cv = appconfig_option_index_find(co, name, 0);
242 if(!cv) {
232 - cv = config_value_create(co, name, default_value);
243 + cv = appconfig_value_create(co, name, default_value);
244 if(!cv) return NULL;
245 }
246 cv->flags |= CONFIG_VALUE_USED;
@@ -246,67 +257,67 @@ char *config_get(const char *section, const char *name, const char *default_valu
257 return(cv->value);
258 }
259
249 -long long config_get_number(const char *section, const char *name, long long value)
260 +long long appconfig_get_number(struct config *root, const char *section, const char *name, long long value)
261 {
262 char buffer[100], *s;
263 sprintf(buffer, "%lld", value);
264
254 - s = config_get(section, name, buffer);
265 + s = appconfig_get(root, section, name, buffer);
266 if(!s) return value;
267
268 return strtoll(s, NULL, 0);
269 }
270
260 -int config_get_boolean(const char *section, const char *name, int value)
271 +int appconfig_get_boolean(struct config *root, const char *section, const char *name, int value)
272 {
273 char *s;
274 if(value) s = "yes";
275 else s = "no";
276
266 - s = config_get(section, name, s);
277 + s = appconfig_get(root, section, name, s);
278 if(!s) return value;
279
280 if(!strcmp(s, "yes") || !strcmp(s, "auto") || !strcmp(s, "on demand")) return 1;
281 return 0;
282 }
283
273 -int config_get_boolean_ondemand(const char *section, const char *name, int value)
284 +int appconfig_get_boolean_ondemand(struct config *root, const char *section, const char *name, int value)
285 {
286 char *s;
287
277 - if(value == CONFIG_ONDEMAND_ONDEMAND)
288 + if(value == CONFIG_BOOLEAN_AUTO)
289 s = "auto";
290
280 - else if(value == CONFIG_ONDEMAND_NO)
291 + else if(value == CONFIG_BOOLEAN_NO)
292 s = "no";
293
294 else
295 s = "yes";
296
286 - s = config_get(section, name, s);
297 + s = appconfig_get(root, section, name, s);
298 if(!s) return value;
299
300 if(!strcmp(s, "yes"))
290 - return CONFIG_ONDEMAND_YES;
301 + return CONFIG_BOOLEAN_YES;
302 else if(!strcmp(s, "no"))
292 - return CONFIG_ONDEMAND_NO;
303 + return CONFIG_BOOLEAN_NO;
304 else if(!strcmp(s, "auto") || !strcmp(s, "on demand"))
294 - return CONFIG_ONDEMAND_ONDEMAND;
305 + return CONFIG_BOOLEAN_AUTO;
306
307 return value;
308 }
309
299 -const char *config_set_default(const char *section, const char *name, const char *value)
310 +const char *appconfig_set_default(struct config *root, const char *section, const char *name, const char *value)
311 {
301 - struct config_value *cv;
312 + struct config_option *cv;
313
314 debug(D_CONFIG, "request to set config in section '%s', name '%s', value '%s'", section, name, value);
315
305 - struct config *co = config_section_find(section);
306 - if(!co) return config_set(section, name, value);
316 + struct section *co = appconfig_section_find(root, section);
317 + if(!co) return appconfig_set(root, section, name, value);
318
308 - cv = config_value_index_find(co, name, 0);
309 - if(!cv) return config_set(section, name, value);
319 + cv = appconfig_option_index_find(co, name, 0);
320 + if(!cv) return appconfig_set(root, section, name, value);
321
322 cv->flags |= CONFIG_VALUE_USED;
323
@@ -323,17 +334,17 @@ const char *config_set_default(const char *section, const char *name, const char
334 return cv->value;
335 }
336
326 -const char *config_set(const char *section, const char *name, const char *value)
337 +const char *appconfig_set(struct config *root, const char *section, const char *name, const char *value)
338 {
328 - struct config_value *cv;
339 + struct config_option *cv;
340
341 debug(D_CONFIG, "request to set config in section '%s', name '%s', value '%s'", section, name, value);
342
332 - struct config *co = config_section_find(section);
333 - if(!co) co = config_section_create(section);
343 + struct section *co = appconfig_section_find(root, section);
344 + if(!co) co = appconfig_section_create(root, section);
345
335 - cv = config_value_index_find(co, name, 0);
336 - if(!cv) cv = config_value_create(co, name, value);
346 + cv = appconfig_option_index_find(co, name, 0);
347 + if(!cv) cv = appconfig_value_create(co, name, value);
348 cv->flags |= CONFIG_VALUE_USED;
349
350 if(strcmp(cv->value, value) != 0) {
@@ -346,23 +357,23 @@ const char *config_set(const char *section, const char *name, const char *value)
357 return value;
358 }
359
349 -long long config_set_number(const char *section, const char *name, long long value)
360 +long long appconfig_set_number(struct config *root, const char *section, const char *name, long long value)
361 {
362 char buffer[100];
363 sprintf(buffer, "%lld", value);
364
354 - config_set(section, name, buffer);
365 + appconfig_set(root, section, name, buffer);
366
367 return value;
368 }
369
359 -int config_set_boolean(const char *section, const char *name, int value)
370 +int appconfig_set_boolean(struct config *root, const char *section, const char *name, int value)
371 {
372 char *s;
373 if(value) s = "yes";
374 else s = "no";
375
365 - config_set(section, name, s);
376 + appconfig_set(root, section, name, s);
377
378 return value;
379 }
@@ -371,10 +382,10 @@ int config_set_boolean(const char *section, const char *name, int value)
382 // ----------------------------------------------------------------------------
383 // config load/save
384
374 -int load_config(char *filename, int overwrite_used)
385 +int appconfig_load(struct config *root, char *filename, int overwrite_used)
386 {
387 int line = 0;
377 - struct config *co = NULL;
388 + struct section *co = NULL;
389
390 char buffer[CONFIG_FILE_LINE_MAX + 1], *s;
391
@@ -404,8 +415,8 @@ int load_config(char *filename, int overwrite_used)
415 s[len - 1] = '\0';
416 s++;
417
407 - co = config_section_find(s);
408 - if(!co) co = config_section_create(s);
418 + co = appconfig_section_find(root, s);
419 + if(!co) co = appconfig_section_create(root, s);
420
421 continue;
422 }
@@ -437,9 +448,9 @@ int load_config(char *filename, int overwrite_used)
448 continue;
449 }
450
440 - struct config_value *cv = config_value_index_find(co, name, 0);
451 + struct config_option *cv = appconfig_option_index_find(co, name, 0);
452
442 - if(!cv) cv = config_value_create(co, name, value);
453 + if(!cv) cv = appconfig_value_create(co, name, value);
454 else {
455 if(((cv->flags & CONFIG_VALUE_USED) && overwrite_used) || !(cv->flags & CONFIG_VALUE_USED)) {
456 debug(D_CONFIG, "Line %d, overwriting '%s/%s'.", line, co->name, cv->name);
@@ -457,11 +468,11 @@ int load_config(char *filename, int overwrite_used)
468 return 1;
469 }
470
460 -void generate_config(BUFFER *wb, int only_changed)
471 +void appconfig_generate(struct config *root, BUFFER *wb, int only_changed)
472 {
473 int i, pri;
463 - struct config *co;
464 - struct config_value *cv;
474 + struct section *co;
475 + struct config_option *cv;
476
477 for(i = 0; i < 3 ;i++) {
478 switch(i) {
@@ -490,8 +501,8 @@ void generate_config(BUFFER *wb, int only_changed)
501 break;
502 }
503
493 - config_global_write_lock();
494 - for(co = config_root; co ; co = co->next) {
504 + appconfig_wrlock(root);
505 + for(co = root->sections; co ; co = co->next) {
506 if(!strcmp(co->name, "global") ||
507 !strcmp(co->name, "plugins") ||
508 !strcmp(co->name, "registry") ||
@@ -506,7 +517,7 @@ void generate_config(BUFFER *wb, int only_changed)
517 int changed = 0;
518 int count = 0;
519
509 - config_section_write_lock(co);
520 + config_section_wrlock(co);
521 for(cv = co->values; cv ; cv = cv->next) {
522 used += (cv->flags & CONFIG_VALUE_USED)?1:0;
523 changed += (cv->flags & CONFIG_VALUE_CHANGED)?1:0;
@@ -523,7 +534,7 @@ void generate_config(BUFFER *wb, int only_changed)
534
535 buffer_sprintf(wb, "\n[%s]\n", co->name);
536
526 - config_section_write_lock(co);
537 + config_section_wrlock(co);
538 for(cv = co->values; cv ; cv = cv->next) {
539
540 if(used && !(cv->flags & CONFIG_VALUE_USED)) {
@@ -534,6 +545,6 @@ void generate_config(BUFFER *wb, int only_changed)
545 config_section_unlock(co);
546 }
547 }
537 - config_global_unlock();
548 + appconfig_unlock(root);
549 }
550 }
src/appconfig.h
+44 -15
@@ -8,25 +8,54 @@
8 #define CONFIG_MAX_NAME 1024
9 #define CONFIG_MAX_VALUE 2048
10
11 -extern int load_config(char *filename, int overwrite_used);
11 +struct config {
12 + struct section *sections;
13 + pthread_mutex_t mutex;
14 + avl_tree_lock index;
15 +};
16
13 -extern char *config_get(const char *section, const char *name, const char *default_value);
14 -extern long long config_get_number(const char *section, const char *name, long long value);
15 -extern int config_get_boolean(const char *section, const char *name, int value);
17 +extern struct config
18 + netdata_config,
19 + stream_config;
20
17 -#define CONFIG_ONDEMAND_NO 0
18 -#define CONFIG_ONDEMAND_YES 1
19 -#define CONFIG_ONDEMAND_ONDEMAND 2
20 -extern int config_get_boolean_ondemand(const char *section, const char *name, int value);
21 +#define CONFIG_BOOLEAN_NO 0
22 +#define CONFIG_BOOLEAN_YES 1
23 +#define CONFIG_BOOLEAN_AUTO 2
24
22 -extern const char *config_set(const char *section, const char *name, const char *value);
23 -extern const char *config_set_default(const char *section, const char *name, const char *value);
24 -extern long long config_set_number(const char *section, const char *name, long long value);
25 -extern int config_set_boolean(const char *section, const char *name, int value);
25 +extern int appconfig_load(struct config *root, char *filename, int overwrite_used);
26
27 -extern int config_exists(const char *section, const char *name);
28 -extern int config_rename(const char *section, const char *old, const char *new);
27 +extern char *appconfig_get(struct config *root, const char *section, const char *name, const char *default_value);
28 +extern long long appconfig_get_number(struct config *root, const char *section, const char *name, long long value);
29 +extern int appconfig_get_boolean(struct config *root, const char *section, const char *name, int value);
30 +extern int appconfig_get_boolean_ondemand(struct config *root, const char *section, const char *name, int value);
31
30 -extern void generate_config(BUFFER *wb, int only_changed);
32 +extern const char *appconfig_set(struct config *root, const char *section, const char *name, const char *value);
33 +extern const char *appconfig_set_default(struct config *root, const char *section, const char *name, const char *value);
34 +extern long long appconfig_set_number(struct config *root, const char *section, const char *name, long long value);
35 +extern int appconfig_set_boolean(struct config *root, const char *section, const char *name, int value);
36 +
37 +extern int appconfig_exists(struct config *root, const char *section, const char *name);
38 +extern int appconfig_rename(struct config *root, const char *section, const char *old, const char *new);
39 +
40 +extern void appconfig_generate(struct config *root, BUFFER *wb, int only_changed);
41 +
42 +// ----------------------------------------------------------------------------
43 +// shortcuts for the default netdata configuration
44 +
45 +#define config_load(filename, overwrite_used) appconfig_load(&netdata_config, filename, overwrite_used)
46 +#define config_get(section, name, default_value) appconfig_get(&netdata_config, section, name, default_value)
47 +#define config_get_number(section, name, value) appconfig_get_number(&netdata_config, section, name, value)
48 +#define config_get_boolean(section, name, value) appconfig_get_boolean(&netdata_config, section, name, value)
49 +#define config_get_boolean_ondemand(section, name, value) appconfig_get_boolean_ondemand(&netdata_config, section, name, value)
50 +
51 +#define config_set(section, name, default_value) appconfig_get(&netdata_config, section, name, default_value)
52 +#define config_set_default(section, name, value) appconfig_set_default(&netdata_config, section, name, value)
53 +#define config_set_number(section, name, value) appconfig_set_number(&netdata_config, section, name, value)
54 +#define config_set_boolean(section, name, value) appconfig_set_boolean(&netdata_config, section, name, value)
55 +
56 +#define config_exists(section, name) appconfig_exists(&netdata_config, section, name)
57 +#define config_rename(section, old, new) appconfig_rename(&netdata_config, section, old, new)
58 +
59 +#define config_generate(buffer, only_changed) appconfig_generate(&netdata_config, buffer, only_changed)
60
61 #endif /* NETDATA_CONFIG_H */
src/freebsd_sysctl.c
+45 -45
@@ -93,10 +93,10 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
93 do_tcp_packets = config_get_boolean("plugin:freebsd:sysctl", "ipv4 TCP packets", 1);
94 do_tcp_errors = config_get_boolean("plugin:freebsd:sysctl", "ipv4 TCP errors", 1);
95 do_tcp_handshake = config_get_boolean("plugin:freebsd:sysctl", "ipv4 TCP handshake issues", 1);
96 - do_ecn = config_get_boolean_ondemand("plugin:freebsd:sysctl", "ECN packets", CONFIG_ONDEMAND_ONDEMAND);
97 - do_tcpext_syscookies = config_get_boolean_ondemand("plugin:freebsd:sysctl", "TCP SYN cookies", CONFIG_ONDEMAND_ONDEMAND);
98 - do_tcpext_ofo = config_get_boolean_ondemand("plugin:freebsd:sysctl", "TCP out-of-order queue", CONFIG_ONDEMAND_ONDEMAND);
99 - do_tcpext_connaborts = config_get_boolean_ondemand("plugin:freebsd:sysctl", "TCP connection aborts", CONFIG_ONDEMAND_ONDEMAND);
96 + do_ecn = config_get_boolean_ondemand("plugin:freebsd:sysctl", "ECN packets", CONFIG_BOOLEAN_AUTO);
97 + do_tcpext_syscookies = config_get_boolean_ondemand("plugin:freebsd:sysctl", "TCP SYN cookies", CONFIG_BOOLEAN_AUTO);
98 + do_tcpext_ofo = config_get_boolean_ondemand("plugin:freebsd:sysctl", "TCP out-of-order queue", CONFIG_BOOLEAN_AUTO);
99 + do_tcpext_connaborts = config_get_boolean_ondemand("plugin:freebsd:sysctl", "TCP connection aborts", CONFIG_BOOLEAN_AUTO);
100 do_udp_packets = config_get_boolean("plugin:freebsd:sysctl", "ipv4 UDP packets", 1);
101 do_udp_errors = config_get_boolean("plugin:freebsd:sysctl", "ipv4 UDP errors", 1);
102 do_icmp_packets = config_get_boolean("plugin:freebsd:sysctl", "ipv4 ICMP packets", 1);
@@ -105,17 +105,17 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
105 do_ip_fragsout = config_get_boolean("plugin:freebsd:sysctl", "ipv4 fragments sent", 1);
106 do_ip_fragsin = config_get_boolean("plugin:freebsd:sysctl", "ipv4 fragments assembly", 1);
107 do_ip_errors = config_get_boolean("plugin:freebsd:sysctl", "ipv4 errors", 1);
108 - do_ip6_packets = config_get_boolean_ondemand("plugin:freebsd:sysctl", "ipv6 packets", CONFIG_ONDEMAND_ONDEMAND);
109 - do_ip6_fragsout = config_get_boolean_ondemand("plugin:freebsd:sysctl", "ipv6 fragments sent", CONFIG_ONDEMAND_ONDEMAND);
110 - do_ip6_fragsin = config_get_boolean_ondemand("plugin:freebsd:sysctl", "ipv6 fragments assembly", CONFIG_ONDEMAND_ONDEMAND);
111 - do_ip6_errors = config_get_boolean_ondemand("plugin:freebsd:sysctl", "ipv6 errors", CONFIG_ONDEMAND_ONDEMAND);
112 - do_icmp6 = config_get_boolean_ondemand("plugin:freebsd:sysctl", "icmp", CONFIG_ONDEMAND_ONDEMAND);
113 - do_icmp6_redir = config_get_boolean_ondemand("plugin:freebsd:sysctl", "icmp redirects", CONFIG_ONDEMAND_ONDEMAND);
114 - do_icmp6_errors = config_get_boolean_ondemand("plugin:freebsd:sysctl", "icmp errors", CONFIG_ONDEMAND_ONDEMAND);
115 - do_icmp6_echos = config_get_boolean_ondemand("plugin:freebsd:sysctl", "icmp echos", CONFIG_ONDEMAND_ONDEMAND);
116 - do_icmp6_router = config_get_boolean_ondemand("plugin:freebsd:sysctl", "icmp router", CONFIG_ONDEMAND_ONDEMAND);
117 - do_icmp6_neighbor = config_get_boolean_ondemand("plugin:freebsd:sysctl", "icmp neighbor", CONFIG_ONDEMAND_ONDEMAND);
118 - do_icmp6_types = config_get_boolean_ondemand("plugin:freebsd:sysctl", "icmp types", CONFIG_ONDEMAND_ONDEMAND);
108 + do_ip6_packets = config_get_boolean_ondemand("plugin:freebsd:sysctl", "ipv6 packets", CONFIG_BOOLEAN_AUTO);
109 + do_ip6_fragsout = config_get_boolean_ondemand("plugin:freebsd:sysctl", "ipv6 fragments sent", CONFIG_BOOLEAN_AUTO);
110 + do_ip6_fragsin = config_get_boolean_ondemand("plugin:freebsd:sysctl", "ipv6 fragments assembly", CONFIG_BOOLEAN_AUTO);
111 + do_ip6_errors = config_get_boolean_ondemand("plugin:freebsd:sysctl", "ipv6 errors", CONFIG_BOOLEAN_AUTO);
112 + do_icmp6 = config_get_boolean_ondemand("plugin:freebsd:sysctl", "icmp", CONFIG_BOOLEAN_AUTO);
113 + do_icmp6_redir = config_get_boolean_ondemand("plugin:freebsd:sysctl", "icmp redirects", CONFIG_BOOLEAN_AUTO);
114 + do_icmp6_errors = config_get_boolean_ondemand("plugin:freebsd:sysctl", "icmp errors", CONFIG_BOOLEAN_AUTO);
115 + do_icmp6_echos = config_get_boolean_ondemand("plugin:freebsd:sysctl", "icmp echos", CONFIG_BOOLEAN_AUTO);
116 + do_icmp6_router = config_get_boolean_ondemand("plugin:freebsd:sysctl", "icmp router", CONFIG_BOOLEAN_AUTO);
117 + do_icmp6_neighbor = config_get_boolean_ondemand("plugin:freebsd:sysctl", "icmp neighbor", CONFIG_BOOLEAN_AUTO);
118 + do_icmp6_types = config_get_boolean_ondemand("plugin:freebsd:sysctl", "icmp types", CONFIG_BOOLEAN_AUTO);
119 do_space = config_get_boolean("plugin:freebsd:sysctl", "space usage for all disks", 1);
120 do_inodes = config_get_boolean("plugin:freebsd:sysctl", "inodes usage for all disks", 1);
121 do_uptime = config_get_boolean("plugin:freebsd:sysctl", "system uptime", 1);
@@ -1431,8 +1431,8 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1431
1432 // --------------------------------------------------------------------
1433
1434 - if (do_tcpext_connaborts == CONFIG_ONDEMAND_YES || (do_tcpext_connaborts == CONFIG_ONDEMAND_ONDEMAND && (tcpstat.tcps_rcvpackafterwin || tcpstat.tcps_rcvafterclose || tcpstat.tcps_rcvmemdrop || tcpstat.tcps_persistdrop || tcpstat.tcps_finwait2_drops))) {
1435 - do_tcpext_connaborts = CONFIG_ONDEMAND_YES;
1434 + if (do_tcpext_connaborts == CONFIG_BOOLEAN_YES || (do_tcpext_connaborts == CONFIG_BOOLEAN_AUTO && (tcpstat.tcps_rcvpackafterwin || tcpstat.tcps_rcvafterclose || tcpstat.tcps_rcvmemdrop || tcpstat.tcps_persistdrop || tcpstat.tcps_finwait2_drops))) {
1435 + do_tcpext_connaborts = CONFIG_BOOLEAN_YES;
1436 st = rrdset_find_localhost("ipv4.tcpconnaborts");
1437 if (unlikely(!st)) {
1438 st = rrdset_create_localhost("ipv4", "tcpconnaborts", NULL, "tcp", NULL, "TCP Connection Aborts", "connections/s", 3010, update_every, RRDSET_TYPE_LINE);
@@ -1455,8 +1455,8 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1455
1456 // --------------------------------------------------------------------
1457
1458 - if (do_tcpext_ofo == CONFIG_ONDEMAND_YES || (do_tcpext_ofo == CONFIG_ONDEMAND_ONDEMAND && tcpstat.tcps_rcvoopack)) {
1459 - do_tcpext_ofo = CONFIG_ONDEMAND_YES;
1458 + if (do_tcpext_ofo == CONFIG_BOOLEAN_YES || (do_tcpext_ofo == CONFIG_BOOLEAN_AUTO && tcpstat.tcps_rcvoopack)) {
1459 + do_tcpext_ofo = CONFIG_BOOLEAN_YES;
1460 st = rrdset_find_localhost("ipv4.tcpofo");
1461 if (unlikely(!st)) {
1462 st = rrdset_create_localhost("ipv4", "tcpofo", NULL, "tcp", NULL, "TCP Out-Of-Order Queue", "packets/s", 3050, update_every, RRDSET_TYPE_LINE);
@@ -1471,8 +1471,8 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1471
1472 // --------------------------------------------------------------------
1473
1474 - if (do_tcpext_syscookies == CONFIG_ONDEMAND_YES || (do_tcpext_syscookies == CONFIG_ONDEMAND_ONDEMAND && (tcpstat.tcps_sc_sendcookie || tcpstat.tcps_sc_recvcookie || tcpstat.tcps_sc_zonefail))) {
1475 - do_tcpext_syscookies = CONFIG_ONDEMAND_YES;
1474 + if (do_tcpext_syscookies == CONFIG_BOOLEAN_YES || (do_tcpext_syscookies == CONFIG_BOOLEAN_AUTO && (tcpstat.tcps_sc_sendcookie || tcpstat.tcps_sc_recvcookie || tcpstat.tcps_sc_zonefail))) {
1475 + do_tcpext_syscookies = CONFIG_BOOLEAN_YES;
1476
1477 st = rrdset_find_localhost("ipv4.tcpsyncookies");
1478 if (unlikely(!st)) {
@@ -1492,8 +1492,8 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1492
1493 // --------------------------------------------------------------------
1494
1495 - if (do_ecn == CONFIG_ONDEMAND_YES || (do_ecn == CONFIG_ONDEMAND_ONDEMAND && (tcpstat.tcps_ecn_ce || tcpstat.tcps_ecn_ect0 || tcpstat.tcps_ecn_ect1))) {
1496 - do_ecn = CONFIG_ONDEMAND_YES;
1495 + if (do_ecn == CONFIG_BOOLEAN_YES || (do_ecn == CONFIG_BOOLEAN_AUTO && (tcpstat.tcps_ecn_ce || tcpstat.tcps_ecn_ect0 || tcpstat.tcps_ecn_ect1))) {
1496 + do_ecn = CONFIG_BOOLEAN_YES;
1497 st = rrdset_find_localhost("ipv4.ecnpkts");
1498 if (unlikely(!st)) {
1499 st = rrdset_create_localhost("ipv4", "ecnpkts", NULL, "ecn", NULL, "IPv4 ECN Statistics", "packets/s", 8700, update_every, RRDSET_TYPE_LINE);
@@ -1772,10 +1772,10 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1772 do_ip6_errors = 0;
1773 error("DISABLED: ipv6.errors");
1774 } else {
1775 - if (do_ip6_packets == CONFIG_ONDEMAND_YES || (do_ip6_packets == CONFIG_ONDEMAND_ONDEMAND &&
1775 + if (do_ip6_packets == CONFIG_BOOLEAN_YES || (do_ip6_packets == CONFIG_BOOLEAN_AUTO &&
1776 (ip6stat.ip6s_localout || ip6stat.ip6s_total ||
1777 ip6stat.ip6s_forward || ip6stat.ip6s_delivered))) {
1778 - do_ip6_packets = CONFIG_ONDEMAND_YES;
1778 + do_ip6_packets = CONFIG_BOOLEAN_YES;
1779 st = rrdset_find_localhost("ipv6.packets");
1780 if (unlikely(!st)) {
1781 st = rrdset_create_localhost("ipv6", "packets", NULL, "packets", NULL, "IPv6 Packets", "packets/s", 3000,
@@ -1797,10 +1797,10 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1797
1798 // --------------------------------------------------------------------
1799
1800 - if (do_ip6_fragsout == CONFIG_ONDEMAND_YES || (do_ip6_fragsout == CONFIG_ONDEMAND_ONDEMAND &&
1800 + if (do_ip6_fragsout == CONFIG_BOOLEAN_YES || (do_ip6_fragsout == CONFIG_BOOLEAN_AUTO &&
1801 (ip6stat.ip6s_fragmented || ip6stat.ip6s_cantfrag ||
1802 ip6stat.ip6s_ofragments))) {
1803 - do_ip6_fragsout = CONFIG_ONDEMAND_YES;
1803 + do_ip6_fragsout = CONFIG_BOOLEAN_YES;
1804 st = rrdset_find_localhost("ipv6.fragsout");
1805 if (unlikely(!st)) {
1806 st = rrdset_create_localhost("ipv6", "fragsout", NULL, "fragments", NULL, "IPv6 Fragments Sent",
@@ -1821,10 +1821,10 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1821
1822 // --------------------------------------------------------------------
1823
1824 - if (do_ip6_fragsin == CONFIG_ONDEMAND_YES || (do_ip6_fragsin == CONFIG_ONDEMAND_ONDEMAND &&
1824 + if (do_ip6_fragsin == CONFIG_BOOLEAN_YES || (do_ip6_fragsin == CONFIG_BOOLEAN_AUTO &&
1825 (ip6stat.ip6s_reassembled || ip6stat.ip6s_fragdropped ||
1826 ip6stat.ip6s_fragtimeout || ip6stat.ip6s_fragments))) {
1827 - do_ip6_fragsin = CONFIG_ONDEMAND_YES;
1827 + do_ip6_fragsin = CONFIG_BOOLEAN_YES;
1828 st = rrdset_find_localhost("ipv6.fragsin");
1829 if (unlikely(!st)) {
1830 st = rrdset_create_localhost("ipv6", "fragsin", NULL, "fragments", NULL, "IPv6 Fragments Reassembly",
@@ -1847,7 +1847,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1847
1848 // --------------------------------------------------------------------
1849
1850 - if (do_ip6_errors == CONFIG_ONDEMAND_YES || (do_ip6_errors == CONFIG_ONDEMAND_ONDEMAND && (
1850 + if (do_ip6_errors == CONFIG_BOOLEAN_YES || (do_ip6_errors == CONFIG_BOOLEAN_AUTO && (
1851 ip6stat.ip6s_toosmall ||
1852 ip6stat.ip6s_odropped ||
1853 ip6stat.ip6s_badoptions ||
@@ -1857,7 +1857,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1857 ip6stat.ip6s_tooshort ||
1858 ip6stat.ip6s_cantforward ||
1859 ip6stat.ip6s_noroute))) {
1860 - do_ip6_errors = CONFIG_ONDEMAND_YES;
1860 + do_ip6_errors = CONFIG_BOOLEAN_YES;
1861 st = rrdset_find_localhost("ipv6.errors");
1862 if (unlikely(!st)) {
1863 st = rrdset_create_localhost("ipv6", "errors", NULL, "errors", NULL, "IPv6 Errors", "packets/s", 3002,
@@ -1903,8 +1903,8 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1903 icmp6_total.msgs_out += icmp6stat.icp6s_outhist[i];
1904 }
1905 icmp6_total.msgs_in += icmp6stat.icp6s_badcode + icmp6stat.icp6s_badlen + icmp6stat.icp6s_checksum + icmp6stat.icp6s_tooshort;
1906 - if (do_icmp6 == CONFIG_ONDEMAND_YES || (do_icmp6 == CONFIG_ONDEMAND_ONDEMAND && (icmp6_total.msgs_in || icmp6_total.msgs_out))) {
1907 - do_icmp6 = CONFIG_ONDEMAND_YES;
1906 + if (do_icmp6 == CONFIG_BOOLEAN_YES || (do_icmp6 == CONFIG_BOOLEAN_AUTO && (icmp6_total.msgs_in || icmp6_total.msgs_out))) {
1907 + do_icmp6 = CONFIG_BOOLEAN_YES;
1908 st = rrdset_find_localhost("ipv6.icmp");
1909 if (unlikely(!st)) {
1910 st = rrdset_create_localhost("ipv6", "icmp", NULL, "icmp", NULL, "IPv6 ICMP Messages",
@@ -1922,8 +1922,8 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1922
1923 // --------------------------------------------------------------------
1924
1925 - if (do_icmp6_redir == CONFIG_ONDEMAND_YES || (do_icmp6_redir == CONFIG_ONDEMAND_ONDEMAND && (icmp6stat.icp6s_inhist[ND_REDIRECT] || icmp6stat.icp6s_outhist[ND_REDIRECT]))) {
1926 - do_icmp6_redir = CONFIG_ONDEMAND_YES;
1925 + if (do_icmp6_redir == CONFIG_BOOLEAN_YES || (do_icmp6_redir == CONFIG_BOOLEAN_AUTO && (icmp6stat.icp6s_inhist[ND_REDIRECT] || icmp6stat.icp6s_outhist[ND_REDIRECT]))) {
1926 + do_icmp6_redir = CONFIG_BOOLEAN_YES;
1927 st = rrdset_find_localhost("ipv6.icmpredir");
1928 if (unlikely(!st)) {
1929 st = rrdset_create_localhost("ipv6", "icmpredir", NULL, "icmp", NULL, "IPv6 ICMP Redirects",
@@ -1941,7 +1941,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1941
1942 // --------------------------------------------------------------------
1943
1944 - if (do_icmp6_errors == CONFIG_ONDEMAND_YES || (do_icmp6_errors == CONFIG_ONDEMAND_ONDEMAND && (
1944 + if (do_icmp6_errors == CONFIG_BOOLEAN_YES || (do_icmp6_errors == CONFIG_BOOLEAN_AUTO && (
1945 icmp6stat.icp6s_badcode ||
1946 icmp6stat.icp6s_badlen ||
1947 icmp6stat.icp6s_checksum ||
@@ -1953,7 +1953,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1953 icmp6stat.icp6s_outhist[ICMP6_DST_UNREACH] ||
1954 icmp6stat.icp6s_outhist[ICMP6_TIME_EXCEEDED] ||
1955 icmp6stat.icp6s_outhist[ICMP6_PARAM_PROB]))) {
1956 - do_icmp6_errors = CONFIG_ONDEMAND_YES;
1956 + do_icmp6_errors = CONFIG_BOOLEAN_YES;
1957 st = rrdset_find_localhost("ipv6.icmperrors");
1958 if (unlikely(!st)) {
1959 st = rrdset_create_localhost("ipv6", "icmperrors", NULL, "icmp", NULL, "IPv6 ICMP Errors", "errors/s", 10100, update_every, RRDSET_TYPE_LINE);
@@ -1987,12 +1987,12 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1987
1988 // --------------------------------------------------------------------
1989
1990 - if (do_icmp6_echos == CONFIG_ONDEMAND_YES || (do_icmp6_echos == CONFIG_ONDEMAND_ONDEMAND && (
1990 + if (do_icmp6_echos == CONFIG_BOOLEAN_YES || (do_icmp6_echos == CONFIG_BOOLEAN_AUTO && (
1991 icmp6stat.icp6s_inhist[ICMP6_ECHO_REQUEST] ||
1992 icmp6stat.icp6s_outhist[ICMP6_ECHO_REQUEST] ||
1993 icmp6stat.icp6s_inhist[ICMP6_ECHO_REPLY] ||
1994 icmp6stat.icp6s_outhist[ICMP6_ECHO_REPLY]))) {
1995 - do_icmp6_echos = CONFIG_ONDEMAND_YES;
1995 + do_icmp6_echos = CONFIG_BOOLEAN_YES;
1996 st = rrdset_find_localhost("ipv6.icmpechos");
1997 if (unlikely(!st)) {
1998 st = rrdset_create_localhost("ipv6", "icmpechos", NULL, "icmp", NULL, "IPv6 ICMP Echo", "messages/s", 10200, update_every, RRDSET_TYPE_LINE);
@@ -2013,12 +2013,12 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
2013
2014 // --------------------------------------------------------------------
2015
2016 - if (do_icmp6_router == CONFIG_ONDEMAND_YES || (do_icmp6_router == CONFIG_ONDEMAND_ONDEMAND && (
2016 + if (do_icmp6_router == CONFIG_BOOLEAN_YES || (do_icmp6_router == CONFIG_BOOLEAN_AUTO && (
2017 icmp6stat.icp6s_inhist[ND_ROUTER_SOLICIT] ||
2018 icmp6stat.icp6s_outhist[ND_ROUTER_SOLICIT] ||
2019 icmp6stat.icp6s_inhist[ND_ROUTER_ADVERT] ||
2020 icmp6stat.icp6s_outhist[ND_ROUTER_ADVERT]))) {
2021 - do_icmp6_router = CONFIG_ONDEMAND_YES;
2021 + do_icmp6_router = CONFIG_BOOLEAN_YES;
2022 st = rrdset_find_localhost("ipv6.icmprouter");
2023 if (unlikely(!st)) {
2024 st = rrdset_create_localhost("ipv6", "icmprouter", NULL, "icmp", NULL, "IPv6 Router Messages", "messages/s", 10400, update_every, RRDSET_TYPE_LINE);
@@ -2039,12 +2039,12 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
2039
2040 // --------------------------------------------------------------------
2041
2042 - if (do_icmp6_neighbor == CONFIG_ONDEMAND_YES || (do_icmp6_neighbor == CONFIG_ONDEMAND_ONDEMAND && (
2042 + if (do_icmp6_neighbor == CONFIG_BOOLEAN_YES || (do_icmp6_neighbor == CONFIG_BOOLEAN_AUTO && (
2043 icmp6stat.icp6s_inhist[ND_NEIGHBOR_SOLICIT] ||
2044 icmp6stat.icp6s_outhist[ND_NEIGHBOR_SOLICIT] ||
2045 icmp6stat.icp6s_inhist[ND_NEIGHBOR_ADVERT] ||
2046 icmp6stat.icp6s_outhist[ND_NEIGHBOR_ADVERT]))) {
2047 - do_icmp6_neighbor = CONFIG_ONDEMAND_YES;
2047 + do_icmp6_neighbor = CONFIG_BOOLEAN_YES;
2048 st = rrdset_find_localhost("ipv6.icmpneighbor");
2049 if (unlikely(!st)) {
2050 st = rrdset_create_localhost("ipv6", "icmpneighbor", NULL, "icmp", NULL, "IPv6 Neighbor Messages", "messages/s", 10500, update_every, RRDSET_TYPE_LINE);
@@ -2065,7 +2065,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
2065
2066 // --------------------------------------------------------------------
2067
2068 - if (do_icmp6_types == CONFIG_ONDEMAND_YES || (do_icmp6_types == CONFIG_ONDEMAND_ONDEMAND && (
2068 + if (do_icmp6_types == CONFIG_BOOLEAN_YES || (do_icmp6_types == CONFIG_BOOLEAN_AUTO && (
2069 icmp6stat.icp6s_inhist[1] ||
2070 icmp6stat.icp6s_inhist[128] ||
2071 icmp6stat.icp6s_inhist[129] ||
@@ -2076,7 +2076,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
2076 icmp6stat.icp6s_outhist[133] ||
2077 icmp6stat.icp6s_outhist[135] ||
2078 icmp6stat.icp6s_outhist[136]))) {
2079 - do_icmp6_types = CONFIG_ONDEMAND_YES;
2079 + do_icmp6_types = CONFIG_BOOLEAN_YES;
2080 st = rrdset_find_localhost("ipv6.icmptypes");
2081 if (unlikely(!st)) {
2082 st = rrdset_create_localhost("ipv6", "icmptypes", NULL, "icmp", NULL, "IPv6 ICMP Types",
src/macos_sysctl.c
+45 -45
@@ -41,10 +41,10 @@ int do_macos_sysctl(int update_every, usec_t dt) {
41 do_tcp_packets = config_get_boolean("plugin:macos:sysctl", "ipv4 TCP packets", 1);
42 do_tcp_errors = config_get_boolean("plugin:macos:sysctl", "ipv4 TCP errors", 1);
43 do_tcp_handshake = config_get_boolean("plugin:macos:sysctl", "ipv4 TCP handshake issues", 1);
44 - do_ecn = config_get_boolean_ondemand("plugin:macos:sysctl", "ECN packets", CONFIG_ONDEMAND_ONDEMAND);
45 - do_tcpext_syscookies = config_get_boolean_ondemand("plugin:macos:sysctl", "TCP SYN cookies", CONFIG_ONDEMAND_ONDEMAND);
46 - do_tcpext_ofo = config_get_boolean_ondemand("plugin:macos:sysctl", "TCP out-of-order queue", CONFIG_ONDEMAND_ONDEMAND);
47 - do_tcpext_connaborts = config_get_boolean_ondemand("plugin:macos:sysctl", "TCP connection aborts", CONFIG_ONDEMAND_ONDEMAND);
44 + do_ecn = config_get_boolean_ondemand("plugin:macos:sysctl", "ECN packets", CONFIG_BOOLEAN_AUTO);
45 + do_tcpext_syscookies = config_get_boolean_ondemand("plugin:macos:sysctl", "TCP SYN cookies", CONFIG_BOOLEAN_AUTO);
46 + do_tcpext_ofo = config_get_boolean_ondemand("plugin:macos:sysctl", "TCP out-of-order queue", CONFIG_BOOLEAN_AUTO);
47 + do_tcpext_connaborts = config_get_boolean_ondemand("plugin:macos:sysctl", "TCP connection aborts", CONFIG_BOOLEAN_AUTO);
48 do_udp_packets = config_get_boolean("plugin:macos:sysctl", "ipv4 UDP packets", 1);
49 do_udp_errors = config_get_boolean("plugin:macos:sysctl", "ipv4 UDP errors", 1);
50 do_icmp_packets = config_get_boolean("plugin:macos:sysctl", "ipv4 ICMP packets", 1);
@@ -53,17 +53,17 @@ int do_macos_sysctl(int update_every, usec_t dt) {
53 do_ip_fragsout = config_get_boolean("plugin:macos:sysctl", "ipv4 fragments sent", 1);
54 do_ip_fragsin = config_get_boolean("plugin:macos:sysctl", "ipv4 fragments assembly", 1);
55 do_ip_errors = config_get_boolean("plugin:macos:sysctl", "ipv4 errors", 1);
56 - do_ip6_packets = config_get_boolean_ondemand("plugin:macos:sysctl", "ipv6 packets", CONFIG_ONDEMAND_ONDEMAND);
57 - do_ip6_fragsout = config_get_boolean_ondemand("plugin:macos:sysctl", "ipv6 fragments sent", CONFIG_ONDEMAND_ONDEMAND);
58 - do_ip6_fragsin = config_get_boolean_ondemand("plugin:macos:sysctl", "ipv6 fragments assembly", CONFIG_ONDEMAND_ONDEMAND);
59 - do_ip6_errors = config_get_boolean_ondemand("plugin:macos:sysctl", "ipv6 errors", CONFIG_ONDEMAND_ONDEMAND);
60 - do_icmp6 = config_get_boolean_ondemand("plugin:macos:sysctl", "icmp", CONFIG_ONDEMAND_ONDEMAND);
61 - do_icmp6_redir = config_get_boolean_ondemand("plugin:macos:sysctl", "icmp redirects", CONFIG_ONDEMAND_ONDEMAND);
62 - do_icmp6_errors = config_get_boolean_ondemand("plugin:macos:sysctl", "icmp errors", CONFIG_ONDEMAND_ONDEMAND);
63 - do_icmp6_echos = config_get_boolean_ondemand("plugin:macos:sysctl", "icmp echos", CONFIG_ONDEMAND_ONDEMAND);
64 - do_icmp6_router = config_get_boolean_ondemand("plugin:macos:sysctl", "icmp router", CONFIG_ONDEMAND_ONDEMAND);
65 - do_icmp6_neighbor = config_get_boolean_ondemand("plugin:macos:sysctl", "icmp neighbor", CONFIG_ONDEMAND_ONDEMAND);
66 - do_icmp6_types = config_get_boolean_ondemand("plugin:macos:sysctl", "icmp types", CONFIG_ONDEMAND_ONDEMAND);
56 + do_ip6_packets = config_get_boolean_ondemand("plugin:macos:sysctl", "ipv6 packets", CONFIG_BOOLEAN_AUTO);
57 + do_ip6_fragsout = config_get_boolean_ondemand("plugin:macos:sysctl", "ipv6 fragments sent", CONFIG_BOOLEAN_AUTO);
58 + do_ip6_fragsin = config_get_boolean_ondemand("plugin:macos:sysctl", "ipv6 fragments assembly", CONFIG_BOOLEAN_AUTO);
59 + do_ip6_errors = config_get_boolean_ondemand("plugin:macos:sysctl", "ipv6 errors", CONFIG_BOOLEAN_AUTO);
60 + do_icmp6 = config_get_boolean_ondemand("plugin:macos:sysctl", "icmp", CONFIG_BOOLEAN_AUTO);
61 + do_icmp6_redir = config_get_boolean_ondemand("plugin:macos:sysctl", "icmp redirects", CONFIG_BOOLEAN_AUTO);
62 + do_icmp6_errors = config_get_boolean_ondemand("plugin:macos:sysctl", "icmp errors", CONFIG_BOOLEAN_AUTO);
63 + do_icmp6_echos = config_get_boolean_ondemand("plugin:macos:sysctl", "icmp echos", CONFIG_BOOLEAN_AUTO);
64 + do_icmp6_router = config_get_boolean_ondemand("plugin:macos:sysctl", "icmp router", CONFIG_BOOLEAN_AUTO);
65 + do_icmp6_neighbor = config_get_boolean_ondemand("plugin:macos:sysctl", "icmp neighbor", CONFIG_BOOLEAN_AUTO);
66 + do_icmp6_types = config_get_boolean_ondemand("plugin:macos:sysctl", "icmp types", CONFIG_BOOLEAN_AUTO);
67 do_uptime = config_get_boolean("plugin:macos:sysctl", "system uptime", 1);
68 }
69
@@ -393,8 +393,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
393
394 // --------------------------------------------------------------------
395
396 - if (do_tcpext_connaborts == CONFIG_ONDEMAND_YES || (do_tcpext_connaborts == CONFIG_ONDEMAND_ONDEMAND && (tcpstat.tcps_rcvpackafterwin || tcpstat.tcps_rcvafterclose || tcpstat.tcps_rcvmemdrop || tcpstat.tcps_persistdrop))) {
397 - do_tcpext_connaborts = CONFIG_ONDEMAND_YES;
396 + if (do_tcpext_connaborts == CONFIG_BOOLEAN_YES || (do_tcpext_connaborts == CONFIG_BOOLEAN_AUTO && (tcpstat.tcps_rcvpackafterwin || tcpstat.tcps_rcvafterclose || tcpstat.tcps_rcvmemdrop || tcpstat.tcps_persistdrop))) {
397 + do_tcpext_connaborts = CONFIG_BOOLEAN_YES;
398 st = rrdset_find_localhost("ipv4.tcpconnaborts");
399 if (unlikely(!st)) {
400 st = rrdset_create_localhost("ipv4", "tcpconnaborts", NULL, "tcp", NULL, "TCP Connection Aborts"
@@ -416,8 +416,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
416
417 // --------------------------------------------------------------------
418
419 - if (do_tcpext_ofo == CONFIG_ONDEMAND_YES || (do_tcpext_ofo == CONFIG_ONDEMAND_ONDEMAND && tcpstat.tcps_rcvoopack)) {
420 - do_tcpext_ofo = CONFIG_ONDEMAND_YES;
419 + if (do_tcpext_ofo == CONFIG_BOOLEAN_YES || (do_tcpext_ofo == CONFIG_BOOLEAN_AUTO && tcpstat.tcps_rcvoopack)) {
420 + do_tcpext_ofo = CONFIG_BOOLEAN_YES;
421 st = rrdset_find_localhost("ipv4.tcpofo");
422 if (unlikely(!st)) {
423 st = rrdset_create_localhost("ipv4", "tcpofo", NULL, "tcp", NULL, "TCP Out-Of-Order Queue"
@@ -433,8 +433,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
433
434 // --------------------------------------------------------------------
435
436 - if (do_tcpext_syscookies == CONFIG_ONDEMAND_YES || (do_tcpext_syscookies == CONFIG_ONDEMAND_ONDEMAND && (tcpstat.tcps_sc_sendcookie || tcpstat.tcps_sc_recvcookie || tcpstat.tcps_sc_zonefail))) {
437 - do_tcpext_syscookies = CONFIG_ONDEMAND_YES;
436 + if (do_tcpext_syscookies == CONFIG_BOOLEAN_YES || (do_tcpext_syscookies == CONFIG_BOOLEAN_AUTO && (tcpstat.tcps_sc_sendcookie || tcpstat.tcps_sc_recvcookie || tcpstat.tcps_sc_zonefail))) {
437 + do_tcpext_syscookies = CONFIG_BOOLEAN_YES;
438
439 st = rrdset_find_localhost("ipv4.tcpsyncookies");
440 if (unlikely(!st)) {
@@ -455,8 +455,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
455
456 // --------------------------------------------------------------------
457
458 - if (do_ecn == CONFIG_ONDEMAND_YES || (do_ecn == CONFIG_ONDEMAND_ONDEMAND && (tcpstat.tcps_ecn_recv_ce || tcpstat.tcps_ecn_not_supported))) {
459 - do_ecn = CONFIG_ONDEMAND_YES;
458 + if (do_ecn == CONFIG_BOOLEAN_YES || (do_ecn == CONFIG_BOOLEAN_AUTO && (tcpstat.tcps_ecn_recv_ce || tcpstat.tcps_ecn_not_supported))) {
459 + do_ecn = CONFIG_BOOLEAN_YES;
460 st = rrdset_find_localhost("ipv4.ecnpkts");
461 if (unlikely(!st)) {
462 st = rrdset_create_localhost("ipv4", "ecnpkts", NULL, "ecn", NULL, "IPv4 ECN Statistics"
@@ -728,10 +728,10 @@ int do_macos_sysctl(int update_every, usec_t dt) {
728 do_ip6_errors = 0;
729 error("DISABLED: ipv6.errors");
730 } else {
731 - if (do_ip6_packets == CONFIG_ONDEMAND_YES || (do_ip6_packets == CONFIG_ONDEMAND_ONDEMAND &&
731 + if (do_ip6_packets == CONFIG_BOOLEAN_YES || (do_ip6_packets == CONFIG_BOOLEAN_AUTO &&
732 (ip6stat.ip6s_localout || ip6stat.ip6s_total ||
733 ip6stat.ip6s_forward || ip6stat.ip6s_delivered))) {
734 - do_ip6_packets = CONFIG_ONDEMAND_YES;
734 + do_ip6_packets = CONFIG_BOOLEAN_YES;
735 st = rrdset_find_localhost("ipv6.packets");
736 if (unlikely(!st)) {
737 st = rrdset_create_localhost("ipv6", "packets", NULL, "packets", NULL, "IPv6 Packets", "packets/s"
@@ -753,10 +753,10 @@ int do_macos_sysctl(int update_every, usec_t dt) {
753
754 // --------------------------------------------------------------------
755
756 - if (do_ip6_fragsout == CONFIG_ONDEMAND_YES || (do_ip6_fragsout == CONFIG_ONDEMAND_ONDEMAND &&
756 + if (do_ip6_fragsout == CONFIG_BOOLEAN_YES || (do_ip6_fragsout == CONFIG_BOOLEAN_AUTO &&
757 (ip6stat.ip6s_fragmented || ip6stat.ip6s_cantfrag ||
758 ip6stat.ip6s_ofragments))) {
759 - do_ip6_fragsout = CONFIG_ONDEMAND_YES;
759 + do_ip6_fragsout = CONFIG_BOOLEAN_YES;
760 st = rrdset_find_localhost("ipv6.fragsout");
761 if (unlikely(!st)) {
762 st = rrdset_create_localhost("ipv6", "fragsout", NULL, "fragments", NULL, "IPv6 Fragments Sent"
@@ -777,10 +777,10 @@ int do_macos_sysctl(int update_every, usec_t dt) {
777
778 // --------------------------------------------------------------------
779
780 - if (do_ip6_fragsin == CONFIG_ONDEMAND_YES || (do_ip6_fragsin == CONFIG_ONDEMAND_ONDEMAND &&
780 + if (do_ip6_fragsin == CONFIG_BOOLEAN_YES || (do_ip6_fragsin == CONFIG_BOOLEAN_AUTO &&
781 (ip6stat.ip6s_reassembled || ip6stat.ip6s_fragdropped ||
782 ip6stat.ip6s_fragtimeout || ip6stat.ip6s_fragments))) {
783 - do_ip6_fragsin = CONFIG_ONDEMAND_YES;
783 + do_ip6_fragsin = CONFIG_BOOLEAN_YES;
784 st = rrdset_find_localhost("ipv6.fragsin");
785 if (unlikely(!st)) {
786 st = rrdset_create_localhost("ipv6", "fragsin", NULL, "fragments", NULL, "IPv6 Fragments Reassembly"
@@ -803,7 +803,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
803
804 // --------------------------------------------------------------------
805
806 - if (do_ip6_errors == CONFIG_ONDEMAND_YES || (do_ip6_errors == CONFIG_ONDEMAND_ONDEMAND && (
806 + if (do_ip6_errors == CONFIG_BOOLEAN_YES || (do_ip6_errors == CONFIG_BOOLEAN_AUTO && (
807 ip6stat.ip6s_toosmall ||
808 ip6stat.ip6s_odropped ||
809 ip6stat.ip6s_badoptions ||
@@ -813,7 +813,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
813 ip6stat.ip6s_tooshort ||
814 ip6stat.ip6s_cantforward ||
815 ip6stat.ip6s_noroute))) {
816 - do_ip6_errors = CONFIG_ONDEMAND_YES;
816 + do_ip6_errors = CONFIG_BOOLEAN_YES;
817 st = rrdset_find_localhost("ipv6.errors");
818 if (unlikely(!st)) {
819 st = rrdset_create_localhost("ipv6", "errors", NULL, "errors", NULL, "IPv6 Errors", "packets/s"
@@ -859,8 +859,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
859 icmp6_total.msgs_out += icmp6stat.icp6s_outhist[i];
860 }
861 icmp6_total.msgs_in += icmp6stat.icp6s_badcode + icmp6stat.icp6s_badlen + icmp6stat.icp6s_checksum + icmp6stat.icp6s_tooshort;
862 - if (do_icmp6 == CONFIG_ONDEMAND_YES || (do_icmp6 == CONFIG_ONDEMAND_ONDEMAND && (icmp6_total.msgs_in || icmp6_total.msgs_out))) {
863 - do_icmp6 = CONFIG_ONDEMAND_YES;
862 + if (do_icmp6 == CONFIG_BOOLEAN_YES || (do_icmp6 == CONFIG_BOOLEAN_AUTO && (icmp6_total.msgs_in || icmp6_total.msgs_out))) {
863 + do_icmp6 = CONFIG_BOOLEAN_YES;
864 st = rrdset_find_localhost("ipv6.icmp");
865 if (unlikely(!st)) {
866 st = rrdset_create_localhost("ipv6", "icmp", NULL, "icmp", NULL, "IPv6 ICMP Messages", "messages/s"
@@ -878,8 +878,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
878
879 // --------------------------------------------------------------------
880
881 - if (do_icmp6_redir == CONFIG_ONDEMAND_YES || (do_icmp6_redir == CONFIG_ONDEMAND_ONDEMAND && (icmp6stat.icp6s_inhist[ND_REDIRECT] || icmp6stat.icp6s_outhist[ND_REDIRECT]))) {
882 - do_icmp6_redir = CONFIG_ONDEMAND_YES;
881 + if (do_icmp6_redir == CONFIG_BOOLEAN_YES || (do_icmp6_redir == CONFIG_BOOLEAN_AUTO && (icmp6stat.icp6s_inhist[ND_REDIRECT] || icmp6stat.icp6s_outhist[ND_REDIRECT]))) {
882 + do_icmp6_redir = CONFIG_BOOLEAN_YES;
883 st = rrdset_find_localhost("ipv6.icmpredir");
884 if (unlikely(!st)) {
885 st = rrdset_create_localhost("ipv6", "icmpredir", NULL, "icmp", NULL, "IPv6 ICMP Redirects"
@@ -897,7 +897,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
897
898 // --------------------------------------------------------------------
899
900 - if (do_icmp6_errors == CONFIG_ONDEMAND_YES || (do_icmp6_errors == CONFIG_ONDEMAND_ONDEMAND && (
900 + if (do_icmp6_errors == CONFIG_BOOLEAN_YES || (do_icmp6_errors == CONFIG_BOOLEAN_AUTO && (
901 icmp6stat.icp6s_badcode ||
902 icmp6stat.icp6s_badlen ||
903 icmp6stat.icp6s_checksum ||
@@ -909,7 +909,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
909 icmp6stat.icp6s_outhist[ICMP6_DST_UNREACH] ||
910 icmp6stat.icp6s_outhist[ICMP6_TIME_EXCEEDED] ||
911 icmp6stat.icp6s_outhist[ICMP6_PARAM_PROB]))) {
912 - do_icmp6_errors = CONFIG_ONDEMAND_YES;
912 + do_icmp6_errors = CONFIG_BOOLEAN_YES;
913 st = rrdset_find_localhost("ipv6.icmperrors");
914 if (unlikely(!st)) {
915 st = rrdset_create_localhost("ipv6", "icmperrors", NULL, "icmp", NULL, "IPv6 ICMP Errors"
@@ -944,12 +944,12 @@ int do_macos_sysctl(int update_every, usec_t dt) {
944
945 // --------------------------------------------------------------------
946
947 - if (do_icmp6_echos == CONFIG_ONDEMAND_YES || (do_icmp6_echos == CONFIG_ONDEMAND_ONDEMAND && (
947 + if (do_icmp6_echos == CONFIG_BOOLEAN_YES || (do_icmp6_echos == CONFIG_BOOLEAN_AUTO && (
948 icmp6stat.icp6s_inhist[ICMP6_ECHO_REQUEST] ||
949 icmp6stat.icp6s_outhist[ICMP6_ECHO_REQUEST] ||
950 icmp6stat.icp6s_inhist[ICMP6_ECHO_REPLY] ||
951 icmp6stat.icp6s_outhist[ICMP6_ECHO_REPLY]))) {
952 - do_icmp6_echos = CONFIG_ONDEMAND_YES;
952 + do_icmp6_echos = CONFIG_BOOLEAN_YES;
953 st = rrdset_find_localhost("ipv6.icmpechos");
954 if (unlikely(!st)) {
955 st = rrdset_create_localhost("ipv6", "icmpechos", NULL, "icmp", NULL, "IPv6 ICMP Echo", "messages/s"
@@ -971,12 +971,12 @@ int do_macos_sysctl(int update_every, usec_t dt) {
971
972 // --------------------------------------------------------------------
973
974 - if (do_icmp6_router == CONFIG_ONDEMAND_YES || (do_icmp6_router == CONFIG_ONDEMAND_ONDEMAND && (
974 + if (do_icmp6_router == CONFIG_BOOLEAN_YES || (do_icmp6_router == CONFIG_BOOLEAN_AUTO && (
975 icmp6stat.icp6s_inhist[ND_ROUTER_SOLICIT] ||
976 icmp6stat.icp6s_outhist[ND_ROUTER_SOLICIT] ||
977 icmp6stat.icp6s_inhist[ND_ROUTER_ADVERT] ||
978 icmp6stat.icp6s_outhist[ND_ROUTER_ADVERT]))) {
979 - do_icmp6_router = CONFIG_ONDEMAND_YES;
979 + do_icmp6_router = CONFIG_BOOLEAN_YES;
980 st = rrdset_find_localhost("ipv6.icmprouter");
981 if (unlikely(!st)) {
982 st = rrdset_create_localhost("ipv6", "icmprouter", NULL, "icmp", NULL, "IPv6 Router Messages"
@@ -998,12 +998,12 @@ int do_macos_sysctl(int update_every, usec_t dt) {
998
999 // --------------------------------------------------------------------
1000
1001 - if (do_icmp6_neighbor == CONFIG_ONDEMAND_YES || (do_icmp6_neighbor == CONFIG_ONDEMAND_ONDEMAND && (
1001 + if (do_icmp6_neighbor == CONFIG_BOOLEAN_YES || (do_icmp6_neighbor == CONFIG_BOOLEAN_AUTO && (
1002 icmp6stat.icp6s_inhist[ND_NEIGHBOR_SOLICIT] ||
1003 icmp6stat.icp6s_outhist[ND_NEIGHBOR_SOLICIT] ||
1004 icmp6stat.icp6s_inhist[ND_NEIGHBOR_ADVERT] ||
1005 icmp6stat.icp6s_outhist[ND_NEIGHBOR_ADVERT]))) {
1006 - do_icmp6_neighbor = CONFIG_ONDEMAND_YES;
1006 + do_icmp6_neighbor = CONFIG_BOOLEAN_YES;
1007 st = rrdset_find_localhost("ipv6.icmpneighbor");
1008 if (unlikely(!st)) {
1009 st = rrdset_create_localhost("ipv6", "icmpneighbor", NULL, "icmp", NULL, "IPv6 Neighbor Messages"
@@ -1025,7 +1025,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1025
1026 // --------------------------------------------------------------------
1027
1028 - if (do_icmp6_types == CONFIG_ONDEMAND_YES || (do_icmp6_types == CONFIG_ONDEMAND_ONDEMAND && (
1028 + if (do_icmp6_types == CONFIG_BOOLEAN_YES || (do_icmp6_types == CONFIG_BOOLEAN_AUTO && (
1029 icmp6stat.icp6s_inhist[1] ||
1030 icmp6stat.icp6s_inhist[128] ||
1031 icmp6stat.icp6s_inhist[129] ||
@@ -1036,7 +1036,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1036 icmp6stat.icp6s_outhist[133] ||
1037 icmp6stat.icp6s_outhist[135] ||
1038 icmp6stat.icp6s_outhist[136]))) {
1039 - do_icmp6_types = CONFIG_ONDEMAND_YES;
1039 + do_icmp6_types = CONFIG_BOOLEAN_YES;
1040 st = rrdset_find_localhost("ipv6.icmptypes");
1041 if (unlikely(!st)) {
1042 st = rrdset_create_localhost("ipv6", "icmptypes", NULL, "icmp", NULL, "IPv6 ICMP Types"
src/main.c
+3 -3
@@ -427,7 +427,7 @@ int main(int argc, char **argv) {
427 while( (opt = getopt(argc, argv, optstring)) != -1 ) {
428 switch(opt) {
429 case 'c':
430 - if(load_config(optarg, 1) != 1) {
430 + if(config_load(optarg, 1) != 1) {
431 error("Cannot load configuration file %s.", optarg);
432 exit(1);
433 }
@@ -474,7 +474,7 @@ int main(int argc, char **argv) {
474 char* debug_flags_string = "debug_flags=";
475 if(strcmp(optarg, "unittest") == 0) {
476 default_rrd_update_every = 1;
477 - if(!config_loaded) load_config(NULL, 0);
477 + if(!config_loaded) config_load(NULL, 0);
478 get_netdata_configured_directories();
479 registry_init();
480 rrd_init("unittest");
@@ -554,7 +554,7 @@ int main(int argc, char **argv) {
554 #endif
555
556 if(!config_loaded)
557 - load_config(NULL, 0);
557 + config_load(NULL, 0);
558
559 {
560 char *pmax = config_get("global", "glibc malloc arena max for plugins", "1");
src/plugin_proc_diskspace.c
+9 -9
@@ -68,12 +68,12 @@ static inline void do_disk_space_stats(struct mountinfo *mi, int update_every) {
68 char var_name[4096 + 1];
69 snprintfz(var_name, 4096, "plugin:proc:diskspace:%s", mi->mount_point);
70
71 - int def_space = config_get_boolean_ondemand("plugin:proc:diskspace", "space usage for all disks", CONFIG_ONDEMAND_ONDEMAND);
72 - int def_inodes = config_get_boolean_ondemand("plugin:proc:diskspace", "inodes usage for all disks", CONFIG_ONDEMAND_ONDEMAND);
71 + int def_space = config_get_boolean_ondemand("plugin:proc:diskspace", "space usage for all disks", CONFIG_BOOLEAN_AUTO);
72 + int def_inodes = config_get_boolean_ondemand("plugin:proc:diskspace", "inodes usage for all disks", CONFIG_BOOLEAN_AUTO);
73
74 if(unlikely(simple_pattern_matches(excluded_mountpoints, mi->mount_point))) {
75 - def_space = CONFIG_ONDEMAND_NO;
76 - def_inodes = CONFIG_ONDEMAND_NO;
75 + def_space = CONFIG_BOOLEAN_NO;
76 + def_inodes = CONFIG_BOOLEAN_NO;
77 }
78
79 do_space = config_get_boolean_ondemand(var_name, "space usage", def_space);
@@ -103,7 +103,7 @@ static inline void do_disk_space_stats(struct mountinfo *mi, int update_every) {
103 do_inodes = m->do_inodes;
104 }
105
106 - if(unlikely(do_space == CONFIG_ONDEMAND_NO && do_inodes == CONFIG_ONDEMAND_NO))
106 + if(unlikely(do_space == CONFIG_BOOLEAN_NO && do_inodes == CONFIG_BOOLEAN_NO))
107 return;
108
109 if(unlikely(mi->flags & MOUNTINFO_READONLY && !m->collected))
@@ -150,9 +150,9 @@ static inline void do_disk_space_stats(struct mountinfo *mi, int update_every) {
150
151 int rendered = 0;
152
153 - if(do_space == CONFIG_ONDEMAND_YES || (do_space == CONFIG_ONDEMAND_ONDEMAND && (bavail || breserved_root || bused))) {
153 + if(do_space == CONFIG_BOOLEAN_YES || (do_space == CONFIG_BOOLEAN_AUTO && (bavail || breserved_root || bused))) {
154 if(unlikely(!m->st_space)) {
155 - m->do_space = CONFIG_ONDEMAND_YES;
155 + m->do_space = CONFIG_BOOLEAN_YES;
156 m->st_space = rrdset_find_bytype_localhost("disk_space", disk);
157 if(unlikely(!m->st_space)) {
158 char title[4096 + 1];
@@ -178,9 +178,9 @@ static inline void do_disk_space_stats(struct mountinfo *mi, int update_every) {
178
179 // --------------------------------------------------------------------------
180
181 - if(do_inodes == CONFIG_ONDEMAND_YES || (do_inodes == CONFIG_ONDEMAND_ONDEMAND && (favail || freserved_root || fused))) {
181 + if(do_inodes == CONFIG_BOOLEAN_YES || (do_inodes == CONFIG_BOOLEAN_AUTO && (favail || freserved_root || fused))) {
182 if(unlikely(!m->st_inodes)) {
183 - m->do_inodes = CONFIG_ONDEMAND_YES;
183 + m->do_inodes = CONFIG_BOOLEAN_YES;
184 m->st_inodes = rrdset_find_bytype_localhost("disk_inodes", disk);
185 if(unlikely(!m->st_inodes)) {
186 char title[4096 + 1];
src/plugin_tc.c
+17 -17
@@ -190,13 +190,13 @@ static inline void tc_device_commit(struct tc_device *d) {
190 static int enable_new_interfaces = -1, enable_bytes = -1, enable_packets = -1, enable_dropped = -1, enable_tokens = -1, enable_ctokens = -1, enabled_all_classes_qdiscs = -1;
191
192 if(unlikely(enable_new_interfaces == -1)) {
193 - enable_new_interfaces = config_get_boolean_ondemand("plugin:tc", "enable new interfaces detected at runtime", CONFIG_ONDEMAND_YES);
194 - enable_bytes = config_get_boolean_ondemand("plugin:tc", "enable traffic charts for all interfaces", CONFIG_ONDEMAND_ONDEMAND);
195 - enable_packets = config_get_boolean_ondemand("plugin:tc", "enable packets charts for all interfaces", CONFIG_ONDEMAND_ONDEMAND);
196 - enable_dropped = config_get_boolean_ondemand("plugin:tc", "enable dropped charts for all interfaces", CONFIG_ONDEMAND_ONDEMAND);
197 - enable_tokens = config_get_boolean_ondemand("plugin:tc", "enable tokens charts for all interfaces", CONFIG_ONDEMAND_NO);
198 - enable_ctokens = config_get_boolean_ondemand("plugin:tc", "enable ctokens charts for all interfaces", CONFIG_ONDEMAND_NO);
199 - enabled_all_classes_qdiscs = config_get_boolean_ondemand("plugin:tc", "enable show all classes and qdiscs for all interfaces", CONFIG_ONDEMAND_NO);
193 + enable_new_interfaces = config_get_boolean_ondemand("plugin:tc", "enable new interfaces detected at runtime", CONFIG_BOOLEAN_YES);
194 + enable_bytes = config_get_boolean_ondemand("plugin:tc", "enable traffic charts for all interfaces", CONFIG_BOOLEAN_AUTO);
195 + enable_packets = config_get_boolean_ondemand("plugin:tc", "enable packets charts for all interfaces", CONFIG_BOOLEAN_AUTO);
196 + enable_dropped = config_get_boolean_ondemand("plugin:tc", "enable dropped charts for all interfaces", CONFIG_BOOLEAN_AUTO);
197 + enable_tokens = config_get_boolean_ondemand("plugin:tc", "enable tokens charts for all interfaces", CONFIG_BOOLEAN_NO);
198 + enable_ctokens = config_get_boolean_ondemand("plugin:tc", "enable ctokens charts for all interfaces", CONFIG_BOOLEAN_NO);
199 + enabled_all_classes_qdiscs = config_get_boolean_ondemand("plugin:tc", "enable show all classes and qdiscs for all interfaces", CONFIG_BOOLEAN_NO);
200 }
201
202 if(unlikely(d->enabled == (char)-1)) {
@@ -370,8 +370,8 @@ static inline void tc_device_commit(struct tc_device *d) {
370 // --------------------------------------------------------------------
371 // bytes
372
373 - if(d->enabled_bytes == CONFIG_ONDEMAND_YES || (d->enabled_bytes == CONFIG_ONDEMAND_ONDEMAND && bytes_sum)) {
374 - d->enabled_bytes = CONFIG_ONDEMAND_YES;
373 + if(d->enabled_bytes == CONFIG_BOOLEAN_YES || (d->enabled_bytes == CONFIG_BOOLEAN_AUTO && bytes_sum)) {
374 + d->enabled_bytes = CONFIG_BOOLEAN_YES;
375
376 if(unlikely(!d->st_bytes))
377 d->st_bytes = rrdset_create_localhost(RRD_TYPE_TC, d->id, d->name ? d->name : d->id
@@ -404,8 +404,8 @@ static inline void tc_device_commit(struct tc_device *d) {
404 // --------------------------------------------------------------------
405 // packets
406
407 - if(d->enabled_packets == CONFIG_ONDEMAND_YES || (d->enabled_packets == CONFIG_ONDEMAND_ONDEMAND && packets_sum)) {
408 - d->enabled_packets = CONFIG_ONDEMAND_YES;
407 + if(d->enabled_packets == CONFIG_BOOLEAN_YES || (d->enabled_packets == CONFIG_BOOLEAN_AUTO && packets_sum)) {
408 + d->enabled_packets = CONFIG_BOOLEAN_YES;
409
410 if(unlikely(!d->st_packets)) {
411 char id[RRD_ID_LENGTH_MAX + 1];
@@ -447,8 +447,8 @@ static inline void tc_device_commit(struct tc_device *d) {
447 // --------------------------------------------------------------------
448 // dropped
449
450 - if(d->enabled_dropped == CONFIG_ONDEMAND_YES || (d->enabled_dropped == CONFIG_ONDEMAND_ONDEMAND && dropped_sum)) {
451 - d->enabled_dropped = CONFIG_ONDEMAND_YES;
450 + if(d->enabled_dropped == CONFIG_BOOLEAN_YES || (d->enabled_dropped == CONFIG_BOOLEAN_AUTO && dropped_sum)) {
451 + d->enabled_dropped = CONFIG_BOOLEAN_YES;
452
453 if(unlikely(!d->st_dropped)) {
454 char id[RRD_ID_LENGTH_MAX + 1];
@@ -491,8 +491,8 @@ static inline void tc_device_commit(struct tc_device *d) {
491 // --------------------------------------------------------------------
492 // tokens
493
494 - if(d->enabled_tokens == CONFIG_ONDEMAND_YES || (d->enabled_tokens == CONFIG_ONDEMAND_ONDEMAND && tokens_sum)) {
495 - d->enabled_tokens = CONFIG_ONDEMAND_YES;
494 + if(d->enabled_tokens == CONFIG_BOOLEAN_YES || (d->enabled_tokens == CONFIG_BOOLEAN_AUTO && tokens_sum)) {
495 + d->enabled_tokens = CONFIG_BOOLEAN_YES;
496
497 if(unlikely(!d->st_tokens)) {
498 char id[RRD_ID_LENGTH_MAX + 1];
@@ -534,8 +534,8 @@ static inline void tc_device_commit(struct tc_device *d) {
534 // --------------------------------------------------------------------
535 // ctokens
536
537 - if(d->enabled_ctokens == CONFIG_ONDEMAND_YES || (d->enabled_ctokens == CONFIG_ONDEMAND_ONDEMAND && ctokens_sum)) {
538 - d->enabled_ctokens = CONFIG_ONDEMAND_YES;
537 + if(d->enabled_ctokens == CONFIG_BOOLEAN_YES || (d->enabled_ctokens == CONFIG_BOOLEAN_AUTO && ctokens_sum)) {
538 + d->enabled_ctokens = CONFIG_BOOLEAN_YES;
539
540 if(unlikely(!d->st_ctokens)) {
541 char id[RRD_ID_LENGTH_MAX + 1];
src/proc_diskstats.c
+48 -48
@@ -198,17 +198,17 @@ static inline int is_major_enabled(int major) {
198
199 int do_proc_diskstats(int update_every, usec_t dt) {
200 static procfile *ff = NULL;
201 - static int global_enable_new_disks_detected_at_runtime = CONFIG_ONDEMAND_YES,
202 - global_enable_performance_for_physical_disks = CONFIG_ONDEMAND_ONDEMAND,
203 - global_enable_performance_for_virtual_disks = CONFIG_ONDEMAND_ONDEMAND,
204 - global_enable_performance_for_partitions = CONFIG_ONDEMAND_NO,
205 - global_do_io = CONFIG_ONDEMAND_ONDEMAND,
206 - global_do_ops = CONFIG_ONDEMAND_ONDEMAND,
207 - global_do_mops = CONFIG_ONDEMAND_ONDEMAND,
208 - global_do_iotime = CONFIG_ONDEMAND_ONDEMAND,
209 - global_do_qops = CONFIG_ONDEMAND_ONDEMAND,
210 - global_do_util = CONFIG_ONDEMAND_ONDEMAND,
211 - global_do_backlog = CONFIG_ONDEMAND_ONDEMAND,
201 + static int global_enable_new_disks_detected_at_runtime = CONFIG_BOOLEAN_YES,
202 + global_enable_performance_for_physical_disks = CONFIG_BOOLEAN_AUTO,
203 + global_enable_performance_for_virtual_disks = CONFIG_BOOLEAN_AUTO,
204 + global_enable_performance_for_partitions = CONFIG_BOOLEAN_NO,
205 + global_do_io = CONFIG_BOOLEAN_AUTO,
206 + global_do_ops = CONFIG_BOOLEAN_AUTO,
207 + global_do_mops = CONFIG_BOOLEAN_AUTO,
208 + global_do_iotime = CONFIG_BOOLEAN_AUTO,
209 + global_do_qops = CONFIG_BOOLEAN_AUTO,
210 + global_do_util = CONFIG_BOOLEAN_AUTO,
211 + global_do_backlog = CONFIG_BOOLEAN_AUTO,
212 globals_initialized = 0;
213
214 if(unlikely(!globals_initialized)) {
@@ -333,21 +333,21 @@ int do_proc_diskstats(int update_every, usec_t dt) {
333 snprintfz(var_name, 4096, "plugin:proc:/proc/diskstats:%s", disk);
334
335 int def_enable = config_get_boolean_ondemand(var_name, "enable", global_enable_new_disks_detected_at_runtime);
336 - if(unlikely(def_enable == CONFIG_ONDEMAND_NO)) {
336 + if(unlikely(def_enable == CONFIG_BOOLEAN_NO)) {
337 // the user does not want any metrics for this disk
338 - d->do_io = CONFIG_ONDEMAND_NO;
339 - d->do_ops = CONFIG_ONDEMAND_NO;
340 - d->do_mops = CONFIG_ONDEMAND_NO;
341 - d->do_iotime = CONFIG_ONDEMAND_NO;
342 - d->do_qops = CONFIG_ONDEMAND_NO;
343 - d->do_util = CONFIG_ONDEMAND_NO;
344 - d->do_backlog = CONFIG_ONDEMAND_NO;
338 + d->do_io = CONFIG_BOOLEAN_NO;
339 + d->do_ops = CONFIG_BOOLEAN_NO;
340 + d->do_mops = CONFIG_BOOLEAN_NO;
341 + d->do_iotime = CONFIG_BOOLEAN_NO;
342 + d->do_qops = CONFIG_BOOLEAN_NO;
343 + d->do_util = CONFIG_BOOLEAN_NO;
344 + d->do_backlog = CONFIG_BOOLEAN_NO;
345 }
346 else {
347 // this disk is enabled
348 // check its direct settings
349
350 - int def_performance = CONFIG_ONDEMAND_ONDEMAND;
350 + int def_performance = CONFIG_BOOLEAN_AUTO;
351
352 // since this is 'on demand' we can figure the performance settings
353 // based on the type of disk
@@ -378,16 +378,16 @@ int do_proc_diskstats(int update_every, usec_t dt) {
378 // check the user configuration (this will also show our 'on demand' decision)
379 def_performance = config_get_boolean_ondemand(var_name, "enable performance metrics", def_performance);
380
381 - int ddo_io = CONFIG_ONDEMAND_NO,
382 - ddo_ops = CONFIG_ONDEMAND_NO,
383 - ddo_mops = CONFIG_ONDEMAND_NO,
384 - ddo_iotime = CONFIG_ONDEMAND_NO,
385 - ddo_qops = CONFIG_ONDEMAND_NO,
386 - ddo_util = CONFIG_ONDEMAND_NO,
387 - ddo_backlog = CONFIG_ONDEMAND_NO;
381 + int ddo_io = CONFIG_BOOLEAN_NO,
382 + ddo_ops = CONFIG_BOOLEAN_NO,
383 + ddo_mops = CONFIG_BOOLEAN_NO,
384 + ddo_iotime = CONFIG_BOOLEAN_NO,
385 + ddo_qops = CONFIG_BOOLEAN_NO,
386 + ddo_util = CONFIG_BOOLEAN_NO,
387 + ddo_backlog = CONFIG_BOOLEAN_NO;
388
389 // we enable individual performance charts only when def_performance is not disabled
390 - if(unlikely(def_performance != CONFIG_ONDEMAND_NO)) {
390 + if(unlikely(def_performance != CONFIG_BOOLEAN_NO)) {
391 ddo_io = global_do_io,
392 ddo_ops = global_do_ops,
393 ddo_mops = global_do_mops,
@@ -414,8 +414,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
414 // --------------------------------------------------------------------------
415 // Do performance metrics
416
417 - if(d->do_io == CONFIG_ONDEMAND_YES || (d->do_io == CONFIG_ONDEMAND_ONDEMAND && (readsectors || writesectors))) {
418 - d->do_io = CONFIG_ONDEMAND_YES;
417 + if(d->do_io == CONFIG_BOOLEAN_YES || (d->do_io == CONFIG_BOOLEAN_AUTO && (readsectors || writesectors))) {
418 + d->do_io = CONFIG_BOOLEAN_YES;
419
420 st = rrdset_find_bytype_localhost(RRD_TYPE_DISK, disk);
421 if(unlikely(!st)) {
@@ -434,8 +434,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
434
435 // --------------------------------------------------------------------
436
437 - if(d->do_ops == CONFIG_ONDEMAND_YES || (d->do_ops == CONFIG_ONDEMAND_ONDEMAND && (reads || writes))) {
438 - d->do_ops = CONFIG_ONDEMAND_YES;
437 + if(d->do_ops == CONFIG_BOOLEAN_YES || (d->do_ops == CONFIG_BOOLEAN_AUTO && (reads || writes))) {
438 + d->do_ops = CONFIG_BOOLEAN_YES;
439
440 st = rrdset_find_bytype_localhost("disk_ops", disk);
441 if(unlikely(!st)) {
@@ -455,8 +455,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
455
456 // --------------------------------------------------------------------
457
458 - if(d->do_qops == CONFIG_ONDEMAND_YES || (d->do_qops == CONFIG_ONDEMAND_ONDEMAND && queued_ios)) {
459 - d->do_qops = CONFIG_ONDEMAND_YES;
458 + if(d->do_qops == CONFIG_BOOLEAN_YES || (d->do_qops == CONFIG_BOOLEAN_AUTO && queued_ios)) {
459 + d->do_qops = CONFIG_BOOLEAN_YES;
460
461 st = rrdset_find_bytype_localhost("disk_qops", disk);
462 if(unlikely(!st)) {
@@ -474,8 +474,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
474
475 // --------------------------------------------------------------------
476
477 - if(d->do_backlog == CONFIG_ONDEMAND_YES || (d->do_backlog == CONFIG_ONDEMAND_ONDEMAND && backlog_ms)) {
478 - d->do_backlog = CONFIG_ONDEMAND_YES;
477 + if(d->do_backlog == CONFIG_BOOLEAN_YES || (d->do_backlog == CONFIG_BOOLEAN_AUTO && backlog_ms)) {
478 + d->do_backlog = CONFIG_BOOLEAN_YES;
479
480 st = rrdset_find_bytype_localhost("disk_backlog", disk);
481 if(unlikely(!st)) {
@@ -493,8 +493,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
493
494 // --------------------------------------------------------------------
495
496 - if(d->do_util == CONFIG_ONDEMAND_YES || (d->do_util == CONFIG_ONDEMAND_ONDEMAND && busy_ms)) {
497 - d->do_util = CONFIG_ONDEMAND_YES;
496 + if(d->do_util == CONFIG_BOOLEAN_YES || (d->do_util == CONFIG_BOOLEAN_AUTO && busy_ms)) {
497 + d->do_util = CONFIG_BOOLEAN_YES;
498
499 st = rrdset_find_bytype_localhost("disk_util", disk);
500 if(unlikely(!st)) {
@@ -512,8 +512,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
512
513 // --------------------------------------------------------------------
514
515 - if(d->do_mops == CONFIG_ONDEMAND_YES || (d->do_mops == CONFIG_ONDEMAND_ONDEMAND && (mreads || mwrites))) {
516 - d->do_mops = CONFIG_ONDEMAND_YES;
515 + if(d->do_mops == CONFIG_BOOLEAN_YES || (d->do_mops == CONFIG_BOOLEAN_AUTO && (mreads || mwrites))) {
516 + d->do_mops = CONFIG_BOOLEAN_YES;
517
518 st = rrdset_find_bytype_localhost("disk_mops", disk);
519 if(unlikely(!st)) {
@@ -533,8 +533,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
533
534 // --------------------------------------------------------------------
535
536 - if(d->do_iotime == CONFIG_ONDEMAND_YES || (d->do_iotime == CONFIG_ONDEMAND_ONDEMAND && (readms || writems))) {
537 - d->do_iotime = CONFIG_ONDEMAND_YES;
536 + if(d->do_iotime == CONFIG_BOOLEAN_YES || (d->do_iotime == CONFIG_BOOLEAN_AUTO && (readms || writems))) {
537 + d->do_iotime = CONFIG_BOOLEAN_YES;
538
539 st = rrdset_find_bytype_localhost("disk_iotime", disk);
540 if(unlikely(!st)) {
@@ -557,8 +557,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
557 // only if this is not the first time we run
558
559 if(likely(dt)) {
560 - if( (d->do_iotime == CONFIG_ONDEMAND_YES || (d->do_iotime == CONFIG_ONDEMAND_ONDEMAND && (readms || writems))) &&
561 - (d->do_ops == CONFIG_ONDEMAND_YES || (d->do_ops == CONFIG_ONDEMAND_ONDEMAND && (reads || writes)))) {
560 + if( (d->do_iotime == CONFIG_BOOLEAN_YES || (d->do_iotime == CONFIG_BOOLEAN_AUTO && (readms || writems))) &&
561 + (d->do_ops == CONFIG_BOOLEAN_YES || (d->do_ops == CONFIG_BOOLEAN_AUTO && (reads || writes)))) {
562 st = rrdset_find_bytype_localhost("disk_await", disk);
563 if(unlikely(!st)) {
564 st = rrdset_create_localhost("disk_await", disk, NULL, family, "disk.await"
@@ -576,8 +576,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
576 rrdset_done(st);
577 }
578
579 - if( (d->do_io == CONFIG_ONDEMAND_YES || (d->do_io == CONFIG_ONDEMAND_ONDEMAND && (readsectors || writesectors))) &&
580 - (d->do_ops == CONFIG_ONDEMAND_YES || (d->do_ops == CONFIG_ONDEMAND_ONDEMAND && (reads || writes)))) {
579 + if( (d->do_io == CONFIG_BOOLEAN_YES || (d->do_io == CONFIG_BOOLEAN_AUTO && (readsectors || writesectors))) &&
580 + (d->do_ops == CONFIG_BOOLEAN_YES || (d->do_ops == CONFIG_BOOLEAN_AUTO && (reads || writes)))) {
581 st = rrdset_find_bytype_localhost("disk_avgsz", disk);
582 if(unlikely(!st)) {
583 st = rrdset_create_localhost("disk_avgsz", disk, NULL, family, "disk.avgsz"
@@ -595,8 +595,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
595 rrdset_done(st);
596 }
597
598 - if( (d->do_util == CONFIG_ONDEMAND_YES || (d->do_util == CONFIG_ONDEMAND_ONDEMAND && busy_ms)) &&
599 - (d->do_ops == CONFIG_ONDEMAND_YES || (d->do_ops == CONFIG_ONDEMAND_ONDEMAND && (reads || writes)))) {
598 + if( (d->do_util == CONFIG_BOOLEAN_YES || (d->do_util == CONFIG_BOOLEAN_AUTO && busy_ms)) &&
599 + (d->do_ops == CONFIG_BOOLEAN_YES || (d->do_ops == CONFIG_BOOLEAN_AUTO && (reads || writes)))) {
600 st = rrdset_find_bytype_localhost("disk_svctm", disk);
601 if(unlikely(!st)) {
602 st = rrdset_create_localhost("disk_svctm", disk, NULL, family, "disk.svctm", "Average Service Time"
src/proc_meminfo.c
+6 -6
@@ -55,8 +55,8 @@ int do_proc_meminfo(int update_every, usec_t dt) {
55
56 if(unlikely(!arl_base)) {
57 do_ram = config_get_boolean("plugin:proc:/proc/meminfo", "system ram", 1);
58 - do_swap = config_get_boolean_ondemand("plugin:proc:/proc/meminfo", "system swap", CONFIG_ONDEMAND_ONDEMAND);
59 - do_hwcorrupt = config_get_boolean_ondemand("plugin:proc:/proc/meminfo", "hardware corrupted ECC", CONFIG_ONDEMAND_ONDEMAND);
58 + do_swap = config_get_boolean_ondemand("plugin:proc:/proc/meminfo", "system swap", CONFIG_BOOLEAN_AUTO);
59 + do_hwcorrupt = config_get_boolean_ondemand("plugin:proc:/proc/meminfo", "hardware corrupted ECC", CONFIG_BOOLEAN_AUTO);
60 do_committed = config_get_boolean("plugin:proc:/proc/meminfo", "committed memory", 1);
61 do_writeback = config_get_boolean("plugin:proc:/proc/meminfo", "writeback memory", 1);
62 do_kernel = config_get_boolean("plugin:proc:/proc/meminfo", "kernel memory", 1);
@@ -163,8 +163,8 @@ int do_proc_meminfo(int update_every, usec_t dt) {
163
164 unsigned long long SwapUsed = SwapTotal - SwapFree;
165
166 - if(SwapTotal || SwapUsed || SwapFree || do_swap == CONFIG_ONDEMAND_YES) {
167 - do_swap = CONFIG_ONDEMAND_YES;
166 + if(SwapTotal || SwapUsed || SwapFree || do_swap == CONFIG_BOOLEAN_YES) {
167 + do_swap = CONFIG_BOOLEAN_YES;
168
169 st = rrdset_find_localhost("system.swap");
170 if(!st) {
@@ -184,8 +184,8 @@ int do_proc_meminfo(int update_every, usec_t dt) {
184
185 // --------------------------------------------------------------------
186
187 - if(arl_hwcorrupted->flags & ARL_ENTRY_FLAG_FOUND && (do_hwcorrupt == CONFIG_ONDEMAND_YES || (do_hwcorrupt == CONFIG_ONDEMAND_ONDEMAND && HardwareCorrupted > 0))) {
188 - do_hwcorrupt = CONFIG_ONDEMAND_YES;
187 + if(arl_hwcorrupted->flags & ARL_ENTRY_FLAG_FOUND && (do_hwcorrupt == CONFIG_BOOLEAN_YES || (do_hwcorrupt == CONFIG_BOOLEAN_AUTO && HardwareCorrupted > 0))) {
188 + do_hwcorrupt = CONFIG_BOOLEAN_YES;
189
190 st = rrdset_find_localhost("mem.hwcorrupt");
191 if(!st) {
src/proc_net_dev.c
+37 -37
@@ -117,15 +117,15 @@ int do_proc_net_dev(int update_every, usec_t dt) {
117 static int do_bandwidth = -1, do_packets = -1, do_errors = -1, do_drops = -1, do_fifo = -1, do_compressed = -1, do_events = -1;
118
119 if(unlikely(enable_new_interfaces == -1)) {
120 - enable_new_interfaces = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "enable new interfaces detected at runtime", CONFIG_ONDEMAND_ONDEMAND);
120 + enable_new_interfaces = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "enable new interfaces detected at runtime", CONFIG_BOOLEAN_AUTO);
121
122 - do_bandwidth = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "bandwidth for all interfaces", CONFIG_ONDEMAND_ONDEMAND);
123 - do_packets = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "packets for all interfaces", CONFIG_ONDEMAND_ONDEMAND);
124 - do_errors = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "errors for all interfaces", CONFIG_ONDEMAND_ONDEMAND);
125 - do_drops = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "drops for all interfaces", CONFIG_ONDEMAND_ONDEMAND);
126 - do_fifo = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "fifo for all interfaces", CONFIG_ONDEMAND_ONDEMAND);
127 - do_compressed = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "compressed packets for all interfaces", CONFIG_ONDEMAND_ONDEMAND);
128 - do_events = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "frames, collisions, carrier counters for all interfaces", CONFIG_ONDEMAND_ONDEMAND);
122 + do_bandwidth = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "bandwidth for all interfaces", CONFIG_BOOLEAN_AUTO);
123 + do_packets = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "packets for all interfaces", CONFIG_BOOLEAN_AUTO);
124 + do_errors = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "errors for all interfaces", CONFIG_BOOLEAN_AUTO);
125 + do_drops = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "drops for all interfaces", CONFIG_BOOLEAN_AUTO);
126 + do_fifo = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "fifo for all interfaces", CONFIG_BOOLEAN_AUTO);
127 + do_compressed = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "compressed packets for all interfaces", CONFIG_BOOLEAN_AUTO);
128 + do_events = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "frames, collisions, carrier counters for all interfaces", CONFIG_BOOLEAN_AUTO);
129
130 disabled_list = simple_pattern_create(
131 config_get("plugin:proc:/proc/net/dev", "disable by default interfaces matching", "lo fireqos* *-ifb")
@@ -164,7 +164,7 @@ int do_proc_net_dev(int update_every, usec_t dt) {
164 snprintfz(var_name, 512, "plugin:proc:/proc/net/dev:%s", d->name);
165 d->enabled = config_get_boolean_ondemand(var_name, "enabled", d->enabled);
166
167 - if(d->enabled == CONFIG_ONDEMAND_NO)
167 + if(d->enabled == CONFIG_BOOLEAN_NO)
168 continue;
169
170 d->do_bandwidth = config_get_boolean_ondemand(var_name, "bandwidth", do_bandwidth);
@@ -179,38 +179,38 @@ int do_proc_net_dev(int update_every, usec_t dt) {
179 if(unlikely(!d->enabled))
180 continue;
181
182 - if(likely(d->do_bandwidth != CONFIG_ONDEMAND_NO)) {
182 + if(likely(d->do_bandwidth != CONFIG_BOOLEAN_NO)) {
183 d->rbytes = str2kernel_uint_t(procfile_lineword(ff, l, 1));
184 d->tbytes = str2kernel_uint_t(procfile_lineword(ff, l, 9));
185 }
186
187 - if(likely(d->do_packets != CONFIG_ONDEMAND_NO)) {
187 + if(likely(d->do_packets != CONFIG_BOOLEAN_NO)) {
188 d->rpackets = str2kernel_uint_t(procfile_lineword(ff, l, 2));
189 d->rmulticast = str2kernel_uint_t(procfile_lineword(ff, l, 8));
190 d->tpackets = str2kernel_uint_t(procfile_lineword(ff, l, 10));
191 }
192
193 - if(likely(d->do_errors != CONFIG_ONDEMAND_NO)) {
193 + if(likely(d->do_errors != CONFIG_BOOLEAN_NO)) {
194 d->rerrors = str2kernel_uint_t(procfile_lineword(ff, l, 3));
195 d->terrors = str2kernel_uint_t(procfile_lineword(ff, l, 11));
196 }
197
198 - if(likely(d->do_drops != CONFIG_ONDEMAND_NO)) {
198 + if(likely(d->do_drops != CONFIG_BOOLEAN_NO)) {
199 d->rdrops = str2kernel_uint_t(procfile_lineword(ff, l, 4));
200 d->tdrops = str2kernel_uint_t(procfile_lineword(ff, l, 12));
201 }
202
203 - if(likely(d->do_fifo != CONFIG_ONDEMAND_NO)) {
203 + if(likely(d->do_fifo != CONFIG_BOOLEAN_NO)) {
204 d->rfifo = str2kernel_uint_t(procfile_lineword(ff, l, 5));
205 d->tfifo = str2kernel_uint_t(procfile_lineword(ff, l, 13));
206 }
207
208 - if(likely(d->do_compressed != CONFIG_ONDEMAND_NO)) {
208 + if(likely(d->do_compressed != CONFIG_BOOLEAN_NO)) {
209 d->rcompressed = str2kernel_uint_t(procfile_lineword(ff, l, 7));
210 d->tcompressed = str2kernel_uint_t(procfile_lineword(ff, l, 16));
211 }
212
213 - if(likely(d->do_events != CONFIG_ONDEMAND_NO)) {
213 + if(likely(d->do_events != CONFIG_BOOLEAN_NO)) {
214 d->rframe = str2kernel_uint_t(procfile_lineword(ff, l, 6));
215 d->tcollisions = str2kernel_uint_t(procfile_lineword(ff, l, 14));
216 d->tcarrier = str2kernel_uint_t(procfile_lineword(ff, l, 15));
@@ -218,10 +218,10 @@ int do_proc_net_dev(int update_every, usec_t dt) {
218
219 // --------------------------------------------------------------------
220
221 - if(unlikely((d->do_bandwidth == CONFIG_ONDEMAND_ONDEMAND && (d->rbytes || d->tbytes))))
222 - d->do_bandwidth = CONFIG_ONDEMAND_YES;
221 + if(unlikely((d->do_bandwidth == CONFIG_BOOLEAN_AUTO && (d->rbytes || d->tbytes))))
222 + d->do_bandwidth = CONFIG_BOOLEAN_YES;
223
224 - if(d->do_bandwidth == CONFIG_ONDEMAND_YES) {
224 + if(d->do_bandwidth == CONFIG_BOOLEAN_YES) {
225 if(unlikely(!d->st_bandwidth)) {
226 d->st_bandwidth = rrdset_find_bytype_localhost("net", d->name);
227
@@ -241,10 +241,10 @@ int do_proc_net_dev(int update_every, usec_t dt) {
241
242 // --------------------------------------------------------------------
243
244 - if(unlikely((d->do_packets == CONFIG_ONDEMAND_ONDEMAND && (d->rpackets || d->tpackets || d->rmulticast))))
245 - d->do_packets = CONFIG_ONDEMAND_YES;
244 + if(unlikely((d->do_packets == CONFIG_BOOLEAN_AUTO && (d->rpackets || d->tpackets || d->rmulticast))))
245 + d->do_packets = CONFIG_BOOLEAN_YES;
246
247 - if(d->do_packets == CONFIG_ONDEMAND_YES) {
247 + if(d->do_packets == CONFIG_BOOLEAN_YES) {
248 if(unlikely(!d->st_packets)) {
249 d->st_packets = rrdset_find_bytype_localhost("net_packets", d->name);
250
@@ -268,10 +268,10 @@ int do_proc_net_dev(int update_every, usec_t dt) {
268
269 // --------------------------------------------------------------------
270
271 - if(unlikely((d->do_errors == CONFIG_ONDEMAND_ONDEMAND && (d->rerrors || d->terrors))))
272 - d->do_errors = CONFIG_ONDEMAND_YES;
271 + if(unlikely((d->do_errors == CONFIG_BOOLEAN_AUTO && (d->rerrors || d->terrors))))
272 + d->do_errors = CONFIG_BOOLEAN_YES;
273
274 - if(d->do_errors == CONFIG_ONDEMAND_YES) {
274 + if(d->do_errors == CONFIG_BOOLEAN_YES) {
275 if(unlikely(!d->st_errors)) {
276 d->st_errors = rrdset_find_bytype_localhost("net_errors", d->name);
277
@@ -294,10 +294,10 @@ int do_proc_net_dev(int update_every, usec_t dt) {
294
295 // --------------------------------------------------------------------
296
297 - if(unlikely((d->do_drops == CONFIG_ONDEMAND_ONDEMAND && (d->rdrops || d->tdrops))))
298 - d->do_drops = CONFIG_ONDEMAND_YES;
297 + if(unlikely((d->do_drops == CONFIG_BOOLEAN_AUTO && (d->rdrops || d->tdrops))))
298 + d->do_drops = CONFIG_BOOLEAN_YES;
299
300 - if(d->do_drops == CONFIG_ONDEMAND_YES) {
300 + if(d->do_drops == CONFIG_BOOLEAN_YES) {
301 if(unlikely(!d->st_drops)) {
302 d->st_drops = rrdset_find_bytype_localhost("net_drops", d->name);
303
@@ -320,10 +320,10 @@ int do_proc_net_dev(int update_every, usec_t dt) {
320
321 // --------------------------------------------------------------------
322
323 - if(unlikely((d->do_fifo == CONFIG_ONDEMAND_ONDEMAND && (d->rfifo || d->tfifo))))
324 - d->do_fifo = CONFIG_ONDEMAND_YES;
323 + if(unlikely((d->do_fifo == CONFIG_BOOLEAN_AUTO && (d->rfifo || d->tfifo))))
324 + d->do_fifo = CONFIG_BOOLEAN_YES;
325
326 - if(d->do_fifo == CONFIG_ONDEMAND_YES) {
326 + if(d->do_fifo == CONFIG_BOOLEAN_YES) {
327 if(unlikely(!d->st_fifo)) {
328 d->st_fifo = rrdset_find_bytype_localhost("net_fifo", d->name);
329
@@ -346,10 +346,10 @@ int do_proc_net_dev(int update_every, usec_t dt) {
346
347 // --------------------------------------------------------------------
348
349 - if(unlikely((d->do_compressed == CONFIG_ONDEMAND_ONDEMAND && (d->rcompressed || d->tcompressed))))
350 - d->do_compressed = CONFIG_ONDEMAND_YES;
349 + if(unlikely((d->do_compressed == CONFIG_BOOLEAN_AUTO && (d->rcompressed || d->tcompressed))))
350 + d->do_compressed = CONFIG_BOOLEAN_YES;
351
352 - if(d->do_compressed == CONFIG_ONDEMAND_YES) {
352 + if(d->do_compressed == CONFIG_BOOLEAN_YES) {
353 if(unlikely(!d->st_compressed)) {
354 d->st_compressed = rrdset_find_bytype_localhost("net_compressed", d->name);
355 if(!d->st_compressed)
@@ -371,10 +371,10 @@ int do_proc_net_dev(int update_every, usec_t dt) {
371
372 // --------------------------------------------------------------------
373
374 - if(unlikely((d->do_events == CONFIG_ONDEMAND_ONDEMAND && (d->rframe || d->tcollisions || d->tcarrier))))
375 - d->do_events = CONFIG_ONDEMAND_YES;
374 + if(unlikely((d->do_events == CONFIG_BOOLEAN_AUTO && (d->rframe || d->tcollisions || d->tcarrier))))
375 + d->do_events = CONFIG_BOOLEAN_YES;
376
377 - if(d->do_events == CONFIG_ONDEMAND_YES) {
377 + if(d->do_events == CONFIG_BOOLEAN_YES) {
378 if(unlikely(!d->st_events)) {
379 d->st_events = rrdset_find_bytype_localhost("net_events", d->name);
380 if(!d->st_events)
src/proc_net_netstat.c
+49 -49
@@ -98,19 +98,19 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
98 hash_ipext = simple_hash("IpExt");
99 hash_tcpext = simple_hash("TcpExt");
100
101 - do_bandwidth = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "bandwidth", CONFIG_ONDEMAND_ONDEMAND);
102 - do_inerrors = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "input errors", CONFIG_ONDEMAND_ONDEMAND);
103 - do_mcast = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "multicast bandwidth", CONFIG_ONDEMAND_ONDEMAND);
104 - do_bcast = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "broadcast bandwidth", CONFIG_ONDEMAND_ONDEMAND);
105 - do_mcast_p = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "multicast packets", CONFIG_ONDEMAND_ONDEMAND);
106 - do_bcast_p = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "broadcast packets", CONFIG_ONDEMAND_ONDEMAND);
107 - do_ecn = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "ECN packets", CONFIG_ONDEMAND_ONDEMAND);
108 -
109 - do_tcpext_reorder = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "TCP reorders", CONFIG_ONDEMAND_ONDEMAND);
110 - do_tcpext_syscookies = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "TCP SYN cookies", CONFIG_ONDEMAND_ONDEMAND);
111 - do_tcpext_ofo = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "TCP out-of-order queue", CONFIG_ONDEMAND_ONDEMAND);
112 - do_tcpext_connaborts = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "TCP connection aborts", CONFIG_ONDEMAND_ONDEMAND);
113 - do_tcpext_memory = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "TCP memory pressures", CONFIG_ONDEMAND_ONDEMAND);
101 + do_bandwidth = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "bandwidth", CONFIG_BOOLEAN_AUTO);
102 + do_inerrors = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "input errors", CONFIG_BOOLEAN_AUTO);
103 + do_mcast = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "multicast bandwidth", CONFIG_BOOLEAN_AUTO);
104 + do_bcast = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "broadcast bandwidth", CONFIG_BOOLEAN_AUTO);
105 + do_mcast_p = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "multicast packets", CONFIG_BOOLEAN_AUTO);
106 + do_bcast_p = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "broadcast packets", CONFIG_BOOLEAN_AUTO);
107 + do_ecn = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "ECN packets", CONFIG_BOOLEAN_AUTO);
108 +
109 + do_tcpext_reorder = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "TCP reorders", CONFIG_BOOLEAN_AUTO);
110 + do_tcpext_syscookies = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "TCP SYN cookies", CONFIG_BOOLEAN_AUTO);
111 + do_tcpext_ofo = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "TCP out-of-order queue", CONFIG_BOOLEAN_AUTO);
112 + do_tcpext_connaborts = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "TCP connection aborts", CONFIG_BOOLEAN_AUTO);
113 + do_tcpext_memory = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "TCP memory pressures", CONFIG_BOOLEAN_AUTO);
114
115 arl_ipext = arl_create("netstat/ipext", NULL, 60);
116 arl_tcpext = arl_create("netstat/tcpext", NULL, 60);
@@ -118,38 +118,38 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
118 // --------------------------------------------------------------------
119 // IPv4
120
121 - if(do_bandwidth != CONFIG_ONDEMAND_NO) {
121 + if(do_bandwidth != CONFIG_BOOLEAN_NO) {
122 arl_expect(arl_ipext, "InOctets", &ipext_InOctets);
123 arl_expect(arl_ipext, "OutOctets", &ipext_OutOctets);
124 }
125
126 - if(do_inerrors != CONFIG_ONDEMAND_NO) {
126 + if(do_inerrors != CONFIG_BOOLEAN_NO) {
127 arl_expect(arl_ipext, "InNoRoutes", &ipext_InNoRoutes);
128 arl_expect(arl_ipext, "InTruncatedPkts", &ipext_InTruncatedPkts);
129 arl_expect(arl_ipext, "InCsumErrors", &ipext_InCsumErrors);
130 }
131
132 - if(do_mcast != CONFIG_ONDEMAND_NO) {
132 + if(do_mcast != CONFIG_BOOLEAN_NO) {
133 arl_expect(arl_ipext, "InMcastOctets", &ipext_InMcastOctets);
134 arl_expect(arl_ipext, "OutMcastOctets", &ipext_OutMcastOctets);
135 }
136
137 - if(do_mcast_p != CONFIG_ONDEMAND_NO) {
137 + if(do_mcast_p != CONFIG_BOOLEAN_NO) {
138 arl_expect(arl_ipext, "InMcastPkts", &ipext_InMcastPkts);
139 arl_expect(arl_ipext, "OutMcastPkts", &ipext_OutMcastPkts);
140 }
141
142 - if(do_bcast != CONFIG_ONDEMAND_NO) {
142 + if(do_bcast != CONFIG_BOOLEAN_NO) {
143 arl_expect(arl_ipext, "InBcastPkts", &ipext_InBcastPkts);
144 arl_expect(arl_ipext, "OutBcastPkts", &ipext_OutBcastPkts);
145 }
146
147 - if(do_bcast_p != CONFIG_ONDEMAND_NO) {
147 + if(do_bcast_p != CONFIG_BOOLEAN_NO) {
148 arl_expect(arl_ipext, "InBcastOctets", &ipext_InBcastOctets);
149 arl_expect(arl_ipext, "OutBcastOctets", &ipext_OutBcastOctets);
150 }
151
152 - if(do_ecn != CONFIG_ONDEMAND_NO) {
152 + if(do_ecn != CONFIG_BOOLEAN_NO) {
153 arl_expect(arl_ipext, "InNoECTPkts", &ipext_InNoECTPkts);
154 arl_expect(arl_ipext, "InECT1Pkts", &ipext_InECT1Pkts);
155 arl_expect(arl_ipext, "InECT0Pkts", &ipext_InECT0Pkts);
@@ -159,27 +159,27 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
159 // --------------------------------------------------------------------
160 // IPv4 TCP
161
162 - if(do_tcpext_reorder != CONFIG_ONDEMAND_NO) {
162 + if(do_tcpext_reorder != CONFIG_BOOLEAN_NO) {
163 arl_expect(arl_tcpext, "TCPFACKReorder", &tcpext_TCPFACKReorder);
164 arl_expect(arl_tcpext, "TCPSACKReorder", &tcpext_TCPSACKReorder);
165 arl_expect(arl_tcpext, "TCPRenoReorder", &tcpext_TCPRenoReorder);
166 arl_expect(arl_tcpext, "TCPTSReorder", &tcpext_TCPTSReorder);
167 }
168
169 - if(do_tcpext_syscookies != CONFIG_ONDEMAND_NO) {
169 + if(do_tcpext_syscookies != CONFIG_BOOLEAN_NO) {
170 arl_expect(arl_tcpext, "SyncookiesSent", &tcpext_SyncookiesSent);
171 arl_expect(arl_tcpext, "SyncookiesRecv", &tcpext_SyncookiesRecv);
172 arl_expect(arl_tcpext, "SyncookiesFailed", &tcpext_SyncookiesFailed);
173 }
174
175 - if(do_tcpext_ofo != CONFIG_ONDEMAND_NO) {
175 + if(do_tcpext_ofo != CONFIG_BOOLEAN_NO) {
176 arl_expect(arl_tcpext, "TCPOFOQueue", &tcpext_TCPOFOQueue);
177 arl_expect(arl_tcpext, "TCPOFODrop", &tcpext_TCPOFODrop);
178 arl_expect(arl_tcpext, "TCPOFOMerge", &tcpext_TCPOFOMerge);
179 arl_expect(arl_tcpext, "OfoPruned", &tcpext_OfoPruned);
180 }
181
182 - if(do_tcpext_connaborts != CONFIG_ONDEMAND_NO) {
182 + if(do_tcpext_connaborts != CONFIG_BOOLEAN_NO) {
183 arl_expect(arl_tcpext, "TCPAbortOnData", &tcpext_TCPAbortOnData);
184 arl_expect(arl_tcpext, "TCPAbortOnClose", &tcpext_TCPAbortOnClose);
185 arl_expect(arl_tcpext, "TCPAbortOnMemory", &tcpext_TCPAbortOnMemory);
@@ -188,7 +188,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
188 arl_expect(arl_tcpext, "TCPAbortFailed", &tcpext_TCPAbortFailed);
189 }
190
191 - if(do_tcpext_memory != CONFIG_ONDEMAND_NO) {
191 + if(do_tcpext_memory != CONFIG_BOOLEAN_NO) {
192 arl_expect(arl_tcpext, "TCPMemoryPressures", &tcpext_TCPMemoryPressures);
193 }
194 }
@@ -228,8 +228,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
228
229 // --------------------------------------------------------------------
230
231 - if(do_bandwidth == CONFIG_ONDEMAND_YES || (do_bandwidth == CONFIG_ONDEMAND_ONDEMAND && (ipext_InOctets || ipext_OutOctets))) {
232 - do_bandwidth = CONFIG_ONDEMAND_YES;
231 + if(do_bandwidth == CONFIG_BOOLEAN_YES || (do_bandwidth == CONFIG_BOOLEAN_AUTO && (ipext_InOctets || ipext_OutOctets))) {
232 + do_bandwidth = CONFIG_BOOLEAN_YES;
233 st = rrdset_find_localhost("system.ipv4");
234 if(unlikely(!st)) {
235 st = rrdset_create_localhost("system", "ipv4", NULL, "network", NULL, "IPv4 Bandwidth", "kilobits/s"
@@ -247,8 +247,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
247
248 // --------------------------------------------------------------------
249
250 - if(do_inerrors == CONFIG_ONDEMAND_YES || (do_inerrors == CONFIG_ONDEMAND_ONDEMAND && (ipext_InNoRoutes || ipext_InTruncatedPkts))) {
251 - do_inerrors = CONFIG_ONDEMAND_YES;
250 + if(do_inerrors == CONFIG_BOOLEAN_YES || (do_inerrors == CONFIG_BOOLEAN_AUTO && (ipext_InNoRoutes || ipext_InTruncatedPkts))) {
251 + do_inerrors = CONFIG_BOOLEAN_YES;
252 st = rrdset_find_localhost("ipv4.inerrors");
253 if(unlikely(!st)) {
254 st = rrdset_create_localhost("ipv4", "inerrors", NULL, "errors", NULL, "IPv4 Input Errors"
@@ -269,8 +269,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
269
270 // --------------------------------------------------------------------
271
272 - if(do_mcast == CONFIG_ONDEMAND_YES || (do_mcast == CONFIG_ONDEMAND_ONDEMAND && (ipext_InMcastOctets || ipext_OutMcastOctets))) {
273 - do_mcast = CONFIG_ONDEMAND_YES;
272 + if(do_mcast == CONFIG_BOOLEAN_YES || (do_mcast == CONFIG_BOOLEAN_AUTO && (ipext_InMcastOctets || ipext_OutMcastOctets))) {
273 + do_mcast = CONFIG_BOOLEAN_YES;
274 st = rrdset_find_localhost("ipv4.mcast");
275 if(unlikely(!st)) {
276 st = rrdset_create_localhost("ipv4", "mcast", NULL, "multicast", NULL, "IPv4 Multicast Bandwidth"
@@ -289,8 +289,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
289
290 // --------------------------------------------------------------------
291
292 - if(do_bcast == CONFIG_ONDEMAND_YES || (do_bcast == CONFIG_ONDEMAND_ONDEMAND && (ipext_InBcastOctets || ipext_OutBcastOctets))) {
293 - do_bcast = CONFIG_ONDEMAND_YES;
292 + if(do_bcast == CONFIG_BOOLEAN_YES || (do_bcast == CONFIG_BOOLEAN_AUTO && (ipext_InBcastOctets || ipext_OutBcastOctets))) {
293 + do_bcast = CONFIG_BOOLEAN_YES;
294 st = rrdset_find_localhost("ipv4.bcast");
295 if(unlikely(!st)) {
296 st = rrdset_create_localhost("ipv4", "bcast", NULL, "broadcast", NULL, "IPv4 Broadcast Bandwidth"
@@ -309,8 +309,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
309
310 // --------------------------------------------------------------------
311
312 - if(do_mcast_p == CONFIG_ONDEMAND_YES || (do_mcast_p == CONFIG_ONDEMAND_ONDEMAND && (ipext_InMcastPkts || ipext_OutMcastPkts))) {
313 - do_mcast_p = CONFIG_ONDEMAND_YES;
312 + if(do_mcast_p == CONFIG_BOOLEAN_YES || (do_mcast_p == CONFIG_BOOLEAN_AUTO && (ipext_InMcastPkts || ipext_OutMcastPkts))) {
313 + do_mcast_p = CONFIG_BOOLEAN_YES;
314 st = rrdset_find_localhost("ipv4.mcastpkts");
315 if(unlikely(!st)) {
316 st = rrdset_create_localhost("ipv4", "mcastpkts", NULL, "multicast", NULL, "IPv4 Multicast Packets"
@@ -329,8 +329,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
329
330 // --------------------------------------------------------------------
331
332 - if(do_bcast_p == CONFIG_ONDEMAND_YES || (do_bcast_p == CONFIG_ONDEMAND_ONDEMAND && (ipext_InBcastPkts || ipext_OutBcastPkts))) {
333 - do_bcast_p = CONFIG_ONDEMAND_YES;
332 + if(do_bcast_p == CONFIG_BOOLEAN_YES || (do_bcast_p == CONFIG_BOOLEAN_AUTO && (ipext_InBcastPkts || ipext_OutBcastPkts))) {
333 + do_bcast_p = CONFIG_BOOLEAN_YES;
334 st = rrdset_find_localhost("ipv4.bcastpkts");
335 if(unlikely(!st)) {
336 st = rrdset_create_localhost("ipv4", "bcastpkts", NULL, "broadcast", NULL, "IPv4 Broadcast Packets"
@@ -349,8 +349,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
349
350 // --------------------------------------------------------------------
351
352 - if(do_ecn == CONFIG_ONDEMAND_YES || (do_ecn == CONFIG_ONDEMAND_ONDEMAND && (ipext_InCEPkts || ipext_InECT0Pkts || ipext_InECT1Pkts || ipext_InNoECTPkts))) {
353 - do_ecn = CONFIG_ONDEMAND_YES;
352 + if(do_ecn == CONFIG_BOOLEAN_YES || (do_ecn == CONFIG_BOOLEAN_AUTO && (ipext_InCEPkts || ipext_InECT0Pkts || ipext_InECT1Pkts || ipext_InNoECTPkts))) {
353 + do_ecn = CONFIG_BOOLEAN_YES;
354 st = rrdset_find_localhost("ipv4.ecnpkts");
355 if(unlikely(!st)) {
356 st = rrdset_create_localhost("ipv4", "ecnpkts", NULL, "ecn", NULL, "IPv4 ECN Statistics"
@@ -386,8 +386,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
386
387 // --------------------------------------------------------------------
388
389 - if(do_tcpext_memory == CONFIG_ONDEMAND_YES || (do_tcpext_memory == CONFIG_ONDEMAND_ONDEMAND && (tcpext_TCPMemoryPressures))) {
390 - do_tcpext_memory = CONFIG_ONDEMAND_YES;
389 + if(do_tcpext_memory == CONFIG_BOOLEAN_YES || (do_tcpext_memory == CONFIG_BOOLEAN_AUTO && (tcpext_TCPMemoryPressures))) {
390 + do_tcpext_memory = CONFIG_BOOLEAN_YES;
391 st = rrdset_find_localhost("ipv4.tcpmemorypressures");
392 if(unlikely(!st)) {
393 st = rrdset_create_localhost("ipv4", "tcpmemorypressures", NULL, "tcp", NULL, "TCP Memory Pressures"
@@ -403,8 +403,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
403
404 // --------------------------------------------------------------------
405
406 - if(do_tcpext_connaborts == CONFIG_ONDEMAND_YES || (do_tcpext_connaborts == CONFIG_ONDEMAND_ONDEMAND && (tcpext_TCPAbortOnData || tcpext_TCPAbortOnClose || tcpext_TCPAbortOnMemory || tcpext_TCPAbortOnTimeout || tcpext_TCPAbortOnLinger || tcpext_TCPAbortFailed))) {
407 - do_tcpext_connaborts = CONFIG_ONDEMAND_YES;
406 + if(do_tcpext_connaborts == CONFIG_BOOLEAN_YES || (do_tcpext_connaborts == CONFIG_BOOLEAN_AUTO && (tcpext_TCPAbortOnData || tcpext_TCPAbortOnClose || tcpext_TCPAbortOnMemory || tcpext_TCPAbortOnTimeout || tcpext_TCPAbortOnLinger || tcpext_TCPAbortFailed))) {
407 + do_tcpext_connaborts = CONFIG_BOOLEAN_YES;
408 st = rrdset_find_localhost("ipv4.tcpconnaborts");
409 if(unlikely(!st)) {
410 st = rrdset_create_localhost("ipv4", "tcpconnaborts", NULL, "tcp", NULL, "TCP Connection Aborts"
@@ -429,8 +429,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
429 }
430 // --------------------------------------------------------------------
431
432 - if(do_tcpext_reorder == CONFIG_ONDEMAND_YES || (do_tcpext_reorder == CONFIG_ONDEMAND_ONDEMAND && (tcpext_TCPRenoReorder || tcpext_TCPFACKReorder || tcpext_TCPSACKReorder || tcpext_TCPTSReorder))) {
433 - do_tcpext_reorder = CONFIG_ONDEMAND_YES;
432 + if(do_tcpext_reorder == CONFIG_BOOLEAN_YES || (do_tcpext_reorder == CONFIG_BOOLEAN_AUTO && (tcpext_TCPRenoReorder || tcpext_TCPFACKReorder || tcpext_TCPSACKReorder || tcpext_TCPTSReorder))) {
433 + do_tcpext_reorder = CONFIG_BOOLEAN_YES;
434 st = rrdset_find_localhost("ipv4.tcpreorders");
435 if(unlikely(!st)) {
436 st = rrdset_create_localhost("ipv4", "tcpreorders", NULL, "tcp", NULL
@@ -453,8 +453,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
453
454 // --------------------------------------------------------------------
455
456 - if(do_tcpext_ofo == CONFIG_ONDEMAND_YES || (do_tcpext_ofo == CONFIG_ONDEMAND_ONDEMAND && (tcpext_TCPOFOQueue || tcpext_TCPOFODrop || tcpext_TCPOFOMerge))) {
457 - do_tcpext_ofo = CONFIG_ONDEMAND_YES;
456 + if(do_tcpext_ofo == CONFIG_BOOLEAN_YES || (do_tcpext_ofo == CONFIG_BOOLEAN_AUTO && (tcpext_TCPOFOQueue || tcpext_TCPOFODrop || tcpext_TCPOFOMerge))) {
457 + do_tcpext_ofo = CONFIG_BOOLEAN_YES;
458 st = rrdset_find_localhost("ipv4.tcpofo");
459 if(unlikely(!st)) {
460 st = rrdset_create_localhost("ipv4", "tcpofo", NULL, "tcp", NULL, "TCP Out-Of-Order Queue"
@@ -476,8 +476,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
476
477 // --------------------------------------------------------------------
478
479 - if(do_tcpext_syscookies == CONFIG_ONDEMAND_YES || (do_tcpext_syscookies == CONFIG_ONDEMAND_ONDEMAND && (tcpext_SyncookiesSent || tcpext_SyncookiesRecv || tcpext_SyncookiesFailed))) {
480 - do_tcpext_syscookies = CONFIG_ONDEMAND_YES;
479 + if(do_tcpext_syscookies == CONFIG_BOOLEAN_YES || (do_tcpext_syscookies == CONFIG_BOOLEAN_AUTO && (tcpext_SyncookiesSent || tcpext_SyncookiesRecv || tcpext_SyncookiesFailed))) {
480 + do_tcpext_syscookies = CONFIG_BOOLEAN_YES;
481 st = rrdset_find_localhost("ipv4.tcpsyncookies");
482 if(unlikely(!st)) {
483 st = rrdset_create_localhost("ipv4", "tcpsyncookies", NULL, "tcp", NULL, "TCP SYN Cookies"
src/proc_net_snmp6.c
+66 -66
@@ -126,28 +126,28 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
126 static unsigned long long UdpLite6InCsumErrors = 0ULL;
127
128 if(unlikely(!arl_base)) {
129 - do_ip_packets = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "ipv6 packets", CONFIG_ONDEMAND_ONDEMAND);
130 - do_ip_fragsout = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "ipv6 fragments sent", CONFIG_ONDEMAND_ONDEMAND);
131 - do_ip_fragsin = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "ipv6 fragments assembly", CONFIG_ONDEMAND_ONDEMAND);
132 - do_ip_errors = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "ipv6 errors", CONFIG_ONDEMAND_ONDEMAND);
133 - do_udp_packets = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "ipv6 UDP packets", CONFIG_ONDEMAND_ONDEMAND);
134 - do_udp_errors = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "ipv6 UDP errors", CONFIG_ONDEMAND_ONDEMAND);
135 - do_udplite_packets = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "ipv6 UDPlite packets", CONFIG_ONDEMAND_ONDEMAND);
136 - do_udplite_errors = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "ipv6 UDPlite errors", CONFIG_ONDEMAND_ONDEMAND);
137 - do_bandwidth = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "bandwidth", CONFIG_ONDEMAND_ONDEMAND);
138 - do_mcast = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "multicast bandwidth", CONFIG_ONDEMAND_ONDEMAND);
139 - do_bcast = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "broadcast bandwidth", CONFIG_ONDEMAND_ONDEMAND);
140 - do_mcast_p = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "multicast packets", CONFIG_ONDEMAND_ONDEMAND);
141 - do_icmp = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "icmp", CONFIG_ONDEMAND_ONDEMAND);
142 - do_icmp_redir = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "icmp redirects", CONFIG_ONDEMAND_ONDEMAND);
143 - do_icmp_errors = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "icmp errors", CONFIG_ONDEMAND_ONDEMAND);
144 - do_icmp_echos = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "icmp echos", CONFIG_ONDEMAND_ONDEMAND);
145 - do_icmp_groupmemb = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "icmp group membership", CONFIG_ONDEMAND_ONDEMAND);
146 - do_icmp_router = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "icmp router", CONFIG_ONDEMAND_ONDEMAND);
147 - do_icmp_neighbor = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "icmp neighbor", CONFIG_ONDEMAND_ONDEMAND);
148 - do_icmp_mldv2 = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "icmp mldv2", CONFIG_ONDEMAND_ONDEMAND);
149 - do_icmp_types = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "icmp types", CONFIG_ONDEMAND_ONDEMAND);
150 - do_ect = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "ect", CONFIG_ONDEMAND_ONDEMAND);
129 + do_ip_packets = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "ipv6 packets", CONFIG_BOOLEAN_AUTO);
130 + do_ip_fragsout = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "ipv6 fragments sent", CONFIG_BOOLEAN_AUTO);
131 + do_ip_fragsin = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "ipv6 fragments assembly", CONFIG_BOOLEAN_AUTO);
132 + do_ip_errors = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "ipv6 errors", CONFIG_BOOLEAN_AUTO);
133 + do_udp_packets = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "ipv6 UDP packets", CONFIG_BOOLEAN_AUTO);
134 + do_udp_errors = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "ipv6 UDP errors", CONFIG_BOOLEAN_AUTO);
135 + do_udplite_packets = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "ipv6 UDPlite packets", CONFIG_BOOLEAN_AUTO);
136 + do_udplite_errors = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "ipv6 UDPlite errors", CONFIG_BOOLEAN_AUTO);
137 + do_bandwidth = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "bandwidth", CONFIG_BOOLEAN_AUTO);
138 + do_mcast = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "multicast bandwidth", CONFIG_BOOLEAN_AUTO);
139 + do_bcast = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "broadcast bandwidth", CONFIG_BOOLEAN_AUTO);
140 + do_mcast_p = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "multicast packets", CONFIG_BOOLEAN_AUTO);
141 + do_icmp = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "icmp", CONFIG_BOOLEAN_AUTO);
142 + do_icmp_redir = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "icmp redirects", CONFIG_BOOLEAN_AUTO);
143 + do_icmp_errors = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "icmp errors", CONFIG_BOOLEAN_AUTO);
144 + do_icmp_echos = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "icmp echos", CONFIG_BOOLEAN_AUTO);
145 + do_icmp_groupmemb = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "icmp group membership", CONFIG_BOOLEAN_AUTO);
146 + do_icmp_router = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "icmp router", CONFIG_BOOLEAN_AUTO);
147 + do_icmp_neighbor = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "icmp neighbor", CONFIG_BOOLEAN_AUTO);
148 + do_icmp_mldv2 = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "icmp mldv2", CONFIG_BOOLEAN_AUTO);
149 + do_icmp_types = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "icmp types", CONFIG_BOOLEAN_AUTO);
150 + do_ect = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "ect", CONFIG_BOOLEAN_AUTO);
151
152 arl_base = arl_create("snmp6", NULL, 60);
153 arl_expect(arl_base, "Ip6InReceives", &Ip6InReceives);
@@ -276,8 +276,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
276
277 // --------------------------------------------------------------------
278
279 - if(do_bandwidth == CONFIG_ONDEMAND_YES || (do_bandwidth == CONFIG_ONDEMAND_ONDEMAND && (Ip6InOctets || Ip6OutOctets))) {
280 - do_bandwidth = CONFIG_ONDEMAND_YES;
279 + if(do_bandwidth == CONFIG_BOOLEAN_YES || (do_bandwidth == CONFIG_BOOLEAN_AUTO && (Ip6InOctets || Ip6OutOctets))) {
280 + do_bandwidth = CONFIG_BOOLEAN_YES;
281 st = rrdset_find_localhost("system.ipv6");
282 if(unlikely(!st)) {
283 st = rrdset_create_localhost("system", "ipv6", NULL, "network", NULL, "IPv6 Bandwidth", "kilobits/s", 500
@@ -295,8 +295,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
295
296 // --------------------------------------------------------------------
297
298 - if(do_ip_packets == CONFIG_ONDEMAND_YES || (do_ip_packets == CONFIG_ONDEMAND_ONDEMAND && (Ip6InReceives || Ip6OutRequests || Ip6InDelivers || Ip6OutForwDatagrams))) {
299 - do_ip_packets = CONFIG_ONDEMAND_YES;
298 + if(do_ip_packets == CONFIG_BOOLEAN_YES || (do_ip_packets == CONFIG_BOOLEAN_AUTO && (Ip6InReceives || Ip6OutRequests || Ip6InDelivers || Ip6OutForwDatagrams))) {
299 + do_ip_packets = CONFIG_BOOLEAN_YES;
300 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".packets");
301 if(unlikely(!st)) {
302 st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "packets", NULL, "packets", NULL, "IPv6 Packets"
@@ -318,8 +318,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
318
319 // --------------------------------------------------------------------
320
321 - if(do_ip_fragsout == CONFIG_ONDEMAND_YES || (do_ip_fragsout == CONFIG_ONDEMAND_ONDEMAND && (Ip6FragOKs || Ip6FragFails || Ip6FragCreates))) {
322 - do_ip_fragsout = CONFIG_ONDEMAND_YES;
321 + if(do_ip_fragsout == CONFIG_BOOLEAN_YES || (do_ip_fragsout == CONFIG_BOOLEAN_AUTO && (Ip6FragOKs || Ip6FragFails || Ip6FragCreates))) {
322 + do_ip_fragsout = CONFIG_BOOLEAN_YES;
323 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".fragsout");
324 if(unlikely(!st)) {
325 st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "fragsout", NULL, "fragments", NULL, "IPv6 Fragments Sent"
@@ -340,14 +340,14 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
340
341 // --------------------------------------------------------------------
342
343 - if(do_ip_fragsin == CONFIG_ONDEMAND_YES || (do_ip_fragsin == CONFIG_ONDEMAND_ONDEMAND
343 + if(do_ip_fragsin == CONFIG_BOOLEAN_YES || (do_ip_fragsin == CONFIG_BOOLEAN_AUTO
344 && (
345 Ip6ReasmOKs
346 || Ip6ReasmFails
347 || Ip6ReasmTimeout
348 || Ip6ReasmReqds
349 ))) {
350 - do_ip_fragsin = CONFIG_ONDEMAND_YES;
350 + do_ip_fragsin = CONFIG_BOOLEAN_YES;
351 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".fragsin");
352 if(unlikely(!st)) {
353 st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "fragsin", NULL, "fragments", NULL
@@ -371,7 +371,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
371
372 // --------------------------------------------------------------------
373
374 - if(do_ip_errors == CONFIG_ONDEMAND_YES || (do_ip_errors == CONFIG_ONDEMAND_ONDEMAND
374 + if(do_ip_errors == CONFIG_BOOLEAN_YES || (do_ip_errors == CONFIG_BOOLEAN_AUTO
375 && (
376 Ip6InDiscards
377 || Ip6OutDiscards
@@ -382,7 +382,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
382 || Ip6InTruncatedPkts
383 || Ip6InNoRoutes
384 ))) {
385 - do_ip_errors = CONFIG_ONDEMAND_YES;
385 + do_ip_errors = CONFIG_BOOLEAN_YES;
386 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".errors");
387 if(unlikely(!st)) {
388 st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "errors", NULL, "errors", NULL, "IPv6 Errors", "packets/s"
@@ -419,8 +419,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
419
420 // --------------------------------------------------------------------
421
422 - if(do_udp_packets == CONFIG_ONDEMAND_YES || (do_udp_packets == CONFIG_ONDEMAND_ONDEMAND && (Udp6InDatagrams || Udp6OutDatagrams))) {
423 - do_udp_packets = CONFIG_ONDEMAND_YES;
422 + if(do_udp_packets == CONFIG_BOOLEAN_YES || (do_udp_packets == CONFIG_BOOLEAN_AUTO && (Udp6InDatagrams || Udp6OutDatagrams))) {
423 + do_udp_packets = CONFIG_BOOLEAN_YES;
424 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".udppackets");
425 if(unlikely(!st)) {
426 st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "udppackets", NULL, "udp", NULL, "IPv6 UDP Packets"
@@ -438,7 +438,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
438
439 // --------------------------------------------------------------------
440
441 - if(do_udp_errors == CONFIG_ONDEMAND_YES || (do_udp_errors == CONFIG_ONDEMAND_ONDEMAND
441 + if(do_udp_errors == CONFIG_BOOLEAN_YES || (do_udp_errors == CONFIG_BOOLEAN_AUTO
442 && (
443 Udp6InErrors
444 || Udp6NoPorts
@@ -447,7 +447,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
447 || Udp6InCsumErrors
448 || Udp6IgnoredMulti
449 ))) {
450 - do_udp_errors = CONFIG_ONDEMAND_YES;
450 + do_udp_errors = CONFIG_BOOLEAN_YES;
451 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".udperrors");
452 if(unlikely(!st)) {
453 st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "udperrors", NULL, "udp", NULL, "IPv6 UDP Errors"
@@ -474,8 +474,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
474
475 // --------------------------------------------------------------------
476
477 - if(do_udplite_packets == CONFIG_ONDEMAND_YES || (do_udplite_packets == CONFIG_ONDEMAND_ONDEMAND && (UdpLite6InDatagrams || UdpLite6OutDatagrams))) {
478 - do_udplite_packets = CONFIG_ONDEMAND_YES;
477 + if(do_udplite_packets == CONFIG_BOOLEAN_YES || (do_udplite_packets == CONFIG_BOOLEAN_AUTO && (UdpLite6InDatagrams || UdpLite6OutDatagrams))) {
478 + do_udplite_packets = CONFIG_BOOLEAN_YES;
479 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".udplitepackets");
480 if(unlikely(!st)) {
481 st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "udplitepackets", NULL, "udplite", NULL
@@ -493,7 +493,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
493
494 // --------------------------------------------------------------------
495
496 - if(do_udplite_errors == CONFIG_ONDEMAND_YES || (do_udplite_errors == CONFIG_ONDEMAND_ONDEMAND
496 + if(do_udplite_errors == CONFIG_BOOLEAN_YES || (do_udplite_errors == CONFIG_BOOLEAN_AUTO
497 && (
498 UdpLite6InErrors
499 || UdpLite6NoPorts
@@ -502,7 +502,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
502 || Udp6InCsumErrors
503 || UdpLite6InCsumErrors
504 ))) {
505 - do_udplite_errors = CONFIG_ONDEMAND_YES;
505 + do_udplite_errors = CONFIG_BOOLEAN_YES;
506 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".udpliteerrors");
507 if(unlikely(!st)) {
508 st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "udpliteerrors", NULL, "udplite", NULL
@@ -527,8 +527,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
527
528 // --------------------------------------------------------------------
529
530 - if(do_mcast == CONFIG_ONDEMAND_YES || (do_mcast == CONFIG_ONDEMAND_ONDEMAND && (Ip6OutMcastOctets || Ip6InMcastOctets))) {
531 - do_mcast = CONFIG_ONDEMAND_YES;
530 + if(do_mcast == CONFIG_BOOLEAN_YES || (do_mcast == CONFIG_BOOLEAN_AUTO && (Ip6OutMcastOctets || Ip6InMcastOctets))) {
531 + do_mcast = CONFIG_BOOLEAN_YES;
532 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".mcast");
533 if(unlikely(!st)) {
534 st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "mcast", NULL, "multicast", NULL
@@ -548,8 +548,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
548
549 // --------------------------------------------------------------------
550
551 - if(do_bcast == CONFIG_ONDEMAND_YES || (do_bcast == CONFIG_ONDEMAND_ONDEMAND && (Ip6OutBcastOctets || Ip6InBcastOctets))) {
552 - do_bcast = CONFIG_ONDEMAND_YES;
551 + if(do_bcast == CONFIG_BOOLEAN_YES || (do_bcast == CONFIG_BOOLEAN_AUTO && (Ip6OutBcastOctets || Ip6InBcastOctets))) {
552 + do_bcast = CONFIG_BOOLEAN_YES;
553 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".bcast");
554 if(unlikely(!st)) {
555 st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "bcast", NULL, "broadcast", NULL
@@ -569,8 +569,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
569
570 // --------------------------------------------------------------------
571
572 - if(do_mcast_p == CONFIG_ONDEMAND_YES || (do_mcast_p == CONFIG_ONDEMAND_ONDEMAND && (Ip6OutMcastPkts || Ip6InMcastPkts))) {
573 - do_mcast_p = CONFIG_ONDEMAND_YES;
572 + if(do_mcast_p == CONFIG_BOOLEAN_YES || (do_mcast_p == CONFIG_BOOLEAN_AUTO && (Ip6OutMcastPkts || Ip6InMcastPkts))) {
573 + do_mcast_p = CONFIG_BOOLEAN_YES;
574 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".mcastpkts");
575 if(unlikely(!st)) {
576 st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "mcastpkts", NULL, "multicast", NULL
@@ -589,8 +589,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
589
590 // --------------------------------------------------------------------
591
592 - if(do_icmp == CONFIG_ONDEMAND_YES || (do_icmp == CONFIG_ONDEMAND_ONDEMAND && (Icmp6InMsgs || Icmp6OutMsgs))) {
593 - do_icmp = CONFIG_ONDEMAND_YES;
592 + if(do_icmp == CONFIG_BOOLEAN_YES || (do_icmp == CONFIG_BOOLEAN_AUTO && (Icmp6InMsgs || Icmp6OutMsgs))) {
593 + do_icmp = CONFIG_BOOLEAN_YES;
594 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".icmp");
595 if(unlikely(!st)) {
596 st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "icmp", NULL, "icmp", NULL, "IPv6 ICMP Messages"
@@ -608,8 +608,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
608
609 // --------------------------------------------------------------------
610
611 - if(do_icmp_redir == CONFIG_ONDEMAND_YES || (do_icmp_redir == CONFIG_ONDEMAND_ONDEMAND && (Icmp6InRedirects || Icmp6OutRedirects))) {
612 - do_icmp_redir = CONFIG_ONDEMAND_YES;
611 + if(do_icmp_redir == CONFIG_BOOLEAN_YES || (do_icmp_redir == CONFIG_BOOLEAN_AUTO && (Icmp6InRedirects || Icmp6OutRedirects))) {
612 + do_icmp_redir = CONFIG_BOOLEAN_YES;
613 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".icmpredir");
614 if(unlikely(!st)) {
615 st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "icmpredir", NULL, "icmp", NULL, "IPv6 ICMP Redirects"
@@ -627,7 +627,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
627
628 // --------------------------------------------------------------------
629
630 - if(do_icmp_errors == CONFIG_ONDEMAND_YES || (do_icmp_errors == CONFIG_ONDEMAND_ONDEMAND
630 + if(do_icmp_errors == CONFIG_BOOLEAN_YES || (do_icmp_errors == CONFIG_BOOLEAN_AUTO
631 && (
632 Icmp6InErrors
633 || Icmp6OutErrors
@@ -641,7 +641,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
641 || Icmp6OutTimeExcds
642 || Icmp6OutParmProblems
643 ))) {
644 - do_icmp_errors = CONFIG_ONDEMAND_YES;
644 + do_icmp_errors = CONFIG_BOOLEAN_YES;
645 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".icmperrors");
646 if(unlikely(!st)) {
647 st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "icmperrors", NULL, "icmp", NULL, "IPv6 ICMP Errors"
@@ -678,14 +678,14 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
678
679 // --------------------------------------------------------------------
680
681 - if(do_icmp_echos == CONFIG_ONDEMAND_YES || (do_icmp_echos == CONFIG_ONDEMAND_ONDEMAND
681 + if(do_icmp_echos == CONFIG_BOOLEAN_YES || (do_icmp_echos == CONFIG_BOOLEAN_AUTO
682 && (
683 Icmp6InEchos
684 || Icmp6OutEchos
685 || Icmp6InEchoReplies
686 || Icmp6OutEchoReplies
687 ))) {
688 - do_icmp_echos = CONFIG_ONDEMAND_YES;
688 + do_icmp_echos = CONFIG_BOOLEAN_YES;
689 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".icmpechos");
690 if(unlikely(!st)) {
691 st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "icmpechos", NULL, "icmp", NULL, "IPv6 ICMP Echo"
@@ -707,7 +707,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
707
708 // --------------------------------------------------------------------
709
710 - if(do_icmp_groupmemb == CONFIG_ONDEMAND_YES || (do_icmp_groupmemb == CONFIG_ONDEMAND_ONDEMAND
710 + if(do_icmp_groupmemb == CONFIG_BOOLEAN_YES || (do_icmp_groupmemb == CONFIG_BOOLEAN_AUTO
711 && (
712 Icmp6InGroupMembQueries
713 || Icmp6OutGroupMembQueries
@@ -716,7 +716,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
716 || Icmp6InGroupMembReductions
717 || Icmp6OutGroupMembReductions
718 ))) {
719 - do_icmp_groupmemb = CONFIG_ONDEMAND_YES;
719 + do_icmp_groupmemb = CONFIG_BOOLEAN_YES;
720 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".groupmemb");
721 if(unlikely(!st)) {
722 st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "groupmemb", NULL, "icmp", NULL
@@ -743,14 +743,14 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
743
744 // --------------------------------------------------------------------
745
746 - if(do_icmp_router == CONFIG_ONDEMAND_YES || (do_icmp_router == CONFIG_ONDEMAND_ONDEMAND
746 + if(do_icmp_router == CONFIG_BOOLEAN_YES || (do_icmp_router == CONFIG_BOOLEAN_AUTO
747 && (
748 Icmp6InRouterSolicits
749 || Icmp6OutRouterSolicits
750 || Icmp6InRouterAdvertisements
751 || Icmp6OutRouterAdvertisements
752 ))) {
753 - do_icmp_router = CONFIG_ONDEMAND_YES;
753 + do_icmp_router = CONFIG_BOOLEAN_YES;
754 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".icmprouter");
755 if(unlikely(!st)) {
756 st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "icmprouter", NULL, "icmp", NULL, "IPv6 Router Messages"
@@ -772,14 +772,14 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
772
773 // --------------------------------------------------------------------
774
775 - if(do_icmp_neighbor == CONFIG_ONDEMAND_YES || (do_icmp_neighbor == CONFIG_ONDEMAND_ONDEMAND
775 + if(do_icmp_neighbor == CONFIG_BOOLEAN_YES || (do_icmp_neighbor == CONFIG_BOOLEAN_AUTO
776 && (
777 Icmp6InNeighborSolicits
778 || Icmp6OutNeighborSolicits
779 || Icmp6InNeighborAdvertisements
780 || Icmp6OutNeighborAdvertisements
781 ))) {
782 - do_icmp_neighbor = CONFIG_ONDEMAND_YES;
782 + do_icmp_neighbor = CONFIG_BOOLEAN_YES;
783 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".icmpneighbor");
784 if(unlikely(!st)) {
785 st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "icmpneighbor", NULL, "icmp", NULL
@@ -802,8 +802,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
802
803 // --------------------------------------------------------------------
804
805 - if(do_icmp_mldv2 == CONFIG_ONDEMAND_YES || (do_icmp_mldv2 == CONFIG_ONDEMAND_ONDEMAND && (Icmp6InMLDv2Reports || Icmp6OutMLDv2Reports))) {
806 - do_icmp_mldv2 = CONFIG_ONDEMAND_YES;
805 + if(do_icmp_mldv2 == CONFIG_BOOLEAN_YES || (do_icmp_mldv2 == CONFIG_BOOLEAN_AUTO && (Icmp6InMLDv2Reports || Icmp6OutMLDv2Reports))) {
806 + do_icmp_mldv2 = CONFIG_BOOLEAN_YES;
807 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".icmpmldv2");
808 if(unlikely(!st)) {
809 st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "icmpmldv2", NULL, "icmp", NULL, "IPv6 ICMP MLDv2 Reports"
@@ -821,7 +821,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
821
822 // --------------------------------------------------------------------
823
824 - if(do_icmp_types == CONFIG_ONDEMAND_YES || (do_icmp_types == CONFIG_ONDEMAND_ONDEMAND
824 + if(do_icmp_types == CONFIG_BOOLEAN_YES || (do_icmp_types == CONFIG_BOOLEAN_AUTO
825 && (
826 Icmp6InType1
827 || Icmp6InType128
@@ -834,7 +834,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
834 || Icmp6OutType135
835 || Icmp6OutType143
836 ))) {
837 - do_icmp_types = CONFIG_ONDEMAND_YES;
837 + do_icmp_types = CONFIG_BOOLEAN_YES;
838 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".icmptypes");
839 if(unlikely(!st)) {
840 st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "icmptypes", NULL, "icmp", NULL, "IPv6 ICMP Types"
@@ -868,14 +868,14 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
868
869 // --------------------------------------------------------------------
870
871 - if(do_ect == CONFIG_ONDEMAND_YES || (do_ect == CONFIG_ONDEMAND_ONDEMAND
871 + if(do_ect == CONFIG_BOOLEAN_YES || (do_ect == CONFIG_BOOLEAN_AUTO
872 && (
873 Ip6InNoECTPkts
874 || Ip6InECT1Pkts
875 || Ip6InECT0Pkts
876 || Ip6InCEPkts
877 ))) {
878 - do_ect = CONFIG_ONDEMAND_YES;
878 + do_ect = CONFIG_BOOLEAN_YES;
879 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".ect");
880 if(unlikely(!st)) {
881 st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "ect", NULL, "packets", NULL, "IPv6 ECT Packets"
src/proc_net_stat_synproxy.c
+12 -12
@@ -10,10 +10,10 @@ int do_proc_net_stat_synproxy(int update_every, usec_t dt) {
10 static procfile *ff = NULL;
11
12 if(unlikely(do_entries == -1)) {
13 - do_entries = config_get_boolean_ondemand("plugin:proc:/proc/net/stat/synproxy", "SYNPROXY entries", CONFIG_ONDEMAND_ONDEMAND);
14 - do_cookies = config_get_boolean_ondemand("plugin:proc:/proc/net/stat/synproxy", "SYNPROXY cookies", CONFIG_ONDEMAND_ONDEMAND);
15 - do_syns = config_get_boolean_ondemand("plugin:proc:/proc/net/stat/synproxy", "SYNPROXY SYN received", CONFIG_ONDEMAND_ONDEMAND);
16 - do_reopened = config_get_boolean_ondemand("plugin:proc:/proc/net/stat/synproxy", "SYNPROXY connections reopened", CONFIG_ONDEMAND_ONDEMAND);
13 + do_entries = config_get_boolean_ondemand("plugin:proc:/proc/net/stat/synproxy", "SYNPROXY entries", CONFIG_BOOLEAN_AUTO);
14 + do_cookies = config_get_boolean_ondemand("plugin:proc:/proc/net/stat/synproxy", "SYNPROXY cookies", CONFIG_BOOLEAN_AUTO);
15 + do_syns = config_get_boolean_ondemand("plugin:proc:/proc/net/stat/synproxy", "SYNPROXY SYN received", CONFIG_BOOLEAN_AUTO);
16 + do_reopened = config_get_boolean_ondemand("plugin:proc:/proc/net/stat/synproxy", "SYNPROXY connections reopened", CONFIG_BOOLEAN_AUTO);
17 }
18
19 if(unlikely(!ff)) {
@@ -57,8 +57,8 @@ int do_proc_net_stat_synproxy(int update_every, usec_t dt) {
57
58 // --------------------------------------------------------------------
59
60 - if((do_entries == CONFIG_ONDEMAND_ONDEMAND && events) || do_entries == CONFIG_ONDEMAND_YES) {
61 - do_entries = CONFIG_ONDEMAND_YES;
60 + if((do_entries == CONFIG_BOOLEAN_AUTO && events) || do_entries == CONFIG_BOOLEAN_YES) {
61 + do_entries = CONFIG_BOOLEAN_YES;
62
63 st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_SYNPROXY "_entries");
64 if(unlikely(!st)) {
@@ -76,8 +76,8 @@ int do_proc_net_stat_synproxy(int update_every, usec_t dt) {
76
77 // --------------------------------------------------------------------
78
79 - if((do_syns == CONFIG_ONDEMAND_ONDEMAND && events) || do_syns == CONFIG_ONDEMAND_YES) {
80 - do_syns = CONFIG_ONDEMAND_YES;
79 + if((do_syns == CONFIG_BOOLEAN_AUTO && events) || do_syns == CONFIG_BOOLEAN_YES) {
80 + do_syns = CONFIG_BOOLEAN_YES;
81
82 st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_SYNPROXY "_syn_received");
83 if(unlikely(!st)) {
@@ -95,8 +95,8 @@ int do_proc_net_stat_synproxy(int update_every, usec_t dt) {
95
96 // --------------------------------------------------------------------
97
98 - if((do_reopened == CONFIG_ONDEMAND_ONDEMAND && events) || do_reopened == CONFIG_ONDEMAND_YES) {
99 - do_reopened = CONFIG_ONDEMAND_YES;
98 + if((do_reopened == CONFIG_BOOLEAN_AUTO && events) || do_reopened == CONFIG_BOOLEAN_YES) {
99 + do_reopened = CONFIG_BOOLEAN_YES;
100
101 st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_SYNPROXY "_conn_reopened");
102 if(unlikely(!st)) {
@@ -114,8 +114,8 @@ int do_proc_net_stat_synproxy(int update_every, usec_t dt) {
114
115 // --------------------------------------------------------------------
116
117 - if((do_cookies == CONFIG_ONDEMAND_ONDEMAND && events) || do_cookies == CONFIG_ONDEMAND_YES) {
118 - do_cookies = CONFIG_ONDEMAND_YES;
117 + if((do_cookies == CONFIG_BOOLEAN_AUTO && events) || do_cookies == CONFIG_BOOLEAN_YES) {
118 + do_cookies = CONFIG_BOOLEAN_YES;
119
120 st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_SYNPROXY "_cookies");
121 if(unlikely(!st)) {
src/proc_vmstat.c
+8 -8
@@ -25,10 +25,10 @@ int do_proc_vmstat(int update_every, usec_t dt) {
25 static unsigned long long pswpout = 0ULL;
26
27 if(unlikely(!arl_base)) {
28 - do_swapio = config_get_boolean_ondemand("plugin:proc:/proc/vmstat", "swap i/o", CONFIG_ONDEMAND_ONDEMAND);
28 + do_swapio = config_get_boolean_ondemand("plugin:proc:/proc/vmstat", "swap i/o", CONFIG_BOOLEAN_AUTO);
29 do_io = config_get_boolean("plugin:proc:/proc/vmstat", "disk i/o", 1);
30 do_pgfaults = config_get_boolean("plugin:proc:/proc/vmstat", "memory page faults", 1);
31 - do_numa = config_get_boolean_ondemand("plugin:proc:/proc/vmstat", "system-wide numa metric summary", CONFIG_ONDEMAND_ONDEMAND);
31 + do_numa = config_get_boolean_ondemand("plugin:proc:/proc/vmstat", "system-wide numa metric summary", CONFIG_BOOLEAN_AUTO);
32
33
34 arl_base = arl_create("vmstat", NULL, 60);
@@ -39,7 +39,7 @@ int do_proc_vmstat(int update_every, usec_t dt) {
39 arl_expect(arl_base, "pswpin", &pswpin);
40 arl_expect(arl_base, "pswpout", &pswpout);
41
42 - if(do_numa == CONFIG_ONDEMAND_YES || (do_numa == CONFIG_ONDEMAND_ONDEMAND && get_numa_node_count() >= 2)) {
42 + if(do_numa == CONFIG_BOOLEAN_YES || (do_numa == CONFIG_BOOLEAN_AUTO && get_numa_node_count() >= 2)) {
43 arl_expect(arl_base, "numa_foreign", &numa_foreign);
44 arl_expect(arl_base, "numa_hint_faults_local", &numa_hint_faults_local);
45 arl_expect(arl_base, "numa_hint_faults", &numa_hint_faults);
@@ -56,7 +56,7 @@ int do_proc_vmstat(int update_every, usec_t dt) {
56 // when all the expected metrics are collected.
57 // Also ARL will not parse their values.
58 has_numa = 0;
59 - do_numa = CONFIG_ONDEMAND_NO;
59 + do_numa = CONFIG_BOOLEAN_NO;
60 }
61 }
62
@@ -87,8 +87,8 @@ int do_proc_vmstat(int update_every, usec_t dt) {
87
88 // --------------------------------------------------------------------
89
90 - if(pswpin || pswpout || do_swapio == CONFIG_ONDEMAND_YES) {
91 - do_swapio = CONFIG_ONDEMAND_YES;
90 + if(pswpin || pswpout || do_swapio == CONFIG_BOOLEAN_YES) {
91 + do_swapio = CONFIG_BOOLEAN_YES;
92
93 static RRDSET *st_swapio = NULL;
94 if(unlikely(!st_swapio)) {
@@ -152,8 +152,8 @@ int do_proc_vmstat(int update_every, usec_t dt) {
152 has_numa = (numa_local || numa_foreign || numa_interleave || numa_other || numa_pte_updates ||
153 numa_huge_pte_updates || numa_hint_faults || numa_hint_faults_local || numa_pages_migrated) ? 1 : 0;
154
155 - if(do_numa == CONFIG_ONDEMAND_YES || (do_numa == CONFIG_ONDEMAND_ONDEMAND && has_numa)) {
156 - do_numa = CONFIG_ONDEMAND_YES;
155 + if(do_numa == CONFIG_BOOLEAN_YES || (do_numa == CONFIG_BOOLEAN_AUTO && has_numa)) {
156 + do_numa = CONFIG_BOOLEAN_YES;
157
158 static RRDSET *st_numa = NULL;
159 if(unlikely(!st_numa)) {
src/sys_devices_system_edac_mc.c
+8 -8
@@ -76,11 +76,11 @@ int do_proc_sys_devices_system_edac_mc(int update_every, usec_t dt) {
76 struct mc *m;
77
78 if(unlikely(do_ce == -1)) {
79 - do_ce = config_get_boolean_ondemand("plugin:proc:/sys/devices/system/edac/mc", "enable ECC memory correctable errors", CONFIG_ONDEMAND_ONDEMAND);
80 - do_ue = config_get_boolean_ondemand("plugin:proc:/sys/devices/system/edac/mc", "enable ECC memory uncorrectable errors", CONFIG_ONDEMAND_ONDEMAND);
79 + do_ce = config_get_boolean_ondemand("plugin:proc:/sys/devices/system/edac/mc", "enable ECC memory correctable errors", CONFIG_BOOLEAN_AUTO);
80 + do_ue = config_get_boolean_ondemand("plugin:proc:/sys/devices/system/edac/mc", "enable ECC memory uncorrectable errors", CONFIG_BOOLEAN_AUTO);
81 }
82
83 - if(do_ce != CONFIG_ONDEMAND_NO) {
83 + if(do_ce != CONFIG_BOOLEAN_NO) {
84 for(m = mc_root; m; m = m->next) {
85 if(m->ce_count_filename) {
86 m->ce_updated = 0;
@@ -102,7 +102,7 @@ int do_proc_sys_devices_system_edac_mc(int update_every, usec_t dt) {
102 }
103 }
104
105 - if(do_ue != CONFIG_ONDEMAND_NO) {
105 + if(do_ue != CONFIG_BOOLEAN_NO) {
106 for(m = mc_root; m; m = m->next) {
107 if(m->ue_count_filename) {
108 m->ue_updated = 0;
@@ -126,8 +126,8 @@ int do_proc_sys_devices_system_edac_mc(int update_every, usec_t dt) {
126
127 // --------------------------------------------------------------------
128
129 - if(do_ce == CONFIG_ONDEMAND_YES || (do_ce == CONFIG_ONDEMAND_ONDEMAND && ce_sum > 0)) {
130 - do_ce = CONFIG_ONDEMAND_YES;
129 + if(do_ce == CONFIG_BOOLEAN_YES || (do_ce == CONFIG_BOOLEAN_AUTO && ce_sum > 0)) {
130 + do_ce = CONFIG_BOOLEAN_YES;
131
132 static RRDSET *ce_st = NULL;
133
@@ -153,8 +153,8 @@ int do_proc_sys_devices_system_edac_mc(int update_every, usec_t dt) {
153
154 // --------------------------------------------------------------------
155
156 - if(do_ue == CONFIG_ONDEMAND_YES || (do_ue == CONFIG_ONDEMAND_ONDEMAND && ue_sum > 0)) {
157 - do_ue = CONFIG_ONDEMAND_YES;
156 + if(do_ue == CONFIG_BOOLEAN_YES || (do_ue == CONFIG_BOOLEAN_AUTO && ue_sum > 0)) {
157 + do_ue = CONFIG_BOOLEAN_YES;
158
159 static RRDSET *ue_st = NULL;
160
src/sys_devices_system_node.c
+2 -2
@@ -72,10 +72,10 @@ int do_proc_sys_devices_system_node(int update_every, usec_t dt) {
72 struct node *m;
73
74 if(unlikely(do_numastat == -1)) {
75 - do_numastat = config_get_boolean_ondemand("plugin:proc:/sys/devices/system/node", "enable per-node numa metrics", CONFIG_ONDEMAND_ONDEMAND);
75 + do_numastat = config_get_boolean_ondemand("plugin:proc:/sys/devices/system/node", "enable per-node numa metrics", CONFIG_BOOLEAN_AUTO);
76 }
77
78 - if(do_numastat == CONFIG_ONDEMAND_YES || (do_numastat == CONFIG_ONDEMAND_ONDEMAND && numa_node_count >= 2)) {
78 + if(do_numastat == CONFIG_BOOLEAN_YES || (do_numastat == CONFIG_BOOLEAN_AUTO && numa_node_count >= 2)) {
79 for(m = numa_root; m; m = m->next) {
80 if(m->numastat_filename) {
81 if(unlikely(!m->numastat_ff)) {
src/sys_fs_cgroup.c
+66 -66
@@ -8,22 +8,22 @@
8
9 static long system_page_size = 4096; // system will be queried via sysconf() in configuration()
10
11 -static int cgroup_enable_cpuacct_stat = CONFIG_ONDEMAND_ONDEMAND;
12 -static int cgroup_enable_cpuacct_usage = CONFIG_ONDEMAND_ONDEMAND;
13 -static int cgroup_enable_memory = CONFIG_ONDEMAND_ONDEMAND;
14 -static int cgroup_enable_detailed_memory = CONFIG_ONDEMAND_ONDEMAND;
15 -static int cgroup_enable_memory_failcnt = CONFIG_ONDEMAND_ONDEMAND;
16 -static int cgroup_enable_swap = CONFIG_ONDEMAND_ONDEMAND;
17 -static int cgroup_enable_blkio_io = CONFIG_ONDEMAND_ONDEMAND;
18 -static int cgroup_enable_blkio_ops = CONFIG_ONDEMAND_ONDEMAND;
19 -static int cgroup_enable_blkio_throttle_io = CONFIG_ONDEMAND_ONDEMAND;
20 -static int cgroup_enable_blkio_throttle_ops = CONFIG_ONDEMAND_ONDEMAND;
21 -static int cgroup_enable_blkio_merged_ops = CONFIG_ONDEMAND_ONDEMAND;
22 -static int cgroup_enable_blkio_queued_ops = CONFIG_ONDEMAND_ONDEMAND;
23 -
24 -static int cgroup_enable_systemd_services = CONFIG_ONDEMAND_YES;
25 -static int cgroup_enable_systemd_services_detailed_memory = CONFIG_ONDEMAND_NO;
26 -static int cgroup_used_memory_without_cache = CONFIG_ONDEMAND_YES;
11 +static int cgroup_enable_cpuacct_stat = CONFIG_BOOLEAN_AUTO;
12 +static int cgroup_enable_cpuacct_usage = CONFIG_BOOLEAN_AUTO;
13 +static int cgroup_enable_memory = CONFIG_BOOLEAN_AUTO;
14 +static int cgroup_enable_detailed_memory = CONFIG_BOOLEAN_AUTO;
15 +static int cgroup_enable_memory_failcnt = CONFIG_BOOLEAN_AUTO;
16 +static int cgroup_enable_swap = CONFIG_BOOLEAN_AUTO;
17 +static int cgroup_enable_blkio_io = CONFIG_BOOLEAN_AUTO;
18 +static int cgroup_enable_blkio_ops = CONFIG_BOOLEAN_AUTO;
19 +static int cgroup_enable_blkio_throttle_io = CONFIG_BOOLEAN_AUTO;
20 +static int cgroup_enable_blkio_throttle_ops = CONFIG_BOOLEAN_AUTO;
21 +static int cgroup_enable_blkio_merged_ops = CONFIG_BOOLEAN_AUTO;
22 +static int cgroup_enable_blkio_queued_ops = CONFIG_BOOLEAN_AUTO;
23 +
24 +static int cgroup_enable_systemd_services = CONFIG_BOOLEAN_YES;
25 +static int cgroup_enable_systemd_services_detailed_memory = CONFIG_BOOLEAN_NO;
26 +static int cgroup_used_memory_without_cache = CONFIG_BOOLEAN_YES;
27
28 static int cgroup_search_in_devices = 1;
29
@@ -211,7 +211,7 @@ void read_cgroup_plugin_configuration() {
211
212 struct blkio {
213 int updated;
214 - int enabled; // CONFIG_ONDEMAND_YES or CONFIG_ONDEMAND_ONDEMAND
214 + int enabled; // CONFIG_BOOLEAN_YES or CONFIG_BOOLEAN_AUTO
215 int delay_counter;
216
217 char *filename;
@@ -236,10 +236,10 @@ struct memory {
236 int updated_msw_usage_in_bytes;
237 int updated_failcnt;
238
239 - int enabled_detailed; // CONFIG_ONDEMAND_YES or CONFIG_ONDEMAND_ONDEMAND
240 - int enabled_usage_in_bytes; // CONFIG_ONDEMAND_YES or CONFIG_ONDEMAND_ONDEMAND
241 - int enabled_msw_usage_in_bytes; // CONFIG_ONDEMAND_YES or CONFIG_ONDEMAND_ONDEMAND
242 - int enabled_failcnt; // CONFIG_ONDEMAND_YES or CONFIG_ONDEMAND_ONDEMAND
239 + int enabled_detailed; // CONFIG_BOOLEAN_YES or CONFIG_BOOLEAN_AUTO
240 + int enabled_usage_in_bytes; // CONFIG_BOOLEAN_YES or CONFIG_BOOLEAN_AUTO
241 + int enabled_msw_usage_in_bytes; // CONFIG_BOOLEAN_YES or CONFIG_BOOLEAN_AUTO
242 + int enabled_failcnt; // CONFIG_BOOLEAN_YES or CONFIG_BOOLEAN_AUTO
243
244 int delay_counter_detailed;
245 int delay_counter_failcnt;
@@ -298,7 +298,7 @@ struct memory {
298 // https://www.kernel.org/doc/Documentation/cgroup-v1/cpuacct.txt
299 struct cpuacct_stat {
300 int updated;
301 - int enabled; // CONFIG_ONDEMAND_YES or CONFIG_ONDEMAND_ONDEMAND
301 + int enabled; // CONFIG_BOOLEAN_YES or CONFIG_BOOLEAN_AUTO
302
303 char *filename;
304
@@ -309,7 +309,7 @@ struct cpuacct_stat {
309 // https://www.kernel.org/doc/Documentation/cgroup-v1/cpuacct.txt
310 struct cpuacct_usage {
311 int updated;
312 - int enabled; // CONFIG_ONDEMAND_YES or CONFIG_ONDEMAND_ONDEMAND
312 + int enabled; // CONFIG_BOOLEAN_YES or CONFIG_BOOLEAN_AUTO
313
314 char *filename;
315
@@ -437,8 +437,8 @@ static inline void cgroup_read_cpuacct_stat(struct cpuacct_stat *cp) {
437
438 cp->updated = 1;
439
440 - if(unlikely(cp->enabled == CONFIG_ONDEMAND_ONDEMAND && (cp->user || cp->system)))
441 - cp->enabled = CONFIG_ONDEMAND_YES;
440 + if(unlikely(cp->enabled == CONFIG_BOOLEAN_AUTO && (cp->user || cp->system)))
441 + cp->enabled = CONFIG_BOOLEAN_YES;
442 }
443 }
444
@@ -492,15 +492,15 @@ static inline void cgroup_read_cpuacct_usage(struct cpuacct_usage *ca) {
492
493 ca->updated = 1;
494
495 - if(unlikely(ca->enabled == CONFIG_ONDEMAND_ONDEMAND && total))
496 - ca->enabled = CONFIG_ONDEMAND_YES;
495 + if(unlikely(ca->enabled == CONFIG_BOOLEAN_AUTO && total))
496 + ca->enabled = CONFIG_BOOLEAN_YES;
497 }
498 }
499
500 static inline void cgroup_read_blkio(struct blkio *io) {
501 static procfile *ff = NULL;
502
503 - if(unlikely(io->enabled == CONFIG_ONDEMAND_ONDEMAND && io->delay_counter > 0)) {
503 + if(unlikely(io->enabled == CONFIG_BOOLEAN_AUTO && io->delay_counter > 0)) {
504 io->delay_counter--;
505 return;
506 }
@@ -558,9 +558,9 @@ static inline void cgroup_read_blkio(struct blkio *io) {
558
559 io->updated = 1;
560
561 - if(unlikely(io->enabled == CONFIG_ONDEMAND_ONDEMAND)) {
561 + if(unlikely(io->enabled == CONFIG_BOOLEAN_AUTO)) {
562 if(unlikely(io->Read || io->Write))
563 - io->enabled = CONFIG_ONDEMAND_YES;
563 + io->enabled = CONFIG_BOOLEAN_YES;
564 else
565 io->delay_counter = cgroup_recheck_zero_blkio_every_iterations;
566 }
@@ -572,7 +572,7 @@ static inline void cgroup_read_memory(struct memory *mem) {
572
573 // read detailed ram usage
574 if(likely(mem->filename_detailed)) {
575 - if(unlikely(mem->enabled_detailed == CONFIG_ONDEMAND_ONDEMAND && mem->delay_counter_detailed > 0)) {
575 + if(unlikely(mem->enabled_detailed == CONFIG_BOOLEAN_AUTO && mem->delay_counter_detailed > 0)) {
576 mem->delay_counter_detailed--;
577 goto memory_next;
578 }
@@ -631,9 +631,9 @@ static inline void cgroup_read_memory(struct memory *mem) {
631
632 mem->updated_detailed = 1;
633
634 - if(unlikely(mem->enabled_detailed == CONFIG_ONDEMAND_ONDEMAND)) {
634 + if(unlikely(mem->enabled_detailed == CONFIG_BOOLEAN_AUTO)) {
635 if(mem->cache || mem->dirty || mem->rss || mem->rss_huge || mem->mapped_file || mem->writeback || mem->swap || mem->pgpgin || mem->pgpgout || mem->pgfault || mem->pgmajfault)
636 - mem->enabled_detailed = CONFIG_ONDEMAND_YES;
636 + mem->enabled_detailed = CONFIG_BOOLEAN_YES;
637 else
638 mem->delay_counter_detailed = cgroup_recheck_zero_mem_detailed_every_iterations;
639 }
@@ -644,30 +644,30 @@ memory_next:
644 // read usage_in_bytes
645 if(likely(mem->filename_usage_in_bytes)) {
646 mem->updated_usage_in_bytes = !read_single_number_file(mem->filename_usage_in_bytes, &mem->usage_in_bytes);
647 - if(unlikely(mem->updated_usage_in_bytes && mem->enabled_usage_in_bytes == CONFIG_ONDEMAND_ONDEMAND && mem->usage_in_bytes))
648 - mem->enabled_usage_in_bytes = CONFIG_ONDEMAND_YES;
647 + if(unlikely(mem->updated_usage_in_bytes && mem->enabled_usage_in_bytes == CONFIG_BOOLEAN_AUTO && mem->usage_in_bytes))
648 + mem->enabled_usage_in_bytes = CONFIG_BOOLEAN_YES;
649 }
650
651 // read msw_usage_in_bytes
652 if(likely(mem->filename_msw_usage_in_bytes)) {
653 mem->updated_msw_usage_in_bytes = !read_single_number_file(mem->filename_msw_usage_in_bytes, &mem->msw_usage_in_bytes);
654 - if(unlikely(mem->updated_msw_usage_in_bytes && mem->enabled_msw_usage_in_bytes == CONFIG_ONDEMAND_ONDEMAND && mem->msw_usage_in_bytes))
655 - mem->enabled_msw_usage_in_bytes = CONFIG_ONDEMAND_YES;
654 + if(unlikely(mem->updated_msw_usage_in_bytes && mem->enabled_msw_usage_in_bytes == CONFIG_BOOLEAN_AUTO && mem->msw_usage_in_bytes))
655 + mem->enabled_msw_usage_in_bytes = CONFIG_BOOLEAN_YES;
656 }
657
658 // read failcnt
659 if(likely(mem->filename_failcnt)) {
660 - if(unlikely(mem->enabled_failcnt == CONFIG_ONDEMAND_ONDEMAND && mem->delay_counter_failcnt > 0)) {
660 + if(unlikely(mem->enabled_failcnt == CONFIG_BOOLEAN_AUTO && mem->delay_counter_failcnt > 0)) {
661 mem->updated_failcnt = 0;
662 mem->delay_counter_failcnt--;
663 }
664 else {
665 mem->updated_failcnt = !read_single_number_file(mem->filename_failcnt, &mem->failcnt);
666 - if(unlikely(mem->updated_failcnt && mem->enabled_failcnt == CONFIG_ONDEMAND_ONDEMAND)) {
666 + if(unlikely(mem->updated_failcnt && mem->enabled_failcnt == CONFIG_BOOLEAN_AUTO)) {
667 if(unlikely(!mem->failcnt))
668 mem->delay_counter_failcnt = cgroup_recheck_zero_mem_failcnt_every_iterations;
669 else
670 - mem->enabled_failcnt = CONFIG_ONDEMAND_YES;
670 + mem->enabled_failcnt = CONFIG_BOOLEAN_YES;
671 }
672 }
673 }
@@ -1074,7 +1074,7 @@ static inline void find_all_cgroups() {
1074 if(cgroup_enable_cpuacct_stat || cgroup_enable_cpuacct_usage) {
1075 if(find_dir_in_subdirs(cgroup_cpuacct_base, NULL, found_subdir_in_dir) == -1) {
1076 cgroup_enable_cpuacct_stat =
1077 - cgroup_enable_cpuacct_usage = CONFIG_ONDEMAND_NO;
1077 + cgroup_enable_cpuacct_usage = CONFIG_BOOLEAN_NO;
1078 error("disabled CGROUP cpu statistics.");
1079 }
1080 }
@@ -1086,7 +1086,7 @@ static inline void find_all_cgroups() {
1086 cgroup_enable_blkio_throttle_io =
1087 cgroup_enable_blkio_throttle_ops =
1088 cgroup_enable_blkio_merged_ops =
1089 - cgroup_enable_blkio_queued_ops = CONFIG_ONDEMAND_NO;
1089 + cgroup_enable_blkio_queued_ops = CONFIG_BOOLEAN_NO;
1090 error("disabled CGROUP blkio statistics.");
1091 }
1092 }
@@ -1096,7 +1096,7 @@ static inline void find_all_cgroups() {
1096 cgroup_enable_memory =
1097 cgroup_enable_detailed_memory =
1098 cgroup_enable_swap =
1099 - cgroup_enable_memory_failcnt = CONFIG_ONDEMAND_NO;
1099 + cgroup_enable_memory_failcnt = CONFIG_BOOLEAN_NO;
1100 error("disabled CGROUP memory statistics.");
1101 }
1102 }
@@ -1150,7 +1150,7 @@ static inline void find_all_cgroups() {
1150 snprintfz(filename, FILENAME_MAX, "%s%s/memory.stat", cgroup_memory_base, cg->id);
1151 if(likely(stat(filename, &buf) != -1)) {
1152 cg->memory.filename_detailed = strdupz(filename);
1153 - cg->memory.enabled_detailed = (cgroup_enable_detailed_memory == CONFIG_ONDEMAND_YES)?CONFIG_ONDEMAND_YES:CONFIG_ONDEMAND_ONDEMAND;
1153 + cg->memory.enabled_detailed = (cgroup_enable_detailed_memory == CONFIG_BOOLEAN_YES)?CONFIG_BOOLEAN_YES:CONFIG_BOOLEAN_AUTO;
1154 debug(D_CGROUP, "memory.stat filename for cgroup '%s': '%s'", cg->id, cg->memory.filename_detailed);
1155 }
1156 else
@@ -1836,25 +1836,25 @@ void update_cgroup_charts(int update_every) {
1836 continue;
1837
1838 if(likely(cgroup_enable_systemd_services && cg->options & CGROUP_OPTIONS_SYSTEM_SLICE_SERVICE)) {
1839 - if(cg->cpuacct_stat.updated && cg->cpuacct_stat.enabled == CONFIG_ONDEMAND_YES) services_do_cpu++;
1839 + if(cg->cpuacct_stat.updated && cg->cpuacct_stat.enabled == CONFIG_BOOLEAN_YES) services_do_cpu++;
1840
1841 if(cgroup_enable_systemd_services_detailed_memory && cg->memory.updated_detailed && cg->memory.enabled_detailed) services_do_mem_detailed++;
1842 - if(cg->memory.updated_usage_in_bytes && cg->memory.enabled_usage_in_bytes == CONFIG_ONDEMAND_YES) services_do_mem_usage++;
1843 - if(cg->memory.updated_failcnt && cg->memory.enabled_failcnt == CONFIG_ONDEMAND_YES) services_do_mem_failcnt++;
1844 - if(cg->memory.updated_msw_usage_in_bytes && cg->memory.enabled_msw_usage_in_bytes == CONFIG_ONDEMAND_YES) services_do_swap_usage++;
1845 -
1846 - if(cg->io_service_bytes.updated && cg->io_service_bytes.enabled == CONFIG_ONDEMAND_YES) services_do_io++;
1847 - if(cg->io_serviced.updated && cg->io_serviced.enabled == CONFIG_ONDEMAND_YES) services_do_io_ops++;
1848 - if(cg->throttle_io_service_bytes.updated && cg->throttle_io_service_bytes.enabled == CONFIG_ONDEMAND_YES) services_do_throttle_io++;
1849 - if(cg->throttle_io_serviced.updated && cg->throttle_io_serviced.enabled == CONFIG_ONDEMAND_YES) services_do_throttle_ops++;
1850 - if(cg->io_queued.updated && cg->io_queued.enabled == CONFIG_ONDEMAND_YES) services_do_queued_ops++;
1851 - if(cg->io_merged.updated && cg->io_merged.enabled == CONFIG_ONDEMAND_YES) services_do_merged_ops++;
1842 + if(cg->memory.updated_usage_in_bytes && cg->memory.enabled_usage_in_bytes == CONFIG_BOOLEAN_YES) services_do_mem_usage++;
1843 + if(cg->memory.updated_failcnt && cg->memory.enabled_failcnt == CONFIG_BOOLEAN_YES) services_do_mem_failcnt++;
1844 + if(cg->memory.updated_msw_usage_in_bytes && cg->memory.enabled_msw_usage_in_bytes == CONFIG_BOOLEAN_YES) services_do_swap_usage++;
1845 +
1846 + if(cg->io_service_bytes.updated && cg->io_service_bytes.enabled == CONFIG_BOOLEAN_YES) services_do_io++;
1847 + if(cg->io_serviced.updated && cg->io_serviced.enabled == CONFIG_BOOLEAN_YES) services_do_io_ops++;
1848 + if(cg->throttle_io_service_bytes.updated && cg->throttle_io_service_bytes.enabled == CONFIG_BOOLEAN_YES) services_do_throttle_io++;
1849 + if(cg->throttle_io_serviced.updated && cg->throttle_io_serviced.enabled == CONFIG_BOOLEAN_YES) services_do_throttle_ops++;
1850 + if(cg->io_queued.updated && cg->io_queued.enabled == CONFIG_BOOLEAN_YES) services_do_queued_ops++;
1851 + if(cg->io_merged.updated && cg->io_merged.enabled == CONFIG_BOOLEAN_YES) services_do_merged_ops++;
1852 continue;
1853 }
1854
1855 type[0] = '\0';
1856
1857 - if(likely(cg->cpuacct_stat.updated && cg->cpuacct_stat.enabled == CONFIG_ONDEMAND_YES)) {
1857 + if(likely(cg->cpuacct_stat.updated && cg->cpuacct_stat.enabled == CONFIG_BOOLEAN_YES)) {
1858 if(unlikely(!cg->st_cpu)) {
1859 cg->st_cpu = rrdset_find_bytype_localhost(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX)
1860 , "cpu");
@@ -1874,7 +1874,7 @@ void update_cgroup_charts(int update_every) {
1874 rrdset_done(cg->st_cpu);
1875 }
1876
1877 - if(likely(cg->cpuacct_usage.updated && cg->cpuacct_usage.enabled == CONFIG_ONDEMAND_YES)) {
1877 + if(likely(cg->cpuacct_usage.updated && cg->cpuacct_usage.enabled == CONFIG_BOOLEAN_YES)) {
1878 char id[RRD_ID_LENGTH_MAX + 1];
1879 unsigned int i;
1880
@@ -1902,7 +1902,7 @@ void update_cgroup_charts(int update_every) {
1902 rrdset_done(cg->st_cpu_per_core);
1903 }
1904
1905 - if(likely(cg->memory.updated_detailed && cg->memory.enabled_detailed == CONFIG_ONDEMAND_YES)) {
1905 + if(likely(cg->memory.updated_detailed && cg->memory.enabled_detailed == CONFIG_BOOLEAN_YES)) {
1906 if(unlikely(!cg->st_mem)) {
1907 cg->st_mem = rrdset_find_bytype_localhost(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX)
1908 , "mem");
@@ -1991,7 +1991,7 @@ void update_cgroup_charts(int update_every) {
1991 rrdset_done(cg->st_pgfaults);
1992 }
1993
1994 - if(likely(cg->memory.updated_usage_in_bytes && cg->memory.enabled_usage_in_bytes == CONFIG_ONDEMAND_YES)) {
1994 + if(likely(cg->memory.updated_usage_in_bytes && cg->memory.enabled_usage_in_bytes == CONFIG_BOOLEAN_YES)) {
1995 if(unlikely(!cg->st_mem_usage)) {
1996 cg->st_mem_usage = rrdset_find_bytype_localhost(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX)
1997 , "mem_usage");
@@ -2012,7 +2012,7 @@ void update_cgroup_charts(int update_every) {
2012 rrdset_done(cg->st_mem_usage);
2013 }
2014
2015 - if(likely(cg->memory.updated_failcnt && cg->memory.enabled_failcnt == CONFIG_ONDEMAND_YES)) {
2015 + if(likely(cg->memory.updated_failcnt && cg->memory.enabled_failcnt == CONFIG_BOOLEAN_YES)) {
2016 if(unlikely(!cg->st_mem_failcnt)) {
2017 cg->st_mem_failcnt = rrdset_find_bytype_localhost(
2018 cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "mem_failcnt");
@@ -2031,7 +2031,7 @@ void update_cgroup_charts(int update_every) {
2031 rrdset_done(cg->st_mem_failcnt);
2032 }
2033
2034 - if(likely(cg->io_service_bytes.updated && cg->io_service_bytes.enabled == CONFIG_ONDEMAND_YES)) {
2034 + if(likely(cg->io_service_bytes.updated && cg->io_service_bytes.enabled == CONFIG_BOOLEAN_YES)) {
2035 if(unlikely(!cg->st_io)) {
2036 cg->st_io = rrdset_find_bytype_localhost(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "io");
2037 if(likely(!cg->st_io)) {
@@ -2050,7 +2050,7 @@ void update_cgroup_charts(int update_every) {
2050 rrdset_done(cg->st_io);
2051 }
2052
2053 - if(likely(cg->io_serviced.updated && cg->io_serviced.enabled == CONFIG_ONDEMAND_YES)) {
2053 + if(likely(cg->io_serviced.updated && cg->io_serviced.enabled == CONFIG_BOOLEAN_YES)) {
2054 if(unlikely(!cg->st_serviced_ops)) {
2055 cg->st_serviced_ops = rrdset_find_bytype_localhost(
2056 cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "serviced_ops");
@@ -2071,7 +2071,7 @@ void update_cgroup_charts(int update_every) {
2071 rrdset_done(cg->st_serviced_ops);
2072 }
2073
2074 - if(likely(cg->throttle_io_service_bytes.updated && cg->throttle_io_service_bytes.enabled == CONFIG_ONDEMAND_YES)) {
2074 + if(likely(cg->throttle_io_service_bytes.updated && cg->throttle_io_service_bytes.enabled == CONFIG_BOOLEAN_YES)) {
2075 if(unlikely(!cg->st_throttle_io)) {
2076 cg->st_throttle_io = rrdset_find_bytype_localhost(
2077 cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "throttle_io");
@@ -2092,7 +2092,7 @@ void update_cgroup_charts(int update_every) {
2092 rrdset_done(cg->st_throttle_io);
2093 }
2094
2095 - if(likely(cg->throttle_io_serviced.updated && cg->throttle_io_serviced.enabled == CONFIG_ONDEMAND_YES)) {
2095 + if(likely(cg->throttle_io_serviced.updated && cg->throttle_io_serviced.enabled == CONFIG_BOOLEAN_YES)) {
2096 if(unlikely(!cg->st_throttle_serviced_ops)) {
2097 cg->st_throttle_serviced_ops = rrdset_find_bytype_localhost(
2098 cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "throttle_serviced_ops");
@@ -2115,7 +2115,7 @@ void update_cgroup_charts(int update_every) {
2115 rrdset_done(cg->st_throttle_serviced_ops);
2116 }
2117
2118 - if(likely(cg->io_queued.updated && cg->io_queued.enabled == CONFIG_ONDEMAND_YES)) {
2118 + if(likely(cg->io_queued.updated && cg->io_queued.enabled == CONFIG_BOOLEAN_YES)) {
2119 if(unlikely(!cg->st_queued_ops)) {
2120 cg->st_queued_ops = rrdset_find_bytype_localhost(
2121 cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "queued_ops");
@@ -2136,7 +2136,7 @@ void update_cgroup_charts(int update_every) {
2136 rrdset_done(cg->st_queued_ops);
2137 }
2138
2139 - if(likely(cg->io_merged.updated && cg->io_merged.enabled == CONFIG_ONDEMAND_YES)) {
2139 + if(likely(cg->io_merged.updated && cg->io_merged.enabled == CONFIG_BOOLEAN_YES)) {
2140 if(unlikely(!cg->st_merged_ops)) {
2141 cg->st_merged_ops = rrdset_find_bytype_localhost(
2142 cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "merged_ops");
src/web_client.c
+1 -1
@@ -2278,7 +2278,7 @@ static inline int web_client_process_url(RRDHOST *host, struct web_client *w, ch
2278 debug(D_WEB_CLIENT_ACCESS, "%llu: Sending netdata.conf ...", w->id);
2279 w->response.data->contenttype = CT_TEXT_PLAIN;
2280 buffer_flush(w->response.data);
2281 - generate_config(w->response.data, 0);
2281 + config_generate(w->response.data, 0);
2282 return 200;
2283 }
2284 else if(unlikely(hash == hash_data && strcmp(tok, WEB_PATH_DATA) == 0)) { // "data"