Merging upstream version 1.39.0.

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

6 files changed, 376 insertions, 56 deletions

diff --git a/docs/cloud/manage/invite-your-team.md b/docs/cloud/manage/invite-your-team.md
index f294a627d..da2d51f7f 100644
--- a/docs/cloud/manage/invite-your-team.md
+++ b/docs/cloud/manage/invite-your-team.md
@@ -1,37 +1,24 @@
----
-title: "Invite your team"
-description: >-
-    "Invite your entire SRE, DevOPs, or ITOps team to Netdata Cloud to give everyone insights into your
-    infrastructure from a single pane of glass."
-custom_edit_url: "https://github.com/netdata/netdata/blob/master/docs/cloud/manage/invite-your-team.md"
-sidebar_label: "Invite your team"
-learn_status: "Published"
-learn_topic_type: "Tasks"
-learn_rel_path: "Operations"
----
+# Invite your team
+
+Invite your entire SRE, DevOPs, or ITOps team to Netdata Cloud, to give everyone insights into your infrastructure from a single pane of glass.
 
 Invite new users to your Space by clicking on **Invite Users** in
 the [Space](https://github.com/netdata/netdata/blob/master/docs/cloud/spaces.md) management area.
 
-![Opening the invitation panel in Netdata Cloud](https://user-images.githubusercontent.com/1153921/108529805-1b13b480-7292-11eb-862f-0499e3fdac17.png)
+![image](https://user-images.githubusercontent.com/70198089/227887469-e46bad55-ef5d-441a-83a5-dcc2af038678.png)
+
 
-Enter the email addresses for the users you want to invite to your Space. You can enter any number of email addresses,
-separated by a comma, to send multiple invitations at once.
+You will be prompted to enter the email addresses for the users you want to invite to your Space. You can enter any number of email addresses, separated by a comma, to send multiple invitations at once.
 
 Next, choose the War Rooms you want to invite these users to. Once logged in, these users are not restricted only to
 these War Rooms. They can be invited to others, or join any that are public.
 
+Next, pick a role for the invited user. You can read more about [which roles are available](https://github.com/netdata/netdata/blob/master/docs/cloud/manage/role-based-access.md#what-roles-are-available) based on your [subscription plan](https://github.com/netdata/netdata/blob/master/docs/cloud/manage/plans.md).
+
 Click the **Send** button to send an email invitation, which will prompt them
-to [sign up](https://github.com/netdata/netdata/blob/master/docs/cloud/manage/sign-in.mdx) and join your Space.
+to [sign up](https://github.com/netdata/netdata/blob/master/docs/cloud/manage/sign-in.md) and join your Space.
 
-![The invitation panel in Netdata Cloud](https://user-images.githubusercontent.com/1153921/97762959-53b33680-1ac7-11eb-8e9d-f3f4a14c0028.png)
+![image](https://user-images.githubusercontent.com/70198089/227888899-8511081b-0157-4e22-81d9-898cc464dcb0.png)
 
 Any unaccepted invitations remain under **Invitations awaiting response**. These invitations can be rescinded at any
 time by clicking the trash can icon.
-
-## What's next?
-
-If your team members have trouble signing in, direct them to
-the [sign in guide](https://github.com/netdata/netdata/blob/master/docs/cloud/manage/sign-in.mdx). Once your
-team is onboarded to Netdata Cloud, they can view shared assets, such
-as [new dashboards](https://github.com/netdata/netdata/blob/master/docs/cloud/visualize/dashboards.md).
diff --git a/docs/cloud/manage/plans.md b/docs/cloud/manage/plans.md
new file mode 100644
index 000000000..9180ab5a0
--- /dev/null
+++ b/docs/cloud/manage/plans.md
@@ -0,0 +1,120 @@
+# Netdata Plans
+
+This page will guide you through the differences between the Community, Pro, Business and Enterprise plans.
+
+At Netdata, we believe in providing free and unrestricted access to high-quality monitoring solutions, and our commitment to this principle will not change. We offer our free SaaS offering - what we call **Community plan** - and Open Source Agent, which features unlimited nodes and users, unlimited metrics, and retention, providing real-time, high-fidelity, out-of-the-box infrastructure monitoring for packaged applications, containers, and operating systems.
+
+We also provide paid subscriptions that designed to provide additional features and capabilities for businesses that need tighter and customizable integration of the free monitoring solution to their processes. These are divided into three different plans: **Pro**, **Business**, and **Enterprise**. Each plan will offers a different set of features and capabilities to meet the needs of businesses of different sizes and with different monitoring requirements.
+
+> ### Note
+> To not disrupt the existing space user's access rights we will keep them in the **Early Bird** plan. The reason for this is to allow users to
+> keep using the legacy **Member** role with the exact same permissions as it has currently.
+>
+> If you move from the **Early Bird** plan to a paid plan, you will not be able to return to the **Early Bird** plan again. The **Community** free plan will always be available to you, but it does not allow
+> you to invite or change users using the Member role. See more details on our [roles and plans](https://github.com/netdata/netdata/blob/master/docs/cloud/manage/role-based-access.md#what-roles-are-available) documentation.
+
+### Plans
+
+The plan is an attribute that is directly attached to your space(s) and that dictates what capabilities and customizations you have on your space. If you have different spaces you can have different Netdata plans on them. This gives you flexibility to chose what is more adequate for your needs on each of your spaces.
+
+Netdata Cloud plans, with the exception of Community, work as subscriptions and overall consist of two pricing components:
+
+* A flat fee component, that is a price per space, and
+* An on-demand metered component, that is related to your usage of Netdata which directly links to the [number of nodes you have running](#running-nodes-and-billing)
+
+Netdata provides two billing frequency options:
+
+* Monthly - Pay as you go, where we charge both the flat fee and the on-demand component every month
+* Yearly - Annual prepayment, where we charge upfront the flat fee and committed amount related to your estimated usage of Netdata (more details [here](#committed-nodes))
+
+For more details on the plans and subscription conditions please check <https://netdata.cloud/pricing>.
+
+#### Running nodes and billing
+
+The only dynamic variable we consider for billing is the number of concurrently running nodes or agents. We only charge you for your active running nodes, so we don't count:
+
+* offline nodes
+* stale nodes, nodes that are available to query through a Netdata parent agent but are not actively connecting metrics at the moment
+
+To ensure we don't overcharge you due to sporadic spikes throughout a month or even at a certain point in a day we are:
+
+* Calculate a daily P90 figure for your running nodes. To achieve that, we take a daily snapshot of your running nodes, and using the node state change events (live, offline) we guarantee that a daily P90 figure is calculated to remove any daily spikes
+* On top of the above, we do a running P90 calculation from the start to the end of your billing cycle. Even if you have an yearly billing frequency we keep a monthly subscription linked to that to identify any potential overage over your [committed nodes](#committed-nodes).
+
+#### Committed nodes
+
+When you subscribe to an Yearly plan you will need to specify the number of nodes that you will commit to. On these nodes, a discounted price of less 25% than the original cost per node of the plan is applied. This amount will be part of your annual prepayment.
+
+```
+Node plan discounted price x committed nodes x 12 months
+```
+
+If, for a given month, your usage is over these committed nodes we will charge the original cost per node for the nodes above the committed number.
+
+#### Plan changes and credit balance
+
+It is ok to change your mind. We allow to change your plan, billing frequency or adjust the committed nodes, on yearly plans, at any time.
+
+To achieve this you will need to:
+
+* Move to the Community plan, where we will cancel the current subscription and:
+  * Issue a credit to you for the unused period, in case you are on a **yearly plan**
+  * Charge you only for the current used period and issue a credit for the unused period related to the flat fee, in case you are on a **monthly plan**
+* Select the new subscription with the change that you want
+
+> ⚠️ On a move to Community (cancellation of an active subscription), please note that you will have all your notification methods configurations active **for a period of 24 hours**.
+> After that, any notification methods unavailable in your new plan at that time will be automatically disabled. You can always re-enable them once you move to a paid plan that includes them.
+
+> ⚠️ Any credit given to you will be available to use on future paid subscriptions with us. It will be available until the the **end of the following year**.
+
+### Areas impacted by plans
+
+##### Role-Based Access model
+
+Depending on the plan associated to your space you will have different roles available:
+
+| **Role** | **Community** | **Pro** | **Business** | **Early Bird** |
+| :-- | :--: | :--: | :--: | :--: |
+| **Administrators**<p>Users with this role can control Spaces, War Rooms, Nodes, Users and Billing.</p><p>They can also access any War 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 War Rooms and Users.</p><p>They can access any War Room in the Space.</p> | - | - | :heavy_check_mark: | - |
+| **Troubleshooters**<p>Users with this role can use Netdata to troubleshoot, not manage entities.</p><p>They can access any War Room in the Space.</p> | - | :heavy_check_mark: | :heavy_check_mark: | - |
+| **Observers**<p>Users with this role can only view data in specific War Rooms.</p>💡 Ideal for restricting your customer's access to their own dedicated rooms.<p></p> | - | - | :heavy_check_mark: | - |
+| **Billing**<p>Users with this role can handle billing options and invoices.</p> | - | - | :heavy_check_mark: | - |
+| **Member** ⚠️ Legacy role<p>Users with this role can create War Rooms and invite other Members.</p><p>They can only see the War Rooms they belong to and all Nodes in the All Nodes room.</p>| - | - | - | :heavy_check_mark: |
+
+For more details check the documentation under [Role-Based Access model](https://github.com/netdata/netdata/blob/master/docs/cloud/manage/role-based-access.md).
+
+##### Events feed
+
+The plan you have subscribed on your space will determine the amount of historical data you will be able to query:
+
+| **Type of events** | **Community** | **Pro** | **Business** |
+| :-- | :-- | :-- | :-- |
+| **Auditing events** - COMING SOON<p>Events related to actions done on your Space, e.g. invite user, change user role or create room.</p>| 4 hours | 7 days | 90 days |
+| **Topology events**<p>Node state transition events, e.g. live or offline.</p>| 4 hours | 7 days | 14 days |
+| **Alert events**<p>Alert state transition events, can be seen as an alert history log.</p>| 4 hours | 7 days | 90 days |
+
+For more details check the documentation under [Events feed](https://github.com/netdata/netdata/blob/master/docs/cloud/insights/events-feed.md).
+
+##### Notification integrations
+
+The plan on your space will determine what type of notifications methods will be available to you:
+
+* **Community** - Email and Discord
+* **Pro** - Email, Discord and webhook
+* **Business** - Unlimited, this includes Slack, PagerDuty, Opsgenie etc.
+
+For mode details check the documentation under [Alert Notifications](https://github.com/netdata/netdata/blob/master/docs/cloud/alerts-notifications/notifications.md).
+
+### Related Topics
+
+#### **Related Concepts**
+
+* [Spaces](https://github.com/netdata/netdata/blob/master/docs/cloud/spaces.md)
+* [Alert Notifications](https://github.com/netdata/netdata/blob/master/docs/cloud/alerts-notifications/notifications.md)
+* [Events feed](https://github.com/netdata/netdata/blob/master/docs/cloud/insights/events-feed.md)
+* [Role-Based Access model](https://github.com/netdata/netdata/blob/master/docs/cloud/manage/role-based-access.md)
+
+#### Related Tasks
+
+* [View Plan & Billing](https://github.com/netdata/netdata/blob/master/docs/cloud/manage/view-plan-billing.md)
diff --git a/docs/cloud/manage/role-based-access.md b/docs/cloud/manage/role-based-access.md
new file mode 100644
index 000000000..1696e0964
--- /dev/null
+++ b/docs/cloud/manage/role-based-access.md
@@ -0,0 +1,136 @@
+# Role-Based Access model
+
+Netdata Cloud's role-based-access mechanism allows you to control what functionalities in the app users can access. Each user can be assigned only one role, which fully specifies all the capabilities they are afforded.
+
+## What roles are available?
+
+With the advent of the paid plans we revamped the roles to cover needs expressed by Netdata users, like providing more limited access to their customers, or
+being able to join any room. We also aligned the offered roles to the target audience of each plan. The end result is the following:
+
+| **Role** | **Community** | **Pro** | **Business** | **Early Bird** |
+| :-- | :--: | :--: | :--: | :--: |
+| **Administrators**<p>Users with this role can control Spaces, War Rooms, Nodes, Users and Billing.</p><p>They can also access any War 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 War Rooms and Users.</p><p>They can access any War Room in the Space.</p> | - | - | :heavy_check_mark: | - |
+| **Troubleshooters**<p>Users with this role can use Netdata to troubleshoot, not manage entities.</p><p>They can access any War Room in the Space.</p> | - | :heavy_check_mark: | :heavy_check_mark: | - |
+| **Observers**<p>Users with this role can only view data in specific War Rooms.</p>💡 Ideal for restricting your customer's access to their own dedicated rooms.<p></p> | - | - | :heavy_check_mark: | - |
+| **Billing**<p>Users with this role can handle billing options and invoices.</p> | - | - | :heavy_check_mark: | - |
+| **Member** ⚠️ Legacy role<p>Users with this role can create War Rooms and invite other Members.</p><p>They can only see the War Rooms they belong to and all Nodes in the All Nodes room.</p>| - | - | - | :heavy_check_mark: | 
+
+## What happens to the previous Member role?
+
+We will maintain a Early Bird plan for existing users, which will continue to provide access to the Member role.
+
+## Which functionalities are available for each role?
+
+In more detail, you can find on the following tables which functionalities are available for each role on each domain.
+
+### Space Management
+
+| **Functionality** | **Administrator** | **Manager** | **Troubleshooter** | **Observer** | **Billing** | **Member** |
+| :-- | :--: | :--: | :--: | :--: | :--: | :--: |
+| See Space | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
+| Leave Space  | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
+| Delete Space | :heavy_check_mark: | - | - | - | - | - |
+| Change name | :heavy_check_mark: | - | - | - | - | - |
+| Change description | :heavy_check_mark: | - | - | - | - | - |
+
+### Node Management
+
+| **Functionality** | **Administrator** | **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 |
+| Connect Node to Space | :heavy_check_mark: | - | - | - | - | - | - |
+| Delete Node from Space | :heavy_check_mark: | - | - | - | - | - | - |
+
+### User Management
+
+| **Functionality** | **Administrator** | **Manager** | **Troubleshooter** | **Observer** | **Billing** | **Member** | Notes |
+| :-- | :--: | :--: | :--: | :--: | :--: | :--: | :-- |
+| See all Users in Space | :heavy_check_mark: | :heavy_check_mark: | - | - | - | :heavy_check_mark: | |
+| Invite new User to Space | :heavy_check_mark: | :heavy_check_mark: | - | - | - | :heavy_check_mark:  | You can't invite a user with a role you don't have permissions to appoint to (see below) |
+| Delete Pending Invitation to Space | :heavy_check_mark: | :heavy_check_mark: | - | - | - | :heavy_check_mark:  | |
+| Delete User from Space | :heavy_check_mark: | :heavy_check_mark: | - | - | - | - | You can't delete a user if he has a role you don't have permissions to appoint to (see below) |
+| Appoint Administrators | :heavy_check_mark: | - | - | - | - | - | |
+| Appoint Billing user | :heavy_check_mark: | - | - | - | - | - | |
+| Appoint Managers | :heavy_check_mark: | :heavy_check_mark: | - | - | - | - | |
+| Appoint Troubleshooters | :heavy_check_mark: | :heavy_check_mark: | - | - | - | - | |
+| Appoint Observer | :heavy_check_mark: | :heavy_check_mark: | - | - | - | - | |
+| Appoint Member | :heavy_check_mark: | - | - | - | - | :heavy_check_mark: | Only available on Early Bird plans |
+| See all Users in a Room | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | - | :heavy_check_mark: | |
+| Invite existing user to Room | :heavy_check_mark: | :heavy_check_mark: | - | - | - | :heavy_check_mark: | User already invited to the Space |
+| Remove user from Room | :heavy_check_mark: | :heavy_check_mark: | - | - | - | - | |
+
+### Room Management
+
+| **Functionality** | **Administrator** | **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 |
+| 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: | - | - | - | - | |
+| Change Room name | :heavy_check_mark: | :heavy_check_mark: | - | - | - | :heavy_check_mark: | If not the _All Nodes_ room |
+| Change Room description | :heavy_check_mark: | :heavy_check_mark: | - | - | - | :heavy_check_mark: | |
+| Add existing Nodes to Room | :heavy_check_mark: | :heavy_check_mark: | - | - | - | :heavy_check_mark: | Node already connected to the Space |
+| Remove Nodes from Room | :heavy_check_mark: | :heavy_check_mark: | - | - | - | :heavy_check_mark: | |
+
+### Notifications Management
+
+| **Functionality** | **Administrator** | **Manager** | **Troubleshooter** | **Observer** | **Billing** | **Member** | Notes |
+| :-- | :--: | :--: | :--: | :--: | :--: | :--: | :-- |
+| See all configured notifications on a Space  | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | - | :heavy_check_mark: | |
+| Add new configuration | :heavy_check_mark: | - | - | - | - | - | |
+| Enable/Disable configuration | :heavy_check_mark: | - | - | - | - | - |  |
+| Edit configuration | :heavy_check_mark: | - | - | - | - | - | Some exceptions apply depending on [service level](https://github.com/netdata/netdata/blob/master/docs/cloud/alerts-notifications/manage-notification-methods.md#available-actions-per-notification-methods-based-on-service-level) |
+| Delete configuration | :heavy_check_mark: | - | - | - | - | - | |
+| Edit personal level notification settings | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | [Manage user notification settings](https://github.com/netdata/netdata/blob/master/docs/cloud/alerts-notifications/manage-notification-methods.md#manage-user-notification-settings) |
+
+Notes:
+* Enable, Edit and Add actions over specific notification methods will only be allowed if your plan has access to those ([service classification](https://github.com/netdata/netdata/blob/master/docs/cloud/alerts-notifications/notifications.md#service-classification))
+
+### Dashboards
+
+| **Functionality** | **Administrator** | **Manager** | **Troubleshooter** | **Observer** | **Billing** | **Member** |
+| :-- | :--: | :--: | :--: | :--: | :--: | :--: |
+| See all dashboards in Room | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | - | :heavy_check_mark: |
+| Add new dashboard to Room | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | - | :heavy_check_mark: |
+| Edit any dashboard in Room | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | - | - | :heavy_check_mark: |
+| Edit own dashboard in Room | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | - | :heavy_check_mark: |
+| Delete any dashboard in Room | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | - | - | :heavy_check_mark: |
+| Delete own dashboard in Room | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | - | :heavy_check_mark: |
+
+### Functions
+
+| **Functionality** | **Administrator** | **Manager** | **Troubleshooter** | **Observer** | **Billing** | **Member** | Notes |
+| :-- | :--: | :--: | :--: | :--: | :--: |  :--: | :-- |
+| See all functions in Room | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | - | :heavy_check_mark: |
+| Run any function in Room | :heavy_check_mark: | :heavy_check_mark: | - | - | - | - |
+| Run read-only function in Room | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | - | :heavy_check_mark: |  |
+| Run sensitive function in Room | :heavy_check_mark: | :heavy_check_mark: | - | - | - | - | There isn't any function on this category yet, so subject to change. |
+
+### Events feed
+
+| **Functionality** | **Administrator** | **Manager** | **Troubleshooter** | **Observer** | **Billing** | **Member** | Notes |
+| :-- | :--: | :--: | :--: | :--: | :--: | :--: | :-- |
+| See Alert or Topology events | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | - | :heavy_check_mark: | |
+| See Auditing events | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | - | - | These are coming soon, not currently available  |
+
+### Billing
+
+| **Functionality** | **Administrator** | **Manager** | **Troubleshooter** | **Observer** | **Billing** | **Member** | Notes |
+| :-- | :--: | :--: | :--: | :--: | :--: | :--: | :-- |
+| See Plan & Billing details | :heavy_check_mark: | - | - | - | :heavy_check_mark: | - | Current plan and usage figures |
+| Update plans | :heavy_check_mark: | - | - | - | - | - | This includes cancelling current plan (going to Community plan) |
+| See invoices | :heavy_check_mark: | - | - | - | :heavy_check_mark: | - | |
+| Manage payment methods | :heavy_check_mark: | - | - | - | :heavy_check_mark: | - | |
+| Update billing email | :heavy_check_mark: | - | - | - | :heavy_check_mark: | - | |
+
+### Other permissions
+
+| **Functionality** | **Administrator** | **Manager** | **Troubleshooter** | **Observer** | **Billing** | **Member** |
+| :-- | :--: | :--: | :--: | :--: | :--: | :--: |
+| See Bookmarks in Space | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | - | :heavy_check_mark: |
+| Add Bookmark to Space | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | - | - | :heavy_check_mark: |
+| Delete Bookmark from Space | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | - | - | :heavy_check_mark: |
+| See Visited Nodes | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | - | :heavy_check_mark: |
+| Update Visited Nodes | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | - | :heavy_check_mark: |
diff --git a/docs/cloud/manage/sign-in.mdx b/docs/cloud/manage/sign-in.md
index 32fcb22e7..96275f573 100644
--- a/docs/cloud/manage/sign-in.mdx
+++ b/docs/cloud/manage/sign-in.md
@@ -1,12 +1,6 @@
----
-title: "Sign in with email, Google, or GitHub"
-description: "Learn how signing in to Cloud works via one of our three authentication methods, plus some tips if you're having trouble signing in."
-custom_edit_url: "https://github.com/netdata/netdata/blob/master/docs/cloud/manage/sign-in.mdx"
-sidebar_label: "Sign in with email, Google, or GitHub"
-learn_status: "Published"
-learn_topic_type: "Tasks"
-learn_rel_path: "Operations"
----
+# Sign in to Netdata
+
+This page explains how to sign in to Netdata with your email, Google account, or GitHub account, and provides some tips if you're having trouble signing in.
 
 You can [sign in to Netdata](https://app.netdata.cloud/sign-in?cloudRoute=spaces?utm_source=docs&utm_content=sign_in_button_first_section) through one of three methods: email, Google, or GitHub. Email uses a
 time-sensitive link that authenticates your browser, and Google/GitHub both use OAuth to associate your email address
@@ -15,7 +9,6 @@ with a Netdata Cloud account.
 No matter the method, your Netdata Cloud account is based around your email address. Netdata Cloud does not store
 passwords.
 
-
 ## Email
 
 To sign in with email, visit [Netdata Cloud](https://app.netdata.cloud/sign-in?cloudRoute=spaces?utm_source=docs&utm_content=sign_in_button_email_section), enter your email address, and click
@@ -35,22 +28,27 @@ If you don't have a Netdata Cloud account yet you won't need to worry about it.
 After your account is created and you sign in to Netdata, you first are asked to agree to Netdata Cloud's [Privacy
 Policy](https://www.netdata.cloud/privacy/) and [Terms of Use](https://www.netdata.cloud/terms/). Once you agree with these you are directed
 through the Netdata Cloud onboarding process, which is explained in the [Netdata Cloud
-quickstart](https://github.com/netdata/netdata/blob/master/docs/cloud/get-started.mdx).
+quickstart](https://github.com/netdata/netdata/blob/master/packaging/installer/README.md).
 
 ### Troubleshooting
 
-You should receive your sign in email in less than a minute. The subject is **Verify your email!** and the sender is `no-reply@app.netdata.cloud` via `sendgrid.net`.
+You should receive your sign in email in less than a minute. The subject is **Verify your email!** for new sign-ups, **Sign in to Netdata** for sign ins.
+The sender is `no-reply@netdata.cloud` via `sendgrid.net`.
 
 If you don't see the email, try the following:
 
--   Check [Netdata Cloud status](https://status.netdata.cloud) for ongoing issues with our infrastructure.
--   Request another sign in email via the [sign in page](https://app.netdata.cloud/sign-in?cloudRoute=spaces?utm_source=docs&utm_content=sign_in_button_troubleshooting_section).
--   Check your spam folder.
--   In Gmail, check the **Updates** category.
+- Check your spam folder.
+- In Gmail, check the **Updates** category.
+- Check [Netdata Cloud status](https://status.netdata.cloud) for ongoing issues with our infrastructure.
+- Request another sign in email via the [sign in page](https://app.netdata.cloud/sign-in?cloudRoute=spaces?utm_source=docs&utm_content=sign_in_button_troubleshooting_section).
 
-You may also want to add `no-reply@app.netdata.cloud` to your address book or contacts list, especially if you're using
+You may also want to add `no-reply@netdata.cloud` to your address book or contacts list, especially if you're using
 a public email service, such as Gmail. You may also want to whitelist/allowlist either the specific email or the entire
-`app.netdata.cloud` domain.
+`netdata.cloud` domain.
+
+In some cases, temporary issues with your mail server or email account may result in your email address being added to a Bounce list by Sendgrid.
+If you are added to that list, no Netdata cloud email can reach you, including alarm notifications. Let us know in Discord that you have trouble receiving
+any email from us and someone will ask you to provide your email address privately, so we can check if you are on the Bounce list.
 
 ## Google and GitHub OAuth
 
@@ -59,7 +57,7 @@ receives via OAuth.
 
 To sign in with Google or GitHub OAuth, visit [Netdata Cloud](https://app.netdata.cloud/sign-in?cloudRoute=spaces?utm_source=docs&utm_content=sign_in_button_google_github_section) and click the
 **Continue with Google/GitHub** or button. Enter your Google/GitHub username and your password. Complete two-factor
-authentication if you or your organization has it enabled. 
+authentication if you or your organization has it enabled.
 
 You are then signed in to Netdata Cloud or directed to the new-user onboarding if you have not signed up previously.
 
@@ -81,8 +79,3 @@ with `user2@example.com`, Netdata Cloud creates a new account and begins the onb
 
 It is not currently possible to link an account created with `user@example.com` to a Google account associated with
 `user2@example.com`.
-
-## What's next? 
-
-If you haven't already onboarded to Netdata Cloud and connected your first nodes, visit 
-the [get started guide](https://github.com/netdata/netdata/blob/master/docs/cloud/get-started.mdx).
diff --git a/docs/cloud/manage/themes.md b/docs/cloud/manage/themes.md
index 11d5cb32f..aaf193a87 100644
--- a/docs/cloud/manage/themes.md
+++ b/docs/cloud/manage/themes.md
@@ -1,12 +1,4 @@
----
-title: "Choose your Netdata Cloud theme"
-description: "Switch between Light and Dark themes in Netdata Cloud to match your personal visualization preferences."
-custom_edit_url: "https://github.com/netdata/netdata/blob/master/docs/cloud/manage/themes.md"
-sidebar_label: "Choose your Netdata Cloud theme"
-learn_status: "Published"
-learn_topic_type: "Tasks"
-learn_rel_path: "Operations"
----
+# Choose your Netdata Cloud theme
 
 The Dark theme is the default for all new Netdata Cloud accounts.
 
diff --git a/docs/cloud/manage/view-plan-billing.md b/docs/cloud/manage/view-plan-billing.md
new file mode 100644
index 000000000..d29f93f98
--- /dev/null
+++ b/docs/cloud/manage/view-plan-billing.md
@@ -0,0 +1,92 @@
+# View Plan & Billing
+
+From the Cloud interface, you can view and manage your space's plan and billing settings, and see the space's usage in terms of running nodes.
+
+To view and manage some specific settings, related to billing options and invoices, you'll be redirected to our billing provider Customer Portal.
+
+## Prerequisites
+
+To see your plan and billing setting you need:
+
+- A Cloud account
+- Access to the space as an Administrator or Billing user
+
+## Steps
+
+1. Click on the **Space settings** cog (located above your profile icon)
+1. Click on the **Plan & Billing** tab
+1. On this page you will be presented with information on your current plan, billing settings, and usage information:
+   1. At the top of the page you will see:
+      - **Credit** amount which refers to any amount you have available to use on future invoices or subscription changes (<https://github.com/netdata/netdata/blob/master/docs/cloud/manage/plans.md#plan-changes-and-credit-balance>) - this is displayed once you have had an active paid subscription with us
+      - **Billing email** the email that was specified to be linked to tha plan subscription. This is where invoices, payment, and subscription-related notifications will be sent.
+      - **Billing options and Invoices** is the link to our billing provider Customer Portal where you will be able to:
+         - See the current subscription. There will always be 2 subscriptions active for the two pricing components mentioned on [Netdata Plans documentation page](https://github.com/netdata/netdata/blob/master/docs/cloud/manage/plans.md#plans)
+         - Change directly the payment method associated to current subscriptions
+         - View, add, delete or change your default payment methods
+         - View or change or Billing information:
+            - Billing email
+            - Address
+            - Phone number
+            - Tax ID
+         - View your invoice history
+   1. At the middle, you'll see details on your current plan as well as means to:
+      - Upgrade or cancel your plan
+      - View full plan details page
+   1. At the bottom, you will find your Usage chart that displays:
+      - Daily count - The weighted 90th percentile of the live node count during the day, taking time as the weight. If you have 30 live nodes throughout the day
+      except for a two hour peak of 44 live nodes, the daily value is 31.
+      - Period count: The 90th percentile of the daily counts for this period up to the date. The last value for the period is used as the number of nodes for the bill for that period. See more details in [running nodes and billing](https://github.com/netdata/netdata/blob/master/docs/cloud/manage/plans.md#running-nodes-and-billing) (only applicable if you are on a paid plan subscription)
+      - Committed nodes: The number of nodes committed to in the yearly plan. In case the period count is higher than the number of committed nodes, the difference is billed as overage.
+
+> ⚠️ At the moment, any changes to an active paid plan, upgrades, change billing frequency or committed nodes, will be a manual two-setup flow:
+>
+> 1. cancel your current subscription - move you to the Community plan
+> 2. chose the plan with the intended changes
+>
+> This is a temporary process that we aim to sort out soon so that it will effortless for you to do any of these actions.
+
+## FAQ
+
+### 1. What Payment Methods are accepted?
+
+You can easily pay online via most major Credit/Debit Cards. More payment options are expected to become available in the near future.
+
+### 2. What happens if a renewal payment fails?
+
+After an initial failed payment, we will attempt to process your payment every week for the next 15 days. After three failed attempts your Space will be moved to the **Community** plan (free forever).
+
+For the next 24 hours, you will be able to use all your current notification method configurations. After 24 hours, any of the notification method configurations that aren't available on your space's plan will be automatically disabled.
+
+Cancellation might affect users in your Space. Please check what roles are available on the [Community plan](https://github.com/netdata/netdata/blob/master/docs/cloud/manage/plans.md#areas-impacted-by-plans). Users with unavailable roles on the Community plan will immediately have restricted access to the Space.
+
+### 3. Which currencies do you support?
+
+We currently accept payments only in US Dollars (USD). We currently have plans to also accept payments in Euros (EUR), but do not currently have an estimate for when such support will be available.
+
+### 4. Can I get a refund? How?
+
+Payments for Netdata subscriptions are refundable **only** if you cancel your subscription within 14 days of purchase. The refund will be credited to the Credit/Debit Card used for making the purchase. To request a refund, please email us at [billing@netdata.cloud](mailto:billing@netdata.cloud).
+
+### 5. How do I cancel my paid Plan?
+
+Your annual or monthly Netdata Subscription plan will automatically renew until you cancel it. You can cancel your paid plan at any time by clicking ‘Cancel Plan’ from the **Plan & Billing** section under settings. You can also cancel your paid Plan by clicking the _Select_ button under **Community** plan in the **Plan & Billing** Section under Settings.
+
+### 6. How can I access my Invoices/Receipts after I paid for a Plan?
+
+You can visit the _Billing Options & Invoices_ in the **Plan & Billing** section under settings in your Netdata Space where you can find all your Invoicing history.
+
+### 7. Why do I see two separate Invoices?
+
+Every time you purchase or renew a Plan, two separate Invoices are generated:
+
+- One Invoice includes the recurring fees of the Plan you have chosen
+
+- The other Invoice includes your monthly “On Demand - Usage”.
+
+  Right after the activation of your subscription, you will receive a zero value Invoice since you had no usage when you subscribed.
+  
+  On the following month you will receive an Invoice based on your monthly usage.
+
+You can find some further details on the [Netdata Plans page](https://github.com/netdata/netdata/blob/master/docs/cloud/manage/plans.md#plans).
+
+> ⚠️ We expect this to change to a single invoice in the future, but currently do not have a concrete timeline for when this change will happen.