Adding upstream version 1.32.0.upstream/1.32.0

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

1 files changed, 37 insertions, 23 deletions

diff --git a/health/REFERENCE.md b/health/REFERENCE.md
index 5ea6b7c5d..f1bb5557d 100644
--- a/health/REFERENCE.md
+++ b/health/REFERENCE.md
@@ -54,14 +54,17 @@ Netdata parses the following lines. Beneath the table is an in-depth explanation
 -   A few lines use space-separated lists to define how the entity behaves. You can use `*` as a wildcard or prefix with
     `!` for a negative match. Order is important, too! See our [simple patterns docs](../libnetdata/simple_pattern/) for
     more examples.
+-   Lines terminated by a `\` are spliced together with the next line. The backslash is removed and the following line is
+    joined with the current one. No space is inserted, so you may split a line anywhere, even in the middle of a word.
+    This comes in handy if your `info` line consists of several sentences.  
 
 | line                                                | required        | functionality                                                                         |
 | --------------------------------------------------- | --------------- | ------------------------------------------------------------------------------------- |
 | [`alarm`/`template`](#alarm-line-alarm-or-template) | yes             | Name of the alarm/template.                                                           |
 | [`on`](#alarm-line-on)                              | yes             | The chart this alarm should attach to.                                                |
-| [`class`](#alarm-line-class)                        | no              | The general classification of the alarm.                                              |
-| [`component`](#alarm-line-component)                | no              | Specify the component of the class of the alarm.                                      |
-| [`type`](#alarm-line-type)                          | no              | The type of error the alarm monitors.                                                 |
+| [`class`](#alarm-line-class)                        | no              | The general alarm classification.                                                     |
+| [`type`](#alarm-line-type)                          | no              | What area of the system the alarm monitors.                                           |
+| [`component`](#alarm-line-component)                | no              | Specific component of the type of the alarm.                                          |
 | [`os`](#alarm-line-os)                              | no              | Which operating systems to run this chart.                                            |
 | [`hosts`](#alarm-line-hosts)                        | no              | Which hostnames will run this alarm.                                                  |
 | [`plugin`](#alarm-line-plugin)                      | no              | Restrict an alarm or template to only a certain plugin.                                             |
@@ -136,24 +139,45 @@ If you create a template using the `disk.io` context, it will apply an alarm to
 
 #### Alarm line `class`
 
-Specify the classification of the alarm or template. 
+This indicates the type of error (or general problem area) that the alarm or template applies to. For example, `Latency` can be used for alarms that trigger on latency issues on network interfaces, web servers, or database systems. Example:
 
-Class can be used to indicate the broader area of the system that the alarm applies to. For example, under the general `Database` class, you can group together alarms that operate on various database systems, like `MySQL`, `CockroachDB`, `CouchDB` etc. Example:
+```yaml
+class: Latency
+```
+
+<details>
+<summary>Netdata's stock alarms use the following `class` attributes by default:</summary>
+
+| Class           |
+| ----------------|
+| Errors          |
+| Latency         |
+| Utilization     |
+| Workload        |
+
+
+</details>
+
+`class` will default to `Unknown` if the line is missing from the alarm configuration.
+
+#### Alarm line `type`
+
+Type can be used to indicate the broader area of the system that the alarm applies to. For example, under the general `Database` type, you can group together alarms that operate on various database systems, like `MySQL`, `CockroachDB`, `CouchDB` etc. Example:
 
 ```yaml
-class: Database
+type: Database
 ```
 <details>
-<summary>Netdata's stock alarms use the following `class` attributes by default, but feel free to adjust for your own requirements.</summary>
+<summary>Netdata's stock alarms use the following `type` attributes by default, but feel free to adjust for your own requirements.</summary>
 
-| Class                    | Description                                                                                      |
+| Type                     | Description                                                                                      |
 | ------------------------ | ------------------------------------------------------------------------------------------------ |
 | Ad Filtering             | Services related to Ad Filtering (like pi-hole)                                                  |
 | Certificates             | Certificates monitoring related                                                                  |
 | Cgroups                  | Alerts for cpu and memory usage of control groups                                                |
 | Computing                | Alerts for shared computing applications (e.g. boinc)                                            |
 | Containers               | Container related alerts (e.g. docker instances)                                                 |
-| Database                 | Database systems (e.g. MySQL, Postgress, etc)                                                    |
+| Database                 | Database systems (e.g. MySQL, PostgreSQL, etc)                                                    |
 | Data Sharing             | Used to group together alerts for data sharing applications                                      |
 | DHCP                     | Alerts for dhcp related services                                                                 |
 | DNS                      | Alerts for dns related services                                                                  |
@@ -162,7 +186,7 @@ class: Database
 | Linux                    | Services specific to Linux (e.g. systemd)                                                        |
 | Messaging                | Alerts for message passing services (e.g. vernemq)                                               |
 | Netdata                  | Internal Netdata components monitoring                                                           |
-| Other                    | Use as a general class of alerts                                                                 |
+| Other                    | When an alert doesn't fit in other types.                                                        |
 | Power Supply             | Alerts from power supply related services (e.g. apcupsd)                                         |
 | Search engine            | Alerts for search services (e.g. elasticsearch)                                                  |
 | Storage                  | Class for alerts dealing with storage services (storage devices typically live under `System`)   |
@@ -174,26 +198,16 @@ class: Database
 
 </details>
 
-If an alarm configuration is missing the `class` line, its value will default to `Unknown`.
+If an alarm configuration is missing the `type` line, its value will default to `Unknown`.
 
 #### Alarm line `component`
 
-Component can be used to narrow down what the previous `class` value specifies for each alarm or template. Continuing from the previous example, `component` might include `MySQL`, `CockroachDB`, `MongoDB`, all under the same `Database` classification. Example:
+Component can be used to narrow down what the previous `type` value specifies for each alarm or template. Continuing from the previous example, `component` might include `MySQL`, `CockroachDB`, `MongoDB`, all under the same `Database` type. Example:
 
 ```yaml
 component: MySQL
 ```
-As with the `class` line, if `component` is missing from the configuration, its value will default to `Unknown`.
-
-#### Alarm line `type`
-
-This indicates the type of error (or general problem area) that the alarm or template applies to. For example, `Latency` can be used for alarms that trigger on latency issues in network interfaces, web servers, or database systems. Example:
-
-```yaml
-type: Latency
-```
-
-`type` will also (as with `class` and `component`) default to `Unknown` if the line is missing from the alarm configuration.
+As with the `class` and `type` line, if `component` is missing from the configuration, its value will default to `Unknown`.
 
 #### Alarm line `os`