Adding upstream version 1.33.0.upstream/1.33.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 6 insertions, 30 deletions

diff --git a/collectors/statsd.plugin/README.md b/collectors/statsd.plugin/README.md
index ba4ada51..1d1c8ab7 100644
--- a/collectors/statsd.plugin/README.md
+++ b/collectors/statsd.plugin/README.md
@@ -4,8 +4,6 @@ description: "The Netdata Agent is a fully-featured StatsD server that collects
 custom_edit_url: https://github.com/netdata/netdata/edit/master/collectors/statsd.plugin/README.md
 -->
 
-# statsd.plugin
-
 StatsD is a system to collect data from any application. Applications send metrics to it, usually via non-blocking UDP communication, and StatsD servers collect these metrics, perform a few simple calculations on them and push them to backend time-series databases.
 
 If you want to learn more about the StatsD protocol, we have written a [blog post](https://www.netdata.cloud/blog/introduction-to-statsd/) about it!
@@ -19,7 +17,7 @@ Since statsd is embedded in Netdata, it means you now have a statsd server embed
 
 Netdata statsd is fast. It can collect more than **1.200.000 metrics per second** on modern hardware, more than **200Mbps of sustained statsd traffic**, using 1 CPU core. The implementation uses two threads: one thread collects metrics, another one updates the charts from the collected data.
 
-# Available StatsD collectors
+## Available StatsD collectors
 
 Netdata ships with collectors implemented using the StatsD collector. They are configuration files (as you will read below), but they function as a collector, in the sense that configuration file organize the metrics of a data source into pre-defined charts. 
 
@@ -532,7 +530,7 @@ Using the client library by [sivy/node-statsd](https://github.com/sivy/node-stat
 You can also use StatsD with:
 - Golang, thanks to [alexcesaro/statsd](https://github.com/alexcesaro/statsd)
 - Ruby, thanks to [reinh/statsd](https://github.com/reinh/statsd)
-- Java, thanks to [DataDog/java-docstatsd-client](https://github.com/DataDog/java-dogstatsd-client)
+- Java, thanks to [DataDog/java-dogstatsd-client](https://github.com/DataDog/java-dogstatsd-client)
 
 
 ### Shell
diff --git a/collectors/statsd.plugin/statsd.c b/collectors/statsd.plugin/statsd.c
index 9e152b09..a630d00d 100644
--- a/collectors/statsd.plugin/statsd.c
+++ b/collectors/statsd.plugin/statsd.c
@@ -1,11 +1,14 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-#include "statsd.h"
+#include "daemon/common.h"
 
 #define STATSD_CHART_PREFIX "statsd"
 
 #define PLUGIN_STATSD_NAME "statsd.plugin"
 
+#define STATSD_LISTEN_PORT 8125
+#define STATSD_LISTEN_BACKLOG 4096
+
 // --------------------------------------------------------------------------------------
 
 // #define STATSD_MULTITHREADED 1
diff --git a/collectors/statsd.plugin/statsd.h b/collectors/statsd.plugin/statsd.h
deleted file mode 100644
index 37d6a08b..00000000
--- a/collectors/statsd.plugin/statsd.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#ifndef NETDATA_STATSD_H
-#define NETDATA_STATSD_H 1
-
-#include "daemon/common.h"
-
-#define STATSD_LISTEN_PORT 8125
-#define STATSD_LISTEN_BACKLOG 4096
-
-#define NETDATA_PLUGIN_HOOK_STATSD \
-    { \
-        .name = "STATSD", \
-        .config_section = NULL, \
-        .config_name = NULL, \
-        .enabled = 1, \
-        .thread = NULL, \
-        .init_routine = NULL, \
-        .start_routine = statsd_main \
-    },
-
-
-extern void *statsd_main(void *ptr);
-
-#endif //NETDATA_STATSD_H