Merging upstream version 1.45.3+dfsg.

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

33 files changed, 675 insertions, 33 deletions

diff --git a/src/collectors/charts.d.plugin/README.md b/src/collectors/charts.d.plugin/README.md
new file mode 100644
index 000000000..72429d278
--- /dev/null
+++ b/src/collectors/charts.d.plugin/README.md
@@ -0,0 +1,190 @@
+# charts.d.plugin
+
+`charts.d.plugin` is a Netdata external plugin. It is an **orchestrator** for data collection modules written in `BASH` v4+.
+
+1. It runs as an independent process `ps fax` shows it
+2. It is started and stopped automatically by Netdata
+3. It communicates with Netdata via a unidirectional pipe (sending data to the `netdata` daemon)
+4. Supports any number of data collection **modules**
+
+To better understand the guidelines and the API behind our External plugins, please have a look at the [Introduction to External plugins](https://github.com/netdata/netdata/blob/master/src/collectors/plugins.d/README.md) prior to reading this page.
+
+
+`charts.d.plugin` has been designed so that the actual script that will do data collection will be permanently in
+memory, collecting data with as little overheads as possible
+(i.e. initialize once, repeatedly collect values with minimal overhead).
+
+`charts.d.plugin` looks for scripts in `/usr/lib/netdata/charts.d`.
+The scripts should have the filename suffix: `.chart.sh`.
+
+By default, `charts.d.plugin` is not included as part of the install when using [our official native DEB/RPM packages](https://github.com/netdata/netdata/blob/master/packaging/installer/methods/packages.md). You can install it by installing the `netdata-plugin-chartsd` package.
+
+## Configuration
+
+`charts.d.plugin` itself can be [configured](https://github.com/netdata/netdata/blob/master/docs/configure/nodes.md#use-edit-config-to-edit-configuration-files) using the configuration file `/etc/netdata/charts.d.conf`. This file is also a BASH script.
+
+In this file, you can place statements like this:
+
+```conf
+enable_all_charts="yes"
+X="yes"
+Y="no"
+```
+
+where `X` and `Y` are the names of individual charts.d collector scripts.
+When set to `yes`, charts.d will evaluate the collector script (see below).
+When set to `no`, charts.d will ignore the collector script.
+
+The variable `enable_all_charts` sets the default enable/disable state for all charts.
+
+## A charts.d module
+
+A `charts.d.plugin` module is a BASH script defining a few functions.
+
+For a module called `X`, the following criteria must be met:
+
+1. The module script must be called `X.chart.sh` and placed in `/usr/libexec/netdata/charts.d`.
+
+2. If the module needs a configuration, it should be called `X.conf` and placed in `/etc/netdata/charts.d`.  
+    The configuration file `X.conf` is also a BASH script itself.  
+    You can edit the default files supplied by Netdata, by editing `/etc/netdata/edit-config charts.d/X.conf`, where `X` is the name of the module.
+
+3. All functions and global variables defined in the script and its configuration, must begin with `X_`.
+
+4. The following functions must be defined:
+
+    - `X_check()` - returns 0 or 1 depending on whether the module is able to run or not
+         (following the standard Linux command line return codes: 0 = OK, the collector can operate and 1 = FAILED,
+         the collector cannot be used).
+
+    - `X_create()` - creates the Netdata charts (commands `CHART` and `DIMENSION`).
+         The return value does matter: 0 = OK, 1 = FAILED.
+
+    - `X_update()` - collects the values for the defined charts (commands `BEGIN`, `SET`, `END`).
+         The return value also matters: 0 = OK, 1 = FAILED.
+
+5. The following global variables are available to be set:
+    - `X_update_every` - is the data collection frequency for the module script, in seconds.
+
+The module script may use more functions or variables. But all of them must begin with `X_`.
+
+### X_check()
+
+The purpose of the BASH function `X_check()` is to check if the module can collect data (or check its config).
+
+For example, if the module is about monitoring a local mysql database, the `X_check()` function may attempt to
+connect to a local mysql database to find out if it can read the values it needs.
+
+`X_check()` is run only once for the lifetime of the module.
+
+### X_create()
+
+The purpose of the BASH function `X_create()` is to create the charts and dimensions using the standard Netdata
+plugin guidelines.
+
+`X_create()` will be called just once and only after `X_check()` was successful.
+You can however call it yourself when there is need for it (for example to add a new dimension to an existing chart).
+
+A non-zero return value will disable the collector.
+
+### X_update()
+
+`X_update()` will be called repeatedly every `X_update_every` seconds, to collect new values and send them to Netdata,
+following the Netdata plugin guidelines.
+
+The function will be called with one parameter: microseconds since the last time it was run. This value should be
+appended to the `BEGIN` statement of every chart updated by the collector script.
+
+A non-zero return value will disable the collector.
+
+### Useful functions charts.d provides
+
+Module scripts can use the following charts.d functions:
+
+#### require_cmd command
+
+`require_cmd()` will check if a command is available in the running system.
+
+For example, your `X_check()` function may use it like this:
+
+```sh
+mysql_check() {
+    require_cmd mysql || return 1
+    return 0
+}
+```
+
+Using the above, if the command `mysql` is not available in the system, the `mysql` module will be disabled.
+
+#### fixid "string"
+
+`fixid()` will get a string and return a properly formatted id for a chart or dimension.
+
+This is an expensive function that should not be used in `X_update()`.
+You can keep the generated id in a BASH associative array to have the values availables in `X_update()`, like this:
+
+```sh
+declare -A X_ids=()
+X_create() {
+   local name="a very bad name for id"
+
+   X_ids[$name]="$(fixid "$name")"
+}
+
+X_update() {
+   local microseconds="$1"
+
+   ...
+   local name="a very bad name for id"
+   ...
+
+   echo "BEGIN ${X_ids[$name]} $microseconds"
+   ...
+}
+```
+
+### Debugging your collectors
+
+You can run `charts.d.plugin` by hand with something like this:
+
+```sh
+# become user netdata
+sudo su -s /bin/sh netdata
+
+# run the plugin in debug mode
+/usr/libexec/netdata/plugins.d/charts.d.plugin debug 1 X Y Z
+```
+
+Charts.d will run in `debug` mode, with an update frequency of `1`, evaluating only the collector scripts
+`X`, `Y` and `Z`. You can define zero or more module scripts. If none is defined, charts.d will evaluate all
+module scripts available.
+
+Keep in mind that if your configs are not in `/etc/netdata`, you should do the following before running
+`charts.d.plugin`:
+
+```sh
+export NETDATA_USER_CONFIG_DIR="/path/to/etc/netdata"
+```
+
+Also, remember that Netdata runs `chart.d.plugin` as user `netdata` (or any other user the `netdata` process is configured to run as).
+
+## Running multiple instances of charts.d.plugin
+
+`charts.d.plugin` will call the `X_update()` function one after another. This means that a delay in collector `X`
+will also delay the collection of `Y` and `Z`.
+
+You can have multiple `charts.d.plugin` running to overcome this problem.
+
+This is what you need to do:
+
+1. Decide a new name for the new charts.d instance: example `charts2.d`.
+
+2. Create/edit the files `/etc/netdata/charts.d.conf` and `/etc/netdata/charts2.d.conf` and enable / disable the
+    module you want each to run. Remember to set `enable_all_charts="no"` to both of them, and enable the individual
+    modules for each.
+
+3. link `/usr/libexec/netdata/plugins.d/charts.d.plugin` to `/usr/libexec/netdata/plugins.d/charts2.d.plugin`.
+    Netdata will spawn a new charts.d process.
+
+Execute the above in this order, since Netdata will (by default) attempt to start new plugins soon after they are
+created in `/usr/libexec/netdata/plugins.d/`.
diff --git a/collectors/charts.d.plugin/ap/README.md b/src/collectors/charts.d.plugin/ap/README.md
index 5b6e75130..5b6e75130 120000
--- a/collectors/charts.d.plugin/ap/README.md
+++ b/src/collectors/charts.d.plugin/ap/README.md
diff --git a/collectors/charts.d.plugin/ap/ap.chart.sh b/src/collectors/charts.d.plugin/ap/ap.chart.sh
index 80c9dc602..80c9dc602 100644
--- a/collectors/charts.d.plugin/ap/ap.chart.sh
+++ b/src/collectors/charts.d.plugin/ap/ap.chart.sh
diff --git a/collectors/charts.d.plugin/ap/ap.conf b/src/collectors/charts.d.plugin/ap/ap.conf
index 38fc157ce..38fc157ce 100644
--- a/collectors/charts.d.plugin/ap/ap.conf
+++ b/src/collectors/charts.d.plugin/ap/ap.conf
diff --git a/collectors/charts.d.plugin/ap/integrations/access_points.md b/src/collectors/charts.d.plugin/ap/integrations/access_points.md
index a0de2c4df..0c0a3feb6 100644
--- a/collectors/charts.d.plugin/ap/integrations/access_points.md
+++ b/src/collectors/charts.d.plugin/ap/integrations/access_points.md
@@ -1,9 +1,9 @@
 <!--startmeta
-custom_edit_url: "https://github.com/netdata/netdata/edit/master/collectors/charts.d.plugin/ap/README.md"
-meta_yaml: "https://github.com/netdata/netdata/edit/master/collectors/charts.d.plugin/ap/metadata.yaml"
+custom_edit_url: "https://github.com/netdata/netdata/edit/master/src/collectors/charts.d.plugin/ap/README.md"
+meta_yaml: "https://github.com/netdata/netdata/edit/master/src/collectors/charts.d.plugin/ap/metadata.yaml"
 sidebar_label: "Access Points"
 learn_status: "Published"
-learn_rel_path: "Data Collection/Linux Systems/Network"
+learn_rel_path: "Collecting Metrics/Linux Systems/Network"
 most_popular: False
 message: "DO NOT EDIT THIS FILE DIRECTLY, IT IS GENERATED BY THE COLLECTOR'S metadata.yaml FILE"
 endmeta-->
@@ -101,7 +101,7 @@ The configuration file name for this integration is `charts.d/ap.conf`.
 
 
 You can edit the configuration file using the `edit-config` script from the
-Netdata [config directory](https://github.com/netdata/netdata/blob/master/docs/configure/nodes.md#the-netdata-config-directory).
+Netdata [config directory](https://github.com/netdata/netdata/blob/master/docs/netdata-agent/configuration.md#the-netdata-config-directory).
 
 ```bash
 cd /etc/netdata 2>/dev/null || cd /opt/netdata/etc/netdata
diff --git a/collectors/charts.d.plugin/ap/metadata.yaml b/src/collectors/charts.d.plugin/ap/metadata.yaml
index ee941e417..ee941e417 100644
--- a/collectors/charts.d.plugin/ap/metadata.yaml
+++ b/src/collectors/charts.d.plugin/ap/metadata.yaml
diff --git a/collectors/charts.d.plugin/apcupsd/README.md b/src/collectors/charts.d.plugin/apcupsd/README.md
index fc6681fe6..fc6681fe6 120000
--- a/collectors/charts.d.plugin/apcupsd/README.md
+++ b/src/collectors/charts.d.plugin/apcupsd/README.md
diff --git a/collectors/charts.d.plugin/apcupsd/apcupsd.chart.sh b/src/collectors/charts.d.plugin/apcupsd/apcupsd.chart.sh
index da9cd19c3..da9cd19c3 100644
--- a/collectors/charts.d.plugin/apcupsd/apcupsd.chart.sh
+++ b/src/collectors/charts.d.plugin/apcupsd/apcupsd.chart.sh
diff --git a/collectors/charts.d.plugin/apcupsd/apcupsd.conf b/src/collectors/charts.d.plugin/apcupsd/apcupsd.conf
index 679c0d61b..679c0d61b 100644
--- a/collectors/charts.d.plugin/apcupsd/apcupsd.conf
+++ b/src/collectors/charts.d.plugin/apcupsd/apcupsd.conf
diff --git a/collectors/charts.d.plugin/apcupsd/integrations/apc_ups.md b/src/collectors/charts.d.plugin/apcupsd/integrations/apc_ups.md
index a5c1f9613..4e3aa3352 100644
--- a/collectors/charts.d.plugin/apcupsd/integrations/apc_ups.md
+++ b/src/collectors/charts.d.plugin/apcupsd/integrations/apc_ups.md
@@ -1,9 +1,9 @@
 <!--startmeta
-custom_edit_url: "https://github.com/netdata/netdata/edit/master/collectors/charts.d.plugin/apcupsd/README.md"
-meta_yaml: "https://github.com/netdata/netdata/edit/master/collectors/charts.d.plugin/apcupsd/metadata.yaml"
+custom_edit_url: "https://github.com/netdata/netdata/edit/master/src/collectors/charts.d.plugin/apcupsd/README.md"
+meta_yaml: "https://github.com/netdata/netdata/edit/master/src/collectors/charts.d.plugin/apcupsd/metadata.yaml"
 sidebar_label: "APC UPS"
 learn_status: "Published"
-learn_rel_path: "Data Collection/UPS"
+learn_rel_path: "Collecting Metrics/UPS"
 most_popular: False
 message: "DO NOT EDIT THIS FILE DIRECTLY, IT IS GENERATED BY THE COLLECTOR'S metadata.yaml FILE"
 endmeta-->
@@ -85,16 +85,16 @@ The following alerts are available:
 
 | Alert name  | On metric | Description |
 |:------------|:----------|:------------|
-| [ apcupsd_ups_charge ](https://github.com/netdata/netdata/blob/master/health/health.d/apcupsd.conf) | apcupsd.charge | average UPS charge over the last minute |
-| [ apcupsd_10min_ups_load ](https://github.com/netdata/netdata/blob/master/health/health.d/apcupsd.conf) | apcupsd.load | average UPS load over the last 10 minutes |
-| [ apcupsd_last_collected_secs ](https://github.com/netdata/netdata/blob/master/health/health.d/apcupsd.conf) | apcupsd.load | number of seconds since the last successful data collection |
-| [ apcupsd_selftest_warning ](https://github.com/netdata/netdata/blob/master/health/health.d/apcupsd.conf) | apcupsd.selftest | self-test failed due to insufficient battery capacity or due to overload. |
-| [ apcupsd_status_onbatt ](https://github.com/netdata/netdata/blob/master/health/health.d/apcupsd.conf) | apcupsd.status | APC UPS has switched to battery power because the input power has failed |
-| [ apcupsd_status_overload ](https://github.com/netdata/netdata/blob/master/health/health.d/apcupsd.conf) | apcupsd.status | APC UPS is overloaded and cannot supply enough power to the load |
-| [ apcupsd_status_lowbatt ](https://github.com/netdata/netdata/blob/master/health/health.d/apcupsd.conf) | apcupsd.status | APC UPS battery is low and needs to be recharged |
-| [ apcupsd_status_replacebatt ](https://github.com/netdata/netdata/blob/master/health/health.d/apcupsd.conf) | apcupsd.status | APC UPS battery has reached the end of its lifespan and needs to be replaced |
-| [ apcupsd_status_nobatt ](https://github.com/netdata/netdata/blob/master/health/health.d/apcupsd.conf) | apcupsd.status | APC UPS has no battery |
-| [ apcupsd_status_commlost ](https://github.com/netdata/netdata/blob/master/health/health.d/apcupsd.conf) | apcupsd.status | APC UPS communication link is lost |
+| [ apcupsd_ups_charge ](https://github.com/netdata/netdata/blob/master/src/health/health.d/apcupsd.conf) | apcupsd.charge | average UPS charge over the last minute |
+| [ apcupsd_10min_ups_load ](https://github.com/netdata/netdata/blob/master/src/health/health.d/apcupsd.conf) | apcupsd.load | average UPS load over the last 10 minutes |
+| [ apcupsd_last_collected_secs ](https://github.com/netdata/netdata/blob/master/src/health/health.d/apcupsd.conf) | apcupsd.load | number of seconds since the last successful data collection |
+| [ apcupsd_selftest_warning ](https://github.com/netdata/netdata/blob/master/src/health/health.d/apcupsd.conf) | apcupsd.selftest | self-test failed due to insufficient battery capacity or due to overload. |
+| [ apcupsd_status_onbatt ](https://github.com/netdata/netdata/blob/master/src/health/health.d/apcupsd.conf) | apcupsd.status | APC UPS has switched to battery power because the input power has failed |
+| [ apcupsd_status_overload ](https://github.com/netdata/netdata/blob/master/src/health/health.d/apcupsd.conf) | apcupsd.status | APC UPS is overloaded and cannot supply enough power to the load |
+| [ apcupsd_status_lowbatt ](https://github.com/netdata/netdata/blob/master/src/health/health.d/apcupsd.conf) | apcupsd.status | APC UPS battery is low and needs to be recharged |
+| [ apcupsd_status_replacebatt ](https://github.com/netdata/netdata/blob/master/src/health/health.d/apcupsd.conf) | apcupsd.status | APC UPS battery has reached the end of its lifespan and needs to be replaced |
+| [ apcupsd_status_nobatt ](https://github.com/netdata/netdata/blob/master/src/health/health.d/apcupsd.conf) | apcupsd.status | APC UPS has no battery |
+| [ apcupsd_status_commlost ](https://github.com/netdata/netdata/blob/master/src/health/health.d/apcupsd.conf) | apcupsd.status | APC UPS communication link is lost |
 
 
 ## Setup
@@ -119,7 +119,7 @@ The configuration file name for this integration is `charts.d/apcupsd.conf`.
 
 
 You can edit the configuration file using the `edit-config` script from the
-Netdata [config directory](https://github.com/netdata/netdata/blob/master/docs/configure/nodes.md#the-netdata-config-directory).
+Netdata [config directory](https://github.com/netdata/netdata/blob/master/docs/netdata-agent/configuration.md#the-netdata-config-directory).
 
 ```bash
 cd /etc/netdata 2>/dev/null || cd /opt/netdata/etc/netdata
diff --git a/src/collectors/charts.d.plugin/apcupsd/metadata.yaml b/src/collectors/charts.d.plugin/apcupsd/metadata.yaml
new file mode 100644
index 000000000..0af9c98e6
--- /dev/null
+++ b/src/collectors/charts.d.plugin/apcupsd/metadata.yaml
@@ -0,0 +1,256 @@
+plugin_name: charts.d.plugin
+modules:
+  - meta:
+      plugin_name: charts.d.plugin
+      module_name: apcupsd
+      monitored_instance:
+        name: APC UPS
+        link: "https://www.apc.com"
+        categories:
+          - data-collection.ups
+        icon_filename: "apc.svg"
+      related_resources:
+        integrations:
+          list: []
+      info_provided_to_referring_integrations:
+        description: ""
+      keywords:
+        - ups
+        - apc
+        - power
+        - supply
+        - battery
+        - apcupsd
+      most_popular: false
+    overview:
+      data_collection:
+        metrics_description: "Monitor APC UPS performance with Netdata for optimal uninterruptible power supply operations. Enhance your power supply reliability with real-time APC UPS metrics."
+        method_description: "The collector uses the `apcaccess` tool to contact the `apcupsd` daemon and get the APC UPS statistics."
+      supported_platforms:
+        include: []
+        exclude: []
+      multi_instance: false
+      additional_permissions:
+        description: ""
+      default_behavior:
+        auto_detection:
+          description: "By default, with no configuration provided, the collector will try to contact 127.0.0.1:3551 with using the `apcaccess` utility."
+        limits:
+          description: ""
+        performance_impact:
+          description: ""
+    setup:
+      prerequisites:
+        list:
+          - title: "Install charts.d plugin"
+            description: |
+              If [using our official native DEB/RPM packages](https://github.com/netdata/netdata/blob/master/packaging/installer/UPDATE.md#determine-which-installation-method-you-used), make sure `netdata-plugin-chartsd` is installed.
+          - title: "Required software"
+            description: "Make sure the `apcaccess` and `apcupsd` are installed and running."
+      configuration:
+        file:
+          name: charts.d/apcupsd.conf
+        options:
+          description: |
+            The config file is sourced by the charts.d plugin. It's a standard bash file.
+            
+            The following collapsed table contains all the options that can be configured for the apcupsd collector.
+          folding:
+            title: "Config options"
+            enabled: true
+          list:
+            - name: apcupsd_sources
+              description: This is an array of apcupsd sources. You can have multiple entries there. Please refer to the example below on how to set it.
+              default_value: "127.0.0.1:3551"
+              required: false
+            - name: apcupsd_timeout
+              description: How long to wait for apcupsd to respond.
+              default_value: 3
+              required: false
+            - name: apcupsd_update_every
+              description: The data collection frequency. If unset, will inherit the netdata update frequency.
+              default_value: 1
+              required: false
+            - name: apcupsd_priority
+              description: The charts priority on the dashboard.
+              default_value: 90000
+              required: false
+            - name: apcupsd_retries
+              description: The number of retries to do in case of failure before disabling the collector.
+              default_value: 10
+              required: false
+        examples:
+          folding:
+            enabled: false
+            title: "Config"
+          list:
+            - name: Multiple apcupsd sources
+              description: Specify a multiple apcupsd sources along with a custom update interval
+              config: |
+                # add all your APC UPSes in this array - uncomment it too
+                declare -A apcupsd_sources=(
+                    ["local"]="127.0.0.1:3551",
+                    ["remote"]="1.2.3.4:3551"
+                )
+                
+                # how long to wait for apcupsd to respond
+                #apcupsd_timeout=3
+                
+                # the data collection frequency
+                # if unset, will inherit the netdata update frequency
+                apcupsd_update_every=5
+                
+                # the charts priority on the dashboard
+                #apcupsd_priority=90000
+                
+                # the number of retries to do in case of failure
+                # before disabling the module
+                #apcupsd_retries=10
+    troubleshooting:
+      problems:
+        list: []
+    alerts:
+      - name: apcupsd_ups_charge
+        link: https://github.com/netdata/netdata/blob/master/src/health/health.d/apcupsd.conf
+        metric: apcupsd.charge
+        info: average UPS charge over the last minute
+        os: "*"
+      - name: apcupsd_10min_ups_load
+        link: https://github.com/netdata/netdata/blob/master/src/health/health.d/apcupsd.conf
+        metric: apcupsd.load
+        info: average UPS load over the last 10 minutes
+        os: "*"
+      - name: apcupsd_last_collected_secs
+        link: https://github.com/netdata/netdata/blob/master/src/health/health.d/apcupsd.conf
+        metric: apcupsd.load
+        info: number of seconds since the last successful data collection
+      - name: apcupsd_selftest_warning
+        link: https://github.com/netdata/netdata/blob/master/src/health/health.d/apcupsd.conf
+        metric: apcupsd.selftest
+        info: self-test failed due to insufficient battery capacity or due to overload.
+      - name: apcupsd_status_onbatt
+        link: https://github.com/netdata/netdata/blob/master/src/health/health.d/apcupsd.conf
+        metric: apcupsd.status
+        info: APC UPS has switched to battery power because the input power has failed
+      - name: apcupsd_status_overload
+        link: https://github.com/netdata/netdata/blob/master/src/health/health.d/apcupsd.conf
+        metric: apcupsd.status
+        info: APC UPS is overloaded and cannot supply enough power to the load
+      - name: apcupsd_status_lowbatt
+        link: https://github.com/netdata/netdata/blob/master/src/health/health.d/apcupsd.conf
+        metric: apcupsd.status
+        info: APC UPS battery is low and needs to be recharged
+      - name: apcupsd_status_replacebatt
+        link: https://github.com/netdata/netdata/blob/master/src/health/health.d/apcupsd.conf
+        metric: apcupsd.status
+        info: APC UPS battery has reached the end of its lifespan and needs to be replaced
+      - name: apcupsd_status_nobatt
+        link: https://github.com/netdata/netdata/blob/master/src/health/health.d/apcupsd.conf
+        metric: apcupsd.status
+        info: APC UPS has no battery
+      - name: apcupsd_status_commlost
+        link: https://github.com/netdata/netdata/blob/master/src/health/health.d/apcupsd.conf
+        metric: apcupsd.status
+        info: APC UPS communication link is lost
+    metrics:
+      folding:
+        title: Metrics
+        enabled: false
+      description: ""
+      availability: []
+      scopes:
+        - name: ups
+          description: "Metrics related to UPS. Each UPS provides its own set of the following metrics."
+          labels: []
+          metrics:
+            - name: apcupsd.charge
+              description: UPS Charge
+              unit: "percentage"
+              chart_type: area
+              dimensions:
+                - name: charge
+            - name: apcupsd.battery.voltage
+              description: UPS Battery Voltage
+              unit: "Volts"
+              chart_type: line
+              dimensions:
+                - name: voltage
+                - name: nominal
+            - name: apcupsd.input.voltage
+              description: UPS Input Voltage
+              unit: "Volts"
+              chart_type: line
+              dimensions:
+                - name: voltage
+                - name: min
+                - name: max
+            - name: apcupsd.output.voltage
+              description: UPS Output Voltage
+              unit: "Volts"
+              chart_type: line
+              dimensions:
+                - name: absolute
+                - name: nominal
+            - name: apcupsd.input.frequency
+              description: UPS Input Voltage
+              unit: "Hz"
+              chart_type: line
+              dimensions:
+                - name: frequency
+            - name: apcupsd.load
+              description: UPS Load
+              unit: "percentage"
+              chart_type: area
+              dimensions:
+                - name: load
+            - name: apcupsd.load_usage
+              description: UPS Load Usage
+              unit: "Watts"
+              chart_type: area
+              dimensions:
+                - name: load
+            - name: apcupsd.temperature
+              description: UPS Temperature
+              unit: "Celsius"
+              chart_type: line
+              dimensions:
+                - name: temp
+            - name: apcupsd.time
+              description: UPS Time Remaining
+              unit: "Minutes"
+              chart_type: area
+              dimensions:
+                - name: time
+            - name: apcupsd.online
+              description: UPS ONLINE flag
+              unit: "boolean"
+              chart_type: line
+              dimensions:
+                - name: online
+            - name: apcupsd.selftest
+              description: UPS Self-Test status
+              unit: status
+              chart_type: line
+              dimensions:
+                - name: OK
+                - name: NO
+                - name: BT
+                - name: NG
+            - name: apcupsd.status
+              description: UPS Status
+              unit: status
+              chart_type: line
+              dimensions:
+                - name: ONLINE
+                - name: ONBATT
+                - name: OVERLOAD
+                - name: LOWBATT
+                - name: REPLACEBATT
+                - name: NOBATT
+                - name: SLAVE
+                - name: SLAVEDOWN
+                - name: COMMLOST
+                - name: CAL
+                - name: TRIM
+                - name: BOOST
+                - name: SHUTTING_DOWN
diff --git a/collectors/charts.d.plugin/charts.d.conf b/src/collectors/charts.d.plugin/charts.d.conf
index 4614f259e..4614f259e 100644
--- a/collectors/charts.d.plugin/charts.d.conf
+++ b/src/collectors/charts.d.plugin/charts.d.conf
diff --git a/collectors/charts.d.plugin/charts.d.dryrun-helper.sh b/src/collectors/charts.d.plugin/charts.d.dryrun-helper.sh
index 91af2c542..91af2c542 100755
--- a/collectors/charts.d.plugin/charts.d.dryrun-helper.sh
+++ b/src/collectors/charts.d.plugin/charts.d.dryrun-helper.sh
diff --git a/collectors/charts.d.plugin/charts.d.plugin.in b/src/collectors/charts.d.plugin/charts.d.plugin.in
index 4e64b7e23..4e64b7e23 100755
--- a/collectors/charts.d.plugin/charts.d.plugin.in
+++ b/src/collectors/charts.d.plugin/charts.d.plugin.in
diff --git a/src/collectors/charts.d.plugin/example/README.md b/src/collectors/charts.d.plugin/example/README.md
new file mode 100644
index 000000000..a16180581
--- /dev/null
+++ b/src/collectors/charts.d.plugin/example/README.md
@@ -0,0 +1,14 @@
+<!--
+title: "Example"
+custom_edit_url: "https://github.com/netdata/netdata/edit/master/src/collectors/charts.d.plugin/example/README.md"
+sidebar_label: "example-charts.d.plugin"
+learn_status: "Published"
+learn_topic_type: "References"
+learn_rel_path: "Integrations/Monitor/Mock Collectors"
+-->
+
+# Example
+
+If you want to understand how charts.d data collector functions, check out the [charts.d example](https://raw.githubusercontent.com/netdata/netdata/master/src/collectors/charts.d.plugin/example/example.chart.sh). 
+
+
diff --git a/collectors/charts.d.plugin/example/example.chart.sh b/src/collectors/charts.d.plugin/example/example.chart.sh
index 6bbbcf1d7..6bbbcf1d7 100644
--- a/collectors/charts.d.plugin/example/example.chart.sh
+++ b/src/collectors/charts.d.plugin/example/example.chart.sh
diff --git a/collectors/charts.d.plugin/example/example.conf b/src/collectors/charts.d.plugin/example/example.conf
index 6232ca584..6232ca584 100644
--- a/collectors/charts.d.plugin/example/example.conf
+++ b/src/collectors/charts.d.plugin/example/example.conf
diff --git a/collectors/charts.d.plugin/libreswan/README.md b/src/collectors/charts.d.plugin/libreswan/README.md
index 1416d9597..1416d9597 120000
--- a/collectors/charts.d.plugin/libreswan/README.md
+++ b/src/collectors/charts.d.plugin/libreswan/README.md
diff --git a/collectors/charts.d.plugin/libreswan/integrations/libreswan.md b/src/collectors/charts.d.plugin/libreswan/integrations/libreswan.md
index bd1eec647..0b08e2b4f 100644
--- a/collectors/charts.d.plugin/libreswan/integrations/libreswan.md
+++ b/src/collectors/charts.d.plugin/libreswan/integrations/libreswan.md
@@ -1,9 +1,9 @@
 <!--startmeta
-custom_edit_url: "https://github.com/netdata/netdata/edit/master/collectors/charts.d.plugin/libreswan/README.md"
-meta_yaml: "https://github.com/netdata/netdata/edit/master/collectors/charts.d.plugin/libreswan/metadata.yaml"
+custom_edit_url: "https://github.com/netdata/netdata/edit/master/src/collectors/charts.d.plugin/libreswan/README.md"
+meta_yaml: "https://github.com/netdata/netdata/edit/master/src/collectors/charts.d.plugin/libreswan/metadata.yaml"
 sidebar_label: "Libreswan"
 learn_status: "Published"
-learn_rel_path: "Data Collection/VPNs"
+learn_rel_path: "Collecting Metrics/VPNs"
 most_popular: False
 message: "DO NOT EDIT THIS FILE DIRECTLY, IT IS GENERATED BY THE COLLECTOR'S metadata.yaml FILE"
 endmeta-->
@@ -116,7 +116,7 @@ The configuration file name for this integration is `charts.d/libreswan.conf`.
 
 
 You can edit the configuration file using the `edit-config` script from the
-Netdata [config directory](https://github.com/netdata/netdata/blob/master/docs/configure/nodes.md#the-netdata-config-directory).
+Netdata [config directory](https://github.com/netdata/netdata/blob/master/docs/netdata-agent/configuration.md#the-netdata-config-directory).
 
 ```bash
 cd /etc/netdata 2>/dev/null || cd /opt/netdata/etc/netdata
diff --git a/collectors/charts.d.plugin/libreswan/libreswan.chart.sh b/src/collectors/charts.d.plugin/libreswan/libreswan.chart.sh
index d526f7a91..d526f7a91 100644
--- a/collectors/charts.d.plugin/libreswan/libreswan.chart.sh
+++ b/src/collectors/charts.d.plugin/libreswan/libreswan.chart.sh
diff --git a/collectors/charts.d.plugin/libreswan/libreswan.conf b/src/collectors/charts.d.plugin/libreswan/libreswan.conf
index 9b3ee77b7..9b3ee77b7 100644
--- a/collectors/charts.d.plugin/libreswan/libreswan.conf
+++ b/src/collectors/charts.d.plugin/libreswan/libreswan.conf
diff --git a/collectors/charts.d.plugin/libreswan/metadata.yaml b/src/collectors/charts.d.plugin/libreswan/metadata.yaml
index 77cb25450..77cb25450 100644
--- a/collectors/charts.d.plugin/libreswan/metadata.yaml
+++ b/src/collectors/charts.d.plugin/libreswan/metadata.yaml
diff --git a/collectors/charts.d.plugin/loopsleepms.sh.inc b/src/collectors/charts.d.plugin/loopsleepms.sh.inc
index 5608b8d8f..5608b8d8f 100644
--- a/collectors/charts.d.plugin/loopsleepms.sh.inc
+++ b/src/collectors/charts.d.plugin/loopsleepms.sh.inc
diff --git a/collectors/charts.d.plugin/opensips/README.md b/src/collectors/charts.d.plugin/opensips/README.md
index bb85ba6d0..bb85ba6d0 120000
--- a/collectors/charts.d.plugin/opensips/README.md
+++ b/src/collectors/charts.d.plugin/opensips/README.md
diff --git a/collectors/charts.d.plugin/opensips/integrations/opensips.md b/src/collectors/charts.d.plugin/opensips/integrations/opensips.md
index 8c88dba0b..6a6a309e8 100644
--- a/collectors/charts.d.plugin/opensips/integrations/opensips.md
+++ b/src/collectors/charts.d.plugin/opensips/integrations/opensips.md
@@ -1,9 +1,9 @@
 <!--startmeta
-custom_edit_url: "https://github.com/netdata/netdata/edit/master/collectors/charts.d.plugin/opensips/README.md"
-meta_yaml: "https://github.com/netdata/netdata/edit/master/collectors/charts.d.plugin/opensips/metadata.yaml"
+custom_edit_url: "https://github.com/netdata/netdata/edit/master/src/collectors/charts.d.plugin/opensips/README.md"
+meta_yaml: "https://github.com/netdata/netdata/edit/master/src/collectors/charts.d.plugin/opensips/metadata.yaml"
 sidebar_label: "OpenSIPS"
 learn_status: "Published"
-learn_rel_path: "Data Collection/Telephony Servers"
+learn_rel_path: "Collecting Metrics/Telephony Servers"
 most_popular: False
 message: "DO NOT EDIT THIS FILE DIRECTLY, IT IS GENERATED BY THE COLLECTOR'S metadata.yaml FILE"
 endmeta-->
@@ -112,7 +112,7 @@ The configuration file name for this integration is `charts.d/opensips.conf`.
 
 
 You can edit the configuration file using the `edit-config` script from the
-Netdata [config directory](https://github.com/netdata/netdata/blob/master/docs/configure/nodes.md#the-netdata-config-directory).
+Netdata [config directory](https://github.com/netdata/netdata/blob/master/docs/netdata-agent/configuration.md#the-netdata-config-directory).
 
 ```bash
 cd /etc/netdata 2>/dev/null || cd /opt/netdata/etc/netdata
diff --git a/collectors/charts.d.plugin/opensips/metadata.yaml b/src/collectors/charts.d.plugin/opensips/metadata.yaml
index 356de5615..356de5615 100644
--- a/collectors/charts.d.plugin/opensips/metadata.yaml
+++ b/src/collectors/charts.d.plugin/opensips/metadata.yaml
diff --git a/collectors/charts.d.plugin/opensips/opensips.chart.sh b/src/collectors/charts.d.plugin/opensips/opensips.chart.sh
index 02401fd59..02401fd59 100644
--- a/collectors/charts.d.plugin/opensips/opensips.chart.sh
+++ b/src/collectors/charts.d.plugin/opensips/opensips.chart.sh
diff --git a/collectors/charts.d.plugin/opensips/opensips.conf b/src/collectors/charts.d.plugin/opensips/opensips.conf
index e25111dce..e25111dce 100644
--- a/collectors/charts.d.plugin/opensips/opensips.conf
+++ b/src/collectors/charts.d.plugin/opensips/opensips.conf
diff --git a/collectors/charts.d.plugin/sensors/README.md b/src/collectors/charts.d.plugin/sensors/README.md
index 7e5a416c4..7e5a416c4 120000
--- a/collectors/charts.d.plugin/sensors/README.md
+++ b/src/collectors/charts.d.plugin/sensors/README.md
diff --git a/collectors/charts.d.plugin/sensors/integrations/linux_sensors_sysfs.md b/src/collectors/charts.d.plugin/sensors/integrations/linux_sensors_sysfs.md
index 130352f61..6e802bb7e 100644
--- a/collectors/charts.d.plugin/sensors/integrations/linux_sensors_sysfs.md
+++ b/src/collectors/charts.d.plugin/sensors/integrations/linux_sensors_sysfs.md
@@ -1,9 +1,9 @@
 <!--startmeta
-custom_edit_url: "https://github.com/netdata/netdata/edit/master/collectors/charts.d.plugin/sensors/README.md"
-meta_yaml: "https://github.com/netdata/netdata/edit/master/collectors/charts.d.plugin/sensors/metadata.yaml"
+custom_edit_url: "https://github.com/netdata/netdata/edit/master/src/collectors/charts.d.plugin/sensors/README.md"
+meta_yaml: "https://github.com/netdata/netdata/edit/master/src/collectors/charts.d.plugin/sensors/metadata.yaml"
 sidebar_label: "Linux Sensors (sysfs)"
 learn_status: "Published"
-learn_rel_path: "Data Collection/Hardware Devices and Sensors"
+learn_rel_path: "Collecting Metrics/Hardware Devices and Sensors"
 most_popular: False
 message: "DO NOT EDIT THIS FILE DIRECTLY, IT IS GENERATED BY THE COLLECTOR'S metadata.yaml FILE"
 endmeta-->
@@ -22,7 +22,7 @@ Module: sensors
 ## Overview
 
 Use this collector when `lm-sensors` doesn't work on your device (e.g. for RPi temperatures).
-For all other cases use the [Python collector](https://github.com/netdata/netdata/blob/master/collectors/python.d.plugin/sensors), which supports multiple jobs, is more efficient and performs calculations on top of the kernel provided values."
+For all other cases use the [Python collector](https://github.com/netdata/netdata/blob/master/src/collectors/python.d.plugin/sensors), which supports multiple jobs, is more efficient and performs calculations on top of the kernel provided values."
 
 
 It will provide charts for all configured system sensors, by reading sensors directly from the kernel.
@@ -95,14 +95,14 @@ If [using our official native DEB/RPM packages](https://github.com/netdata/netda
 
 #### Enable the sensors collector
 
-The `sensors` collector is disabled by default. To enable it, use `edit-config` from the Netdata [config directory](https://github.com/netdata/netdata/blob/master/docs/configure/nodes.md), which is typically at `/etc/netdata`, to edit the `charts.d.conf` file.
+The `sensors` collector is disabled by default. To enable it, use `edit-config` from the Netdata [config directory](https://github.com/netdata/netdata/blob/master/docs/netdata-agent/configuration.md), which is typically at `/etc/netdata`, to edit the `charts.d.conf` file.
 
 ```bash
 cd /etc/netdata   # Replace this path with your Netdata config directory, if different
 sudo ./edit-config charts.d.conf
 ```
 
-Change the value of the `sensors` setting to `force` and uncomment the line. Save the file and restart the Netdata Agent with `sudo systemctl restart netdata`, or the [appropriate method](https://github.com/netdata/netdata/blob/master/docs/configure/start-stop-restart.md) for your system.
+Change the value of the `sensors` setting to `force` and uncomment the line. Save the file and restart the Netdata Agent with `sudo systemctl restart netdata`, or the [appropriate method](https://github.com/netdata/netdata/blob/master/packaging/installer/README.md#maintaining-a-netdata-agent-installation) for your system.
 
 
 
@@ -114,7 +114,7 @@ The configuration file name for this integration is `charts.d/sensors.conf`.
 
 
 You can edit the configuration file using the `edit-config` script from the
-Netdata [config directory](https://github.com/netdata/netdata/blob/master/docs/configure/nodes.md#the-netdata-config-directory).
+Netdata [config directory](https://github.com/netdata/netdata/blob/master/docs/netdata-agent/configuration.md#the-netdata-config-directory).
 
 ```bash
 cd /etc/netdata 2>/dev/null || cd /opt/netdata/etc/netdata
diff --git a/src/collectors/charts.d.plugin/sensors/metadata.yaml b/src/collectors/charts.d.plugin/sensors/metadata.yaml
new file mode 100644
index 000000000..ef32ee723
--- /dev/null
+++ b/src/collectors/charts.d.plugin/sensors/metadata.yaml
@@ -0,0 +1,182 @@
+plugin_name: charts.d.plugin
+modules:
+  - meta:
+      plugin_name: charts.d.plugin
+      module_name: sensors
+      monitored_instance:
+        name: Linux Sensors (sysfs)
+        link: "https://www.kernel.org/doc/Documentation/hwmon/sysfs-interface"
+        categories:
+          - data-collection.hardware-devices-and-sensors
+        icon_filename: "microchip.svg"
+      related_resources:
+        integrations:
+          list: []
+      info_provided_to_referring_integrations:
+        description: ""
+      keywords:
+        - sensors
+        - sysfs
+        - hwmon
+        - rpi
+        - raspberry pi
+      most_popular: false
+    overview:
+      data_collection:
+        metrics_description: |
+          Use this collector when `lm-sensors` doesn't work on your device (e.g. for RPi temperatures).
+          For all other cases use the [Python collector](https://github.com/netdata/netdata/blob/master/src/collectors/python.d.plugin/sensors), which supports multiple jobs, is more efficient and performs calculations on top of the kernel provided values."
+        method_description: |
+          It will provide charts for all configured system sensors, by reading sensors directly from the kernel.
+          The values graphed are the raw hardware values of the sensors.
+      supported_platforms:
+        include: [Linux]
+        exclude: []
+      multi_instance: true
+      additional_permissions:
+        description: ""
+      default_behavior:
+        auto_detection:
+          description: "By default, the collector will try to read entries under `/sys/devices`"
+        limits:
+          description: ""
+        performance_impact:
+          description: ""
+    setup:
+      prerequisites:
+        list:
+          - title: "Install charts.d plugin"
+            description: |
+              If [using our official native DEB/RPM packages](https://github.com/netdata/netdata/blob/master/packaging/installer/UPDATE.md#determine-which-installation-method-you-used), make sure `netdata-plugin-chartsd` is installed.
+          - title: "Enable the sensors collector"
+            description: |
+              The `sensors` collector is disabled by default. To enable it, use `edit-config` from the Netdata [config directory](https://github.com/netdata/netdata/blob/master/docs/netdata-agent/configuration.md), which is typically at `/etc/netdata`, to edit the `charts.d.conf` file.
+
+              ```bash
+              cd /etc/netdata   # Replace this path with your Netdata config directory, if different
+              sudo ./edit-config charts.d.conf
+              ```
+
+              Change the value of the `sensors` setting to `force` and uncomment the line. Save the file and restart the Netdata Agent with `sudo systemctl restart netdata`, or the [appropriate method](https://github.com/netdata/netdata/blob/master/packaging/installer/README.md#maintaining-a-netdata-agent-installation) for your system.
+      configuration:
+        file:
+          name: charts.d/sensors.conf
+        options:
+          description: |
+            The config file is sourced by the charts.d plugin. It's a standard bash file.
+            
+            The following collapsed table contains all the options that can be configured for the sensors collector.
+          folding:
+            title: "Config options"
+            enabled: true
+          list:
+            - name: sensors_sys_dir
+              description: The directory the kernel exposes sensor data.
+              default_value: "/sys/devices"
+              required: false
+            - name: sensors_sys_depth
+              description: How deep in the tree to check for sensor data.
+              default_value: 10
+              required: false
+            - name: sensors_source_update
+              description: If set to 1, the script will overwrite internal script functions with code generated ones.
+              default_value: 1
+              required: false
+            - name: sensors_update_every
+              description: The data collection frequency. If unset, will inherit the netdata update frequency.
+              default_value: 1
+              required: false
+            - name: sensors_priority
+              description: The charts priority on the dashboard.
+              default_value: 90000
+              required: false
+            - name: sensors_retries
+              description: The number of retries to do in case of failure before disabling the collector.
+              default_value: 10
+              required: false
+        examples:
+          folding:
+            enabled: false
+            title: "Config"
+          list:
+            - name: Set sensors path depth
+              description: Set a different sensors path depth
+              config: |
+                # the directory the kernel keeps sensor data
+                #sensors_sys_dir="/sys/devices"
+                
+                # how deep in the tree to check for sensor data
+                sensors_sys_depth=5
+                
+                # if set to 1, the script will overwrite internal
+                # script functions with code generated ones
+                # leave to 1, is faster
+                #sensors_source_update=1
+                
+                # the data collection frequency
+                # if unset, will inherit the netdata update frequency
+                #sensors_update_every=
+                
+                # the charts priority on the dashboard
+                #sensors_priority=90000
+                
+                # the number of retries to do in case of failure
+                # before disabling the module
+                #sensors_retries=10
+    troubleshooting:
+      problems:
+        list: []
+    alerts: []
+    metrics:
+      folding:
+        title: Metrics
+        enabled: false
+      description: ""
+      availability: []
+      scopes:
+        - name: sensor chip
+          description: "Metrics related to sensor chips. Each chip provides its own set of the following metrics."
+          labels: []
+          metrics:
+            - name: sensors.temp
+              description: Temperature
+              unit: "Celsius"
+              chart_type: line
+              dimensions:
+                - name: "{filename}"
+            - name: sensors.volt
+              description: Voltage
+              unit: "Volts"
+              chart_type: line
+              dimensions:
+                - name: "{filename}"
+            - name: sensors.curr
+              description: Current
+              unit: "Ampere"
+              chart_type: line
+              dimensions:
+                - name: "{filename}"
+            - name: sensors.power
+              description: Power
+              unit: "Watt"
+              chart_type: line
+              dimensions:
+                - name: "{filename}"
+            - name: sensors.fans
+              description: Fans Speed
+              unit: "Rotations / Minute"
+              chart_type: line
+              dimensions:
+                - name: "{filename}"
+            - name: sensors.energy
+              description: Energy
+              unit: "Joule"
+              chart_type: area
+              dimensions:
+                - name: "{filename}"
+            - name: sensors.humidity
+              description: Humidity
+              unit: "Percent"
+              chart_type: line
+              dimensions:
+                - name: "{filename}"
diff --git a/collectors/charts.d.plugin/sensors/sensors.chart.sh b/src/collectors/charts.d.plugin/sensors/sensors.chart.sh
index 9576e2ab2..9576e2ab2 100644
--- a/collectors/charts.d.plugin/sensors/sensors.chart.sh
+++ b/src/collectors/charts.d.plugin/sensors/sensors.chart.sh
diff --git a/collectors/charts.d.plugin/sensors/sensors.conf b/src/collectors/charts.d.plugin/sensors/sensors.conf
index bcb28807d..bcb28807d 100644
--- a/collectors/charts.d.plugin/sensors/sensors.conf
+++ b/src/collectors/charts.d.plugin/sensors/sensors.conf