Merging upstream version 1.35.0.

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

3 files changed, 13 insertions, 52 deletions

diff --git a/docs/guides/collect-apache-nginx-web-logs.md b/docs/guides/collect-apache-nginx-web-logs.md
index 0298e1d43..a75a4b1cd 100644
--- a/docs/guides/collect-apache-nginx-web-logs.md
+++ b/docs/guides/collect-apache-nginx-web-logs.md
@@ -12,15 +12,11 @@ By parsing web server log files with Netdata, and seeing the volume of redirects
 you can better understand what's happening on your infrastructure. Too many bad requests? Maybe a recent deploy missed a
 few small SVG icons. Too many requests? Time to batten down the hatches—it's a DDoS.
 
-Netdata has been capable of monitoring web log files for quite some time, thanks for the [weblog python.d
-module](/collectors/python.d.plugin/web_log/README.md), but we recently refactored this module in Go, and that effort
-comes with a ton of improvements.
-
-You can now use the [LTSV log format](http://ltsv.org/), track TLS and cipher usage, and the whole parser is faster than
+You can use the [LTSV log format](http://ltsv.org/), track TLS and cipher usage, and the whole parser is faster than
 ever. In one test on a system with SSD storage, the collector consistently parsed the logs for 200,000 requests in
-200ms, using ~30% of a single core. To learn more about these improvements, see our [v1.19 release post](https://blog.netdata.cloud/posts/release-1.19/).
+200ms, using ~30% of a single core.
 
-The [go.d plugin](https://learn.netdata.cloud/docs/agent/collectors/go.d.plugin/modules/weblog/) is currently compatible
+The [web_log](https://learn.netdata.cloud/docs/agent/collectors/go.d.plugin/modules/weblog/) collector is currently compatible
 with [Nginx](https://nginx.org/en/) and [Apache](https://httpd.apache.org/).
 
 This guide will walk you through using the new Go-based web log collector to turn the logs these web servers
@@ -34,33 +30,6 @@ installation procedures.
 Almost all web server installations will need _no_ configuration to start collecting metrics. As long as your web server
 has readable access log file, you can configure the web log plugin to access and parse it.
 
-## Configure the web log collector
-
-To use the Go version of this plugin, you need to explicitly enable it, and disable the deprecated Python version.
-First, open `python.d.conf`:
-
-```bash
-cd /etc/netdata/ # Replace with your Netdata configuration directory, if not /etc/netdata/
-./edit-config python.d.conf
-```
-
-Find the `web_log` line, uncomment it, and set it to `web_log: no`. Next, open the `go.d.conf` file for editing.
-
-```bash
-./edit-config go.d.conf
-```
-
-Find the `web_log` line again, uncomment it, and set it to `web_log: yes`.
-
-Finally, restart Netdata with `sudo systemctl restart netdata`, or the [appropriate
-method](/docs/configure/start-stop-restart.md) for your system. You should see metrics in your Netdata dashboard!
-
-![Example of real-time web server log metrics in Netdata's
-dashboard](https://user-images.githubusercontent.com/1153921/69448130-2980c280-0d15-11ea-9fa5-6dcff25a92c3.png)
-
-If you don't see web log charts, or **web log nginx**/**web log apache** menus on the right-hand side of your dashboard,
-continue reading for other configuration options.
-
 ## Custom configuration of the web log collector
 
 The web log collector's default configuration comes with a few example jobs that should cover most Linux distributions
@@ -152,11 +121,7 @@ documentation](/health/README.md).
 
 ## What's next?
 
-Now that you have web log collection up and running, we recommend you take a look at the documentation for our
-[python.d](/collectors/python.d.plugin/web_log/README.md) for some ideas of how you can turn these rather "boring" logs
-into powerful real-time tools for keeping your servers happy.
+Now that you have web log collection up and running, we recommend you take a look at the collector's [documentation](https://learn.netdata.cloud/docs/agent/collectors/go.d.plugin/modules/weblog/) for some ideas of how you can turn these rather "boring" logs into powerful real-time tools for keeping your servers happy.
 
 Don't forget to give GitHub user [Wing924](https://github.com/Wing924) a big 👍 for his hard work in starting up the Go
 refactoring effort.
-
-
diff --git a/docs/guides/configure/performance.md b/docs/guides/configure/performance.md
index 8e0108979..f83634168 100644
--- a/docs/guides/configure/performance.md
+++ b/docs/guides/configure/performance.md
@@ -72,7 +72,7 @@ seconds, respectively.
 ### Specific plugin or collector
 
 Every collector and plugin has its own `update every` setting, which you can also change in the `go.d.conf`,
-`python.d.conf`, `node.d.conf`, or `charts.d.conf` files, or in individual collector configuration files. If the `update
+`python.d.conf`, or `charts.d.conf` files, or in individual collector configuration files. If the `update
 every` for an individual collector is less than the global, the Netdata Agent uses the global setting. See the [enable
 or configure a collector](/docs/collect/enable-configure.md) doc for details.
 
@@ -103,16 +103,14 @@ Keep in mind that if a plugin/collector has nothing to do, it simply shuts down
 You will only improve the Agent's performance by disabling plugins/collectors that are actively collecting metrics.
 
 Open `netdata.conf` and scroll down to the `[plugins]` section. To disable any plugin, uncomment it and set the value to
-`no`. For example, to explicitly keep the `proc` and `go.d` plugins enabled while disabling `python.d`, `charts.d`, and
-`node.d`.
+`no`. For example, to explicitly keep the `proc` and `go.d` plugins enabled while disabling `python.d` and `charts.d`.
 
 ```conf
 [plugins]
     proc = yes
-		python.d = no
-		charts.d = no
-		node.d = no
-		go.d = yes
+	python.d = no
+	charts.d = no
+	go.d = yes
 ```
 
 Disable specific collectors by opening their respective plugin configuration files, uncommenting the line for the
@@ -121,7 +119,6 @@ collector, and setting its value to `no`.
 ```bash
 sudo ./edit-config go.d.conf
 sudo ./edit-config python.d.conf
-sudo ./edit-config node.d.conf
 sudo ./edit-config charts.d.conf
 ```
 
@@ -186,7 +183,6 @@ Finally, edit `netdata.conf` with the following settings:
 ```conf
 [global]
     bind socket to IP = 127.0.0.1
-    access log = none
     disconnect idle web clients after seconds = 3600
     enable web responses gzip compression = no
 ```
@@ -218,7 +214,7 @@ If you installation is working correctly, and you're not actively auditing Netda
 `netdata.conf`.
 
 ```conf
-[global]
+[logs]
     debug log = none
     error log = none
     access log = none
diff --git a/docs/guides/step-by-step/step-06.md b/docs/guides/step-by-step/step-06.md
index 89a8cb732..f04098fc1 100644
--- a/docs/guides/step-by-step/step-06.md
+++ b/docs/guides/step-by-step/step-06.md
@@ -39,7 +39,7 @@ they were built in.
 
 These modules are primarily written in [Go](https://learn.netdata.cloud/docs/agent/collectors/go.d.plugin/) (`go.d`) and
 [Python](/collectors/python.d.plugin/README.md), although some use [Bash](/collectors/charts.d.plugin/README.md)
-(`charts.d`) or [Node.js](/collectors/node.d.plugin/README.md) (`node.d`).
+(`charts.d`).
 
 ## Enable and disable plugins
 
@@ -58,14 +58,14 @@ Enabled:
 
 ```conf
 [plugins]
-  # node.d = yes
+  # python.d = yes
 ```
 
 Disabled:
 
 ```conf
 [plugins]
-  node.d = no
+  python.d = no
 ```
 
 When you explicitly disable a plugin this way, it won't auto-collect metrics using its collectors.