Merging upstream version 2.0.3+dfsg:

- does not include dygraphs anymore (Closes: #923993)
- does not include pako anymore (Closes: #1042533)
- does not include dashboard binaries anymore (Closes: #1045145)

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

5 files changed, 29 insertions, 7 deletions

diff --git a/integrations/templates/overview.md b/integrations/templates/overview.md
index 3063b6860..d75b32d88 100644
--- a/integrations/templates/overview.md
+++ b/integrations/templates/overview.md
@@ -2,8 +2,10 @@
 [% include 'overview/collector.md' %]
 [% elif entry.integration_type == 'exporter' %]
 [% include 'overview/exporter.md' %]
-[% elif entry.integration_type == 'notification' %]
+[% elif entry.integration_type == 'agent_notification' %]
 [% include 'overview/notification.md' %]
 [% elif entry.integration_type == 'authentication' %]
 [% include 'overview/authentication.md' %]
+[% elif entry.integration_type == 'logs' %]
+[% include 'overview/logs.md' %]
 [% endif %]
diff --git a/integrations/templates/overview/logs.md b/integrations/templates/overview/logs.md
new file mode 100644
index 000000000..2ff0f69a9
--- /dev/null
+++ b/integrations/templates/overview/logs.md
@@ -0,0 +1,11 @@
+# [[ entry.meta.name ]]
+
+[[ entry.overview.description ]]
+
+## Visualization
+
+[[ entry.overview.visualization.description ]]
+
+## Key features
+
+[[ entry.overview.key_features.description ]]
\ No newline at end of file
diff --git a/integrations/templates/platform_info.md b/integrations/templates/platform_info.md
index 7fc0dc790..db9e61f6b 100644
--- a/integrations/templates/platform_info.md
+++ b/integrations/templates/platform_info.md
@@ -6,6 +6,6 @@ We build native packages for the following releases:
 [% for e in entries %]
 | [[ e.version ]] | [[ e.support ]] | [[ ', '.join(e.arches) ]] | [[ e.notes ]] |
 [% endfor %]
-[% endif %]
 
 On other releases of this distribution, a static binary will be installed in `/opt/netdata`.
+[% endif %]
diff --git a/integrations/templates/setup.md b/integrations/templates/setup.md
index 1c41e8cf9..2cac9ec7f 100644
--- a/integrations/templates/setup.md
+++ b/integrations/templates/setup.md
@@ -1,4 +1,14 @@
 ## Setup
+[% if entry.integration_type == 'logs' %]
+
+## Prerequisites
+
+[[ entry.setup.prerequisites.description]]
+
+## Configuration
+
+There is no configuration needed for this integration.
+[% else %]
 
 [% if entry.setup.description %]
 [[ entry.setup.description ]]
@@ -44,7 +54,7 @@ Configuration for this specific integration is located in the `[[ entry.setup.co
 [% include 'setup/sample-netdata-config.md' %]
 [% endif %]
 
-You can edit the configuration file using the `edit-config` script from the
+You can edit the configuration file using the [`edit-config`](/docs/netdata-agent/configuration/README.md#edit-a-configuration-file-using-edit-config) script from the
 Netdata [config directory](/docs/netdata-agent/configuration/README.md#the-netdata-config-directory).
 
 ```bash
@@ -106,3 +116,4 @@ There are no configuration examples.
 
 [% endif %]
 [% endif %]
+[% endif %]
\ No newline at end of file
diff --git a/integrations/templates/troubleshooting.md b/integrations/templates/troubleshooting.md
index 2176dd010..7c72bdde9 100644
--- a/integrations/templates/troubleshooting.md
+++ b/integrations/templates/troubleshooting.md
@@ -85,13 +85,12 @@ docker logs netdata 2>&1 | grep [[ entry.meta.module_name ]]
 
 [% endif %]
 [% endif %]
-[% elif entry.integration_type == 'notification' %]
-[% if 'cloud-notifications' in entry._src_path|string %]
+[% elif entry.integration_type == 'cloud_notification' %]
 [% if entry.troubleshooting.problems.list %]
 ## Troubleshooting
 
 [% endif %]
-[% else %]
+[% elif entry.integration_type == 'agent_notification' %]
 ## Troubleshooting
 
 ### Test Notification
@@ -114,7 +113,6 @@ export NETDATA_ALARM_NOTIFY_DEBUG=1
 
 Note that this will test _all_ alert mechanisms for the selected role.
 
-[% endif %]
 [% elif entry.integration_type == 'exporter' %]
 [% if entry.troubleshooting.problems.list %]
 ## Troubleshooting