Merging upstream version 1.33.1.

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

4 files changed, 6 insertions, 14 deletions

diff --git a/collectors/README.md b/collectors/README.md
index a37a7e890..e9cce42b3 100644
--- a/collectors/README.md
+++ b/collectors/README.md
@@ -7,8 +7,7 @@ custom_edit_url: https://github.com/netdata/netdata/edit/master/collectors/READM
 
 Netdata can collect metrics from hundreds of different sources, be they internal data created by the system itself, or
 external data created by services or applications. To see _all_ of the sources Netdata collects from, view our [list of
-supported collectors](/collectors/COLLECTORS.md), and then view our [quickstart guide](/collectors/QUICKSTART.md) to get
-up-and-running.
+supported collectors](/collectors/COLLECTORS.md).
 
 There are two essential points to understand about how collecting metrics works in Netdata:
 
@@ -17,13 +16,11 @@ There are two essential points to understand about how collecting metrics works
 -   Upon startup, Netdata will **auto-detect** any application or service that has a
     [collector](/collectors/COLLECTORS.md), as long as both the collector and the app/service are configured correctly.
 
-Most users will want to enable a new Netdata collector for their app/service. For those details, see our [quickstart
-guide](/collectors/QUICKSTART.md).
+Most users will want to enable a new Netdata collector for their app/service. For those details, see
+our [collectors' configuration reference](/collectors/REFERENCE.md).
 
 ## Take your next steps with collectors
 
-[Collectors quickstart](/collectors/QUICKSTART.md)
-
 [Supported collectors list](/collectors/COLLECTORS.md)
 
 [Collectors configuration reference](/collectors/REFERENCE.md)
diff --git a/collectors/REFERENCE.md b/collectors/REFERENCE.md
index e5c52115e..fc9ed366d 100644
--- a/collectors/REFERENCE.md
+++ b/collectors/REFERENCE.md
@@ -10,9 +10,6 @@ Welcome to the collector configuration reference guide.
 This guide contains detailed information about enabling/disabling plugins or modules, in addition a quick reference to
 the internal plugins API.
 
-To learn the basics of collecting metrics from other applications and services, see the [collector
-quickstart](QUICKSTART.md).
-
 ## Netdata's collector architecture
 
 Netdata has an intricate system for organizing and managing its collectors. **Collectors** are the processes/programs
@@ -23,8 +20,7 @@ MySQL database, among many others.
 
 For most users, enabling individual collectors for the application/service you're interested in is far more important
 than knowing which plugin it uses. See our [collectors list](/collectors/COLLECTORS.md) to see whether your favorite app/service has
-a collector, and then read the [collectors quickstart](/collectors/QUICKSTART.md) and the documentation for that specific collector
-to figure out how to enable it.
+a collector, and then read the documentation for that specific collector to figure out how to enable it.
 
 There are three types of plugins:
 
@@ -46,7 +42,6 @@ However, there are cases that auto-detection fails. Usually, the reason is that
 allow Netdata to connect. In most of the cases, allowing the user `netdata` from `localhost` to connect and collect
 metrics, will automatically enable data collection for the application in question (it will require a Netdata restart).
 
-View our [collectors quickstart](/collectors/QUICKSTART.md) for explicit details on enabling and configuring collector modules.
 
 ## Troubleshoot a collector
 
diff --git a/collectors/ebpf.plugin/README.md b/collectors/ebpf.plugin/README.md
index 8fc6809e2..babcd5206 100644
--- a/collectors/ebpf.plugin/README.md
+++ b/collectors/ebpf.plugin/README.md
@@ -45,7 +45,7 @@ which allow hooking into arbitrary user-space functions in a similar manner to k
 ## Manually enable the collector on Linux
 
 **The eBPF collector is installed and enabled by default on most new installations of the Agent**. The eBPF collector
-does not currently work with [static build installations](/packaging/installer/methods/kickstart-64.md) for kernels older
+does not currently work with [static build installations](/packaging/installer/methods/kickstart.md#static-builds) for kernels older
 than `4.11`, but improved support is in active development.
 
 eBPF monitoring only works on Linux systems and with specific Linux kernels, including all kernels newer than `4.11.0`,
diff --git a/collectors/ebpf.plugin/ebpf.d.conf b/collectors/ebpf.plugin/ebpf.d.conf
index 633c53791..0ca9ff0d6 100644
--- a/collectors/ebpf.plugin/ebpf.d.conf
+++ b/collectors/ebpf.plugin/ebpf.d.conf
@@ -57,7 +57,7 @@
     oomkill = yes
     process = yes
     shm = yes
-    socket = yes
+    socket = no # Disabled while we are fixing race condition
     softirq = yes
     sync = yes
     swap = no