dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,301 Commits 106 Branches 71 Tags
Commit Graph

1484 Commits

Author SHA1 Message Date
Volodymyr Babak
99a3e9769f Edge test - speed up test by moving firmware and device data check into separate method 2022-12-28 16:02:56 +02:00
Volodymyr Babak
51a3620b11 Edge sync test - add check for rule chain msg is root 2022-12-27 18:22:28 +02:00
Volodymyr Babak
031706e1cf Added functionality to push latest timeseries values to edge on assing entities to edge 2022-12-27 16:53:26 +02:00
Andrii Shvaika
509da5dee4 Merge branch 'feature/notification-system' of github.com:ViacheslavKlimov/thingsboard into feature/notification-system 2022-12-27 13:07:55 +02:00
Andrii Shvaika
34d7a6ced8 Merge remote-tracking branch 'origin/master' into develop/3.5 2022-12-27 13:06:46 +02:00
ViacheslavKlimov
409976c6a3 Multiple notification targets for request; improvements and refactoring 2022-12-23 18:47:40 +02:00
dashevchenko
c89374e506 added ttl service 2022-12-22 13:56:45 +02:00
dashevchenko
419380712e fixed security test 2022-12-22 12:37:48 +02:00
zbeacon
5710f01c03 Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning 2022-12-22 08:30:42 +02:00
ViacheslavKlimov
7792e80283 Merge branch 'master' into feature/notification-system 2022-12-21 17:53:41 +02:00
ViacheslavKlimov
0a17f99360 Refactoring; TbSlackNode 2022-12-21 15:04:06 +02:00
dashevchenko
ed37dc850a merged with master 2022-12-20 12:09:34 +02:00
dashevchenko
81ed6a6702 added tests for alarm comment services 2022-12-20 11:26:11 +02:00
ViacheslavKlimov
738b9dc494 Slack notification channel; refactoring 2022-12-19 19:56:20 +02:00
Andrew Shvayka
84c82d08a7
Merge pull request #7792 from volodymyr-babak/edge/misc-fixes 
[3.4.3][Bug] Edge root rule chain update fix. USER entity support added. INACTIVITY_TIMEOUT pushed to edge.
 2022-12-19 11:56:47 +02:00
ViacheslavKlimov
55fc7131fb Validation for rule node configuration; improve validation error message 2022-12-17 16:58:58 +02:00
ViacheslavKlimov
4b39d2a221 Notification request stats 2022-12-15 15:50:01 +02:00
ViacheslavKlimov
aa89d0e936 Merge branch 'master' into feature/notification-system 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java
#	application/src/main/java/org/thingsboard/server/service/ws/DefaultWebSocketService.java
#	application/src/test/java/org/thingsboard/server/controller/BaseWebsocketApiTest.java
#	application/src/test/java/org/thingsboard/server/controller/TbTestWebSocketClient.java
 2022-12-15 15:32:26 +02:00
Volodymyr Babak
268f0499bf Merge branch 'master' of github.com:thingsboard/thingsboard into edge/misc-fixes 2022-12-15 14:53:39 +02:00
Andrii Shvaika
aadc2e35b7 Merge with master 2022-12-15 14:27:13 +02:00
Andrew Shvayka
10587d797e
Merge pull request #7788 from ViacheslavKlimov/fix/sysadmin-ws-session 
[3.4.3] Fix NPE on WS subscription for sysadmin
 2022-12-15 12:07:51 +02:00
ViacheslavKlimov
a6bfb049aa Improvements for notification templates 2022-12-14 19:02:23 +02:00
ViacheslavKlimov
deb2867df1 Multiple notification delivery methods; notification templates 2022-12-14 14:27:20 +02:00
Volodymyr Babak
f399a80dee Merge remote-tracking branch 'upstream/master' into edge/misc-fixes 2022-12-13 17:11:24 +02:00
Andrew Shvayka
7b2494c1e0
Merge pull request #7786 from YevhenBondarenko/fix/device-with-credentials 
[3.4.3] fixed saveDeviceWithCredentials notifications
 2022-12-13 17:02:29 +02:00
