From 83ba6762cc43d9db581b979bb5e3445669e46cc2 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 25 Nov 2024 18:33:56 +0100 Subject: Merging upstream version 2.0.3+dfsg (Closes: #923993, #1042533, #1045145). Signed-off-by: Daniel Baumann --- src/collectors/nfacct.plugin/integrations/netfilter.md | 4 ++-- src/collectors/nfacct.plugin/plugin_nfacct.c | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'src/collectors/nfacct.plugin') diff --git a/src/collectors/nfacct.plugin/integrations/netfilter.md b/src/collectors/nfacct.plugin/integrations/netfilter.md index b8dcb8520..f8ba4ef74 100644 --- a/src/collectors/nfacct.plugin/integrations/netfilter.md +++ b/src/collectors/nfacct.plugin/integrations/netfilter.md @@ -106,8 +106,8 @@ The file format is a modified INI syntax. The general structure is: [section2] option3 = some third value ``` -You can edit the configuration file using the `edit-config` script from the -Netdata [config directory](/docs/netdata-agent/configuration/README.md#the-netdata-config-directory). +You can edit the configuration file using the [`edit-config`](https://github.com/netdata/netdata/blob/master/docs/netdata-agent/configuration/README.md#edit-a-configuration-file-using-edit-config) script from the +Netdata [config directory](https://github.com/netdata/netdata/blob/master/docs/netdata-agent/configuration/README.md#the-netdata-config-directory). ```bash cd /etc/netdata 2>/dev/null || cd /opt/netdata/etc/netdata diff --git a/src/collectors/nfacct.plugin/plugin_nfacct.c b/src/collectors/nfacct.plugin/plugin_nfacct.c index 92c82351a..6225ec4a6 100644 --- a/src/collectors/nfacct.plugin/plugin_nfacct.c +++ b/src/collectors/nfacct.plugin/plugin_nfacct.c @@ -747,7 +747,6 @@ void nfacct_signals() } int main(int argc, char **argv) { - clocks_init(); nd_log_initialize_for_external_plugins("nfacct.plugin"); // ------------------------------------------------------------------------ @@ -832,12 +831,11 @@ int main(int argc, char **argv) { time_t started_t = now_monotonic_sec(); size_t iteration; - usec_t step = netdata_update_every * USEC_PER_SEC; heartbeat_t hb; - heartbeat_init(&hb); + heartbeat_init(&hb, netdata_update_every * USEC_PER_SEC); for(iteration = 0; 1; iteration++) { - usec_t dt = heartbeat_next(&hb, step); + usec_t dt = heartbeat_next(&hb); if(unlikely(netdata_exit)) break; -- cgit v1.2.3