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

713 Commits

Author SHA1 Message Date
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
0ce128725d License header fix 2020-12-12 20:03:24 +02:00
Volodymyr Babak
0c7a51242d Tech depts. Added support for Edge entity on push to edge node 2020-12-12 19:08:44 +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
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
Volodymyr Babak
9f79f83d83 Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge 2020-12-07 11:36:20 +02:00
Volodymyr Babak
d79d00aa87 Merge remote-tracking branch 'upstream/master' into develop/3.3-edge 2020-12-07 10:46:15 +02:00
Volodymyr Babak
ed85d3de3e Refactored RPC request 2020-12-01 18:58:58 +02:00
Andrii Shvaika
87a8cec7b5 Version set to 3.2.1-SNAPSHOT 2020-12-01 18:05:47 +02:00
Andrii Shvaika
a87956ebfd Improvements to Storage Days calculation 2020-11-28 16:38:28 +02:00
Andrii Shvaika
4e8b0aa674 Merge branch 'master' of github.com:thingsboard/thingsboard 2020-11-28 15:05:21 +02:00
Andrii Shvaika
458beede1a Default Storage TTL in Days 2020-11-28 15:05:11 +02:00
YevhenBondarenko
8f8814d167 moved sms configs to common package, rest client improvements 2020-11-27 12:03:22 +02:00
YevhenBondarenko
8515b6d6e0 alarm rules improvements 2020-11-25 18:19:33 +02:00
Andrii Shvaika
254905c2b3 Minor improvements 2020-11-25 12:53:33 +02:00
Andrii Shvaika
eb8975d504 SMS Email Limits 2020-11-20 18:02:09 +02:00
Andrii Shvaika
3feb32c0f6 Improvements to the templates 2020-11-20 15:45:09 +02:00
YevhenBondarenko
1c79480b33 created sendApiFeatureStateEmail 2020-11-20 15:45:09 +02:00
Igor Kulikov
ffdf56222e Add send sms rule node config ui 2020-11-20 14:58:24 +02:00
Igor Kulikov
1e1e3ec6a3 Introduce SMS Service. Add Send SMS Rule Node 2020-11-20 13:08:20 +02:00
Volodymyr Babak
3bdb7bb5ad SERVER_SCOPE by default, if not provided in metadata 2020-11-19 17:26:07 +02:00
Volodymyr Babak
fe53158b82 Merge remote-tracking branch 'upstream/develop/2.5.5' into develop/2.6-edge 2020-11-19 15:54:39 +02:00
Andrii Shvaika
0fff851210 Alarm Query fix for propagated alarms with entities assigned to customer 2020-11-19 11:26:51 +02:00
YevhenBondarenko
076f548358 refactored AlarmState 2020-11-16 13:07:58 +02:00
YevhenBondarenko
150b1bb809 AlarmState improvements (used createDetails for update or clear alarm). 2020-11-16 13:07:58 +02:00
Viacheslav Kukhtyn
c03356e944 Merge branch 'master' into feature/log-telemetry-updated 2020-11-13 13:10:09 +02:00
YevhenBondarenko
0f662a679c Merge with develop/2.5.5 2020-11-13 12:02:13 +02:00
Andrii Shvaika
dc25e0dd3c Merge branch 'master' of github.com:thingsboard/thingsboard 2020-11-12 19:32:51 +02:00
Andrii Shvaika
cb41548b22 Add cleanup of clear alarm state on non matching condition 2020-11-12 19:32:45 +02:00
YevhenBondarenko
72a0126e23 AlarmState improvements 2020-11-12 17:07:07 +02:00
YevhenBondarenko
eece6418c3 updated versions 2020-11-12 13:22:32 +02:00
Viacheslav Kukhtyn
c3ee6785aa Merge branch 'master' into feature/log-telemetry-updated 2020-11-11 11:44:42 +02:00
YevhenBondarenko
a2eea121be AlarmState improvements 2020-11-11 11:20:26 +02:00
YevhenBondarenko
55b8ae92ea refactored 2020-11-11 11:20:26 +02:00
YevhenBondarenko
1daf5a44b5 alarm state improvements (added details to alarm from device profile details pattern) 2020-11-11 11:20:26 +02:00
Volodymyr Babak
c5e33e48f0 Set SERVER_SCOPE by default if not provided 2020-11-10 17:44:44 +02:00
Volodymyr Babak
3cc0c5baf0 Set version to 3.3.0-SNAPSHOT 2020-11-10 16:43:28 +02:00
Volodymyr Babak
905273ea3d Merge remote-tracking branch 'upstream/develop/2.5.5' into develop/2.6-edge 2020-11-10 16:10:48 +02:00
Andrii Shvaika
3518a3d927 Merge with master 2020-11-09 10:42:47 +02:00
Andrew Shvayka
a99a8e458c Revert "alarm state improvements (added details to alarm from device profile details pattern)" 
This reverts commit ecf530c63ebc489e01b1857bc0ba55875078c10a.
 2020-11-04 18:02:53 +02:00
Andrew Shvayka
1c4ab0e711 Revert "refactored" 
This reverts commit da8a03e98efb359ba40556ab22d9c29c40005207.
 2020-11-04 18:02:53 +02:00
YevhenBondarenko
da8a03e98e refactored 2020-11-04 18:01:01 +02:00
YevhenBondarenko
ecf530c63e alarm state improvements (added details to alarm from device profile details pattern) 2020-11-04 18:01:01 +02:00
Andrii Shvaika
a64c4e3e20 DeviceProfileNode fix for conditions based on the attributes 2020-11-03 13:05:31 +02:00
Vladyslav_Prykhodko
e095bd379f UI: Added trim value for created device, improvement created default rule chain and view queue-type-list 2020-11-03 11:05:14 +02:00
Andrii Shvaika
78ac876103 Bug fixes for Device Profile node 2020-10-29 13:26:15 +02:00
Andrii Shvaika
feb9120050 Improvements to Device Profile Rule Node 2020-10-28 19:02:56 +02:00