From 9dd91dce20c5d4691f8e8170723ec4731acb76f9 Mon Sep 17 00:00:00 2001 From: Marc Fournier Date: Wed, 25 Jan 2017 08:10:48 +0100 Subject: [PATCH] smart: log warning if CAP_SYS_RAWIO is missing Related to #2143 --- contrib/systemd.collectd.service | 1 + src/smart.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/contrib/systemd.collectd.service b/contrib/systemd.collectd.service index d0f1bdea..7bc15d7c 100644 --- a/contrib/systemd.collectd.service +++ b/contrib/systemd.collectd.service @@ -20,6 +20,7 @@ ProtectHome=true # exec CAP_SETUID CAP_SETGID # iptables CAP_NET_ADMIN # ping CAP_NET_RAW +# smart CAP_SYS_RAWIO # turbostat CAP_SYS_RAWIO # # Example, if you use the iptables plugin alongside the dns or ping plugin: diff --git a/src/smart.c b/src/smart.c index 93bfcbec..5bb6af43 100644 --- a/src/smart.c +++ b/src/smart.c @@ -33,6 +33,10 @@ #include #include +#ifdef HAVE_SYS_CAPABILITY_H +#include +#endif + static const char *config_keys[] = {"Disk", "IgnoreSelected", "IgnoreSleepMode", "UseSerial"}; @@ -241,7 +245,25 @@ static int smart_read(void) { return (0); } /* int smart_read */ +static int smart_init(void) { +#if defined(HAVE_SYS_CAPABILITY_H) && defined(CAP_SYS_RAWIO) + if (check_capability(CAP_SYS_RAWIO) != 0) { + if (getuid() == 0) + WARNING("smart plugin: Running collectd as root, but the " + "CAP_SYS_RAWIO capability is missing. The plugin's read " + "function will probably fail. Is your init system dropping " + "capabilities?"); + else + WARNING("smart plugin: collectd doesn't have the CAP_SYS_RAWIO " + "capability. If you don't want to run collectd as root, try " + "running \"setcap cap_sys_rawio=ep\" on the collectd binary."); + } +#endif + return (0); +} /* int smart_init */ + void module_register(void) { plugin_register_config("smart", smart_config, config_keys, config_keys_num); + plugin_register_init("smart", smart_init); plugin_register_read("smart", smart_read); } /* void module_register */ -- 2.11.0