Merging upstream version 1.47.0.

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

2 files changed, 5 insertions, 6 deletions

diff --git a/docs/netdata-cloud/authentication-and-authorization/role-based-access-model.md b/docs/netdata-cloud/authentication-and-authorization/role-based-access-model.md
index fec33ca22..d2a3ea4f2 100644
--- a/docs/netdata-cloud/authentication-and-authorization/role-based-access-model.md
+++ b/docs/netdata-cloud/authentication-and-authorization/role-based-access-model.md
@@ -11,7 +11,7 @@ being able to join any Room. We also aligned the offered roles to the target aud
 |:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:-------------------|:-------------------|:-------------------|:--------------------------|
 | **Admins**<p>Users with this role can control Spaces, Rooms, Nodes, Users and Billing.</p><p>They can also access any Room in the Space.</p>                                              | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:        |
 | **Managers**<p>Users with this role can manage Rooms and Users.</p><p>They can access any Room in the Space.</p>                                                                          | -                  | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:        |
-| **Troubleshooters**<p>Users with this role can use Netdata to troubleshoot, not manage entities.</p><p>They can access any Room in the Space.</p>                                         | -                  | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:        |
+| **Troubleshooters**<p>Users with this role can use Netdata to troubleshoot, not manage entities.</p><p>They need to be assigned to Rooms in the Space.</p>                                | -                  | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:        |
 | **Observers**<p>Users with this role can only view data in specific Rooms.</p>💡 Ideal for restricting your customer's access to their own dedicated rooms.<p></p>                        | -                  | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:        |
 | **Billing**<p>Users with this role can handle billing options and invoices.</p>                                                                                                           | -                  | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:        |
 | **Member** ⚠️ Legacy role<p>Users with this role you can create Rooms and invite other Members.</p><p>They can only see the Rooms they belong to and all Nodes in the All Nodes Room.</p> | -                  | -                  | -                  | -                         |
@@ -36,7 +36,7 @@ In more detail, you can find on the following tables which functionalities are a
 
 | **Functionality**                         |     **Admin**      |    **Manager**     | **Troubleshooter** | **Observer** | **Billing** |     **Member**     | Notes                                      |
 |:------------------------------------------|:------------------:|:------------------:|:------------------:|:------------:|:-----------:|:------------------:|:-------------------------------------------|
-| See all Nodes in Space (_All Nodes_ Room) | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |      -       |      -      | :heavy_check_mark: | Members are always on the _All Nodes_ Room |
+| See all Nodes in Space (_All Nodes_ Room) | :heavy_check_mark: | :heavy_check_mark: |         -          |      -       |      -      | :heavy_check_mark: | Members are always on the _All Nodes_ Room |
 | Connect Node to Space                     | :heavy_check_mark: |         -          |         -          |      -       |      -      |         -          | -                                          |
 | Delete Node from Space                    | :heavy_check_mark: |         -          |         -          |      -       |      -      |         -          | -                                          |
 
@@ -62,8 +62,8 @@ In more detail, you can find on the following tables which functionalities are a
 
 | **Functionality**            |     **Admin**      |    **Manager**     | **Troubleshooter** |    **Observer**    | **Billing** |     **Member**     | Notes                                                                              |
 |:-----------------------------|:------------------:|:------------------:|:------------------:|:------------------:|:-----------:|:------------------:|:-----------------------------------------------------------------------------------|
-| See all Rooms in a Space     | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |         -          |      -      |         -          |                                                                                    |
-| Join any Room in a Space     | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |         -          |      -      |         -          | By joining a Room you will be enabled to get notifications from nodes on that Room |
+| See all Rooms in a Space     | :heavy_check_mark: | :heavy_check_mark: |         -          |         -          |      -      |         -          |                                                                                    |
+| Join any Room in a Space     | :heavy_check_mark: | :heavy_check_mark: |         -          |         -          |      -      |         -          | By joining a Room you will be enabled to get notifications from nodes on that Room |
 | Leave Room                   | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |      -      | :heavy_check_mark: |                                                                                    |
 | Create a new Room in a Space | :heavy_check_mark: | :heavy_check_mark: |         -          |         -          |      -      | :heavy_check_mark: |                                                                                    |
 | Delete Room                  | :heavy_check_mark: | :heavy_check_mark: |         -          |         -          |      -      |         -          |                                                                                    |
@@ -145,7 +145,6 @@ Netdata Cloud paid subscription required for all action except "List All".
 | View                                  | :heavy_check_mark: | :heavy_check_mark: |         -          |         -          |         -          |         -          |
 | View File Format                      | :heavy_check_mark: | :heavy_check_mark: |         -          |         -          |         -          |         -          |
 
-
 ### Other permissions
 
 | **Functionality**          |     **Admin**      |    **Manager**     | **Troubleshooter** |    **Observer**    | **Billing** |     **Member**     |
diff --git a/docs/netdata-cloud/organize-your-infrastructure-invite-your-team.md b/docs/netdata-cloud/organize-your-infrastructure-invite-your-team.md
index 1ca004d99..05538a916 100644
--- a/docs/netdata-cloud/organize-your-infrastructure-invite-your-team.md
+++ b/docs/netdata-cloud/organize-your-infrastructure-invite-your-team.md
@@ -41,7 +41,7 @@ We recommend a few strategies for organizing your Rooms.
   If you have a user-facing SaaS product, or an internal service that this said product relies on, you may want to monitor that entire stack in a single Room. This might include Kubernetes clusters, Docker containers, proxies, databases, web servers, brokers, and more. End-to-end Rooms are valuable tools for ensuring the health and performance of your organization's essential services.
 
 - **Incident response**  
-  You can also create new Rooms as one of the first steps in your incident response process. For example, you have a user-facing web app that relies on Apache Pulsar for a message queue, and one of your nodes using the [Pulsar collector](/src/go/collectors/go.d.plugin/modules/pulsar/README.md) begins reporting a suspiciously low messages rate. You can create a Room called `$year-$month-$day-pulsar-rate`, add all your Pulsar nodes in addition to nodes they connect to, and begin diagnosing the root cause in a Room optimized for getting to resolution as fast as possible.
+  You can also create new Rooms as one of the first steps in your incident response process. For example, you have a user-facing web app that relies on Apache Pulsar for a message queue, and one of your nodes using the [Pulsar collector](/src/go/plugin/go.d/modules/pulsar/README.md) begins reporting a suspiciously low messages rate. You can create a Room called `$year-$month-$day-pulsar-rate`, add all your Pulsar nodes in addition to nodes they connect to, and begin diagnosing the root cause in a Room optimized for getting to resolution as fast as possible.
 
 ### Add Rooms