1515 Commits

Author SHA1 Message Date
YevhenBondarenko
c4377f514f merge with develop/3.5.2 2023-09-04 20:00:39 +02:00
Andrew Shvayka
09b74dada9
Merge pull request #9157 from thingsboard/fix/tenant-profile-serialization
Fix tenant profile update msg construction for Edge
2023-09-04 18:49:51 +03:00
Igor Kulikov
875c8d526b Widget Bundles to Wudget Types Many to Many support for UI 2023-09-01 18:55:29 +03:00
Igor Kulikov
1fb9ba622e Widget -> Widget Bundle Many to Many support. 2023-08-31 12:09:42 +03:00
ViacheslavKlimov
724300c076 Fix tenant profile Java serialization; add test 2023-08-29 15:41:35 +03:00
YevhenBondarenko
ffa00bd94a refactoring due to comments 2023-08-22 16:59:01 +02:00
YevhenBondarenko
ada9ff7b4e merge with develop/3.5.2 2023-08-18 16:48:48 +02:00
Igor Kulikov
67f12c0c2c Merge branch 'develop/3.5.2' into feature/widget-bundles 2023-08-18 16:15:17 +03:00
Igor Kulikov
c57cb2b754 Switch to unique widget type FQN. 2023-08-18 16:14:21 +03:00
Andrew Shvayka
e5658f68df
Merge pull request #9082 from imbeacon/feature/mqtt-topic-in-metadata-for-transport
Feature/mqtt topic in metadata for transport
2023-08-18 13:07:38 +03:00
Vladyslav_Prykhodko
35284eacd6 Merge branch 'feature/alarm-types' of github.com:YevhenBondarenko/thingsboard into YevhenBondarenko-feature/alarm-types 2023-08-18 12:52:21 +03:00
Andrew Shvayka
3186789f3e
Merge pull request #9062 from AndriiLandiak/feature/edge-tenant-sync
Feature/Edge: tenant and tenant profile sync up
2023-08-17 17:35:42 +03:00
Andrew Shvayka
d9dee141c1
Merge pull request #8843 from thingsboard/feature/microsoft-teams-notifications
Notifications via Microsoft Teams
2023-08-17 17:33:14 +03:00
Andrii Shvaika
ca6095402f Merge with master 2023-08-17 12:19:02 +03:00
ViacheslavKlimov
8a023e9655 Merge with develop/3.5.2 2023-08-16 18:11:45 +03:00
Andrii Landiak
e53ea0f20b Merge remote-tracking branch 'upstream/develop/3.5.2' into feature/edge-tenant-sync 2023-08-16 13:44:45 +03:00
Andrew Shvayka
18a617472a
Merge pull request #8793 from thingsboard/feature/account-notification-settings
User-level notification settings
2023-08-15 17:45:49 +03:00
ViacheslavKlimov
d8896fe9dd Minor refactoring for user notification settings 2023-08-15 17:34:10 +03:00
YevhenBondarenko
1c17b00513 added alarm_types table 2023-08-15 16:00:14 +02:00
Andrew Shvayka
111fb0b472
Merge pull request #9065 from ShvaykaD/feature/add-internal-type-to-tb-msg
Added internalType field to TbMsg to have the ability to use switch-cases instead of if-return blocks.
2023-08-15 12:30:16 +03:00
imbeacon
fac2e013e2 Moved sending topic to MQTT transport only, parameter renamed to mqttTopic in metadata 2023-08-14 20:19:25 +03:00
ViacheslavKlimov
ce06ea10ca Use user settings api instead of additionalInfo 2023-08-14 17:43:39 +03:00
ViacheslavKlimov
655a2777e2 Merge branch 'develop/3.5.2' into feature/microsoft-teams-notifications 2023-08-14 17:00:01 +03:00
Andrii Shvaika
344ffb2e0b Merge with master 2023-08-14 15:02:17 +03:00
ShvaykaD
e1b18e7bed additional updates after review 2023-08-12 09:17:21 +03:00
ShvaykaD
ea5a855272 renamed custom msg type to NA 2023-08-11 20:34:17 +03:00
ShvaykaD
cebe1040d4 refactoring after review 2023-08-11 20:27:54 +03:00
Andrii Landiak
c164c68e12 Refactoring EdgeUtils to use enum map to match entity type with edge event type 2023-08-11 13:48:13 +03:00
ViacheslavKlimov
ae76f4ebbb Merge branch 'master' into feature/update-tenant-profile-isolation 2023-08-11 13:39:03 +03:00
Andrii Landiak
d56f6484b1 Add EntityType reference to EdgeEventType to match types for edge 2023-08-11 12:56:32 +03:00
imbeacon
355a92588a Added topic to metadata for attributes and telemetry messages 2023-08-11 11:48:24 +03:00
Andrii Landiak
9cae7c918b Improve EdgeUtils and EntityType to match with EdgeEntityType due to refacroting comments 2023-08-11 09:16:03 +03:00
ShvaykaD
3d5cfa0c2e added internal type to TbMsg to replace if-return blocks with switch-case 2023-08-10 15:46:01 +03:00
Andrii Landiak
9e1ab9abae
Feature/tenant profile edge sync 2023-08-10 10:38:38 +03:00
Vladyslav_Prykhodko
6e7869ffbe Merge remote-tracking branch 'upstream/develop/3.5.2' into feature/timeseries-api-improvements 2023-08-09 18:03:48 +03:00
YevhenBondarenko
2427539f22 merge with develop/3.5.2 2023-08-08 01:46:52 +02:00
Andrii Landiak
8faa1410b6
Edge crud notification: implement event publisher strategy to process pubsub model for detecting changes in entities
* Improve edge notification for entities' CRUD operations. Use service layer to notify instead of TbService

