From df16a6a310b180edbf492a26ccc2b91e2dd1a2c4 Mon Sep 17 00:00:00 2001
From: ViacheslavKlimov <viacheslavklimov11@gmail.com>
Date: Mon, 10 Apr 2023 10:57:27 +0300
Subject: [PATCH] Refactoring for monitoring service

---
 monitoring/pom.xml                            | 18 +----
 monitoring/src/main/conf/logback.xml          |  2 +-
 monitoring/src/main/conf/tb-monitoring.conf   |  2 +-
 .../ThingsboardMonitoringApplication.java     |  2 +-
 .../monitoring/client/TbClient.java           | 10 +--
 .../monitoring/client/WsClient.java           |  2 +-
 .../monitoring/client/WsClientFactory.java    |  2 +-
 .../monitoring/config/DeviceConfig.java       |  2 +-
 .../config/MonitoringTargetConfig.java        |  2 +-
 .../monitoring/config/TransportType.java      |  2 +-
 .../monitoring/config/WsConfig.java           |  2 +-
 .../CoapTransportMonitoringConfig.java        |  2 +-
 .../HttpTransportMonitoringConfig.java        |  2 +-
 .../MqttTransportMonitoringConfig.java        |  2 +-
 .../service/TransportMonitoringConfig.java    |  2 +-
 .../monitoring/data/Latencies.java            |  2 +-
 .../thingsboard/monitoring/data/Latency.java  |  2 +-
 .../monitoring/data/MonitoredServiceKey.java  |  2 +-
 .../data/TransportFailureException.java       |  2 +-
 .../monitoring/data/TransportInfo.java        |  2 +-
 .../monitoring/data/cmd/CmdsWrapper.java      |  2 +-
 .../monitoring/data/cmd/EntityDataCmd.java    |  2 +-
 .../monitoring/data/cmd/EntityDataUpdate.java |  2 +-
 .../monitoring/data/cmd/LatestValueCmd.java   |  2 +-
 .../notification/HighLatencyNotification.java |  2 +-
 .../data/notification/Notification.java       |  2 +-
 .../ServiceFailureNotification.java           |  2 +-
 .../ServiceRecoveryNotification.java          |  2 +-
 .../notification/NotificationService.java     |  2 +-
 .../channels/NotificationChannel.java         |  2 +-
 .../impl/SlackNotificationChannel.java        |  2 +-
 .../service/MonitoringReporter.java           | 57 ++++++++-------
 .../transport/TransportHealthChecker.java     |  2 +-
 .../transport/TransportMonitoringService.java |  4 +-
 .../impl/CoapTransportHealthChecker.java      |  2 +-
 .../impl/HttpTransportHealthChecker.java      |  2 +-
 .../impl/MqttTransportHealthChecker.java      |  2 +-
 .../monitoring/util/TbStopWatch.java          |  2 +-
 monitoring/src/main/resources/logback.xml     |  4 +-
 .../src/main/resources/tb-monitoring.yml      | 72 ++++++++++++++-----
 msa/monitoring/pom.xml                        |  2 +-
 pom.xml                                       |  5 ++
 42 files changed, 139 insertions(+), 101 deletions(-)

diff --git a/monitoring/pom.xml b/monitoring/pom.xml
index 7f9e6c3369..429df521b6 100644
--- a/monitoring/pom.xml
+++ b/monitoring/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright © 2016-2022 The Thingsboard Authors
+    Copyright © 2016-2023 The Thingsboard Authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.4.3-SNAPSHOT</version>
+        <version>3.5.0-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
 
@@ -59,28 +59,16 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <artifactId>spring-boot-starter</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.eclipse.californium</groupId>
             <artifactId>californium-core</artifactId>
-            <version>2.6.1</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.californium</groupId>
             <artifactId>scandium</artifactId>
-            <version>2.6.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.leshan</groupId>
-            <artifactId>leshan-client-cf</artifactId>
-            <version>2.0.0-M4</version>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.leshan</groupId>
-            <artifactId>leshan-core</artifactId>
-            <version>2.0.0-M4</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.paho</groupId>
diff --git a/monitoring/src/main/conf/logback.xml b/monitoring/src/main/conf/logback.xml
index 5d37a17110..98411ef482 100644
--- a/monitoring/src/main/conf/logback.xml
+++ b/monitoring/src/main/conf/logback.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
 
