1153 Commits

Author SHA1 Message Date
imbeacon
fac2e013e2 Moved sending topic to MQTT transport only, parameter renamed to mqttTopic in metadata 2023-08-14 20:19:25 +03:00
imbeacon
355a92588a Added topic to metadata for attributes and telemetry messages 2023-08-11 11:48:24 +03:00
Andrew Shvayka
173e229da1
Merge pull request #8786 from ShvaykaD/feature/filter-nodes-improvements
Filter nodes improvements && fixes for enrichment rule nodes && added TbMsgType enum and enforced use of it in corresponding places.
2023-08-04 13:57:10 +03:00
Andrii Shvaika
75fd37428a Merge with master 2023-07-31 13:59:20 +03:00
Sergey Matvienko
3b8a9d94ec Lwm2m transport - merge non-unique endpoints for models fetched from cache 2023-07-24 22:57:52 +02:00
ShvaykaD
47929ef784 replaced newMsg and trasformMsg with new methods that uses TbMsgType && mark old methods as deprecated && refactoring 2023-07-06 12:20:23 +03:00
ShvaykaD
0c4c8353de refactoring & added tests for alarm status filter node & entity and msg type switch nodes & check field presence 2023-06-28 12:43:49 +03:00
ShvaykaD
a3c0850277 added tests for TbCheckAlarmStatusNode && TbMsgTypeFilterNodeTest && TbOriginatorTypeFilterNodeTest && replaced SessionMsgType && refactoring 2023-06-23 19:00:25 +03:00
ViacheslavKlimov
0bd7f74c47 Fix issues 2023-06-13 14:12:54 +03:00
ViacheslavKlimov
f98eee5407 Merge branch 'develop/3.5.2' into feature/exceeded-rate-limits-notifications
# Conflicts:
#	application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
#	application/src/main/resources/thingsboard.yml
#	application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java
#	dao/src/main/java/org/thingsboard/server/dao/notification/DefaultNotifications.java
#	ui-ngx/src/app/modules/common/modules-map.ts
2023-06-13 13:49:51 +03:00
ShvaykaD
138128d837 added more logs to RPC processing logic in MQTT and CoAP transports 2023-06-07 15:18:45 +03:00
ShvaykaD
d500d5cb17 updated RPC based logs to use RPC keyword instead of rpc 2023-06-06 14:30:02 +03:00
ViacheslavKlimov
2f560315d1 Exceeded rate limits notifications; their deduplication; refactoring 2023-06-02 15:09:09 +03:00
Igor Kulikov
11b49146ce Merge with master 2023-05-30 17:01:30 +03:00
Andrii Shvaika
b37a708f40 Fix invalid return code for legacy 3.x MQTT clients 2023-05-30 12:01:32 +03:00
ShvaykaD
b2ca9ce086 added logic to cleanup rpcAwaitingAck map when before session close 2023-05-29 14:08:53 +03:00
Andrii Shvaika
bf63eaccfe Merge branch 'master' into develop/3.5.2 2023-05-22 17:50:05 +03:00
Andrew Shvayka
07cba2b16c
Merge pull request #8598 from dashevchenko/xxe_fixed
Fixed xxe vulnerability
2023-05-22 17:46:51 +03:00
Igor Kulikov
9ae1f1e329 Version set to 3.5.2-SNAPSHOT 2023-05-22 16:32:24 +03:00
Igor Kulikov
59cc8244b5 Version set to 3.5.1-SNAPSHOT 2023-05-22 16:31:19 +03:00
Igor Kulikov
c422e39724 Version set to 3.5.1-SNAPSHOT 2023-05-22 16:26:54 +03:00
Andrii Shvaika
6120fb132a Version set to 3.5.2. Migration script improved 2023-05-22 13:16:06 +03:00
dashevchenko
9b461272c4 fixed xxe vulnerability 2023-05-22 13:11:14 +03:00
Andrew Shvayka
da9bea1f20
Merge pull request #8519 from adovh/replace_ObjectMapper_usages_with_JacksonUtil
[3.5.1]Replace object mapper usages with jackson utils
2023-05-19 17:07:16 +03:00
Igor Kulikov
7058f99068 Version set to 3.5.1-SNAPSHOT 2023-05-12 15:45:11 +03:00
AndriiD
7187fbb4d3 Replace object mapper usages with jackson utils 2023-05-10 14:10:58 +03:00
Andrew Shvayka
1a366d476e
Revert "[3.5.1]Replace object mapper usages with jackson utils" 2023-05-08 14:54:21 +03:00
AndriiD
32e5d8561b Merge remote-tracking branch 'origin/develop/3.5.1' into replace_ObjectMapper_usages_with_JacksonUtil
# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/SystemInfoController.java
#	dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ConfigTemplateServiceTest.java
#	rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNode.java
#	rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbSendEmailNode.java
#	rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java
#	rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java
#	rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbRestApiCallNodeTest.java
#	rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java
2023-05-04 14:35:41 +03:00
YevhenBondarenko
fbf9773a61 optimize imports 2023-05-02 10:57:58 +02:00
AndriiD
73833a666b Merge branch 'develop/3.5' into replace_ObjectMapper_usages_with_JacksonUtil
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/action/EntityActionService.java
2023-04-28 15:08:44 +03:00
Andrii Shvaika
8e20fd8800 Metric wildcards and default attributes 2023-04-27 17:08:34 +03:00
Andrii Shvaika
a405999a88 Use shared attributes for sparkplug devices 2023-04-25 19:03:17 +03:00
Andrii Shvaika
a0c370079e Improve the device name 2023-04-20 18:00:34 +03:00
AndriiD
2ea6896507 Merge remote-tracking branch 'origin/develop/3.5' into replace_ObjectMapper_usages_with_JacksonUtil
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
#	application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java
2023-04-17 00:22:12 +03:00
Andrew Shvayka
d2fc5c7b77
Merge pull request #8358 from thingsboard/feature/x509-device-provisioning
Feature/x509 device provisioning
2023-04-14 14:30:24 +03:00
Andrii Landiak
1fc8d7a52b Add validation for X509 trusted chain 2023-04-14 13:26:28 +03:00
AndriiD
dd9c055ecf replace_ObjectMapper_usages_with_JacksonUtil 2023-04-14 11:58:24 +03:00
Andrii Shvaika
7988a58c37 Protection from garbage in redis 2023-04-13 17:12:59 +03:00
Andrii Shvaika
4cea4362dc Merge branch 'feature/x509-device-cert-impr' of github.com:AndriiLandiak/thingsboard into feature/x509-device-provisioning 2023-04-12 12:47:41 +03:00
Andrii Landiak
df18155c81 Refactoring 2023-04-07 18:02:25 +03:00
Andrew Shvayka
838c2f5d33
Merge pull request #7857 from ShvaykaD/improvements/report-device-activity-on-rpc-processing
Improvements for reporting device activity during RPC processing
2023-04-07 15:50:28 +03:00
Andrew Shvayka
14ed9df205
Merge pull request #6986 from adovh/feature/work-1385-custom-mqtt-subscribe-topic
[3.5] added ability to create&subscribe custom mqtt attributes topics
2023-04-07 13:48:20 +03:00
Andrii Landiak
55adb3d12a Refactor x509: add logic of rotating x509 credentials and creating new device to DeviceProvisionService 2023-04-07 13:07:08 +03:00
dashevchenko
b10ed7621d minor refactoring 2023-04-06 18:34:08 +03:00
dashevchenko
c4a5569650 Added logging for failed mqtt ssl certificates 2023-04-06 18:08:06 +03:00
Andrii Landiak
2ac861876e Refactoring: fix conflict, add logs 2023-03-29 11:40:41 +03:00
Andrii Landiak
1674223e63 Merge branch 'develop/3.5' of github.com:AndriiLandiak/thingsboard into feature/x509-device-cert-impr 2023-03-28 12:01:41 +03:00
deaflynx
038a714e87 Merge remote-tracking branch 'alandiak/feature/x509-device-cert-impr' into feature/x509-device-cert-impr 2023-03-22 12:15:54 +02:00
Vladyslav_Prykhodko
1b2b84e48e Merge remote-tracking branch 'upstream/develop/3.5' into feature/notification-system 2023-03-21 15:32:23 +02:00
nickAS21
d8e97dd74d sparkplug: add getNodeDeviceName() 2023-03-20 17:17:51 +02:00