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

8549 Commits

Author SHA1 Message Date
Bohdan Smetaniuk
d81804ac8d scope replaced to EntityDataProto 2020-07-14 19:22:31 +03:00
Bohdan Smetaniuk
2b14fa3634 fixed bug with saving server attributes in client scope 2020-07-14 15:38:21 +03:00
Andrii Shvaika
4c27b514a6 Merge remote-tracking branch 'origin/develop/2.5.3' 2020-07-14 10:35:11 +03:00
Andrii Shvaika
af1f6229bb Improved logging of failed and timeout messages 2020-07-14 10:34:20 +03:00
Andrii Shvaika
933c502ce3 Merge remote-tracking branch 'origin/master' 2020-07-13 15:47:42 +03:00
Andrii Shvaika
c2e36851fc Merge with 2.5.3 2020-07-13 15:47:28 +03:00
Volodymyr Babak
2071890ac9 Added device creation lock by device name 2020-07-13 11:46:22 +03:00
Andrew Shvayka
6ddf0a6398 Alarm Indexes improved 2020-07-12 01:06:31 +03:00
Andrew Shvayka
9ce9e004c4 Fix for transaction management 2020-07-11 18:40:57 +03:00
Andrew Shvayka
8808c268ae
Merge pull request #3076 from YevhenBondarenko/develop/2.5.3-batch-improvements 
Develop/2.5.3 batch improvements
 2020-07-10 20:21:30 +03:00
Andrii Shvaika
c4390e896a Different message on parse error 2020-07-10 17:06:19 +03:00
vzikratyi
9eb9302ee3 Used DB lock instead of Java lock 2020-07-10 15:54:34 +03:00
Andrii Shvaika
ce0bebf9e8 Cluster mode for Alarms API 2020-07-10 15:35:49 +03:00
YevhenBondarenko
e77127019f Ts batch improvements 2020-07-10 12:46:47 +03:00
Andrii Shvaika
86a7e9cfa2 Alarm API 2020-07-10 11:57:52 +03:00
Andrii Shvaika
5e3572e5c6 Dynamic Values Implementation Draft 2020-07-09 19:23:15 +03:00
VoBa
6d0ff4d8f2
Merge pull request #22 from BohdanSmetanyuk/bug/alarms 
bug with alarms fixed
 2020-07-09 17:30:30 +03:00
Bohdan Smetaniuk
6b153ee2ad bug with alarms fixed 2020-07-09 13:57:04 +03:00
Andrii Shvaika
fa8535ca95 Alarm Search Text 2020-07-09 13:23:46 +03:00
Igor Kulikov
31f0689f63 Websocket Api tests improvements 2020-07-09 12:35:47 +03:00
vzikratyi
5aba253928 Changed OAuth2ClientsDomainParams protocol 2020-07-09 12:11:49 +03:00
Igor Kulikov
6c5971a12c Merge branch 'master' into feature/entity-data-query 2020-07-08 15:23:53 +03:00
Igor Kulikov
bbb2c0d0a1 Alarm query optimizations 2020-07-08 15:17:52 +03:00
Igor Kulikov
86ebc3014f Revert controller tests filter 2020-07-07 19:10:53 +03:00
Igor Kulikov
562bbbe849 Fix upgrade scripts. 2020-07-07 18:02:29 +03:00
Volodymyr Babak
6c3d2d986e Added edge state. Added edge id and cloud type to proto 2020-07-07 17:59:12 +03:00
Andrii Shvaika
b7e1c039f3 Entity Data Query Upgrade Script 2020-07-07 15:37:37 +03:00
Andrew Shvayka
a17a85657c
Merge pull request #3046 from YevhenBondarenko/feature/uuid-update 
Feature/UUID update
 2020-07-07 15:31:18 +03:00
Andrii Shvaika
d102ef7d3f Alarm Implementation 2020-07-07 15:30:43 +03:00
YevhenBondarenko
4ede5894f7 refactored updating alarm relations. 2020-07-07 14:43:18 +03:00
YevhenBondarenko
8b770cbc96 refactored updating alarm relations. 2020-07-07 14:23:41 +03:00
VoBa
d43edb83fd
Merge pull request #20 from BohdanSmetanyuk/feature/edge_event_controller 
added check permissions
 2020-07-07 14:21:39 +03:00
YevhenBondarenko
7184ba1d89 refactored uuid upgrade and added updating alarm relations. 2020-07-07 14:12:12 +03:00
Bohdan Smetaniuk
9fdcd6a429 check permissions 2020-07-07 13:47:10 +03:00
deaflynx
bdc37d3eb0 Merged with BohdanSmetanyuk: added DefaultEdgeNotificationService,BaseEdgeEventControllerTest,EdgeEventControllerNoSqlTest,EdgeEventControllerSqlTest 2020-07-07 11:33:45 +03:00
deaflynx
978efe60fc Added EdgeEventController.java 2020-07-07 11:31:16 +03:00
vzikratyi
60857dd733 Refactored OAuth2Controller 2020-07-07 10:59:44 +03:00
Bohdan Smetaniuk
4621d28e33 deleted unused fields 2020-07-06 19:34:31 +03:00
Bohdan Smetaniuk
1fe848b042 deleted unused imports 2020-07-06 19:32:10 +03:00
Bohdan Smetaniuk
51bfc91f14 fixes in EdgeEventControllerTest and in relation processing 2020-07-06 19:15:08 +03:00
Igor Kulikov
92c4d00fbb UI: Refactor entities hierarchy widget to use new WS data query API. 2020-07-06 18:00:10 +03:00
Andrii Shvaika
2eb7949d57 Improvements 2020-07-06 17:04:14 +03:00
Andrii Shvaika
aec2d388ce Alarm Websockets API 2020-07-06 17:04:14 +03:00
Andrii Shvaika
65fa1a7a9c Websockets Implementation 2020-07-06 17:04:14 +03:00
vzikratyi-tb
89419c6999
Prometheus Metrics (#3052) 
* Moved resetting ruleEngineStats to Consumer

* Moved counters to Map in TbCoreConsumerStats

* Added actuator and MetricsService

* Added metrics to core and rule_engine consumers

* Replaced summary with counters

* Removed most setters and getters from TbRuleEngine stats

* Added stats to Transport consumer

* Added JsInvoke actuator stats

* Removed MetricsService
 2020-07-06 14:47:36 +03:00
Igor Kulikov
dee4625fa9 UI: WS Alarm Data 2020-07-06 14:42:36 +03:00
Bohdan Smetaniuk
0cf800d0a8 test, license 2020-07-06 12:25:15 +03:00
Igor Kulikov
15e302e06c Merge branch 'feature/entity-data-query' of github.com:thingsboard/thingsboard into feature/entity-data-query 2020-07-03 18:33:38 +03:00
Igor Kulikov
4747e110bc UI: Alarm data query support 2020-07-03 18:33:06 +03:00
Bohdan Smetaniuk
3c3da12e29 added EdgeEventController 2020-07-03 15:42:07 +03:00