Merge branch 'staging/4.2' into release/4.2

Author: ashvayka

_config.yml

@@ -100,6 +100,6 @@ release:
   pe_flutter_app_ver: 1.6.0
   ce_dart_client_ver: 4.0.0
   pe_dart_client_ver: 4.0.0
-  broker_full_ver: 2.1.0
-  broker_branch: release-2.1.0
+  broker_full_ver: 2.2.0
+  broker_branch: release-2.2.0
   trendz_ver: 1.13.2

_data/mqtt-broker/docs-home.yml

@@ -6,27 +6,42 @@ toc:
 - title: What is TBMQ?
   path: /docs/mqtt-broker/getting-started-guides/what-is-thingsboard-mqtt-broker/
 - title: Configuration
-  new: true
   section:
     - title: TBMQ
       path: /docs/mqtt-broker/install/config/
     - title: TBMQ Integration Executor
       path: /docs/mqtt-broker/install/ie-config/
-      new: true
 - title: Security
-  path: /docs/mqtt-broker/security/
+  section:
+    - title: Overview
+      path: /docs/mqtt-broker/security/overview/
+    - title: MQTT over SSL
+      path: /docs/mqtt-broker/security/mqtts/
+    - title: MQTT Listeners
+      path: /docs/mqtt-broker/security/listeners/
+    - title: Authentication
+      section:
+      - title: Basic
+        path: /docs/mqtt-broker/security/authentication/basic/
+      - title: X.509 Certificate Chain
+        path: /docs/mqtt-broker/security/authentication/x509/
+      - title: JWT
+        new: true
+        path: /docs/mqtt-broker/security/authentication/jwt/
+      - title: SCRAM
+        path: /docs/mqtt-broker/security/authentication/scram/
+    - title: Enable HTTPS
+      path: /docs/mqtt-broker/security/https/
 - title: Integration with ThingsBoard
   path: /docs/mqtt-broker/user-guide/integrations/how-to-connect-thingsboard-to-tbmq/
-- title: Features
+- title: MQTT Features
   section:
     - title: MQTT protocol
       path: /docs/mqtt-broker/user-guide/mqtt-protocol/
     - title: Topics & Wildcards
       path: /docs/mqtt-broker/user-guide/topics/
     - title: Quality of Service (QoS)
       path: /docs/mqtt-broker/user-guide/qos/
-    - title: TBMQ client type
-      path: /docs/mqtt-broker/user-guide/mqtt-client-type/
     - title: MQTT over WebSocket
       path: /docs/mqtt-broker/user-guide/mqtt-over-ws/
     - title: Shared Subscriptions
@@ -37,6 +52,21 @@ toc:
       path: /docs/mqtt-broker/user-guide/last-will/
     - title: Keep Alive
       path: /docs/mqtt-broker/user-guide/keep-alive/
+- title: Other Features
+  new: true
+  section:
+    - title: TBMQ Client Type
+      path: /docs/mqtt-broker/user-guide/mqtt-client-type/
+    - title: Blocked Clients
+      path: /docs/mqtt-broker/other/blocked-client/
+    - title: Backpressure
+      path: /docs/mqtt-broker/user-guide/backpressure/
+    - title: Msg Delivery Strategies
+      path: /docs/mqtt-broker/other/msg-delivery-strategy/
+    - title: PROXY Protocol
+      path: /docs/mqtt-broker/other/proxy-protocol/
+    - title: Health API
+      path: /docs/mqtt-broker/other/health/
 - title: Integrations
   new: true
   section:
@@ -68,11 +98,6 @@ toc:
       path: /docs/mqtt-broker/user-guide/ui/users/
     - title: Settings
       path: /docs/mqtt-broker/user-guide/ui/settings/
-- title: Other Features
-  new: true
-  section:
-    - title: PROXY Protocol
-      path: /docs/mqtt-broker/other/proxy-protocol/
 - title: Subscriptions
   path: /docs/mqtt-broker/subscription/
 - title: Need Help?

_data/mqtt-broker/reference.yml

@@ -13,7 +13,6 @@ toc:
   section:
     - title: "Point-to-point: 1M Msg/sec Throughput"
       path: /docs/mqtt-broker/reference/1m-throughput-p2p-performance-test/