* Improve queue service, delete unused class for edge event updates

* Improve alarm delete and add handle fox delete dao event notification

* Refactoring: provide notification for relations and alarms. Improve logic and bad edge event type using

* Add entity type to SaveEvent to process correct message type to edge

* Improve relation service publish event

* Introduce EdgeEventSourcing service instead of saving edge events on controller/service layers. Part #2

* Improved stability of device edge test

* Push credential updated event only in case update

* Add tenantId to saveUser signature to send correct notification for listener

* Fix tests to send correct notification msg to edge

* Fix tests with correct action type

* Add delete msg to edge for customer

* Refactor ActionEntityEvent to use lombok builder

* Remove unnecessary comments

* Added edgeSynchronizationManager into BaseAlarmProcessor and BaseRelationProcessor

* Fixed license header

* Remove notification to edge from Version Control Service

* Fixed alarm del processing - find related edges inside edge processor

* Fix controller test for publish event to listener if entity was deleted

* Added check for edge imitator messages during login as tenant admin

* Refactoring: Added filtering of relation on EdgeEventSourcingListener

* Refactored to be in sync with PE

* Refactored edge test to be in sync with PE edge test changes

* EdgeControllerTest - moved await block into separate method to reuse it

* Fixed EdgeControllerTest

* Fixed testAssignEdgeToCustomerFromDifferentTenant test

* testSyncEdge - make stable

* Refacroting - update utils method name to pop* in EdgeControllerTest

* testSyncEdge - fixed order and nubmer of edge events

* testGetEdgeEvents - check by pop items, and not by index to improve stability on slow machines

* testGetEdgeEvents - added check that list is empty

* Removed test debug output

* EntityServiceTest - Fixed compilation error after merge

* Improve service layer event publisher to process each notification and validate in listener

* Improve BaseAlarmService to send notification to listener

* Fix asset-device notification action to send delete to all edges

* Delete unnecessary usage of sendMsgToEdge

* Improve processEntityNotification to be in sync with changed needed for PE

* Pull request review - minor refactoring

* Fix tests after review-refactoring

* Refactor tests to be in sync with PE

* Fixed repeated update - added check for old_edge_event table existance before migration

* DeviceEdgeProcessor - do edgeSynchronizationManager as soon as possible to avoid unnecessary downlinks

* BaseEdgeProcessor - refactoring and remove duplicate methods. Introduce EdgeEventType.isAllEdgesRelated

* Organize imports

* Improve Edge test: add sync completed message to await

* Minor refactoring for EdgeProcessor notification: asset and device

* EdgeEventSourcingListener - updated logging to avoid null pointer exception

* BaseAlarmService - added check for alarm to avoid NPE. EdgeEventSourcingListener - added try/catch blocks

* EdgeEventSourcingListener - fixed error message log level

---------

Co-authored-by: Volodymyr Babak <volodymyr.babak@gmail.com>
2023-08-07 13:21:02 +03:00
ViacheslavKlimov
1a93db75e0 Improvements for Microsoft Teams notifications 2023-08-04 17:33:11 +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
Vladyslav_Prykhodko
5c0fb5e9b4 Merge remote-tracking branch 'upstream/develop/3.5.2' into feature/account-notification-settings 2023-08-01 10:45:16 +03:00
Vladyslav_Prykhodko
b8954da47b Merge branch from develop/3.5.2 2023-07-31 15:50:43 +03:00
ViacheslavKlimov
5862b417aa Add custom topic properties configuration 2023-07-28 12:06:04 +03:00
Sergey Matvienko
4f99d75e15 license:format for new classes 2023-07-27 21:38:02 +02:00
Sergey Matvienko
859c820dc3 AbstractRateLimitException introduced in common/data for all rate limit related exceptions 2023-07-27 21:38:02 +02:00
ShvaykaD
2d4fbd6833 added checkMsgType util method to TbMsg & resolved other review comments 2023-07-27 14:48:53 +03:00
Vladyslav_Prykhodko
d54320bc79 Merge remote-tracking branch 'upstream/develop/3.5.2' into feature/microsoft-teams-notifications 2023-07-25 12:40:09 +03:00
ShvaykaD
9d20fa7d9e added additional validation to ActionTypeTest and TbMsgTypeTest 2023-07-21 16:12:34 +03:00
ShvaykaD
2cac9aab9d fix typo 2023-07-19 12:36:36 +03:00
ShvaykaD
883eb472f2 fixes after merge to PE 2023-07-19 12:28:42 +03:00
YevhenBondarenko
4b7cc4571d added deleteLatest api 2023-07-12 19:48:25 +02:00