diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-01-26 18:05:15 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-01-26 18:05:42 +0000 |
| commit | 112b5b91647c3dea45cc1c9bc364df526c8012f1 (patch) | |
| tree | 450af925135ec664c4310a1eb28b69481094ee2a /collectors/tc.plugin | |
| parent | Releasing debian version 1.32.1-2. (diff) | |
| download | netdata-112b5b91647c3dea45cc1c9bc364df526c8012f1.tar.xz netdata-112b5b91647c3dea45cc1c9bc364df526c8012f1.zip | |
Merging upstream version 1.33.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'collectors/tc.plugin')
| -rw-r--r-- | collectors/tc.plugin/plugin_tc.c | 2 | ||||
| -rw-r--r-- | collectors/tc.plugin/plugin_tc.h | 31 | ||||
| -rwxr-xr-x | collectors/tc.plugin/tc-qos-helper.sh.in | 6 |
3 files changed, 4 insertions, 35 deletions
diff --git a/collectors/tc.plugin/plugin_tc.c b/collectors/tc.plugin/plugin_tc.c index 0197db073..ce3fe668b 100644 --- a/collectors/tc.plugin/plugin_tc.c +++ b/collectors/tc.plugin/plugin_tc.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-or-later -#include "plugin_tc.h" +#include "daemon/common.h" #define RRD_TYPE_TC "tc" #define PLUGIN_TC_NAME "tc.plugin" diff --git a/collectors/tc.plugin/plugin_tc.h b/collectors/tc.plugin/plugin_tc.h deleted file mode 100644 index d51fcf674..000000000 --- a/collectors/tc.plugin/plugin_tc.h +++ /dev/null @@ -1,31 +0,0 @@ -// SPDX-License-Identifier: GPL-3.0-or-later - -#ifndef NETDATA_PLUGIN_TC_H -#define NETDATA_PLUGIN_TC_H 1 - -#include "daemon/common.h" - -#if (TARGET_OS == OS_LINUX) - -#define NETDATA_PLUGIN_HOOK_LINUX_TC \ - { \ - .name = "PLUGIN[tc]", \ - .config_section = CONFIG_SECTION_PLUGINS, \ - .config_name = "tc", \ - .enabled = 1, \ - .thread = NULL, \ - .init_routine = NULL, \ - .start_routine = tc_main \ - }, - -extern void *tc_main(void *ptr); - -#else // (TARGET_OS == OS_LINUX) - -#define NETDATA_PLUGIN_HOOK_LINUX_TC - -#endif // (TARGET_OS == OS_LINUX) - - -#endif /* NETDATA_PLUGIN_TC_H */ - diff --git a/collectors/tc.plugin/tc-qos-helper.sh.in b/collectors/tc.plugin/tc-qos-helper.sh.in index 65d33153b..97d4d016d 100755 --- a/collectors/tc.plugin/tc-qos-helper.sh.in +++ b/collectors/tc.plugin/tc-qos-helper.sh.in @@ -89,13 +89,13 @@ if [ ! -d "${fireqos_run_dir}" ]; then if [ -d "${LOCALSTATEDIR}/run/fireqos" ]; then fireqos_run_dir="${LOCALSTATEDIR}/run/fireqos" else - warning "FireQoS is installed as '${fireqos}', its installation config at '${fireqos_exec_dir}/install.config' specifies local state data at '${LOCALSTATEDIR}/run/fireqos', but this directory is not found or is not readable (check the permissions of its parents)." + warning "FireQOS is installed as '${fireqos}', its installation config at '${fireqos_exec_dir}/install.config' specifies local state data at '${LOCALSTATEDIR}/run/fireqos', but this directory is not found or is not readable (check the permissions of its parents)." fi else - warning "Although FireQoS is installed on this system as '${fireqos}', I cannot find/read its installation configuration at '${fireqos_exec_dir}/install.config'." + warning "Although FireQOS is installed on this system as '${fireqos}', I cannot find/read its installation configuration at '${fireqos_exec_dir}/install.config'." fi else - warning "FireQoS is not installed on this system. Use FireQoS to apply traffic QoS and expose the class names to netdata. Check https://github.com/netdata/netdata/tree/master/collectors/tc.plugin#tcplugin" + warning "FireQOS is not installed on this system. Use FireQOS to apply traffic QoS and expose the class names to netdata. Check https://github.com/netdata/netdata/tree/master/collectors/tc.plugin#tcplugin" fi fi |