-      new: true
     - title: "Fan-out: 3M Msg/sec Throughput"
       path: /docs/mqtt-broker/reference/3m-throughput-single-node-performance-test/
     - title: "Fan-in: 100M MQTT Connections"

_data/pages_info.yml

@@ -844,6 +844,15 @@
 "/docs/mqtt-broker/mqtt-client-credentials-management/":
   url: "/docs/mqtt-broker/mqtt-client-credentials-management/"
   redirect_from: []
+"/docs/mqtt-broker/other/blocked-client/":
+  url: "/docs/mqtt-broker/other/blocked-client/"
+  redirect_from: []
+"/docs/mqtt-broker/other/health/":
+  url: "/docs/mqtt-broker/other/health/"
+  redirect_from: []
+"/docs/mqtt-broker/other/msg-delivery-strategy/":
+  url: "/docs/mqtt-broker/other/msg-delivery-strategy/"
+  redirect_from: []
 "/docs/mqtt-broker/other/proxy-protocol/":
   url: "/docs/mqtt-broker/other/proxy-protocol/"
   redirect_from: []
@@ -868,15 +877,39 @@
 "/docs/mqtt-broker/search/":
   url: "/docs/mqtt-broker/search/"
   redirect_from: []
-"/docs/mqtt-broker/security/":
-  url: "/docs/mqtt-broker/security/"
+"/docs/mqtt-broker/security/authentication/basic/":
+  url: "/docs/mqtt-broker/security/authentication/basic/"
+  redirect_from: []
+"/docs/mqtt-broker/security/authentication/jwt/":
+  url: "/docs/mqtt-broker/security/authentication/jwt/"
+  redirect_from: []
+"/docs/mqtt-broker/security/authentication/scram/":
+  url: "/docs/mqtt-broker/security/authentication/scram/"
+  redirect_from: []
+"/docs/mqtt-broker/security/authentication/x509/":
+  url: "/docs/mqtt-broker/security/authentication/x509/"
+  redirect_from: []
+"/docs/mqtt-broker/security/https/":
+  url: "/docs/mqtt-broker/security/https/"
+  redirect_from: []
+"/docs/mqtt-broker/security/listeners/":
+  url: "/docs/mqtt-broker/security/listeners/"
+  redirect_from: []
+"/docs/mqtt-broker/security/mqtts/":
+  url: "/docs/mqtt-broker/security/mqtts/"
+  redirect_from: []
+"/docs/mqtt-broker/security/overview/":
+  url: "/docs/mqtt-broker/security/overview/"
   redirect_from: []
 "/docs/mqtt-broker/subscription/":
   url: "/docs/mqtt-broker/subscription/"
   redirect_from: []
 "/docs/mqtt-broker/troubleshooting/":
   url: "/docs/mqtt-broker/troubleshooting/"
   redirect_from: []
+"/docs/mqtt-broker/user-guide/backpressure/":
+  url: "/docs/mqtt-broker/user-guide/backpressure/"
+  redirect_from: []
 "/docs/mqtt-broker/user-guide/integrations/how-to-connect-thingsboard-to-tbmq/":
   url: "/docs/mqtt-broker/user-guide/integrations/how-to-connect-thingsboard-to-tbmq/"
   redirect_from: []

_includes/docs/edge/troubleshooting.md

@@ -268,10 +268,6 @@ ThingsBoard Edge exposes a set of telemetry keys that allow you to monitor messa
             <span class="phrase-heading">Community chat</span>
             <p>Our Gitter channel is the best way to contact our engineers and share your ideas with them.</p>
         </a>
-        <a href="https://groups.google.com/forum/#!forum/thingsboard">
-            <span class="phrase-heading">Q&A forum</span>
-            <p>Our user forum is a great place to go for community support.</p>
-        </a>
         <a href="https://stackoverflow.com/questions/tagged/thingsboard">
             <span class="phrase-heading">Stack Overflow</span>
             <p>The ThingsBoard team will also monitor posts tagged thingsboard. If there aren’t any existing questions that help, please ask a new one!</p>

_includes/docs/mqtt-broker/getting-started-guides/what-is-thingsboard-mqtt-broker.md

@@ -1,5 +1,5 @@
 
