75 Commits

Author SHA1 Message Date
YevhenBondarenko
a665b2cbe6 added power mode to lwm2m-device-profile-transport-configuration 2021-06-24 10:53:35 +03:00
Vladyslav_Prykhodko
fe3378eab1 UI: Add SNMP device transport configuration 2021-06-18 12:58:38 +03:00
Vladyslav_Prykhodko
75801045cf UI: Add SNMP device profile configuration 2021-06-17 15:08:00 +03:00
Igor Kulikov
b4566a93fd Add mobile dashboard to alarm rules 2021-06-14 15:42:27 +03:00
Vladyslav_Prykhodko
874f5e8448 UI: Rename firmware to OtaPackage 2021-05-31 18:15:31 +03:00
Igor Kulikov
5cc3a93cb9 Introduce default dashboard for device profile 2021-05-07 18:25:05 +03:00
Igor Kulikov
df8c9cecae Minor improvements 2021-05-06 20:14:34 +03:00
Igor Kulikov
d5b640d602 Add image fields for dashboard and device profile entities. Introduce getAllAlarms and getCustomerAlarms API 2021-05-06 17:01:46 +03:00
Andrii Shvaika
00bd26f1f5 Merge with master 2021-04-30 11:25:56 +03:00
Vladyslav_Prykhodko
fd8dee0a9d UI: Add firmware type 2021-04-30 10:58:32 +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
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
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
Vladyslav_Prykhodko
e31a95619c UI: Added firmware autocomplete component; Add firmware to device and device profile 2021-04-13 15:10:13 +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
Igor Kulikov
a207e31841 Merge with master 2021-04-09 12:40:43 +03:00
Volodymyr Babak
7044e3e40f Merge remote-tracking branch 'upstream/master' into develop/3.3-edge 2021-03-30 19:35:58 +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
Andrii Shvaika
32e8ee11bd Merge with develop/3.3 2021-03-24 18:17:50 +02:00
Igor Kulikov
e17de056c2 Merge with master 2021-03-19 12:16:43 +02:00
ShvaykaD
c5c8fbd3f7
[3.2.2] [WIP] coap transport (#4239)
* init CoapDeviceProfile & added ui components

* added transport payload type configuration for default coap device type

* added AbstractCoapTransportResource & updated efento resource

* fixed coap device profile save & update

* fixed Attribute Updates notifications

* revert CoapOkCallback onSuccess changes

* updated provision request to handle proto payload type

* fix license

* updated Rpc subscribe/unsubscribe action

* add more device emulator clients

* added fix for Coap Transport: ability to handle requests with oneElementUriPaths and MultiElementUriPaths

* fix TbCoapServer implementation

* changed response type to CREATED in POST requests

* improved implementation

* fix typos

* minor bug-fixes & improvements

* fix TbCoapServerMessageDeliverer class

* improved relay sensor implementation

* added tests for CoAP transport\

* fix typo

* removed nosql tests

* fix coap endpoint creation & improved getAttributes tests

* transport tests refactoring
2021-03-15 18:18:45 +02:00
Viacheslav Klimov
44c1cbcbc0 Merge remote-tracking branch 'thingsboard/develop/3.3' into develop/snmp
# Conflicts:
#	application/pom.xml
#	application/src/main/resources/thingsboard.yml
#	common/transport/pom.xml
#	msa/transport/pom.xml
#	pom.xml
#	transport/pom.xml
#	ui-ngx/src/app/modules/home/components/home-components.module.ts
#	ui-ngx/src/app/modules/home/components/profile/device/device-profile-transport-configuration.component.html
#	ui-ngx/src/app/shared/models/device.models.ts
2021-03-10 15:22:03 +02:00
vkukhtyn
5a72479951
[WIP] SNMP initial implementation (#3755)
* Add SNMP type to transport profiles

* Update reference config for transport profiles

* Initial implementation to retrieve a value using SNMP GET message

* Fix license header

* Move config files

* Use async handler for SNMP response

* Send SNMP agent response to attributes and telemetry

* UI: add SNMP option for device profile

* UI: use JSON field to set SNMP profile configuration

* Handle device profile update event

* Use concurrent hash map for SNMP device sessions

* UI: Add device transport configuration control

* Cancel async request to avoid memory leak and timeout handling

* Start SNMP pooling after application started

* Move OID per profile mapping to SNMP transport context

* Fix build after merge with 3.2.1-SNAPSHOT

* Init device sessions on TB start

* Fix build error, refactoring

* Update session context on device update

* Set device info on session context creating

* Refresh pooling params on device or profile update

* Update license header

* Process device and profile transport config update

* Process SNMP response asynchronously

* Change polling implementation
2021-03-10 14:56:25 +02:00
Vladyslav_Prykhodko
d5c3f4c997 Merge master in develop/3.3 2021-01-27 13:31:46 +02:00
Vladyslav_Prykhodko
c8814f7cfa UI: Refactoring lwm2m 2021-01-19 19:36:57 +02:00
Igor Kulikov
d31358b2ea Update license header - set 2021 year 2021-01-11 13:42:16 +02:00
Igor Kulikov
ed56f041f8 UI optimizations 2021-01-05 11:37:05 +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
ShvaykaD
4a18781304 added TransportPayloadTypeConfiguration, fix tests, ui 2020-11-13 16:19:40 +02:00
ShvaykaD
18a57d638d merge with master 2020-11-11 18:25:29 +02:00
Vladyslav_Prykhodko
b9950d82e9 UI: Fixed show not correct time for device profiles scheduler preview 2020-10-29 14:10:05 -04:00
ShvaykaD
37c381996e ui updates 2020-10-29 14:58:28 +02:00
YevhenBondarenko
7724495cb1 added default queue for device profile 2020-10-28 17:20:53 +02:00
Igor Kulikov
ed090b3e6c UI: Improve dialog actions style 2020-10-14 12:32:07 +03:00
Igor Kulikov
19b8464937 Merge device provisioning feature 2020-10-12 19:39:47 +03:00
Igor Kulikov
155b967b47 Improve device profile alarm rules UI 2020-10-12 17:29:27 +03:00
zbeacon
005ad70657 Merge branch 'master' of https://github.com/thingsboard/thingsboard into feature/device-provision-3.2-onlyProfileVersion 2020-10-12 13:57:01 +03:00
Igor Kulikov
7640d32d3b Fix conflicts 2020-10-12 10:18:43 +03:00
Igor Kulikov
20c90c8a6f Improve device/device profile components, remove unnecessary transport configurations 2020-10-12 10:12:42 +03:00
Vladyslav_Prykhodko
06c3fb8eab UI: Refactoring device profile 2020-10-12 09:45:34 +03:00
Vladyslav_Prykhodko
30a6a462da UI: Improvement view device profile settings 2020-10-09 18:11:49 +03:00
zbeacon
35f6f40ca3 Merge branch 'master' of https://github.com/thingsboard/thingsboard into feature/device-provision-3.2-onlyProfileVersion 2020-10-09 17:35:30 +03:00
Igor Kulikov
c7b57ca543 Add Device Wizard improvements 2020-10-09 17:19:51 +03:00
zbeacon
e8220e5102 Merge branch 'develop/3.2' of https://github.com/thingsboard/thingsboard into feature/device-provision-3.2-onlyProfileVersion 2020-10-07 10:36:15 +03:00
Vladyslav_Prykhodko
fd602dec7f UI: Added device profile schedule setting for alarm setting 2020-10-06 19:22:40 +03:00