Adding upstream version 1.46.3.upstream

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

5 files changed, 152 insertions, 8 deletions

diff --git a/collectors/python.d.plugin/retroshare/README.md b/src/collectors/python.d.plugin/retroshare/README.md
index 4e4c2cdb7..4e4c2cdb7 120000
--- a/collectors/python.d.plugin/retroshare/README.md
+++ b/src/collectors/python.d.plugin/retroshare/README.md
diff --git a/collectors/python.d.plugin/retroshare/integrations/retroshare.md b/src/collectors/python.d.plugin/retroshare/integrations/retroshare.md
index 4fc003c6f..b045127ee 100644
--- a/collectors/python.d.plugin/retroshare/integrations/retroshare.md
+++ b/src/collectors/python.d.plugin/retroshare/integrations/retroshare.md
@@ -1,9 +1,9 @@
 <!--startmeta
-custom_edit_url: "https://github.com/netdata/netdata/edit/master/collectors/python.d.plugin/retroshare/README.md"
-meta_yaml: "https://github.com/netdata/netdata/edit/master/collectors/python.d.plugin/retroshare/metadata.yaml"
+custom_edit_url: "https://github.com/netdata/netdata/edit/master/src/collectors/python.d.plugin/retroshare/README.md"
+meta_yaml: "https://github.com/netdata/netdata/edit/master/src/collectors/python.d.plugin/retroshare/metadata.yaml"
 sidebar_label: "RetroShare"
 learn_status: "Published"
-learn_rel_path: "Data Collection/Media Services"
+learn_rel_path: "Collecting Metrics/Media Services"
 most_popular: False
 message: "DO NOT EDIT THIS FILE DIRECTLY, IT IS GENERATED BY THE COLLECTOR'S metadata.yaml FILE"
 endmeta-->
@@ -76,7 +76,7 @@ The following alerts are available:
 
 | Alert name  | On metric | Description |
 |:------------|:----------|:------------|