-**TBMQ** represents an open-source MQTT message broker. It has the capacity to handle more than **4M** concurrent client connections, 
+**TBMQ** represents an open-source <a target="_blank" href="/products/mqtt-broker/">MQTT message broker</a>. It has the capacity to handle more than **4M** concurrent client connections, 
 supporting a minimum of [3M messages per second throughput](/docs/mqtt-broker/reference/3m-throughput-single-node-performance-test/) per single-node deployment 
 with low latency delivery. 
 In the cluster mode, its capabilities are further enhanced, 
@@ -45,6 +45,7 @@ Our implementation ensures reliable performance and compatibility across diverse
 * All MQTT v5.0 features
 * Multi-node cluster support
 * X.509 certificate chain authentication support
+* JWT authentication
 * Access control (ACL) based on client ID, username, or X.509 certificate chain
 * REST query support for clients’ sessions and subscriptions
 * Rate limits of message processing
@@ -54,6 +55,8 @@ Our implementation ensures reliable performance and compatibility across diverse
 * Integrations with external systems (HTTP, MQTT, Kafka)
 * Kafka topics and consumer groups monitoring
 * Proxy protocol
+* Blocked clients
+* MQTT channel backpressure support
 
 ## Architecture
 

_includes/docs/mqtt-broker/getting-started.md

@@ -4,7 +4,7 @@
 
 ## Introduction
 
-The goal of this tutorial is to showcase the fundamental usage of [TBMQ](/docs/mqtt-broker/getting-started-guides/what-is-thingsboard-mqtt-broker/). 
+The goal of this tutorial is to showcase the fundamental usage of <a target="_blank" href="/products/mqtt-broker/">TBMQ</a>. 
 Through this tutorial, you will gain knowledge and proficiency in the following areas:
 
 * Establishing connections between MQTT clients and the broker.
@@ -47,21 +47,19 @@ sysadmin
 
 ## Configure client authentication & authorization
 
-In order to secure the connection to the broker we should enable Basic or TLS authentication.
-In this tutorial, we will focus on the [Basic](/docs/mqtt-broker/security/#basic-authentication) authentication type.
-For this, we have set `SECURITY_MQTT_BASIC_ENABLED` environment variable to `true` in the `docker-compose.yml` downloaded in the previous step.
+In order to secure the connection to the broker, we should [enable Basic authentication](/docs/mqtt-broker/security/authentication/basic/).
 
 Once Basic authentication is enabled, it is necessary to create MQTT Client Credentials of type `Basic` to authenticate and validate the connecting client.
 
-* Navigate to "Credentials" tab, click "+" in the top right corner of the table.
+* Navigate to _Authentication_ - _Credentials_ tab, click "+" in the top right corner of the table.
 * Input credentials name. For example, "Getting Started Credentials".
 * Input "username" and "password" with chosen values. For example, use `username` and `password` values respectively.
 * Authorization rules are set to allow publishing/subscribing to any topic by default.
 * Click "Add" to save credentials.
 
 {% include images-gallery.html imageCollection="broker-mqtt-creds-creation" %}
 
-A wider range of authentication methods can be found within the [security guide](/docs/mqtt-broker/security/), offering enhanced options for ensuring secure access.
+A wider range of authentication methods can be found within the [security guide](/docs/mqtt-broker/security/overview/), offering enhanced options for ensuring secure access.
 
 ## Publishing and Subscribing to Topics
 
@@ -116,7 +114,7 @@ This tool uses your host, port, and client credentials data to construct `mosqui
 
 Please follow these steps to generate commands for "Getting Started Credentials":
 
-1. Open the 'Client Credentials' page from the left-hand menu.
+1. Open the _Authentication_ - _Credentials_ page from the left-hand menu.
 2. Click on row with client credentials "Getting Started Credentials" to open the details.
 3. Click on the "Check connectivity" button.
 4. In the opened window, select your operating system and install the necessary client tools.

_includes/docs/mqtt-broker/index.md

@@ -1,4 +1,4 @@
-**TBMQ** is a highly scalable and fault-tolerant MQTT broker designed for efficient message routing between connected devices using the MQTT protocol.
+**TBMQ** is a highly scalable and fault-tolerant <a target="_blank" href="/products/mqtt-broker/">MQTT broker</a> designed for efficient message routing between connected devices using the MQTT protocol.
 
 With the ability to manage over **4M** concurrent client connections, TBMQ delivers a minimum [throughput of 3M messages per second](/docs/mqtt-broker/reference/3m-throughput-single-node-performance-test/) 
 in single-node deployment with low latency.