Merging upstream version 2.0.3+dfsg (Closes: #923993, #1042533, #1045145).

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

2 files changed, 34 insertions, 19 deletions

diff --git a/docs/netdata-agent/configuration/optimizing-metrics-database/README.md b/docs/netdata-agent/configuration/optimizing-metrics-database/README.md
index fdbd3b690..c5769ccd4 100644
--- a/docs/netdata-agent/configuration/optimizing-metrics-database/README.md
+++ b/docs/netdata-agent/configuration/optimizing-metrics-database/README.md
@@ -1,3 +1,3 @@
 # Optimizing Metrics Database Overview
 
-This section contains documentation to help you understand how the metrics DB works, understand the key features and configure them to suit your needs.
\ No newline at end of file
+This section contains documentation to help you understand how the metrics DB works, understand the key features and configure them to suit your needs.
diff --git a/docs/netdata-agent/configuration/optimizing-metrics-database/change-metrics-storage.md b/docs/netdata-agent/configuration/optimizing-metrics-database/change-metrics-storage.md
index 8a8659eff..2282cbc44 100644
--- a/docs/netdata-agent/configuration/optimizing-metrics-database/change-metrics-storage.md
+++ b/docs/netdata-agent/configuration/optimizing-metrics-database/change-metrics-storage.md
@@ -7,9 +7,9 @@ space**. This provides greater control and helps you optimize storage usage for
 
 | Tier |     Resolution      | Time Limit | Size Limit (min 256 MB) |
 |:----:|:-------------------:|:----------:|:-----------------------:|
-|  0   |  high (per second)  |  14 days   |          1 GiB          |
-|  1   | middle (per minute) |  3 months  |          1 GiB          |
-|  2   |   low (per hour)    |  2 years   |          1 GiB          |
+|  0   |  high (per second)  |    14d     |          1 GiB          |
+|  1   | middle (per minute) |    3mo     |          1 GiB          |
+|  2   |   low (per hour)    |     2y     |          1 GiB          |
 
 > **Note**: If a user sets a disk space size less than 256 MB for a tier, Netdata will automatically adjust it to 256 MB.
 
@@ -17,7 +17,7 @@ With these defaults, Netdata requires approximately 4 GiB of storage space (incl
 
 ## Retention Settings
 
-> **In a parent-child setup**, these settings manage the shared storage space utilized by the Netdata parent agent for
+> **In a parent-child setup**, these settings manage the shared storage space used by the Netdata parent agent for
 > storing metrics collected by both the parent and its child nodes.
 
 You can fine-tune retention for each tier by setting a time limit or size limit. Setting a limit to 0 disables it,
@@ -32,22 +32,22 @@ retention strategies as shown in the table below:
 
 You can change these limits in `netdata.conf`:
 
-```
+```text
 [db]
-    mode = dbengine	
+    mode = dbengine
     storage tiers = 3
 
     # Tier 0, per second data. Set to 0 for no limit.
-    dbengine tier 0 disk space MB = 1024
-    dbengine tier 0 retention days = 14
+    dbengine tier 0 retention size = 1GiB
+    dbengine tier 0 retention time = 14d
 
     # Tier 1, per minute data. Set to 0 for no limit.
-    dbengine tier 1 disk space MB = 1024
-    dbengine tier 1 retention days = 90
+    dbengine tier 1 retention size = 1GiB
+    dbengine tier 1 retention time = 3mo
 
     # Tier 2, per hour data. Set to 0 for no limit.
-    dbengine tier 2 disk space MB = 1024
-    dbengine tier 2 retention days = 730
+    dbengine tier 2 retention size = 1GiB
+    dbengine tier 2 retention time = 2y
 ```
 
 ## Monitoring Retention Utilization
@@ -58,6 +58,24 @@ your storage space (disk space limits) and time (time limits) are used for metri
 
 ## Legacy configuration
 
+### v1.99.0 and prior
+
+Netdata prior to v2 supports the following configuration options in  `netdata.conf`.
+They have the same defaults as the latest v2, but the unit of each value is given in the option name, not at the value.
+
+```text
+storage tiers = 3
+# Tier 0, per second data. Set to 0 for no limit.
+dbengine tier 0 disk space MB = 1024
+dbengine tier 0 retention days = 14
+# Tier 1, per minute data. Set to 0 for no limit.
+dbengine tier 1 disk space MB = 1024
+dbengine tier 1 retention days = 90
+# Tier 2, per hour data. Set to 0 for no limit.
+dbengine tier 2 disk space MB = 1024
+dbengine tier 2 retention days = 730
+```
+
 ### v1.45.6 and prior
 
 Netdata versions prior to v1.46.0 relied on a disk space-based retention.
@@ -72,17 +90,14 @@ Netdata versions prior to v1.46.0 relied on a disk space-based retention.
 
 You can change these limits in `netdata.conf`:
 
-```
+```text
 [db]
-    mode = dbengine	
+    mode = dbengine
     storage tiers = 3
-
     # Tier 0, per second data
     dbengine multihost disk space MB = 256
-
     # Tier 1, per minute data
     dbengine tier 1 multihost disk space MB = 1024
-
     # Tier 2, per hour data
     dbengine tier 2 multihost disk space MB = 1024
 ```
@@ -96,7 +111,7 @@ for the parent node and all of its children.
 To configure the database engine, look for the `page cache size MB` and `dbengine multihost disk space MB` settings in
 the `[db]` section of your `netdata.conf`.
 
-```conf
+```text
 [db]
     dbengine page cache size MB = 32
     dbengine multihost disk space MB = 256