-    Copyright © 2016-2022 The Thingsboard Authors
+    Copyright © 2016-2023 The Thingsboard Authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/monitoring/src/main/conf/tb-monitoring.conf b/monitoring/src/main/conf/tb-monitoring.conf
index 6c6b191176..d1d729bd20 100644
--- a/monitoring/src/main/conf/tb-monitoring.conf
+++ b/monitoring/src/main/conf/tb-monitoring.conf
@@ -1,5 +1,5 @@
 #
-# Copyright © 2016-2022 The Thingsboard Authors
+# Copyright © 2016-2023 The Thingsboard Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/ThingsboardMonitoringApplication.java b/monitoring/src/main/java/org/thingsboard/monitoring/ThingsboardMonitoringApplication.java
index 8997c0d373..3fa43a8175 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/ThingsboardMonitoringApplication.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/ThingsboardMonitoringApplication.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/client/TbClient.java b/monitoring/src/main/java/org/thingsboard/monitoring/client/TbClient.java
index ea5ac53c63..9dcc58cf2f 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/client/TbClient.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/client/TbClient.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,13 +28,13 @@ import java.time.Duration;
 @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 public class TbClient extends RestClient {
 
-    @Value("${monitoring.auth.username}")
+    @Value("${monitoring.rest.username}")
     private String username;
-    @Value("${monitoring.auth.password}")
+    @Value("${monitoring.rest.password}")
     private String password;
 
-    public TbClient(@Value("${monitoring.auth.base_url}") String baseUrl,
-                    @Value("${monitoring.rest_request_timeout_ms}") int requestTimeoutMs) {
+    public TbClient(@Value("${monitoring.rest.base_url}") String baseUrl,
+                    @Value("${monitoring.rest.request_timeout_ms}") int requestTimeoutMs) {
         super(new RestTemplateBuilder()
                 .setConnectTimeout(Duration.ofMillis(requestTimeoutMs))
                 .setReadTimeout(Duration.ofMillis(requestTimeoutMs))
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/client/WsClient.java b/monitoring/src/main/java/org/thingsboard/monitoring/client/WsClient.java
index 7d2cbcd936..20e7a900ff 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/client/WsClient.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/client/WsClient.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/client/WsClientFactory.java b/monitoring/src/main/java/org/thingsboard/monitoring/client/WsClientFactory.java
index b3fc4f1558..168830e1c7 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/client/WsClientFactory.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/client/WsClientFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/config/DeviceConfig.java b/monitoring/src/main/java/org/thingsboard/monitoring/config/DeviceConfig.java
index 15517b5f5b..548ad6d08b 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/config/DeviceConfig.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/config/DeviceConfig.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/config/MonitoringTargetConfig.java b/monitoring/src/main/java/org/thingsboard/monitoring/config/MonitoringTargetConfig.java
index 4530c5211d..5f1ab49e91 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/config/MonitoringTargetConfig.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/config/MonitoringTargetConfig.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/config/TransportType.java b/monitoring/src/main/java/org/thingsboard/monitoring/config/TransportType.java
index 8b2ec3151b..ed0a4ea331 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/config/TransportType.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/config/TransportType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/config/WsConfig.java b/monitoring/src/main/java/org/thingsboard/monitoring/config/WsConfig.java
index 4dcca5ea6c..58d0772471 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/config/WsConfig.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/config/WsConfig.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/config/service/CoapTransportMonitoringConfig.java b/monitoring/src/main/java/org/thingsboard/monitoring/config/service/CoapTransportMonitoringConfig.java
index ff6b7b25bd..905858b4eb 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/config/service/CoapTransportMonitoringConfig.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/config/service/CoapTransportMonitoringConfig.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/config/service/HttpTransportMonitoringConfig.java b/monitoring/src/main/java/org/thingsboard/monitoring/config/service/HttpTransportMonitoringConfig.java
index a7250e4f49..3a3e8f612c 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/config/service/HttpTransportMonitoringConfig.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/config/service/HttpTransportMonitoringConfig.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/config/service/MqttTransportMonitoringConfig.java b/monitoring/src/main/java/org/thingsboard/monitoring/config/service/MqttTransportMonitoringConfig.java
index e8c34f7db7..7fef5b95dc 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/config/service/MqttTransportMonitoringConfig.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/config/service/MqttTransportMonitoringConfig.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/config/service/TransportMonitoringConfig.java b/monitoring/src/main/java/org/thingsboard/monitoring/config/service/TransportMonitoringConfig.java
index d2d75a888a..0712d1d919 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/config/service/TransportMonitoringConfig.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/config/service/TransportMonitoringConfig.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/data/Latencies.java b/monitoring/src/main/java/org/thingsboard/monitoring/data/Latencies.java
index 1c380ae9a3..19652b4a78 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/data/Latencies.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/data/Latencies.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/data/Latency.java b/monitoring/src/main/java/org/thingsboard/monitoring/data/Latency.java
index 6c385cf6e4..c64291e30f 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/data/Latency.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/data/Latency.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/data/MonitoredServiceKey.java b/monitoring/src/main/java/org/thingsboard/monitoring/data/MonitoredServiceKey.java
index 57609d609a..825162952f 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/data/MonitoredServiceKey.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/data/MonitoredServiceKey.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/data/TransportFailureException.java b/monitoring/src/main/java/org/thingsboard/monitoring/data/TransportFailureException.java
index c9160fcffc..8157c4af5f 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/data/TransportFailureException.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/data/TransportFailureException.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/data/TransportInfo.java b/monitoring/src/main/java/org/thingsboard/monitoring/data/TransportInfo.java
index e3ae1dc4d9..d7619ea32d 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/data/TransportInfo.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/data/TransportInfo.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/data/cmd/CmdsWrapper.java b/monitoring/src/main/java/org/thingsboard/monitoring/data/cmd/CmdsWrapper.java
index 3d39f711a2..34227150ea 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/data/cmd/CmdsWrapper.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/data/cmd/CmdsWrapper.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/data/cmd/EntityDataCmd.java b/monitoring/src/main/java/org/thingsboard/monitoring/data/cmd/EntityDataCmd.java
index b0990b70f6..ccd6fa8f7c 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/data/cmd/EntityDataCmd.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/data/cmd/EntityDataCmd.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/data/cmd/EntityDataUpdate.java b/monitoring/src/main/java/org/thingsboard/monitoring/data/cmd/EntityDataUpdate.java
index debb123e15..5f3a466217 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/data/cmd/EntityDataUpdate.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/data/cmd/EntityDataUpdate.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/data/cmd/LatestValueCmd.java b/monitoring/src/main/java/org/thingsboard/monitoring/data/cmd/LatestValueCmd.java
index a09c41c184..5c2cffcbb6 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/data/cmd/LatestValueCmd.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/data/cmd/LatestValueCmd.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/HighLatencyNotification.java b/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/HighLatencyNotification.java
index 6639b8c753..939cb7440f 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/HighLatencyNotification.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/HighLatencyNotification.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/Notification.java b/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/Notification.java
index 5e07abf7fa..21e5994d84 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/Notification.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/Notification.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/ServiceFailureNotification.java b/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/ServiceFailureNotification.java
index 85325a1e50..4b78d96a63 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/ServiceFailureNotification.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/ServiceFailureNotification.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/ServiceRecoveryNotification.java b/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/ServiceRecoveryNotification.java
index f8e69e5bf6..44eaf093cc 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/ServiceRecoveryNotification.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/data/notification/ServiceRecoveryNotification.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/notification/NotificationService.java b/monitoring/src/main/java/org/thingsboard/monitoring/notification/NotificationService.java
index ae3619a27f..f882105048 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/notification/NotificationService.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/notification/NotificationService.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/NotificationChannel.java b/monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/NotificationChannel.java
index 7b84d7b9ae..5224a4c38e 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/NotificationChannel.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/NotificationChannel.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/impl/SlackNotificationChannel.java b/monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/impl/SlackNotificationChannel.java
index 394ac21287..13a36a589c 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/impl/SlackNotificationChannel.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/notification/channels/impl/SlackNotificationChannel.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/service/MonitoringReporter.java b/monitoring/src/main/java/org/thingsboard/monitoring/service/MonitoringReporter.java
index f0acf17bbb..4649e31ac4 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/service/MonitoringReporter.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/service/MonitoringReporter.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,12 +30,12 @@ import org.thingsboard.monitoring.data.notification.HighLatencyNotification;
 import org.thingsboard.monitoring.data.notification.ServiceFailureNotification;
 import org.thingsboard.monitoring.data.notification.ServiceRecoveryNotification;
 import org.thingsboard.monitoring.notification.NotificationService;
-import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.id.EntityId;
-import org.thingsboard.server.common.data.id.EntityIdFactory;
+import org.thingsboard.server.common.data.asset.Asset;
+import org.thingsboard.server.common.data.id.AssetId;
 
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
@@ -52,14 +52,15 @@ public class MonitoringReporter {
 
     @Value("${monitoring.failures_threshold}")
     private int failuresThreshold;
-    @Value("${monitoring.latency.threshold_ms}")
-    private int latencyThresholdMs;
     @Value("${monitoring.send_repeated_failure_notification}")
     private boolean sendRepeatedFailureNotification;
-    @Value("${monitoring.latency.reporting_entity_type}")
-    private EntityType reportingEntityType;
-    @Value("${monitoring.latency.reporting_entity_id}")
-    private String reportingEntityId;
+
+    @Value("${monitoring.latency.enabled}")
+    private boolean latencyReportingEnabled;
+    @Value("${monitoring.latency.threshold_ms}")
+    private int latencyThresholdMs;
+    @Value("${monitoring.latency.reporting_asset_id}")
+    private String reportingAssetId;
 
     public void reportLatencies(TbClient tbClient) {
         List<Latency> latencies = this.latencies.values().stream()
@@ -75,27 +76,35 @@ public class MonitoringReporter {
         }
         log.info("Latencies:\n{}", latencies.stream().map(latency -> latency.getKey() + ": " + latency.getAvg() + " ms")
                 .collect(Collectors.joining("\n")));
+
+        if (!latencyReportingEnabled) return;
+
         if (latencies.stream().anyMatch(latency -> latency.getAvg() >= (double) latencyThresholdMs)) {
             HighLatencyNotification highLatencyNotification = new HighLatencyNotification(latencies, latencyThresholdMs);
             notificationService.sendNotification(highLatencyNotification);
         }
 
-        if (reportingEntityType != null && StringUtils.isNotBlank(reportingEntityId)) {
-            try {
-                EntityId entityId;
-                try {
-                    entityId = EntityIdFactory.getByTypeAndUuid(reportingEntityType, reportingEntityId);
-                } catch (Exception e) {
-                    return;
-                }
-                ObjectNode msg = JacksonUtil.newObjectNode();
-                latencies.forEach(latency -> {
-                    msg.set(latency.getKey(), new DoubleNode(latency.getAvg()));
+        try {
+            if (StringUtils.isBlank(reportingAssetId)) {
+                String assetName = "Monitoring";
+                Asset monitoringAsset = tbClient.findAsset(assetName).orElseGet(() -> {
+                    Asset asset = new Asset();
+                    asset.setType("Monitoring");
+                    asset.setName(assetName);
+                    asset = tbClient.saveAsset(asset);
+                    log.info("Created monitoring asset {}", asset.getId());
+                    return asset;
                 });
-                tbClient.saveEntityTelemetry(entityId, "time", msg);
-            } catch (Exception e) {
-                log.error("Failed to report latencies: {}", e.getMessage());
+                reportingAssetId = monitoringAsset.getId().toString();
             }
+
+            ObjectNode msg = JacksonUtil.newObjectNode();
+            latencies.forEach(latency -> {
+                msg.set(latency.getKey(), new DoubleNode(latency.getAvg()));
+            });
+            tbClient.saveEntityTelemetry(new AssetId(UUID.fromString(reportingAssetId)), "time", msg);
+        } catch (Exception e) {
+            log.error("Failed to report latencies: {}", e.getMessage());
         }
     }
 
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/transport/TransportHealthChecker.java b/monitoring/src/main/java/org/thingsboard/monitoring/transport/TransportHealthChecker.java
index f73f935664..a8163c45b1 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/transport/TransportHealthChecker.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/transport/TransportHealthChecker.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/transport/TransportMonitoringService.java b/monitoring/src/main/java/org/thingsboard/monitoring/transport/TransportMonitoringService.java
index 3bd706217e..b3dd10db15 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/transport/TransportMonitoringService.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/transport/TransportMonitoringService.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -134,7 +134,7 @@ public final class TransportMonitoringService {
             deviceId = new DeviceId(deviceConfig.getId());
         }
 
-        log.debug("Loading credentials for device {}", deviceId);
+        log.info("Loading credentials for device {}", deviceId);
         DeviceCredentials credentials = tbClient.getDeviceCredentialsByDeviceId(deviceId)
                 .orElseThrow(() -> new IllegalArgumentException("No credentials found for device " + deviceId));
         target.getDevice().setCredentials(credentials);
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/transport/impl/CoapTransportHealthChecker.java b/monitoring/src/main/java/org/thingsboard/monitoring/transport/impl/CoapTransportHealthChecker.java
index 84568623c4..3e36e62c58 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/transport/impl/CoapTransportHealthChecker.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/transport/impl/CoapTransportHealthChecker.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/transport/impl/HttpTransportHealthChecker.java b/monitoring/src/main/java/org/thingsboard/monitoring/transport/impl/HttpTransportHealthChecker.java
index f055e9958d..834025b9e5 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/transport/impl/HttpTransportHealthChecker.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/transport/impl/HttpTransportHealthChecker.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/transport/impl/MqttTransportHealthChecker.java b/monitoring/src/main/java/org/thingsboard/monitoring/transport/impl/MqttTransportHealthChecker.java
index ca8ba275aa..850cfe136b 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/transport/impl/MqttTransportHealthChecker.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/transport/impl/MqttTransportHealthChecker.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/util/TbStopWatch.java b/monitoring/src/main/java/org/thingsboard/monitoring/util/TbStopWatch.java
index b60fff70cd..af5eefc25e 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/util/TbStopWatch.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/util/TbStopWatch.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2022 The Thingsboard Authors
+ * Copyright © 2016-2023 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/monitoring/src/main/resources/logback.xml b/monitoring/src/main/resources/logback.xml
index 99e2c7172d..a7ca84126f 100644
--- a/monitoring/src/main/resources/logback.xml
+++ b/monitoring/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
 
-    Copyright © 2016-2022 The Thingsboard Authors
+    Copyright © 2016-2023 The Thingsboard Authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@
 
     <logger name="org" level="WARN"/>
     <logger name="org.thingsboard.server" level="INFO"/>
-    <logger name="org.thingsboard.monitoring" level="DEBUG"/>
+    <logger name="org.thingsboard.monitoring" level="INFO"/>
     <logger name="org.thingsboard.monitoring.client" level="WARN"/>
 
     <root level="INFO">
diff --git a/monitoring/src/main/resources/tb-monitoring.yml b/monitoring/src/main/resources/tb-monitoring.yml
index d0f9be4ea2..a916f86b0d 100644
--- a/monitoring/src/main/resources/tb-monitoring.yml
+++ b/monitoring/src/main/resources/tb-monitoring.yml
@@ -1,5 +1,5 @@
 #
-# Copyright © 2016-2022 The Thingsboard Authors
+# Copyright © 2016-2023 The Thingsboard Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,57 +14,93 @@
 # limitations under the License.
 #
 
-server:
-  port: '${SERVER_PORT:8990}'
-
 monitoring:
-  auth:
-    base_url: '${AUTH_BASE_URL:http://localhost:8080}'
-    username: '${AUTH_USERNAME:tenant@thingsboard.org}'
-    password: '${AUTH_PASSWORD:tenant}'
+  # Monitored server domain
+  domain: "${DOMAIN:localhost}"
+  rest:
+    # Base REST API url, https://DOMAIN by default
+    base_url: '${REST_BASE_URL:https://${monitoring.domain}}'
+    # Authentication username
+    username: '${REST_AUTH_USERNAME:tenant@thingsboard.org}'
+    # Authentication password
+    password: '${REST_AUTH_PASSWORD:tenant}'
+    # REST request timeout in milliseconds
+    request_timeout_ms: '${REST_REQUEST_TIMEOUT_MS:5000}'
   ws:
-    base_url: '${WS_BASE_URL:ws://localhost:8080}'
+    # WebSocket url, wss://DOMAIN by default
+    base_url: '${WS_BASE_URL:wss://${monitoring.domain}}'
+    # Maximum time between request to transport and WebSocket update
     check_timeout_ms: '${WS_CHECK_TIMEOUT_MS:5000}'
+    # WebSocket request timeout
     request_timeout_ms: '${WS_REQUEST_TIMEOUT_MS:3000}'
-  rest_request_timeout_ms: '${REST_REQUEST_TIMEOUT_MS:5000}'
 
+  # Failures threshold for notifying
   failures_threshold: '${FAILURES_THRESHOLD:2}'
+  # Whether to notify about next failures after first notification (will notify after each FAILURES_THRESHOLD failures)
   send_repeated_failure_notification: '${SEND_REPEATED_FAILURE_NOTIFICATION:true}'
 
   transports:
+    # Transports check frequency in milliseconds
     monitoring_rate_ms: '${TRANSPORTS_MONITORING_RATE_MS:10000}'
 
     mqtt:
-      enabled: '${MQTT_TRANSPORT_MONITORING_ENABLED:false}'
+      # Enable MQTT checks
+      enabled: '${MQTT_TRANSPORT_MONITORING_ENABLED:true}'
+      # MQTT request timeout in milliseconds
       request_timeout_ms: '${MQTT_REQUEST_TIMEOUT_MS:4000}'
+      # MQTT QoS
       qos: '${MQTT_QOS_LEVEL:1}'
       targets:
-        - base_url: '${MQTT_TRANSPORT_BASE_URL:tcp://localhost:1883}'
+          # MQTT base url, tcp://DOMAIN:1883 by default
+        - base_url: '${MQTT_TRANSPORT_BASE_URL:tcp://${monitoring.domain}:1883}'
           device:
+            # MQTT device to push telemetry for. If not set - device will be found or created automatically
             id: '${MQTT_TRANSPORT_TARGET_DEVICE_ID:}'
+        # To add more targets, use following environment variables:
+        # monitoring.transports.mqtt.targets[1].base_url, monitoring.transports.mqtt.targets[1].device.id,
+        # monitoring.transports.mqtt.targets[2].base_url, monitoring.transports.mqtt.targets[2].device.id, etc.
 
     coap:
-      enabled: '${COAP_TRANSPORT_MONITORING_ENABLED:false}'
+      # Enable CoAP checks
+      enabled: '${COAP_TRANSPORT_MONITORING_ENABLED:true}'
+      # CoAP request timeout in milliseconds
       request_timeout_ms: '${COAP_REQUEST_TIMEOUT_MS:4000}'
       targets:
-        - base_url: '${COAP_TRANSPORT_BASE_URL:coap://localhost}'
+        # CoAP base url, coap://DOMAIN by default
+        - base_url: '${COAP_TRANSPORT_BASE_URL:coap://${monitoring.domain}}'
+          # CoAP device to push telemetry for. If not set - device will be found or created automatically
           device:
             id: '${COAP_TRANSPORT_TARGET_DEVICE_ID:}'
+        # To add more targets, use following environment variables:
+        # monitoring.transports.coap.targets[1].base_url, monitoring.transports.coap.targets[1].device.id,
+        # monitoring.transports.coap.targets[2].base_url, monitoring.transports.coap.targets[2].device.id, etc.
 
     http:
-      enabled: '${HTTP_TRANSPORT_MONITORING_ENABLED:false}'
+      # Enable HTTP checks
+      enabled: '${HTTP_TRANSPORT_MONITORING_ENABLED:true}'
+      # HTTP request timeout in milliseconds
       request_timeout_ms: '${HTTP_REQUEST_TIMEOUT_MS:4000}'
       targets:
-        - base_url: '${HTTP_TRANSPORT_BASE_URL:http://localhost:8080}'
+        # HTTP base url, https://DOMAIN by default
+        - base_url: '${HTTP_TRANSPORT_BASE_URL:https://${monitoring.domain}}'
           device:
+            # HTTP device to push telemetry for. If not set - device will be found or created automatically
             id: '${HTTP_TRANSPORT_TARGET_DEVICE_ID:}'
+        # To add more targets, use following environment variables:
+        # monitoring.transports.http.targets[1].base_url, monitoring.transports.http.targets[1].device.id,
+        # monitoring.transports.http.targets[2].base_url, monitoring.transports.http.targets[2].device.id, etc.
 
   notification_channels:
     slack:
+      # Enable notifying via Slack
       enabled: '${SLACK_NOTIFICATION_CHANNEL_ENABLED:false}'
+      # Slack webhook url
       webhook_url: '${SLACK_WEBHOOK_URL:}'
 
   latency:
+    # Enable latencies reporting
+    enabled: "${LATENCY_REPORTING_ENABLED:true}"
+    # Latency threshold for notifying
     threshold_ms: '${LATENCY_THRESHOLD:2000}'
-    reporting_entity_type: '${LATENCY_REPORTING_ENTITY_TYPE:ASSET}'
-    reporting_entity_id: '${LATENCY_REPORTING_ENTITY_ID:}'
+    # ID of the asset to save latencies to. If not set and latencies reporting is enabled - asset will be found or created automatically
+    reporting_asset_id: '${LATENCY_REPORTING_ASSET_ID:}'
diff --git a/msa/monitoring/pom.xml b/msa/monitoring/pom.xml
index 6f3dc22cb5..eab4ab746b 100644
--- a/msa/monitoring/pom.xml
+++ b/msa/monitoring/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>3.4.3-SNAPSHOT</version>
+        <version>3.5.0-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index eedda97880..52b470a1a4 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1085,6 +1085,11 @@
                 <artifactId>jaxb-runtime</artifactId>
                 <version>${jaxb-runtime.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter</artifactId>
+                <version>${spring-boot.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-starter-security</artifactId>