diff --git a/application/src/main/data/json/edge/instructions/install/centos/instructions.md b/application/src/main/data/json/edge/instructions/install/centos/instructions.md
index de5e57d926..1822add6d8 100644
--- a/application/src/main/data/json/edge/instructions/install/centos/instructions.md
+++ b/application/src/main/data/json/edge/instructions/install/centos/instructions.md
@@ -1,7 +1,7 @@
-Here is the list of commands, that can be used to quickly install ThingsBoard Edge on RHEL/CentOS 7/8 and connect to the server.
+Here is the list of commands that can be used to quickly install ThingsBoard Edge on RHEL/CentOS 7/8 and connect to the server.
#### Prerequisites
-Before continue to installation execute the following commands in order to install necessary tools:
+Before continuing to installation, execute the following commands to install the necessary tools:
```bash
sudo yum install -y nano wget && sudo yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
@@ -9,29 +9,28 @@ sudo yum install -y nano wget && sudo yum install -y https://dl.fedoraproject.or
```
#### Step 1. Install Java 17 (OpenJDK)
-ThingsBoard service is running on Java 17. Follow these instructions to install OpenJDK 17:
+ThingsBoard service is running on Java 17. To install OpenJDK 17, follow these instructions:
```bash
sudo dnf install java-17-openjdk
{:copy-code}
```
-Please don't forget to configure your operating system to use OpenJDK 17 by default.
-You can configure which version is the default using the following command:
+Configure your operating system to use OpenJDK 17 by default. You can configure the default version by running the following command:
```bash
sudo update-alternatives --config java
{:copy-code}
```
-You can check the installation using the following command:
+To check the installed Java version on your system, use the following command:
```bash
java -version
{:copy-code}
```
-Expected command output is:
+The expected result is:
```text
openjdk version "17.x.xx"
@@ -39,14 +38,13 @@ OpenJDK Runtime Environment (...)
OpenJDK 64-Bit Server VM (build ...)
```
-#### Step 2. Configure ThingsBoard Database
-ThingsBoard Edge supports SQL and hybrid database approaches.
-In this guide we will use SQL only.
-For hybrid details please follow official installation instructions from the ThingsBoard documentation site.
+#### Step 2. Configure ThingsBoard Edge Database
-### PostgresSql
-ThingsBoard Edge uses PostgreSQL database as a local storage.
-To install PostgreSQL, follow the instructions below.
+ThingsBoard Edge supports **SQL** and **hybrid** database configurations.
+In this guide, we’ll use an **SQL** database.
+For more details about the hybrid setup, please refer to the official installation instructions on the ThingsBoard documentation site.
+
+To install the PostgreSQL database, run these commands:
```bash
# Update your system
@@ -55,7 +53,8 @@ sudo dnf update
```
Install the repository RPM:
-**For CentOS/RHEL 8:**
+
+* **For CentOS/RHEL 8:**
```bash
# Install the repository RPM (For CentOS/RHEL 8):
@@ -63,7 +62,7 @@ sudo sudo dnf -y install https://download.postgresql.org/pub/repos/yum/reporpms/
{:copy-code}
```
-**For CentOS/RHEL 9:**
+* **For CentOS/RHEL 9:**
```bash
# Install the repository RPM (for CentOS 9):
@@ -111,22 +110,11 @@ sudo systemctl restart postgresql-16.service && psql -U postgres -d postgres -h
{:copy-code}
```
-#### Step 3. Choose Queue Service
-
-ThingsBoard Edge supports only Kafka or in-memory queue (since v4.0) for message storage and communication between ThingsBoard services.
-How to choose the right queue implementation?
-
-In Memory queue implementation is built-in and default. It is useful for development(PoC) environments and is not suitable for production deployments or any sort of cluster deployments.
-
-Kafka is recommended for production deployments. This queue is used on the most of ThingsBoard production environments now.
-
-In Memory queue is built in and enabled by default. No additional configuration is required.
-
-#### Step 4. ThingsBoard Edge Service Installation
+#### Step 3. ThingsBoard Edge Service Installation
Download installation package:
```bash
-wget wget https://github.com/thingsboard/thingsboard-edge/releases/download/v${TB_EDGE_TAG}/tb-edge-${TB_EDGE_TAG}.rpm
+wget https://github.com/thingsboard/thingsboard-edge/releases/download/v${TB_EDGE_TAG}/tb-edge-${TB_EDGE_TAG}.rpm
{:copy-code}
```
@@ -137,8 +125,8 @@ sudo rpm -Uvh tb-edge-${TB_EDGE_TAG}.rpm
{:copy-code}
```
-#### Step 5. Configure ThingsBoard Edge
-To configure ThingsBoard Edge, you can use the following command to automatically update the configuration file with specific values:
+#### Step 4. Configure ThingsBoard Edge
+To configure ThingsBoard Edge, you can use the following command to automatically update the configuration file with specific values:
```bash
sudo sh -c 'cat <> /etc/tb-edge/conf/tb-edge.conf
@@ -151,7 +139,7 @@ EOL'
{:copy-code}
```
-##### Configure PostgreSQL (Optional)
+##### [Optional] Configure PostgreSQL Connection
If you changed PostgreSQL default datasource settings, use the following command:
```bash
@@ -163,11 +151,10 @@ EOL'
{:copy-code}
```
-PUT_YOUR_POSTGRESQL_PASSWORD_HERE: Replace with your actual PostgreSQL user password.
-
+* **PUT_YOUR_POSTGRESQL_PASSWORD_HERE**: Replace with your actual **PostgreSQL user password**.
-##### [Optional] Update bind ports
-If ThingsBoard Edge is going to be running on the same machine where ThingsBoard server (cloud) is running, you'll need to update configuration parameters to avoid port collision between ThingsBoard server and ThingsBoard Edge.
+##### [Optional] Update Bind Ports
+If ThingsBoard Edge runs on the same machine as the ThingsBoard Server, you need to update the port configuration to avoid conflicts between the two services.
Please execute the following command to update ThingsBoard Edge configuration file (**/etc/tb-edge/conf/tb-edge.conf**):
@@ -182,28 +169,26 @@ EOL'
{:copy-code}
```
-Make sure that ports above (18080, 11883, 15683) are not used by any other application.
+Make sure that ports **18080**, **11883**, and **15683–15688** are not being used by any other applications.
+
+#### Step 5. Run Installation Script
-#### Step 6. Run installation Script
-Once ThingsBoard Edge is installed and configured please execute the following install script:
+Once ThingsBoard Edge is installed and configured, please execute the following install script:
```bash
sudo /usr/share/tb-edge/bin/install/install.sh
{:copy-code}
```
-#### Step 7. Restart ThingsBoard Edge Service
+#### Step 6. Start ThingsBoard Edge Service
```bash
-sudo service tb-edge restart
+sudo service tb-edge start
{:copy-code}
```
-#### Step 8. Open ThingsBoard Edge UI
-
-Once started, you will be able to open **ThingsBoard Edge UI** using the following link http://localhost:8080.
-
-###### NOTE: Edge HTTP bind port update
+#### Step 7. Open ThingsBoard Edge UI
-If the Edge HTTP bind port was changed to 18080 during Edge installation, access the ThingsBoard Edge instance at http://localhost:18080.
+Once the Edge service has started, open the Edge web interface at http://localhost:8080, or http://localhost:18080 if you modified the HTTP bind port configuration in the previous step.
+Log in using your **tenant credentials** from either your local ThingsBoard Server or the **ThingsBoard Live Demo**.
\ No newline at end of file
diff --git a/application/src/main/data/json/edge/instructions/install/docker/instructions.md b/application/src/main/data/json/edge/instructions/install/docker/instructions.md
index e568d273af..8325c006d3 100644
--- a/application/src/main/data/json/edge/instructions/install/docker/instructions.md
+++ b/application/src/main/data/json/edge/instructions/install/docker/instructions.md
@@ -1,34 +1,17 @@
-Here is the list of commands, that can be used to quickly install ThingsBoard Edge using docker compose and connect to the server.
+Here is the list of commands that can be used to quickly install ThingsBoard Edge using docker compose and connect to the server.
#### Prerequisites
Install Docker CE and Docker Compose.
-#### Step 1. Running ThingsBoard Edge
+#### Step 1. Create the ThingsBoard Edge Docker Compose file
-Here you can find ThingsBoard Edge docker image:
+ThingsBoard Edge supports both **in-memory** and **Kafka** queues for message storage and communication between ThingsBoard services.
+It also supports **SQL** and **hybrid** database configurations.
+In this guide, we’ll use the **in-memory** queue and an **SQL** database.
+For more details about the hybrid setup, please refer to the official installation instructions on the ThingsBoard documentation site.
- thingsboard/tb-edge
-
-#### Step 2. Choose Queue and/or Database Services
-
-ThingsBoard Edge supports only Kafka or in-memory queue (since v4.0) for message storage and communication between ThingsBoard services.
-
-ThingsBoard Edge supports SQL and hybrid database approaches.
-In this guide we will use SQL only.
-For hybrid details please follow official installation instructions from the ThingsBoard documentation site.
-
-How to choose the right queue implementation?
-
-In Memory queue implementation is built-in and default. It is useful for development(PoC) environments and is not suitable for production deployments or any sort of cluster deployments.
-
-Kafka is recommended for production deployments. This queue is used on the most of ThingsBoard production environments now.
-
-Hybrid implementation combines PostgreSQL and Cassandra databases with Kafka queue service. It is recommended if you plan to manage 1M+ devices in production or handle high data ingestion rate (more than 5000 msg/sec).
-
-Create a docker compose file for the ThingsBoard Edge service:
-
-##### In Memory
+Now, create a Docker Compose file for the ThingsBoard Edge service:
```bash
nano docker-compose.yml
@@ -38,7 +21,6 @@ nano docker-compose.yml
Add the following lines to the yml file:
```bash
-version: '3.8'
services:
mytbedge:
restart: always
@@ -54,6 +36,7 @@ services:
CLOUD_RPC_HOST: ${BASE_URL}
CLOUD_RPC_PORT: ${CLOUD_RPC_PORT}
CLOUD_RPC_SSL_ENABLED: ${CLOUD_RPC_SSL_ENABLED}
+ ${EXTRA_HOSTS}
volumes:
- tb-edge-data:/data
- tb-edge-logs:/var/log/tb-edge
@@ -78,41 +61,28 @@ volumes:
{:copy-code}
```
-##### [Optional] Update bind ports
-If ThingsBoard Edge is set to run on the same machine where the ThingsBoard server is operating, you need to update port configuration to prevent port collision between the ThingsBoard server and ThingsBoard Edge.
+##### [Optional] Update Bind Ports
+If ThingsBoard Edge runs on the same machine as the ThingsBoard Server, you need to update the port configuration to avoid conflicts between the two services.
-Ensure that the ports 18080, 11883, 15683-15688 are not used by any other application.
+Make sure that ports **18080**, **11883**, and **15683–15688** are not being used by any other applications.
-Then, update the port configuration in the docker-compose.yml file:
-```bash
-sed -i ‘s/8080:8080/18080:8080/; s/1883:1883/11883:1883/; s/5683-5688:5683-5688\/udp/15683-15688:5683-5688\/udp/’ docker-compose.yml
-{:copy-code}
-```
-#### Start ThingsBoard Edge
-Set the terminal in the directory which contains the docker-compose.yml file and execute the following commands to up this docker compose directly:
+Then, update the port configuration in the `docker-compose.yml` file accordingly:
```bash
-docker compose up -d && docker compose logs -f mytbedge
+sed -i 's/8080:8080/18080:8080/; s/1883:1883/11883:1883/; s/5683-5688:5683-5688\/udp/15683-15688:5683-5688\/udp/' docker-compose.yml
{:copy-code}
```
-###### NOTE: Docker Compose V2 vs docker-compose (with a hyphen)
-
-ThingsBoard supports Docker Compose V2 (Docker Desktop or Compose plugin) starting from **3.4.2** release, because **docker-compose** as standalone setup is no longer supported by Docker.
-We **strongly** recommend to update to Docker Compose V2 and use it.
-If you still rely on using Docker Compose as docker-compose (with a hyphen), then please execute the following commands to start ThingsBoard Edge:
+#### Step 2. Start ThingsBoard Edge
+Navigate to the directory containing the `docker-compose.yml` file and run the following command to start the ThingsBoard Edge service:
```bash
-docker-compose up -d
-docker-compose logs -f mytbedge
+docker compose up -d && docker compose logs -f mytbedge
+{:copy-code}
```
#### Step 3. Open ThingsBoard Edge UI
-Once the Edge service is started, open the Edge UI at http://localhost:8080.
-
-###### NOTE: Edge HTTP bind port update
-
-If the Edge HTTP bind port was changed to 18080 during Edge installation, access the ThingsBoard Edge instance at http://localhost:18080.
+Once the Edge service has started, open the Edge web interface at http://localhost:8080, or http://localhost:18080 if you modified the HTTP bind port configuration in the previous step.
-Please use your tenant credentials from local Server instance or ThingsBoard Live Demo to log in to the ThingsBoard Edge.
+Log in using your **tenant credentials** from either your local ThingsBoard Server or the **ThingsBoard Live Demo**.
diff --git a/application/src/main/data/json/edge/instructions/install/ubuntu/instructions.md b/application/src/main/data/json/edge/instructions/install/ubuntu/instructions.md
index a56b83e558..b4782dd46a 100644
--- a/application/src/main/data/json/edge/instructions/install/ubuntu/instructions.md
+++ b/application/src/main/data/json/edge/instructions/install/ubuntu/instructions.md
@@ -1,4 +1,4 @@
-Here is the list of commands, that can be used to quickly install ThingsBoard Edge on Ubuntu Server and connect to the server.
+Here is the list of commands that can be used to quickly install ThingsBoard Edge on Ubuntu Server and connect to the server.
#### Step 1. Install Java 17 (OpenJDK)
ThingsBoard service is running on Java 17. To install OpenJDK 17, follow these instructions:
@@ -25,19 +25,16 @@ java -version
The expected result is:
```text
-openjdk version "17.x.xx"
+openjdk version "17.x.xx"
OpenJDK Runtime Environment (...)
-OpenJDK 64-Bit Server VM (...)
+OpenJDK 64-Bit Server VM (build ...)
```
#### Step 2. Configure ThingsBoard Edge Database
-ThingsBoard Edge supports SQL and hybrid database approaches.
-In this guide we will use SQL only.
-For hybrid details please follow official installation instructions from the ThingsBoard documentation site.
-
-### Configure PostgreSQL
-ThingsBoard Edge uses PostgreSQL database as a local storage.
+ThingsBoard Edge supports **SQL** and **hybrid** database configurations.
+In this guide, we’ll use an **SQL** database.
+For more details about the hybrid setup, please refer to the official installation instructions on the ThingsBoard documentation site.
To install the PostgreSQL database, run these commands:
@@ -71,18 +68,8 @@ echo "CREATE DATABASE tb_edge;" | psql -U postgres -d postgres -h 127.0.0.1 -W
{:copy-code}
```
-#### Step 3. Choose Queue Service
-
-ThingsBoard Edge supports only Kafka or in-memory queue (since v4.0) for message storage and communication between ThingsBoard services. Choose the appropriate queue implementation based on your specific business needs:
-
-In Memory: The built-in and default queue implementation. It is useful for development or proof-of-concept (PoC) environments, but is not recommended for production or any type of clustered deployments due to limited scalability.
-
-Kafka: Recommended for production deployments. This queue is used in the most of ThingsBoard production environments now.
-
-In Memory queue is built in and enabled by default. No additional configuration is required.
-
-#### Step 4. ThingsBoard Edge Service Installation
-Download installation package:
+#### Step 3. ThingsBoard Edge Service Installation
+Download the installation package:
```bash
wget https://github.com/thingsboard/thingsboard-edge/releases/download/v${TB_EDGE_TAG}/tb-edge-${TB_EDGE_TAG}.deb
@@ -96,8 +83,8 @@ sudo dpkg -i tb-edge-${TB_EDGE_TAG}.deb
{:copy-code}
```
-#### Step 5. Configure ThingsBoard Edge
-To configure ThingsBoard Edge, you can use the following command to automatically update the configuration file with specific values:
+#### Step 4. Configure ThingsBoard Edge
+To configure ThingsBoard Edge, you can use the following command to automatically update the configuration file with specific values:
```bash
sudo sh -c 'cat <> /etc/tb-edge/conf/tb-edge.conf
@@ -110,7 +97,7 @@ EOL'
{:copy-code}
```
-##### [Optional] Configure PostgreSQL
+##### [Optional] Configure PostgreSQL Connection
If you changed PostgreSQL default datasource settings, use the following command:
```bash
@@ -122,10 +109,10 @@ EOL'
{:copy-code}
```
-PUT_YOUR_POSTGRESQL_PASSWORD_HERE: Replace with your actual PostgreSQL user password.
+* **PUT_YOUR_POSTGRESQL_PASSWORD_HERE**: Replace with your actual **PostgreSQL user password**.
-##### [Optional] Update bind ports
-If ThingsBoard Edge is going to be running on the same machine where ThingsBoard server (cloud) is running, you'll need to update configuration parameters to avoid port collision between ThingsBoard server and ThingsBoard Edge.
+##### [Optional] Update Bind Ports
+If ThingsBoard Edge runs on the same machine as the ThingsBoard Server, you need to update the port configuration to avoid conflicts between the two services.
Please execute the following command to update ThingsBoard Edge configuration file (**/etc/tb-edge/conf/tb-edge.conf**):
@@ -140,29 +127,26 @@ EOL'
{:copy-code}
```
-Make sure that ports above (18080, 11883, 15683) are not used by any other application.
+Make sure that ports **18080**, **11883**, and **15683–15688** are not being used by any other applications.
-#### Step 6. Run installation Script
+#### Step 5. Run Installation Script
-Once ThingsBoard Edge is installed and configured please execute the following install script:
+Once ThingsBoard Edge is installed and configured, please execute the following installation script:
```bash
sudo /usr/share/tb-edge/bin/install/install.sh
{:copy-code}
```
-#### Step 7. Restart ThingsBoard Edge Service
+#### Step 6. Start ThingsBoard Edge Service
```bash
-sudo service tb-edge restart
+sudo service tb-edge start
{:copy-code}
```
-#### Step 8. Open ThingsBoard Edge UI
-
-Once started, you will be able to open **ThingsBoard Edge UI** using the following link http://localhost:8080.
-
-###### NOTE: Edge HTTP bind port update
+#### Step 7. Open ThingsBoard Edge UI
-Use next **ThingsBoard Edge UI** link **http://localhost:18080** if you updated HTTP 8080 bind port to **18080**.
+Once the Edge service has started, open the Edge web interface at http://localhost:8080, or http://localhost:18080 if you modified the HTTP bind port configuration in the previous step.
+Log in using your **tenant credentials** from either your local ThingsBoard Server or the **ThingsBoard Live Demo**.
\ No newline at end of file
diff --git a/application/src/main/data/json/edge/instructions/upgrade/centos/instructions.md b/application/src/main/data/json/edge/instructions/upgrade/centos/instructions.md
index c0e721ace2..82774e89cb 100644
--- a/application/src/main/data/json/edge/instructions/upgrade/centos/instructions.md
+++ b/application/src/main/data/json/edge/instructions/upgrade/centos/instructions.md
@@ -1,15 +1,15 @@
#### Upgrading to ${TB_EDGE_VERSION}EDGE
-**ThingsBoard Edge package download:**
+ThingsBoard Edge package download:
```bash
wget https://github.com/thingsboard/thingsboard-edge/releases/download/v${TB_EDGE_TAG}/tb-edge-${TB_EDGE_TAG}.rpm
{:copy-code}
```
-##### ThingsBoard Edge service upgrade
Install package:
```bash
sudo rpm -Uvh tb-edge-${TB_EDGE_TAG}.rpm
{:copy-code}
```
+
${UPGRADE_DB}
diff --git a/application/src/main/data/json/edge/instructions/upgrade/docker/instructions.md b/application/src/main/data/json/edge/instructions/upgrade/docker/instructions.md
index f1b9931e8b..68c7597f84 100644
--- a/application/src/main/data/json/edge/instructions/upgrade/docker/instructions.md
+++ b/application/src/main/data/json/edge/instructions/upgrade/docker/instructions.md
@@ -1,10 +1,3 @@
#### Upgrading to ${TB_EDGE_VERSION}
-Execute the following command to pull **${TB_EDGE_VERSION}** image:
-
-```bash
-docker pull thingsboard/tb-edge:${TB_EDGE_VERSION}
-{:copy-code}
-```
-
${UPGRADE_DB}
diff --git a/application/src/main/data/json/edge/instructions/upgrade/docker/start_service.md b/application/src/main/data/json/edge/instructions/upgrade/docker/start_service.md
index a6c9c6731c..5d1f121764 100644
--- a/application/src/main/data/json/edge/instructions/upgrade/docker/start_service.md
+++ b/application/src/main/data/json/edge/instructions/upgrade/docker/start_service.md
@@ -1,11 +1,10 @@
-Modify ‘main’ docker compose (`docker-compose.yml`) file for ThingsBoard Edge and update version of the image:
+Modify ‘main’ docker compose (`docker-compose.yml`) a file for ThingsBoard Edge and update a version of the image:
```bash
nano docker-compose.yml
{:copy-code}
```
```text
-version: '3.8'
services:
mytbedge:
restart: always
@@ -13,7 +12,7 @@ services:
...
```
-Make sure your image is the set to **tb-edge-${TB_EDGE_VERSION}**.
+Make sure your image is set to **tb-edge-${TB_EDGE_VERSION}**.
Execute the following commands to up this docker compose directly:
```bash
diff --git a/application/src/main/data/json/edge/instructions/upgrade/docker/upgrade_db.md b/application/src/main/data/json/edge/instructions/upgrade/docker/upgrade_db.md
index 386c5f2743..523316cdae 100644
--- a/application/src/main/data/json/edge/instructions/upgrade/docker/upgrade_db.md
+++ b/application/src/main/data/json/edge/instructions/upgrade/docker/upgrade_db.md
@@ -1,4 +1,4 @@
-Create docker compose file for ThingsBoard Edge upgrade process:
+Create a docker compose file for ThingsBoard Edge upgrade process:
```bash
> docker-compose-upgrade.yml && nano docker-compose-upgrade.yml
@@ -8,7 +8,6 @@ Create docker compose file for ThingsBoard Edge upgrade process:
Add the following lines to the yml file:
```bash
-version: '3.8'
services:
mytbedge:
restart: on-failure
@@ -40,7 +39,7 @@ volumes:
{:copy-code}
```
-Execute the following command to start upgrade process:
+Execute the following command to start an upgrade process:
```bash
docker compose -f docker-compose-upgrade.yml up --abort-on-container-exit
diff --git a/application/src/main/data/json/edge/instructions/upgrade/docker/upgrade_preparing.md b/application/src/main/data/json/edge/instructions/upgrade/docker/upgrade_preparing.md
index f12eaa5fc0..d2a6f796a1 100644
--- a/application/src/main/data/json/edge/instructions/upgrade/docker/upgrade_preparing.md
+++ b/application/src/main/data/json/edge/instructions/upgrade/docker/upgrade_preparing.md
@@ -1,6 +1,6 @@
-Here is the list of commands, that can be used to quickly upgrade ThingsBoard Edge on Docker (Linux or MacOS).
+Here is the list of commands that can be used to quickly upgrade ThingsBoard Edge on Docker (Linux or macOS).
-#### Prepare for upgrading ThingsBoard Edge
+#### Prepare for Upgrading ThingsBoard Edge
Set the terminal in the directory which contains the `docker-compose.yml` file and execute the following command
to stop and remove currently running TB Edge container:
@@ -10,70 +10,6 @@ docker compose rm mytbedge
{:copy-code}
```
-**OPTIONAL:** If you still rely on Docker Compose as docker-compose (with a hyphen) here is the list of the above commands:
-```text
-docker-compose stop
-docker-compose rm mytbedge
-```
-
-##### Migrating Data from Docker Bind Mount Folders to Docker Volumes
-Starting with the **3.6.2** release, the ThingsBoard team has transitioned from using Docker bind mount folders to Docker volumes.
-This change aims to enhance security and efficiency in storing data for Docker containers and to mitigate permission issues across various environments.
-
-To migrate from Docker bind mounts to Docker volumes, please execute the following commands:
-
-```bash
-docker run --rm -v tb-edge-data:/volume -v ~/.mytb-edge-data:/backup busybox sh -c "cp -a /backup/. /volume"
-docker run --rm -v tb-edge-logs:/volume -v ~/.mytb-edge-logs:/backup busybox sh -c "cp -a /backup/. /volume"
-docker run --rm -v tb-edge-postgres-data:/volume -v ~/.mytb-edge-data/db:/backup busybox sh -c "cp -a /backup/. /volume"
-{:copy-code}
-```
-
-After completing the data migration to the newly created Docker volumes, you'll need to update the volume mounts in your Docker Compose configuration.
-Modify the `docker-compose.yml` file for ThingsBoard Edge to update the volume settings.
-
-Update volume mounts. Locate the following snippet:
-```text
- volumes:
- - ~/.mytb-edge-data:/data
- - ~/.mytb-edge-logs:/var/log/tb-edge
-...
-```
-
-And replace it with:
-```text
- volumes:
- - tb-edge-data:/data
- - tb-edge-logs:/var/log/tb-edge
-...
-```
-
-Apply a similar update for the PostgreSQL service. Find the section:
-```text
- volumes:
- - ~/.mytb-edge-data/db:/var/lib/postgresql/data
-...
-```
-
-And replace it with:
-```text
- volumes:
- - tb-edge-postgres-data:/var/lib/postgresql/data
-...
-```
-
-Finally, please add next volumes section at the end of the file:
-```text
-...
-volumes:
- tb-edge-data:
- name: tb-edge-data
- tb-edge-logs:
- name: tb-edge-logs
- tb-edge-postgres-data:
- name: tb-edge-postgres-data
-```
-
##### Backup Database
Make a copy of the database volume before upgrading:
diff --git a/application/src/main/data/json/edge/instructions/upgrade/start_service.md b/application/src/main/data/json/edge/instructions/upgrade/start_service.md
index c26c183154..109ccf5b4b 100644
--- a/application/src/main/data/json/edge/instructions/upgrade/start_service.md
+++ b/application/src/main/data/json/edge/instructions/upgrade/start_service.md
@@ -1,4 +1,4 @@
-Start the service
+#### Start the Service
```bash
sudo systemctl tb-edge start
diff --git a/application/src/main/data/json/edge/instructions/upgrade/ubuntu/instructions.md b/application/src/main/data/json/edge/instructions/upgrade/ubuntu/instructions.md
index 59d243c63c..8d4a8d6e26 100644
--- a/application/src/main/data/json/edge/instructions/upgrade/ubuntu/instructions.md
+++ b/application/src/main/data/json/edge/instructions/upgrade/ubuntu/instructions.md
@@ -1,15 +1,14 @@
#### Upgrading to ${TB_EDGE_VERSION}EDGE
-**ThingsBoard Edge package download:**
+ThingsBoard Edge package download:
```bash
wget https://github.com/thingsboard/thingsboard-edge/releases/download/v${TB_EDGE_TAG}/tb-edge-${TB_EDGE_TAG}.deb
{:copy-code}
```
-##### ThingsBoard Edge service upgrade
-
Install package:
```bash
sudo dpkg -i tb-edge-${TB_EDGE_TAG}.deb
{:copy-code}
```
+
${UPGRADE_DB}
diff --git a/application/src/main/data/json/edge/instructions/upgrade/upgrade_preparing.md b/application/src/main/data/json/edge/instructions/upgrade/upgrade_preparing.md
index bdd6c4ea18..3d3ac8c705 100644
--- a/application/src/main/data/json/edge/instructions/upgrade/upgrade_preparing.md
+++ b/application/src/main/data/json/edge/instructions/upgrade/upgrade_preparing.md
@@ -1,6 +1,6 @@
-Here is the list of commands, that can be used to quickly upgrade ThingsBoard Edge on ${OS}
+Here is the list of commands that can be used to quickly upgrade ThingsBoard Edge on ${OS}
-#### Prepare for upgrading ThingsBoard Edge
+#### Prepare for Upgrading ThingsBoard Edge
Stop ThingsBoard Edge service:
@@ -33,4 +33,4 @@ sudo -Hiu postgres pg_dump tb_edge > tb_edge.sql.bak
{:copy-code}
```
-Check backup file created successfully.
+Check the backup file created successfully.
diff --git a/ui-ngx/src/app/modules/home/pages/edge/edge-instructions-dialog.component.html b/ui-ngx/src/app/modules/home/pages/edge/edge-instructions-dialog.component.html
index 5f35d2fd70..ada8a4b579 100644
--- a/ui-ngx/src/app/modules/home/pages/edge/edge-instructions-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/pages/edge/edge-instructions-dialog.component.html
@@ -30,39 +30,39 @@
-
- Ubuntu
+
+ Docker
-
- CentOS/RHEL
+
+ Ubuntu
-
- Docker
+
+ CentOS/RHEL
diff --git a/ui-ngx/src/app/shared/models/edge.models.ts b/ui-ngx/src/app/shared/models/edge.models.ts
index 49c858767b..5d68d167e0 100644
--- a/ui-ngx/src/app/shared/models/edge.models.ts
+++ b/ui-ngx/src/app/shared/models/edge.models.ts
@@ -184,9 +184,9 @@ export interface EdgeInstructions {
}
export enum EdgeInstructionsMethod {
+ docker,
ubuntu,
- centos,
- docker
+ centos
}
export const edgeVersionAttributeKey = 'edgeVersion';