This patch adds the main configuration file(/etc/ndctl/monitor.conf) of ndctl monitor. It contains the configuration directives that give ndctl monitor instructions. Users can change the configuration by editing this file or using [--config-file] option to override this file. The changed value will work after restart ndctl monitor service.
Signed-off-by: QI Fuli <[email protected]> --- configure.ac | 1 + ndctl.spec.in | 1 + ndctl/Makefile.am | 5 +++ ndctl/monitor.c | 110 ++++++++++++++++++++++++++++++++++++++++++++- ndctl/monitor.conf | 41 +++++++++++++++++ 5 files changed, 157 insertions(+), 1 deletion(-) create mode 100644 ndctl/monitor.conf diff --git a/configure.ac b/configure.ac index cf44260..ff0096d 100644 --- a/configure.ac +++ b/configure.ac @@ -144,6 +144,7 @@ AC_CHECK_FUNCS([ \ ]) my_CFLAGS="\ +-D DEF_CONF_FILE='\"${sysconfdir}/ndctl/monitor.conf\"' \ -Wall \ -Wchar-subscripts \ -Wformat-security \ diff --git a/ndctl.spec.in b/ndctl.spec.in index e2c879c..41a1d59 100644 --- a/ndctl.spec.in +++ b/ndctl.spec.in @@ -116,6 +116,7 @@ make check %{_bindir}/ndctl %{_mandir}/man1/ndctl* %{bashcompdir}/ +%{_sysconfdir}/ndctl/monitor.conf %files -n daxctl %defattr(-,root,root) diff --git a/ndctl/Makefile.am b/ndctl/Makefile.am index 083609a..58b747a 100644 --- a/ndctl/Makefile.am +++ b/ndctl/Makefile.am @@ -42,3 +42,8 @@ ndctl_SOURCES += ../test/libndctl.c \ ../test/core.c \ test.c endif + +monitor_config_file = monitor.conf +monitor_configdir = $(sysconfdir)/ndctl/ +monitor_config_DATA = $(monitor_config_file) +EXTRA_DIST += $(monitor_config_file) diff --git a/ndctl/monitor.c b/ndctl/monitor.c index 12317d0..8300250 100644 --- a/ndctl/monitor.c +++ b/ndctl/monitor.c @@ -16,9 +16,9 @@ #include <sys/epoll.h> #define BUF_SIZE 2048 - static struct monitor { const char *log; + const char *config_file; const char *dimm_event; bool daemon; bool human; @@ -454,6 +454,108 @@ dimm_event_all: return 0; } +static void parse_config(const char **arg, char *key, char *val, char *ident) +{ + struct strbuf value = STRBUF_INIT; + size_t arg_len = *arg ? strlen(*arg) : 0; + + if (!ident || !key || (strcmp(ident, key) != 0)) + return; + + if (arg_len) { + strbuf_add(&value, *arg, arg_len); + strbuf_addstr(&value, " "); + } + strbuf_addstr(&value, val); + *arg = strbuf_detach(&value, NULL); +} + +static int read_config_file(struct ndctl_ctx *ctx, struct monitor *_monitor, + struct util_filter_params *_param) +{ + FILE *f; + int line = 0; + size_t len = 0; + char *buf, *value, *config_file; + + if (_monitor->config_file) + config_file = strdup(_monitor->config_file); + else + config_file = strdup(DEF_CONF_FILE); + if (!config_file) { + fail("strdup default config file failed\n"); + goto out; + } + + buf = malloc(BUF_SIZE); + if (!buf) { + fail("malloc read config-file buf error\n"); + goto out; + } + + f = fopen(config_file, "r"); + if (!f) { + fail("config-file: %s cannot be opened\n", config_file); + goto out; + } + + while (fgets(buf, BUF_SIZE, f)) { + value = NULL; + line++; + + while (isspace(*buf)) + buf++; + + if (*buf == '#' || *buf == '\0') + continue; + + value = strchr(buf, '='); + if (!value) { + fail("config-file syntax error, skip line[%i]\n", line); + continue; + } + + value[0] = '\0'; + value++; + + while (isspace(value[0])) + value++; + + len = strlen(buf); + if (len == 0) + continue; + while (isspace(buf[len-1])) + len--; + buf[len] = '\0'; + + len = strlen(value); + if (len == 0) + continue; + while (isspace(value[len-1])) + len--; + value[len] = '\0'; + + if (len == 0) + continue; + + parse_config(&_param->bus, "bus", value, buf); + parse_config(&_param->dimm, "dimm", value, buf); + parse_config(&_param->region, "region", value, buf); + parse_config(&_param->namespace, "namespace", value, buf); + parse_config(&_monitor->dimm_event, "dimm-event", value, buf); + + if (!_monitor->log) + parse_config(&_monitor->log, "log", value, buf); + } + fclose(f); + free(config_file); + return 0; +out: + if (config_file) + free(config_file); + return 1; +} + int cmd_monitor(int argc, const char **argv, void *ctx) { const struct option options[] = { @@ -469,6 +571,8 @@ int cmd_monitor(int argc, const char **argv, void *ctx) OPT_FILENAME('l', "log", &monitor.log, "<file> | syslog | standard", "where to output the monitor's notification"), + OPT_FILENAME('c', "config-file", &monitor.config_file, + "config-file", "override the default config"), OPT_BOOLEAN('x', "daemon", &monitor.daemon, "run ndctl monitor as a daemon"), OPT_BOOLEAN('u', "human", &monitor.human, @@ -495,7 +599,11 @@ int cmd_monitor(int argc, const char **argv, void *ctx) ndctl_set_log_fn((struct ndctl_ctx *)ctx, log_standard); ndctl_set_log_priority((struct ndctl_ctx *)ctx, LOG_NOTICE); + if (read_config_file((struct ndctl_ctx *)ctx, &monitor, ¶m)) + goto out; + if (monitor.log) { + fix_filename(prefix, (const char **)&monitor.log); if (strncmp(monitor.log, "./syslog", 8) == 0) ndctl_set_log_fn((struct ndctl_ctx *)ctx, log_syslog); else if (strncmp(monitor.log, "./standard", 10) == 0) diff --git a/ndctl/monitor.conf b/ndctl/monitor.conf new file mode 100644 index 0000000..857aadf --- /dev/null +++ b/ndctl/monitor.conf @@ -0,0 +1,41 @@ +# This is the main ndctl monitor configuration file. It contains the +# configuration directives that give ndctl monitor instructions. +# You can change the configuration of ndctl monitor by editing this +# file or using [--config-file=<file>] option to override this one. +# The changed value will work after restart ndctl monitor service. + +# In this file, lines starting with a hash (#) are comments. +# The configurations should follow <key> = <value> style. +# Multiple space-separated values are allowed, but except the following +# characters: : ? / \ % " ' $ & ! * { } [ ] ( ) = < > @ + +# The objects to monitor are filtered via dimm's name by setting key "dimm". +# If this value is different from the value of [--dimm=<value>] option, +# both of the values will work. +# dimm = all + +# The objects to monitor are filtered via its parent bus by setting key "bus". +# If this value is different from the value of [--bus=<value>] option, +# both of the values will work. +# bus = all + +# The objects to monitor are filtered via region by setting key "region". +# If this value is different from the value of [--region=<value>] option, +# both of the values will work. +# region = all + +# The objects to monitor are filtered via namespace by setting key "namespace". +# If this value is different from the value of [--namespace=<value>] option, +# both of the values will work. +# namespace = all + +# The DIMM events to monitor are filtered via event type by setting key +# "dimm-event". If this value is different from the value of +# [--dimm-event=<value>] option, both of the values will work. +# dimm-event = all + +# Users can choose to output the notifications to syslog (log=syslog), +# to standard output (log=standard) or to write into a special file (log=<file>) +# by setting key "log". If this value is in conflict with the value of +# [--log=<value>] option, this value will be ignored. +# log = /var/log/ndctl/monitor.log -- 2.18.0 _______________________________________________ Linux-nvdimm mailing list [email protected] https://lists.01.org/mailman/listinfo/linux-nvdimm