-| [ retroshare_dht_working ](https://github.com/netdata/netdata/blob/master/health/health.d/retroshare.conf) | retroshare.dht | number of DHT peers |
+| [ retroshare_dht_working ](https://github.com/netdata/netdata/blob/master/src/health/health.d/retroshare.conf) | retroshare.dht | number of DHT peers |
 
 
 ## Setup
@@ -97,7 +97,7 @@ The configuration file name for this integration is `python.d/retroshare.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](/docs/netdata-agent/configuration/README.md#the-netdata-config-directory).
 
 ```bash
 cd /etc/netdata 2>/dev/null || cd /opt/netdata/etc/netdata
@@ -117,7 +117,7 @@ Additionally, the following collapsed table contains all the options that can be
 Every configuration JOB starts with a `job_name` value which will appear in the dashboard, unless a `name` parameter is specified.
 
 
-<details><summary>Config options</summary>
+<details open><summary>Config options</summary>
 
 | Name | Description | Default | Required |
 |:----|:-----------|:-------|:--------:|
@@ -136,7 +136,7 @@ Every configuration JOB starts with a `job_name` value which will appear in the
 
 A basic configuration for a RetroShare server running on localhost.
 
-<details><summary>Config</summary>
+<details open><summary>Config</summary>
 
 ```yaml
 localhost:
@@ -150,7 +150,7 @@ localhost:
 
 A basic configuration for a remote RetroShare server.
 
-<details><summary>Config</summary>
+<details open><summary>Config</summary>
 
 ```yaml
 remote:
diff --git a/src/collectors/python.d.plugin/retroshare/metadata.yaml b/src/collectors/python.d.plugin/retroshare/metadata.yaml
new file mode 100644
index 000000000..e0270e1dd
--- /dev/null
+++ b/src/collectors/python.d.plugin/retroshare/metadata.yaml
@@ -0,0 +1,144 @@
+plugin_name: python.d.plugin
+modules:
+  - meta:
+      plugin_name: python.d.plugin
+      module_name: retroshare
+      monitored_instance:
+        name: RetroShare
+        link: "https://retroshare.cc/"
+        categories:
+          - data-collection.media-streaming-servers
+        icon_filename: "retroshare.png"
+      related_resources:
+        integrations:
+          list: []
+      info_provided_to_referring_integrations:
+        description: ""
+      keywords:
+        - retroshare
+        - p2p
+      most_popular: false
+    overview:
+      data_collection:
+        metrics_description: "This collector monitors RetroShare statistics such as application bandwidth, peers, and DHT metrics."
+        method_description: "It connects to the RetroShare web interface to gather metrics."
+      supported_platforms:
+        include: []
+        exclude: []
+      multi_instance: true
+      additional_permissions:
+        description: ""
+      default_behavior:
+        auto_detection:
+          description: "The collector will attempt to connect and detect a RetroShare web interface through http://localhost:9090, even without any configuration."
+        limits:
+          description: ""
+        performance_impact:
+          description: ""
+    setup:
+      prerequisites:
+        list:
+          - title: "RetroShare web interface"
+            description: |
+              RetroShare needs to be configured to enable the RetroShare WEB Interface and allow access from the Netdata host.
+      configuration:
+        file:
+          name: python.d/retroshare.conf
+        options:
+          description: |
+            There are 2 sections:
+            
+            * Global variables
+            * One or more JOBS that can define multiple different instances to monitor.
+            
+            The following options can be defined globally: priority, penalty, autodetection_retry, update_every, but can also be defined per JOB to override the global values.
+            
+            Additionally, the following collapsed table contains all the options that can be configured inside a JOB definition.
+            
+            Every configuration JOB starts with a `job_name` value which will appear in the dashboard, unless a `name` parameter is specified.
+          folding:
+            title: "Config options"
+            enabled: true
+          list:
+            - name: update_every
+              description: Sets the default data collection frequency.
+              default_value: 5
+              required: false
+            - name: priority
+              description: Controls the order of charts at the netdata dashboard.
+              default_value: 60000
+              required: false
+            - name: autodetection_retry
+              description: Sets the job re-check interval in seconds.
+              default_value: 0
+              required: false
+            - name: penalty
+              description: Indicates whether to apply penalty to update_every in case of failures.
+              default_value: yes
+              required: false
+            - name: name
+              description: Job name. This value will overwrite the `job_name` value. JOBS with the same name are mutually exclusive. Only one of them will be allowed running at any time. This allows autodetection to try several alternatives and pick the one that works.
+              default_value: ""
+              required: false
+            - name: url
+              description: The URL to the RetroShare Web UI.
+              default_value: "http://localhost:9090"
+              required: false
+        examples:
+          folding:
+            enabled: true
+            title: "Config"
+          list:
+            - name: Local RetroShare Web UI
+              description: A basic configuration for a RetroShare server running on localhost.
+              config: |
+                localhost:
+                 name: 'local retroshare'
+                 url: 'http://localhost:9090'
+            - name: Remote RetroShare Web UI
+              description: A basic configuration for a remote RetroShare server.
+              config: |
+                remote:
+                 name: 'remote retroshare'
+                 url: 'http://1.2.3.4:9090'
+
+    troubleshooting:
+      problems:
+        list: []
+    alerts:
+      - name: retroshare_dht_working
+        link: https://github.com/netdata/netdata/blob/master/src/health/health.d/retroshare.conf
+        metric: retroshare.dht
+        info: number of DHT peers
+    metrics:
+      folding:
+        title: Metrics
+        enabled: false
+      description: ""
+      availability: []
+      scopes:
+        - name: global
+          description: "These metrics refer to the entire monitored application."
+          labels: []
+          metrics:
+            - name: retroshare.bandwidth
+              description: RetroShare Bandwidth
+              unit: "kilobits/s"
+              chart_type: area
+              dimensions:
+                - name: Upload
+                - name: Download
+            - name: retroshare.peers
+              description: RetroShare Peers
+              unit: "peers"
+              chart_type: line
+              dimensions:
+                - name: All friends
+                - name: Connected friends
+            - name: retroshare.dht
+              description: Retroshare DHT
+              unit: "peers"
+              chart_type: line
+              dimensions:
+                - name: DHT nodes estimated
+                - name: RS nodes estimated
diff --git a/collectors/python.d.plugin/retroshare/retroshare.chart.py b/src/collectors/python.d.plugin/retroshare/retroshare.chart.py
index 3f9593e94..3f9593e94 100644
--- a/collectors/python.d.plugin/retroshare/retroshare.chart.py
+++ b/src/collectors/python.d.plugin/retroshare/retroshare.chart.py
diff --git a/collectors/python.d.plugin/retroshare/retroshare.conf b/src/collectors/python.d.plugin/retroshare/retroshare.conf
index 3d0af538d..3d0af538d 100644
--- a/collectors/python.d.plugin/retroshare/retroshare.conf
+++ b/src/collectors/python.d.plugin/retroshare/retroshare.conf