Andrii Shvaika
00bd26f1f5
Merge with master
2021-04-30 11:25:56 +03:00
YevhenBondarenko
ab10dd4494
implemented software update
2021-04-30 10:58:32 +03:00
Andrew Shvayka
e3292e89c1
Merge pull request #4301 from thingsboard/develop/snmp
...
SNMP Transport
2021-04-28 16:29:13 +03:00
YevhenBondarenko
aee3fd3b6e
FirmwareCache refactoring
2021-04-28 11:29:04 +03:00
Viacheslav Klimov
47994e1a66
Merge branch 'master' into master-to-snmp
...
# Conflicts:
# application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
# common/queue/src/main/proto/queue.proto
# common/transport/http/src/main/java/org/thingsboard/server/transport/http/DeviceApiController.java
# common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/TransportContext.java
# dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
2021-04-26 13:37:39 +03:00
Andrii Shvaika
53bf6af23b
Merge branch 'master' of github.com:thingsboard/thingsboard into feature/firmware
2021-04-22 15:52:08 +03:00
Viacheslav Klimov
030d80d05a
CustomerId to TbMsg and SessionInfo
2021-04-22 13:15:19 +03:00
Andrii Shvaika
279e221523
Merge with master
2021-04-22 10:55:57 +03:00
Andrew Shvayka
07aefe533a
Merge pull request #4380 from YevhenBondarenko/develop/3.3-firmware
...
[WIP] feature firmware
2021-04-22 10:35:29 +03:00
YevhenBondarenko
75fe679bab
MqttTransportHandler improvements
2021-04-22 08:16:17 +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
ShvaykaD
321fb731a6
Support of server-side RPC requests via protobuf for CoAP and MQTT
...
* rpc response schema added
* rpc request proto
* fixed device profile validation
* fix error messages
2021-04-20 11:14:27 +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
ShvaykaD
dc87550835
Extract coap-server component to separate module to be used in coap transport and core (CoAP integrations).
...
* init commit: coap-server component
* move coap-server to separate module
* fix typo
2021-04-09 13:06:43 +03:00
Igor Kulikov
a207e31841
Merge with master
2021-04-09 12:40:43 +03:00
Igor Kulikov
4a63660e1d
Version set to 3.3.0-SNAPSHOT
2021-04-09 12:37:08 +03:00
ShvaykaD
2344d6d62f
Fixed RPC string params in protobuf payload type. Reverted changes from the previous fix ( #4356 )
...
* Revert "added a fix for string value RPC params: removed redundant escaped characters"
This reverts commit 1891af54
* removed redundant escape characters for string RPC params in Proto payload
* cleanup code
2021-04-02 12:25:05 +03:00
ShvaykaD
fd3e18f18b
CoAP DTLS support ( #4316 )
...
* dtls init commit
* added fixes after review
* fix typo
* changed translation for DeviceCredentialsType.X509_CERTIFICATE
2021-03-30 18:28:03 +03: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
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
Igor Kulikov
3255eb9027
Version set to 3.2.2-SNAPSHOT
2021-03-03 12:02:06 +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
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
Andrii Shvaika
d06ce5555c
Simplified implementation of the overwrite activity time flag
2021-01-22 16:06:48 +02:00
Igor Kulikov
d31358b2ea
Update license header - set 2021 year
2021-01-11 13:42:16 +02:00
Igor Kulikov
6814c21ee9
restore ver 3.2.1-SNAPSHOT
2020-12-23 18:24:42 +02:00
Igor Kulikov
0d64a64bfe
Merge with develop/2.5.6
2020-12-23 18:24:09 +02:00
Igor Kulikov
bfee301625
Set ver to 2.5.6-SNAPSHOT
2020-12-23 17:47:58 +02:00
YevhenBondarenko
16d82e77fc
refactored
2020-12-23 16:54:14 +02:00
YevhenBondarenko
bff16ddafd
Mqtt flag sessionPresent depends on flag isCleanSession
2020-12-22 18:02:38 +02:00
Andrii Shvaika
be84a0fc20
Version set to 2.5.6-SNAPSHOT
2020-12-21 16:42:45 +02:00
Andrew Shvayka
7667afaeae
Develop/lwm2m ( #3826 )
...
* LwM2M - Start transport
* LwM2M - Test endpoint
* LwM2M - Test endpoint
* LwM2M - Test add xml
* LwM2M device registration
* LwM2M - add get from client, add attributes and telemetry upgrade from registration client
* LwM2M - add get from client, add attributes and telemetry upgrade from registration client
* LwM2M implementation
* LwM2M - add to service telemetry and attribute
* LwM2M add to service attribute and telemetry
* LwM2M - add LWM2M_CREDENTIALS to DeviceCredentialsType
* LwM2M - add LWM2M_CREDENTIALS to DeviceCredentialsType
* LwM2M - add transport.process
* LwM2M - delete from yml tenantid, PSK -ok
* LwM2M - yml del tenantId
* LwM2M - add RPK
* LwM2M - add connect only x509 certificate. Crate certificates in serverKeyStore.jks and clientKeyStore.jks
* LwM2M - add no_sec
* LwM2M - add RPK & PSK integration test with app Client
* LwM2M - add RPK & PSK integration test with app Client
* LwM2M - add read JKS from file
* LwM2M - add read JKS from file
* LwM2M - add bootstrap cert
* LwM2M - add bootstrap RPK
* LwM2M - add bootstrap No_sec
* LwM2M - cleaned the code
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - fix bug CoAP transport
* LwM2M: UI - add Json to credentials
* LwM2M: Back - add command "/3/0/5" - trigger client
* LwM2M: fix bug Json edit dialog
* LwM2M: fix bug Json edit dialog
* lwm2m: fix bug Json edit dialog: add validate
* lwm2m: UI add tabs
* lwm2m: UI add tabs (cleaner)
* lwm2m: add interface SecurityConfigModels
* lwm2m: add interface SecurityConfigModels2
* lwm2m: change html
* lwm2m: UI add bootstrap component
* lwm2m: UI add bootstrap component with FormControl
* lwm2m: UI add start Observe
* lwm2m: UI - correct
* lwm2m: UI - correct
* lwm2m: UI - add Validator: BS RPK, X509
* lwm2m: UI - add Observe
* lwm2m: UI - finish Observe
* lwm2m: UI - fix bug config-service update identity
* lwm2m: Bootstarp&Sewrver All config secure
* lwm2m: Bootstarp&Sewrver All config secure for new Front format
* lwm2m: Bootstarp&Sewrver Different config secure for new Front format
* lwm2m: Add attributes Gui and Backend
* lwm2m: Add attributes Gui and Backend final
* lwm2m: Add telemetrys to Gui
* lwm2m: Add Attribute & telemetry in Gui to instance
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry for mobile
* lwm2m: Model folder
* lwm2m: Ok on AWS: NoSec, PSK, X509
bad registration - RPK
* lwm2m: KeyStore start only one
* lwm2m: Server observe ok
* lwm2m: Server fix bug finish session without remove
* lwm2m: Server add function installValue
* lwm2m: Server add function getAttrTelemetry to tingsboard
* lwm2m: Server add function installValue
* lwm2m: Server add function update Telemetry, Attr from observe
* lwm2m: Server add comments
* lwm2m: Server add session listener
* lwm2m: Server add onGetChangeCredentials with analyze
* lwm2m: Server add onGetChangeCredentials with analyze Onserve add
* lwm2m: Server: updated algorithm for analyzing dynamic changes in attributes / telemetry / observation
* lwm2m: fix bug: "ngx-flowchart" compile
* lwm2m: get value resource OPAQUE - byte [] to HexString
* lwm2m: change path to base
* lwm2m: fix bug COAP & lwm2m
* Lwm2m_3_2: back: cleaner, test bootstrap-ok front: restore
* Lwm2m_3_2: back: del SynchronousRegistrationListener.java
* Lwm2m_3_2: front: start profile lwm2m UI
* Lwm2m_3_2: front&back: add to profile lwm2m (api, getModels...)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (2)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (3)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (4)
* Lwm2m_3_2: front: add update change bootstrapConfig and save to config json
* Lwm2m_3_2: update after merge master
* lwm2m: fix bug proto
* lwm2m: fix bug in yml keyStore.jks
* lwm2m: fix bug tests
* lwm2m: front: add nameThingsboard
* lwm2m: fix bug Autowired lwm2mContext, caseCamel
* lwm2m: back-end^ start api /lwm2m/deviceProfile/bootstrap
* lwm2m: back-end: add method read models from resources
* lwm2m: back-end/front: add and finish api bootstrapConfig
* lwm2m: back-end: add decode profile
* lwm2m: back-end: add new bin in transport api
* lwm2m: add microservice lwm2m and docker lwm2m.
* lwm2m: add microservice lwm2m and docker lwm2m (fix bug)
* lwm2m: front: start fix bug disabled resources
* lwm2m: master to lwm2m merge, front add change attribute, telemetry
* lwm2m: front PR
* lwm2m: front add sort keyName to Json on the start
* lwm2m: front add instances
* lwm2m: front add/del instances FormGrp Value
* lwm2m: Merge remote-tracking branch 'origin/master' into develop/lwm2m
# Conflicts:
# common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
# common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/SessionMsgListener.java
# ui-ngx/src/app/modules/home/components/home-components.module.ts
* lwm2m: Merge remote-tracking branch 'origin/master' into develop/lwm2m
* lwm2m: Front: del sort after add/del instance
* lwm2m: Front: fix bug reindex FormArray after update
* Lwm2m: Front fix bug add/del instans
* Lwm2m: Front finish1 profile
* Lwm2m: Back add profile to ModelClient
* Lwm2m: Back add form profile sent thingsboard: attr/tel/observe
* Lwm2m: Back -> fix bug: serverKeyStore.jks] Unable to load KeyStore files server
* Lwm2m: Back -> fix bug: onRegistered an unReg
* Lwm2m: Back -> add updateProfiles
* Lwm2m: Back -> add updateDevice and updateProfile dynamic
* Lwm2m: Back -> error if CoapCode not access
* Lwm2m: Front -> clear credential
* Lwm2m: Front -> credential fix bug button "save"
* Lwm2m: Back -> add telemetry logLwm2m
Co-authored-by: nickAS21 <nick@avalr.com.ua>
2020-12-09 17:13:11 +02:00
Andrew Shvayka
24ccd2a2b5
Revert "[3.2.1] Develop/lwm2m ( #3547 )"
...
This reverts commit df6151f5ae8d3b77a67318dbb774d55e3f297960.
2020-12-09 17:11:50 +02:00
Andrew Shvayka
df6151f5ae
[3.2.1] Develop/lwm2m ( #3547 )
...
* LwM2M - Start transport
* LwM2M - Test endpoint
* LwM2M - Test endpoint
* LwM2M - Test add xml
* LwM2M device registration
* LwM2M - add get from client, add attributes and telemetry upgrade from registration client
* LwM2M - add get from client, add attributes and telemetry upgrade from registration client
* LwM2M implementation
* LwM2M - add to service telemetry and attribute
* LwM2M add to service attribute and telemetry
* LwM2M - add LWM2M_CREDENTIALS to DeviceCredentialsType
* LwM2M - add LWM2M_CREDENTIALS to DeviceCredentialsType
* LwM2M - add transport.process
* LwM2M - delete from yml tenantid, PSK -ok
* LwM2M - yml del tenantId
* LwM2M - add RPK
* LwM2M - add connect only x509 certificate. Crate certificates in serverKeyStore.jks and clientKeyStore.jks
* LwM2M - add no_sec
* LwM2M - add RPK & PSK integration test with app Client
* LwM2M - add RPK & PSK integration test with app Client
* LwM2M - add read JKS from file
* LwM2M - add read JKS from file
* LwM2M - add bootstrap cert
* LwM2M - add bootstrap RPK
* LwM2M - add bootstrap No_sec
* LwM2M - cleaned the code
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - fix bug CoAP transport
* LwM2M: UI - add Json to credentials
* LwM2M: Back - add command "/3/0/5" - trigger client
* LwM2M: fix bug Json edit dialog
* LwM2M: fix bug Json edit dialog
* lwm2m: fix bug Json edit dialog: add validate
* lwm2m: UI add tabs
* lwm2m: UI add tabs (cleaner)
* lwm2m: add interface SecurityConfigModels
* lwm2m: add interface SecurityConfigModels2
* lwm2m: change html
* lwm2m: UI add bootstrap component
* lwm2m: UI add bootstrap component with FormControl
* lwm2m: UI add start Observe
* lwm2m: UI - correct
* lwm2m: UI - correct
* lwm2m: UI - add Validator: BS RPK, X509
* lwm2m: UI - add Observe
* lwm2m: UI - finish Observe
* lwm2m: UI - fix bug config-service update identity
* lwm2m: Bootstarp&Sewrver All config secure
* lwm2m: Bootstarp&Sewrver All config secure for new Front format
* lwm2m: Bootstarp&Sewrver Different config secure for new Front format
* lwm2m: Add attributes Gui and Backend
* lwm2m: Add attributes Gui and Backend final
* lwm2m: Add telemetrys to Gui
* lwm2m: Add Attribute & telemetry in Gui to instance
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry for mobile
* lwm2m: Model folder
* lwm2m: Ok on AWS: NoSec, PSK, X509
bad registration - RPK
* lwm2m: KeyStore start only one
* lwm2m: Server observe ok
* lwm2m: Server fix bug finish session without remove
* lwm2m: Server add function installValue
* lwm2m: Server add function getAttrTelemetry to tingsboard
* lwm2m: Server add function installValue
* lwm2m: Server add function update Telemetry, Attr from observe
* lwm2m: Server add comments
* lwm2m: Server add session listener
* lwm2m: Server add onGetChangeCredentials with analyze
* lwm2m: Server add onGetChangeCredentials with analyze Onserve add
* lwm2m: Server: updated algorithm for analyzing dynamic changes in attributes / telemetry / observation
* lwm2m: fix bug: "ngx-flowchart" compile
* lwm2m: get value resource OPAQUE - byte [] to HexString
* lwm2m: change path to base
* lwm2m: fix bug COAP & lwm2m
* Lwm2m_3_2: back: cleaner, test bootstrap-ok front: restore
* Lwm2m_3_2: back: del SynchronousRegistrationListener.java
* Lwm2m_3_2: front: start profile lwm2m UI
* Lwm2m_3_2: front&back: add to profile lwm2m (api, getModels...)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (2)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (3)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (4)
* Lwm2m_3_2: front: add update change bootstrapConfig and save to config json
* Lwm2m_3_2: update after merge master
* lwm2m: fix bug proto
* lwm2m: fix bug in yml keyStore.jks
* lwm2m: fix bug tests
* lwm2m: front: add nameThingsboard
* lwm2m: fix bug Autowired lwm2mContext, caseCamel
* lwm2m: back-end^ start api /lwm2m/deviceProfile/bootstrap
* lwm2m: back-end: add method read models from resources
* lwm2m: back-end/front: add and finish api bootstrapConfig
* lwm2m: back-end: add decode profile
* lwm2m: back-end: add new bin in transport api
* lwm2m: add microservice lwm2m and docker lwm2m.
* lwm2m: add microservice lwm2m and docker lwm2m (fix bug)
* lwm2m: front: start fix bug disabled resources
* lwm2m: master to lwm2m merge, front add change attribute, telemetry
* lwm2m: front PR
* lwm2m: front add sort keyName to Json on the start
* lwm2m: front add instances
* lwm2m: front add/del instances FormGrp Value
* lwm2m: Merge remote-tracking branch 'origin/master' into develop/lwm2m
# Conflicts:
# common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
# common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/SessionMsgListener.java
# ui-ngx/src/app/modules/home/components/home-components.module.ts
* lwm2m: Merge remote-tracking branch 'origin/master' into develop/lwm2m
* lwm2m: Front: del sort after add/del instance
* lwm2m: Front: fix bug reindex FormArray after update
* Lwm2m: Front fix bug add/del instans
* Lwm2m: Front finish1 profile
* Lwm2m: Back add profile to ModelClient
* Lwm2m: Back add form profile sent thingsboard: attr/tel/observe
* Lwm2m: Back -> fix bug: serverKeyStore.jks] Unable to load KeyStore files server
* Lwm2m: Back -> fix bug: onRegistered an unReg
* Lwm2m: Back -> add updateProfiles
* Lwm2m: Back -> add updateDevice and updateProfile dynamic
* Lwm2m: Back -> error if CoapCode not access
* Lwm2m: Front -> clear credential
* Lwm2m: Front -> credential fix bug button "save"
* Lwm2m: Back -> add telemetry logLwm2m
Co-authored-by: nickAS21 <nick@avalr.com.ua>
2020-12-09 17:09:16 +02:00
Andrii Shvaika
460cec99ec
Version set to 3.3-SNAPSHOT
2020-12-09 11:07:00 +02:00
Andrii Shvaika
87a8cec7b5
Version set to 3.2.1-SNAPSHOT
2020-12-01 18:05:47 +02:00
zbeacon
680eb89fa0
Added validation for device name in provision request, if it is present. Added session closing when provision client tries to use topics not allowed for provisioning feature
2020-11-25 10:55:06 +02:00
Andrii Shvaika
529608e60f
Improved transport cache invalidation for device updates
2020-11-24 12:11:29 +02:00
Viacheslav Kukhtyn
63406b010f
Use the same device session info in transport service and in context
2020-11-24 09:59:26 +02:00
Viacheslav Kukhtyn
52d7d790f6
Update device and session infos in context
2020-11-24 09:59:26 +02:00
Viacheslav Kukhtyn
c36fc46e2c
Override default implementation onDeviceUpdate()
2020-11-24 09:59:26 +02:00
Andrii Shvaika
4f0253a33a
Ack messages that we ignore
2020-11-23 16:24:07 +02:00
ShvaykaD
dc310f4cab
merge with master
2020-11-16 19:13:00 +02:00
Andrii Shvaika
706fd01d76
Device Profile Proto Improvement
2020-11-16 17:18:24 +02:00
ShvaykaD
13a731ecb3
fix MqttTopicFilterFactory toFilter
2020-11-16 16:56:59 +02:00
ShvaykaD
7482d73a9b
added AlwaysTrueTopicFilter
2020-11-16 16:56:59 +02:00
