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

496 Commits

Author SHA1 Message Date
Viacheslav Klimov
f89b30777e Initial implementation for per-customer api usage stats 2021-04-22 13:15:19 +03:00
Andrii Shvaika
279e221523 Merge with master 2021-04-22 10:55:57 +03:00
YevhenBondarenko
f55f0ecb94 implemented firmware update for the http and mqtt transports 2021-04-21 19:56:09 +03:00
Viacheslav Klimov
3c1682f57a Merge branch 'master' into master-to-snmp 
# Conflicts:
#	common/data/pom.xml
#	common/queue/src/main/java/org/thingsboard/server/queue/discovery/ZkDiscoveryService.java
#	dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java
#	ui-ngx/src/app/shared/models/device.models.ts
 2021-04-20 18:08:10 +03:00
Sergey Matvienko
27788790df dependency upgrade: grpc.version up to 1.36.0. explicitly added protobuf-java-util due to grpc not depends on it anymore 2021-04-19 13:18:55 +03:00
Sergey Matvienko
562637ad34 ZKDiscoveryService: fix potential outdated server info on recalculatePartitions. info logs added on application event 2021-04-19 12:40:22 +03:00
Sergey Matvienko
e64b1074a7 queue consumer: added queue check on the very first poll in the lifecycle before any subscribe method calls 2021-04-19 12:40:22 +03:00
Sergey Matvienko
b35ce062a7 queue consumer: implemented nonblocking subscribe method to prevent locks on repartition event. moved message decoding out of the lock to reduce locking time. using monotonic time instead wall-clock. added debug messages 2021-04-19 12:40:22 +03:00
Viacheslav Klimov
a00e3be7ba Merge branch 'master' into master-to-develop-snmp 
# Conflicts:
#	common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceService.java
#	common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileTransportConfiguration.java
#	common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/CoapTransportService.java
#	common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportServiceImpl.java
#	common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/SessionMsgListener.java
#	dao/src/main/java/org/thingsboard/server/dao/device/DeviceDao.java
#	dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
#	pom.xml
 2021-04-12 15:45:39 +03:00
