*result = strtoull(buffer, NULL, 0);
return 0;
}
+
+// ----------------------------------------------------------------------------
+// simple_pattern_match
+
+struct simple_pattern {
+ const char *match;
+ size_t len;
+ NETDATA_SIMPLE_PREFIX_MODE mode;
+ struct simple_pattern *next;
+};
+
+NETDATA_SIMPLE_PATTERN *netdata_simple_pattern_list_create(const char *list, NETDATA_SIMPLE_PREFIX_MODE default_mode) {
+ struct simple_pattern *root = NULL;
+
+ if(unlikely(!list || !*list)) return root;
+
+ char *a = strdupz(list);
+ if(a && *a) {
+ char *s = a;
+
+ while(s && *s) {
+ // skip all spaces
+ while(isspace(*s)) s++;
+
+ // empty string
+ if(unlikely(!*s)) break;
+
+ // find the next space
+ char *c = s;
+ while(*c && !isspace(*c)) c++;
+
+ // find the next word
+ char *n;
+ if(likely(*c)) n = c + 1;
+ else n = NULL;
+
+ // terminate our string
+ *c = '\0';
+
+ char buf[100 + 1];
+ strncpy(buf, s, 100);
+ buf[100] = '\0';
+ if(likely(n)) *c = ' ';
+ s = buf;
+
+ NETDATA_SIMPLE_PREFIX_MODE mode;
+ size_t len = strlen(s);
+ if(len >= 2 && *s == '*' && s[len - 1] == '*') {
+ s[len - 1] = '\0';
+ s++;
+ len -= 2;
+ mode = NETDATA_SIMPLE_PATTERN_MODE_SUBSTRING;
+ }
+ else if(len >= 1 && *s == '*') {
+ s++;
+ len--;
+ mode = NETDATA_SIMPLE_PATTERN_MODE_SUFFIX;
+ }
+ else if(len >= 1 && s[len - 1] == '*') {
+ s[len - 1] = '\0';
+ len--;
+ mode = NETDATA_SIMPLE_PATTERN_MODE_PREFIX;
+ }
+ else
+ mode = default_mode;
+
+ if(len) {
+ if(*s == '*')
+ error("simple pattern '%s' includes '%s' that is invalid", a, s);
+
+ // allocate the structure
+ struct simple_pattern *m = mallocz(sizeof(struct simple_pattern));
+ m->match = strdup(s);
+ m->len = strlen(m->match);
+ m->mode = mode;
+ m->next = root;
+ root = m;
+ }
+ else
+ error("simple pattern '%s' includes invalid matches", a);
+
+ // prepare for next loop
+ s = n;
+ }
+ }
+
+ free(a);
+ return (NETDATA_SIMPLE_PATTERN *)root;
+}
+
+int netdata_simple_pattern_list_matches(NETDATA_SIMPLE_PATTERN *list, const char *str) {
+ struct simple_pattern *m, *root = (struct simple_pattern *)list;
+
+ if(unlikely(!root)) return 0;
+
+ size_t len = strlen(str);
+ for(m = root; m ; m = m->next) {
+ if(m->len <= len) {
+ switch(m->mode) {
+ case NETDATA_SIMPLE_PATTERN_MODE_SUBSTRING:
+ if(unlikely(strstr(str, m->match)))
+ return 1;
+ break;
+
+ case NETDATA_SIMPLE_PATTERN_MODE_PREFIX:
+ if(unlikely(strncmp(str, m->match, m->len) == 0))
+ return 1;
+ break;
+
+ case NETDATA_SIMPLE_PATTERN_MODE_SUFFIX:
+ if(unlikely(strcmp(&str[len - m->len], m->match) == 0))
+ return 1;
+ break;
+
+ case NETDATA_SIMPLE_PATTERN_MODE_EXACT:
+ default:
+ if(unlikely(strcmp(str, m->match) == 0))
+ return 1;
+ break;
+ }
+ }
+ }
+
+ return 0;
+}
extern int read_single_number_file(const char *filename, unsigned long long *result);
+typedef enum {
+ NETDATA_SIMPLE_PATTERN_MODE_EXACT,
+ NETDATA_SIMPLE_PATTERN_MODE_PREFIX,
+ NETDATA_SIMPLE_PATTERN_MODE_SUFFIX,
+ NETDATA_SIMPLE_PATTERN_MODE_SUBSTRING
+} NETDATA_SIMPLE_PREFIX_MODE;
+typedef void NETDATA_SIMPLE_PATTERN;
+extern NETDATA_SIMPLE_PATTERN *netdata_simple_pattern_list_create(const char *list, NETDATA_SIMPLE_PREFIX_MODE default_mode);
+extern int netdata_simple_pattern_list_matches(NETDATA_SIMPLE_PATTERN *list, const char *str);
+
#endif /* NETDATA_COMMON_H */
if(pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL) != 0)
error("Cannot set pthread cancel state to ENABLE.");
- // disable (by default) various interface that are not needed
- config_get_boolean("plugin:proc:/proc/net/dev:lo", "enabled", 0);
- config_get_boolean("plugin:proc:/proc/net/dev:fireqos_monitor", "enabled", 0);
-
- // when ZERO, attempt to do it
- int vdo_cpu_netdata = !config_get_boolean("plugin:proc", "netdata server resources", 1);
+ int vdo_cpu_netdata = config_get_boolean("plugin:proc", "netdata server resources", 1);
// check the enabled status for each module
int i;
// --------------------------------------------------------------------
- if(!vdo_cpu_netdata) {
+ if(vdo_cpu_netdata) {
static RRDSET *st = NULL;
if(unlikely(!st)) {
st = rrdset_find_bytype("netdata", "plugin_proc_modules");
}
-// linked list of mount points that are by default disabled
-static struct excluded_mount_point {
- const char *prefix;
- size_t len;
- struct excluded_mount_point *next;
-} *excluded_mount_points = NULL;
-
-static inline int is_mount_point_excluded(const char *mount_point) {
- static int initialized = 0;
-
- if(unlikely(!initialized)) {
- initialized = 1;
-
- char *a = config_get("plugin:proc:/proc/diskstats", "exclude space metrics on paths", "/proc/ /sys/ /var/run/user/ /run/user/");
- if(a && *a) {
- char *s = a;
-
- while(s && *s) {
- // skip all spaces
- while(isspace(*s)) s++;
-
- // empty string
- if(unlikely(!*s)) break;
-
- // find the next space
- char *c = s;
- while(*c && !isspace(*c)) c++;
-
- char *n;
- if(likely(*c)) n = c + 1;
- else n = NULL;
-
- // terminate our string
- *c = '\0';
-
- // allocate the structure
- struct excluded_mount_point *m = mallocz(sizeof(struct excluded_mount_point));
- m->prefix = strdup(s);
- m->len = strlen(m->prefix);
- m->next = excluded_mount_points;
- excluded_mount_points = m;
-
- // prepare for next loop
- s = n;
- if(likely(n)) *c = ' ';
- }
- }
- }
-
- size_t len = strlen(mount_point);
- struct excluded_mount_point *m;
- for(m = excluded_mount_points; m ; m = m->next) {
- if(m->len <= len) {
- // fprintf(stderr, "SPACE: comparing '%s' with '%s'\n", mount_point, m->prefix);
- if(unlikely(strncmp(m->prefix, mount_point, m->len) == 0)) {
- // fprintf(stderr, "SPACE: excluded '%s'\n", mount_point);
- return 1;
- }
- }
- }
-
- // fprintf(stderr, "SPACE: included '%s'\n", mount_point);
- return 0;
-}
-
// Data to be stored in DICTIONARY mount_points used by do_disk_space_stats().
// This DICTIONARY is used to lookup the settings of the mount point on each iteration.
struct mount_point_metadata {
const char *disk = mi->persistent_id;
static DICTIONARY *mount_points = NULL;
+ static NETDATA_SIMPLE_PATTERN *excluded_mountpoints = NULL;
int do_space, do_inodes;
if(unlikely(!mount_points)) {
mount_points = dictionary_create(DICTIONARY_FLAG_SINGLE_THREADED);
+ excluded_mountpoints = netdata_simple_pattern_list_create(config_get("plugin:proc:/proc/diskstats", "exclude space metrics on paths", "/proc/ /sys/ /var/run/user/ /run/user/"), NETDATA_SIMPLE_PATTERN_MODE_PREFIX);
}
struct mount_point_metadata *m = dictionary_get(mount_points, mi->mount_point);
int def_space = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "space usage for all disks", CONFIG_ONDEMAND_ONDEMAND);
int def_inodes = config_get_boolean_ondemand("plugin:proc:/proc/diskstats", "inodes usage for all disks", CONFIG_ONDEMAND_ONDEMAND);
- if(unlikely(is_mount_point_excluded(mi->mount_point))) {
+ if(unlikely(netdata_simple_pattern_list_matches(excluded_mountpoints, mi->mount_point))) {
def_space = CONFIG_ONDEMAND_NO;
def_inodes = CONFIG_ONDEMAND_NO;
}
int do_proc_net_dev(int update_every, usec_t dt) {
(void)dt;
+ static NETDATA_SIMPLE_PATTERN *disabled_list = NULL;
static procfile *ff = NULL;
- static int enable_new_interfaces = -1, enable_ifb_interfaces = -1, enable_veth_interfaces = -1;
+ static int enable_new_interfaces = -1;
static int do_bandwidth = -1, do_packets = -1, do_errors = -1, do_drops = -1, do_fifo = -1, do_compressed = -1, do_events = -1;
if(unlikely(enable_new_interfaces == -1)) {
enable_new_interfaces = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "enable new interfaces detected at runtime", CONFIG_ONDEMAND_ONDEMAND);
- enable_ifb_interfaces = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "enable ifb interfaces", CONFIG_ONDEMAND_NO);
- enable_veth_interfaces = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "enable veth interfaces", enable_new_interfaces);
do_bandwidth = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "bandwidth for all interfaces", CONFIG_ONDEMAND_ONDEMAND);
do_packets = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "packets for all interfaces", CONFIG_ONDEMAND_ONDEMAND);
do_fifo = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "fifo for all interfaces", CONFIG_ONDEMAND_ONDEMAND);
do_compressed = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "compressed packets for all interfaces", CONFIG_ONDEMAND_ONDEMAND);
do_events = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "frames, collisions, carrier counters for all interfaces", CONFIG_ONDEMAND_ONDEMAND);
+
+ disabled_list = netdata_simple_pattern_list_create(config_get("plugin:proc:/proc/net/dev", "disable by default interfaces matching", "lo fireqos* *-ifb"), NETDATA_SIMPLE_PATTERN_MODE_EXACT);
}
if(unlikely(!ff)) {
// remember we configured it
d->configured = 1;
- // start with the default enabled flag
d->enabled = enable_new_interfaces;
- if(d->enabled) {
- if(unlikely(!strcmp(d->name, "lo")))
- d->enabled = CONFIG_ONDEMAND_NO;
- else if(unlikely(!strncmp(d->name, "veth", 4)))
- d->enabled = enable_veth_interfaces;
- else if(unlikely(d->len >= 4 && strcmp(&d->name[d->len - 4], "-ifb") == 0))
- d->enabled = enable_ifb_interfaces;
- }
+
+ if(d->enabled)
+ d->enabled = !netdata_simple_pattern_list_matches(disabled_list, d->name);
char var_name[512 + 1];
snprintfz(var_name, 512, "plugin:proc:/proc/net/dev:%s", d->name);
projects / netdata.git / commitdiff