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

2962 Commits

Author SHA1 Message Date
Andrew Shvayka
0d626c5c88
Merge pull request #7564 from AndriiLandiak/edge-event-partition 
[3.4.2] Table partitioning for edge event.
 2022-11-09 13:31:52 +02:00
Andrew Shvayka
f6b4406341
Merge pull request #7518 from smatvienko-tb/cassandra-cloud-astra 
[3.4.2] Cassandra cloud connects to Datastax Astra DB
 2022-11-09 13:10:38 +02:00
Igor Kulikov
1ed5e5b115
Merge pull request #7554 from dmytro-landiak/alarm-subscriptions 
[3.4.2] Fix alarm subscriptions on rest api
 2022-11-08 16:18:45 +02:00
ViacheslavKlimov
165e86c82b Notification rules processing; refactoring 2022-11-08 16:04:50 +02:00
Volodymyr Babak
22118af4db Added Edge RPC response/request support 2022-11-08 13:13:58 +02:00
ViacheslavKlimov
b73e89d691 Merge remote-tracking branch 'dmytro-landiak/alarm-subscriptions' into feature/notification-system 2022-11-08 12:33:05 +02:00
Andrii Shvaika
7ce3af709b Fix broken test logic 2022-11-08 11:56:14 +02:00
Andrii Landiak
ebb29ca200 Refactoring code and optimize import 2022-11-07 18:17:12 +02:00
Andrii Shvaika
0873b9e158 Improvements to #7434 2022-11-07 18:12:28 +02:00
Andrii Landiak
d0090f8b7a Removed unnecessary unused case for DataUpdateService 2022-11-07 17:52:44 +02:00
Andrii Shvaika
6e33b09205 Merge branch 'feature/jwt-token-outdate-on-logout' of github.com:CooL16/thingsboard 2022-11-07 17:30:23 +02:00
Andrii Landiak
11ee41bf34 Adding partition to edge_event table 2022-11-07 14:42:49 +02:00
ViacheslavKlimov
48023495a8 Notification api refactoring 2022-11-07 13:50:16 +02:00
ViacheslavKlimov
e391459343 Merge remote-tracking branch 'origin/master' into feature/notification-system 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/telemetry/DefaultAlarmSubscriptionService.java
#	application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java
#	dao/src/main/java/org/thingsboard/server/dao/user/UserDao.java
#	rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java
 2022-11-06 18:55:41 +02:00
dlandiak
bce6249eeb fix alarm subscriptions on rest api 2022-11-04 17:28:09 +02:00
ViacheslavKlimov
3734a0da49 Notifications api permission checks, WS improvements, new target configs 2022-11-04 15:29:15 +02:00
dlandiak
52d7da7afd inactivity timeout fix - get from attr when persist to telemetry and default found 2022-11-04 10:33:08 +02:00
oyurov
3ab1f34594 Clean code 2022-11-02 14:07:49 +01:00
oyurov
6d34aa237c Refactoring 2022-11-02 13:03:17 +01:00
ShvaykaD
fea91220f0 fix error in merge with master 2022-11-02 12:55:03 +02:00
ShvaykaD
e9961a3a39 merge with master 2022-11-02 12:00:05 +02:00
oyurov
215a44b7c7 Added tests 2022-11-02 09:19:51 +01:00
oyurov
d10289253f Refactor 2022-11-02 08:46:58 +01:00
Sergey Matvienko
db3ca06f4d Merge remote-tracking branch 'ce/master' into jwt-random 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/AdminController.java
#	application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
#	application/src/main/java/org/thingsboard/server/service/security/model/token/JwtTokenFactory.java
 2022-11-01 20:05:50 +02:00
Andrii Shvaika
c10e491de7 Merge branch 'master' of github.com:thingsboard/thingsboard 2022-11-01 16:56:55 +02:00
Andrii Shvaika
08b226c18f Bump Cassandra versions 2022-11-01 16:56:47 +02:00
Sergey Matvienko
069e77eb17 Merge remote-tracking branch 'ce/master' into cassandra-cloud-astra 2022-11-01 14:11:58 +02:00
Volodymyr Babak
ba645e4570 Merge remote-tracking branch 'upstream/master' into feature/edge-limit-attempt 2022-11-01 11:04:56 +02:00
Igor Kulikov
dbef7c4ece Fix tests 2022-11-01 09:52:19 +02:00
Volodymyr Babak
19287fa250 Merge remote-tracking branch 'origin/master' into feature/edge-limit-attempt 2022-10-31 19:09:25 +02:00
Andrew Shvayka
3844ff6372
Merge pull request #7395 from volodymyr-babak/feature/edge-multi-customers 
[3.4.2] Edge PE - customers hierarchy support
 2022-10-31 18:49:01 +02:00
ViacheslavKlimov
4d34c328d6 New TbNotificationNode; refactoring 2022-10-31 17:44:21 +02:00
ViacheslavKlimov
89d2a337e1 WebSocket API for notifications; refactoring 2022-10-31 14:05:08 +02:00
Andrew Shvayka
0fb0fb03c6
Merge pull request #7324 from imbeacon/fix/rate-limits 
[3.4.2] Fix for rate limits filter
 2022-10-31 13:36:41 +02:00
Volodymyr Babak
7c80781c24 Minor code refactoring - added tenant as entity id 2022-10-28 15:41:57 +03:00
Andrii Shvaika
3f819487d6 Added var for clear code 2022-10-28 13:18:00 +03:00
Andrii Shvaika
d00bcbfa83 MVEL executor tests 2022-10-28 13:00:28 +03:00
Volodymyr Babak
cbcf6192d8 Edge device test - disconnect mqtt client 2022-10-27 17:32:25 +03:00
Volodymyr Babak
0389513b40 Improved edge rpc session logging 2022-10-27 17:13:36 +03:00
Volodymyr Babak
3a7cc56c88 Fixed edge telemetry stability test 2022-10-27 12:03:33 +03:00
Volodymyr Babak
7a2bd5dfad Organize imports 2022-10-24 18:34:07 +03:00
Volodymyr Babak
546b477c34 Attemp to send downlink 10 times max in case edge connected - discard all other attempts and ack failed messages 2022-10-24 18:32:22 +03:00
Volodymyr Babak
0936e4922b Remove duplicated autogenerated code coverage 2022-10-21 12:22:44 +03:00
Volodymyr Babak
9d60fc6ac7 Updated asset edge test to check asset profiles 2022-10-21 12:07:55 +03:00
Volodymyr Babak
47a8e6b60f Merge remote-tracking branch 'upstream/master' into feature/edge-multi-customers 2022-10-20 20:55:21 +03:00
Andrii Shvaika
5633aeaa6e Merge with master 2022-10-20 12:43:52 +03:00
Andrew Shvayka
9d23c91137
Merge pull request #7403 from ViacheslavKlimov/feature/remote-js-executor-improvements 
[3.4.2] Improvements for remote JS executor
 2022-10-20 11:37:00 +03:00
Volodymyr Babak
d20379f36e Fixed customer contorller test. Revert customer service impl 2022-10-19 18:01:19 +03:00
Volodymyr Babak
cfd471fe4a CE edge - single customer 2022-10-18 19:22:14 +03:00
Andrii Shvaika
d3f06bd3a4 MVEL executor implementation 2022-10-18 18:39:43 +03:00