Volodymyr Babak
df6f4c9924 Merge remote-tracking branch 'upstream/master' into develop/3.3-edge 2021-04-09 19:04:26 +03:00
Volodymyr Babak
7044e3e40f Merge remote-tracking branch 'upstream/master' into develop/3.3-edge 2021-03-30 19:35:58 +03:00
Andrii Shvaika
32e8ee11bd Merge with develop/3.3 2021-03-24 18:17:50 +02:00
Viacheslav Klimov
039508bfbd Refactor 2021-03-24 17:49:17 +02:00
Viacheslav Klimov
8f2438d6ab
SNMP devices balancing (#4254) 
* Fix merge errors

* Implement SNMP transports balancing

* Refactor; implement transport device cache

* Refactor

* Finish up device lifecycle handling implementing; refactor

* Refactor

* Change base image to thingsboard/openjdk11 for msa snmp transport

* Refactor

* Change transport services names to upper-case
 2021-03-22 17:17:42 +02:00
YevhenBondarenko
ad7c314b24 TbResource extends SearchTextBased, created TbResourceInfo 2021-03-20 07:49:00 +02:00
Igor Kulikov
e17de056c2 Merge with master 2021-03-19 12:16:43 +02:00
Volodymyr Babak
0f64b3764f Merge remote-tracking branch 'upstream/develop/3.3' into develop/3.3-edge 2021-03-16 16:59:15 +02:00
Andrii Shvaika
b4184d014c Improvements to startTime and endTime for subscriptions 2021-03-16 13:46:12 +02:00
Yevhen Bondarenko
43fe84a284
created TransportResourceCache (#4232) 
* created TransportResourceCache

* return resource by sysadmin if not found by tenant in DefaultTransportApiService
 2021-03-12 13:00:51 +02:00
Yevhen Bondarenko
e2dd5b96ae
added resource dao support (#4213) 
* Version set to 3.3.0-SNAPSHOT

* added resource dao

* added resource support in transport lvl (get resources and "update", "delete" notifications)

* refactoring

* added resource table to hsql schema

* added check for models dir in InstallScripts

* added pageLink support to getResources
 2021-03-09 19:45:28 +02:00
Igor Kulikov
8fe6c956c8 Version set to 3.3.0-SNAPSHOT. Code style improvements. 2021-03-04 12:37:38 +02:00
Andrew Shvayka
a3cb9724e3
Merge pull request #4191 from thingsboard/master 
Merge master to develop 3.3
 2021-03-03 15:57:51 +02:00
Volodymyr Babak
e96452cdcf Merge remote-tracking branch 'upstream/develop/3.3' into develop/3.3-edge 2021-03-03 15:18:38 +02:00
Igor Kulikov
3255eb9027 Version set to 3.2.2-SNAPSHOT 2021-03-03 12:02:06 +02:00
Yevhen Bondarenko
3716e2833a
[WIP]added redis stores support to lwm2m transport (#4164) 
* added redis stores support to lwm2m transport

* added cache dependency to dao

* added cache dependency to dao-api

* moved JacksonUtil to the common.util package

* added cache to the component scan for install

* lwm2m stores improvements
 2021-02-26 14:16:34 +02:00
Volodymyr Babak
10d3dd01bb Merge branch 'develop/3.3' of github.com:thingsboard/thingsboard into develop/3.3-edge 2021-02-22 19:08:30 +02:00
Andrii Shvaika
4b43cd75f7 Merge branch 'master' into develop/3.3 2021-02-22 13:29:08 +02:00
vzikratyi-tb
ef33c68727
Added kafka consumer-groups statistics (#4123) 
* Added kafka consumer-groups statistics

* Fixed PR notes

* Updated stats.kafka-response-timeout-ms

* Log kafka stats only once for CORE and RULE_ENGINE
 2021-02-22 12:03:06 +02:00
Volodymyr Babak
c46c1b08e7 Merge remote-tracking branch 'upstream/master' into develop/3.3-edge 2021-02-15 17:07:25 +02:00
Andrii Shvaika
6c1074a8b0 Fix for race condition in the partition change events 2021-02-15 14:25:40 +02:00
Volodymyr Babak
b58c831343 Merge remote-tracking branch 'upstream/develop/3.3' into develop/3.3-edge 2021-02-12 13:10:06 +02:00
Igor Kulikov
67aba9e4b1 Merge branch 'master' into develop/3.3 2021-02-11 11:05:10 +02:00
Igor Kulikov
efad71b5ac Fix TbKafkaNode. Configure directly serializer class for key/values instead of string class name. 2021-02-10 17:06:20 +02:00
Igor Kulikov
43178107c3 Merge with master 2021-02-08 20:02:54 +02:00
Igor Kulikov
22e5771120 JDK 11 Support 2021-02-04 19:31:20 +02:00
Volodymyr Babak
499eb1aef4 Merge remote-tracking branch 'upstream/develop/3.3' into develop/3.3-edge 2021-01-27 15:12:58 +02:00
Vladyslav_Prykhodko
d5c3f4c997 Merge master in develop/3.3 2021-01-27 13:31:46 +02:00
Igor Kulikov
61723da391 Version set to 3.3.0-SNAPSHOT 2021-01-26 10:17:52 +02:00
Volodymyr Babak
bc3008ad7b Merge remote-tracking branch 'upstream/master' into develop/3.3-edge 2021-01-17 01:47:49 +02:00
Volodymyr Babak
20a6719453 Merge remote-tracking branch 'origin/master' into develop/3.3-edge 2021-01-17 01:01:04 +02:00
Igor Kulikov
d31358b2ea Update license header - set 2021 year 2021-01-11 13:42:16 +02:00
YevhenBondarenko
1b905ef727 refactored 2020-12-30 15:21:58 +02:00
YevhenBondarenko
4de258f2ae removed ServiceId from kafka consumer groupId 2020-12-30 15:21:58 +02:00
Volodymyr Babak
b2de96fbff Merge remote-tracking branch 'upstream/develop/3.3' into develop/3.3-edge 2020-12-24 15:13:57 +02:00
Igor Kulikov
6814c21ee9 restore ver 3.2.1-SNAPSHOT 2020-12-23 18:24:42 +02:00
Igor Kulikov
bfee301625 Set ver to 2.5.6-SNAPSHOT 2020-12-23 17:47:58 +02:00
Volodymyr Babak
64694532db Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge 2020-12-14 12:48:49 +02:00
Volodymyr Babak
b48d43f4dd Added support for EDGE entity 2020-12-13 19:28:05 +02:00
nickAS21
ca46f5fb75 Lwm2m: backEnd: add DelayedRequest + in the start by to name 2020-12-13 16:55:48 +02:00
Volodymyr Babak
193cccf123 Refactored Edge session message poll mechanism. Removed tech dept - Integer.MAX_INTEGER. Code refactoring 2020-12-10 16:18:12 +02:00