From c8d28ed672566ddc2df6853bab83d4a61b5fda30 Mon Sep 17 00:00:00 2001 From: Andrii Shvaika Date: Wed, 10 May 2023 14:41:34 +0300 Subject: [PATCH 1/3] No snapshot versions for edge --- .../service/edge/instructions/DefaultEdgeInstallService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/application/src/main/java/org/thingsboard/server/service/edge/instructions/DefaultEdgeInstallService.java b/application/src/main/java/org/thingsboard/server/service/edge/instructions/DefaultEdgeInstallService.java index 9dd65eef60..2c4a14635d 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/instructions/DefaultEdgeInstallService.java +++ b/application/src/main/java/org/thingsboard/server/service/edge/instructions/DefaultEdgeInstallService.java @@ -67,7 +67,9 @@ public class DefaultEdgeInstallService implements EdgeInstallService { dockerInstallInstructions = dockerInstallInstructions.replace("${LOCALHOST_WARNING}", ""); dockerInstallInstructions = dockerInstallInstructions.replace("${BASE_URL}", baseUrl); } - dockerInstallInstructions = dockerInstallInstructions.replace("${TB_EDGE_VERSION}", appVersion + "EDGE"); + String edgeVersion = appVersion + "EDGE"; + edgeVersion = edgeVersion.replace("-SNAPSHOT", ""); + dockerInstallInstructions = dockerInstallInstructions.replace("${TB_EDGE_VERSION}", edgeVersion); dockerInstallInstructions = dockerInstallInstructions.replace("${CLOUD_ROUTING_KEY}", edge.getRoutingKey()); dockerInstallInstructions = dockerInstallInstructions.replace("${CLOUD_ROUTING_SECRET}", edge.getSecret()); dockerInstallInstructions = dockerInstallInstructions.replace("${CLOUD_RPC_PORT}", Integer.toString(rpcPort)); From bcd2b9415684827ed18ba8414ca71f036255518c Mon Sep 17 00:00:00 2001 From: YevhenBondarenko Date: Wed, 10 May 2023 17:18:45 +0200 Subject: [PATCH 2/3] fixed start for windows --- common/util/pom.xml | 2 +- .../src/main/java/org/thingsboard/common/util/SystemUtil.java | 2 +- pom.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/util/pom.xml b/common/util/pom.xml index 18b08621ec..79d2d6a064 100644 --- a/common/util/pom.xml +++ b/common/util/pom.xml @@ -89,7 +89,7 @@ data - com.github.dblock + com.github.oshi oshi-core diff --git a/common/util/src/main/java/org/thingsboard/common/util/SystemUtil.java b/common/util/src/main/java/org/thingsboard/common/util/SystemUtil.java index 23fb2a6257..cd68e99ac4 100644 --- a/common/util/src/main/java/org/thingsboard/common/util/SystemUtil.java +++ b/common/util/src/main/java/org/thingsboard/common/util/SystemUtil.java @@ -59,7 +59,7 @@ public class SystemUtil { public static Optional getCpuUsage() { try { - return Optional.of((int) (HARDWARE.getProcessor().getSystemCpuLoad() * 100.0)); + return Optional.of((int) (HARDWARE.getProcessor().getSystemCpuLoad(1000) * 100.0)); } catch (Exception e) { log.debug("Failed to get cpu usage!!!", e); } diff --git a/pom.xml b/pom.xml index f78a4826bc..4fa780b3d3 100755 --- a/pom.xml +++ b/pom.xml @@ -150,7 +150,7 @@ 2.21.0 2.12.0 1.12.1 - 3.4.0 + 6.4.2 @@ -2003,7 +2003,7 @@ ${exp4j.version} - com.github.dblock + com.github.oshi oshi-core ${oshi.version} From c9fb23e1054271fc7efe424d77f1ed7fdaaf7891 Mon Sep 17 00:00:00 2001 From: YevhenBondarenko Date: Wed, 10 May 2023 17:53:50 +0200 Subject: [PATCH 3/3] SystemUtil improvements --- .../java/org/thingsboard/common/util/SystemUtil.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/common/util/src/main/java/org/thingsboard/common/util/SystemUtil.java b/common/util/src/main/java/org/thingsboard/common/util/SystemUtil.java index cd68e99ac4..927f7f3013 100644 --- a/common/util/src/main/java/org/thingsboard/common/util/SystemUtil.java +++ b/common/util/src/main/java/org/thingsboard/common/util/SystemUtil.java @@ -42,7 +42,7 @@ public class SystemUtil { long total = memory.getTotal(); long available = memory.getAvailable(); return Optional.of(toPercent(total - available, total)); - } catch (Exception e) { + } catch (Throwable e) { log.debug("Failed to get memory usage!!!", e); } return Optional.empty(); @@ -51,7 +51,7 @@ public class SystemUtil { public static Optional getTotalMemory() { try { return Optional.of(HARDWARE.getMemory().getTotal()); - } catch (Exception e) { + } catch (Throwable e) { log.debug("Failed to get total memory!!!", e); } return Optional.empty(); @@ -60,7 +60,7 @@ public class SystemUtil { public static Optional getCpuUsage() { try { return Optional.of((int) (HARDWARE.getProcessor().getSystemCpuLoad(1000) * 100.0)); - } catch (Exception e) { + } catch (Throwable e) { log.debug("Failed to get cpu usage!!!", e); } return Optional.empty(); @@ -69,7 +69,7 @@ public class SystemUtil { public static Optional getCpuCount() { try { return Optional.of(HARDWARE.getProcessor().getLogicalProcessorCount()); - } catch (Exception e) { + } catch (Throwable e) { log.debug("Failed to get total cpu count!!!", e); } return Optional.empty(); @@ -81,7 +81,7 @@ public class SystemUtil { long total = store.getTotalSpace(); long available = store.getUsableSpace(); return Optional.of(toPercent(total - available, total)); - } catch (Exception e) { + } catch (Throwable e) { log.debug("Failed to get free disc space!!!", e); } return Optional.empty(); @@ -91,7 +91,7 @@ public class SystemUtil { try { FileStore store = Files.getFileStore(Paths.get("/")); return Optional.of(store.getTotalSpace()); - } catch (Exception e) { + } catch (Throwable e) { log.debug("Failed to get total disc space!!!", e); } return Optional.empty();