Andrew Shvayka
28d151b940
Merge pull request #7783 from YevhenBondarenko/fix/bulk-import 
[3.4.3] fixed device bulk import with empty credentials
 2022-12-13 16:58:17 +02:00
Volodymyr Babak
4c60bd1a4e Edge rule chain service - fixed update of root rule chain in runtime 2022-12-13 16:15:33 +02:00
Volodymyr Babak
10ab64b0d5 Device Edge Service - push inactivityTimeout to edge 2022-12-13 15:55:00 +02:00
Volodymyr Babak
055fbce062 Edge telemetry processor - added support of USER entity 2022-12-13 15:41:53 +02:00
ViacheslavKlimov
4a834a0442 Fix NPE on WS subscription for sysadmin 2022-12-13 15:06:29 +02:00
ViacheslavKlimov
1ba77a30d7 Merge branch 'master' into feature/notification-system 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java
#	application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java
 2022-12-13 12:55:21 +02:00
YevhenBondarenko
7cb9166677 fixed saveDeviceWithCredentials notifications 2022-12-13 10:58:34 +01:00
YevhenBondarenko
d2233e5157 added bulk import device test 2022-12-12 18:40:50 +01:00
ViacheslavKlimov
2494cec616 Add validation for EntityDataPageLink 2022-12-09 16:25:09 +02:00
ViacheslavKlimov
bb42362f1d Add pageLink sort property validation 2022-12-09 12:21:40 +02:00
Andrew Shvayka
f813073bfb
Merge pull request #7596 from imbeacon/mqtt5-codes 
[3.5] Added Mqtt v5 reason codes for ack messages
 2022-12-08 14:40:14 +02:00
zbeacon
6fad315a03 Added changes due to comments 2022-12-06 12:55:45 +02:00
zbeacon
591708b029 Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning 2022-12-05 15:23:09 +02:00
imbeacon
0cbf163e8f Merge remote-tracking branch 'upstream/develop/3.5' into mqtt5-codes 2022-12-02 09:37:58 +02:00
Andrew Shvayka
dfdb2e5bf8
Merge pull request #7704 from ViacheslavKlimov/fix/concurrent-partition-creation-errors 
[3.4.2] Fix issues with partition creation
 2022-11-30 14:33:03 +02:00
zbeacon
0dcde60443 Added alarm assignment feature and tests for it 2022-11-30 13:06:00 +02:00
ViacheslavKlimov
39341d1414 Fix transaction abortion on partition save error; don't throw any exceptions 2022-11-30 12:55:51 +02:00
YevhenBondarenko
6a99caf682 added tests for TbClusterService onQueueChange 2022-11-29 20:38:29 +01:00
Igor Kulikov
42c502d266 Fix tests 2022-11-28 12:11:34 +02:00
Andrew Shvayka
c28526fb25
Merge pull request #7651 from volodymyr-babak/bug/fix-edge-fetcher 
[3.4.2][Bug] Updates to stability of synchronization between edge and cloud in case of many events simultaneously
 2022-11-25 11:20:29 +02:00
Volodymyr Babak
75f7b7319a Added base implementation of edge docker install instructions controller 2022-11-23 20:50:45 +02:00
Igor Kulikov
d10f64c348 Refactor MVEL -> TBEL 2022-11-22 16:38:01 +02:00
Volodymyr Babak
a094b71a24 Fix stability of testSendDeviceToCloudWithNameThatAlreadyExistsOnCloud 2022-11-21 18:30:25 +02:00
Volodymyr Babak
833ea1b397 Decreased number of message in edge random timeseries failure to speed up tests execution 2022-11-18 19:23:21 +02:00
oyurov
26b1d09cbd Tests improvements 2022-11-18 12:19:28 +01:00