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

1009 Commits

Author SHA1 Message Date
Volodymyr Babak
eb24519772 Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge 2020-12-29 16:55:07 +02:00
Volodymyr Babak
056889be97 Added edgeType and edgeSearchQuery support 2020-12-29 12:01:40 +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
Volodymyr Babak
995bac539c Added findMissingToRelatedRuleChains method 2020-12-24 14:15:39 +02:00
Volodymyr Babak
e58af8fb22 Added findMissingToRelatedRuleChains method 2020-12-24 13:39:24 +02:00
Volodymyr Babak
df11b383c1 Naming conventions update 2020-12-23 19:12:05 +02:00
Volodymyr Babak
c5d93d17f4 Naming conventions update 2020-12-23 18:24:41 +02:00
deaflynx
f9e2d128a2 Import refactor 2020-12-18 14:36:05 +02:00
deaflynx
ceadc391f3 Added EdgeInfo, fix for CustomerIsPublic 2020-12-18 14:15:39 +02:00
Volodymyr Babak
ead9fd9e5d Code review fixes 2020-12-17 10:54:07 +02:00
Volodymyr Babak
af8562c3a0 Added support for device profile entity on edge 2020-12-16 19:35:22 +02:00
Volodymyr Babak
b45bee7843 Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge 2020-12-15 18:51:56 +02:00
Volodymyr Babak
59c55fb2c5 For devices from edge new id generated every time 2020-12-15 18:32:35 +02:00
Volodymyr Babak
32b608e10d Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge 2020-12-14 15:45:38 +02:00
Volodymyr Babak
b52d2aae17 Get rid of configuration field 2020-12-14 15:31:58 +02:00
Volodymyr Babak
846f5ba86b Merge remote-tracking branch 'deaflynx/develop/3.3-edge' into develop/3.3-edge 2020-12-14 12:55:07 +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
Artem Babak
4b08103857 Removed device's methods for edge 2020-12-14 11:35:42 +02:00
Volodymyr Babak
b48d43f4dd Added support for EDGE entity 2020-12-13 19:28:05 +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
Artem Babak
c19cf2372e Added findEntityViewByTenantIdAndEdgeIdAndType and findDevicesByTenantIdAndEdgeIdAndDeviceProfileId 2020-12-11 08:48:18 +02:00
Artem Babak
3ffa7e3592 Added button unassignFromEdge for entities. Added findAssetsByTenantIdAndEdgeIdAndType() 2020-12-10 16:59:15 +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
nickAS21
2fcc48555c
Lwm2m 3 3 (#3829) 
* Lwm2m: Back ->  add telemetry logLwm2m

* Lwm2m: Back ->  add telemetry logLwm2m

* Lwm2m: SNAPSHOT 3.3.o

* Lwm2m: SNAPSHOT 3.3.0 All
 2020-12-09 22:37:47 +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
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
79929c995b Merge remote-tracking branch 'upstream/develop/2.5.5' into develop/2.6-edge 2020-12-05 16:53:56 +02:00
YevhenBondarenko
6f2f9c54dc fixed zones in SchedulerUtils and ApiUsageStateService improvements 2020-12-03 16:11:33 +02:00
YevhenBondarenko
0f26bb4894 fixed cycle api usage state update 2020-12-02 11:52:20 +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
Igor Kulikov
44c2f78f3c
Merge pull request #3776 from YevhenBondarenko/alarm-rules-improvements 
alarm rules improvements
 2020-11-25 18:29:27 +02:00
YevhenBondarenko
8515b6d6e0 alarm rules improvements 2020-11-25 18:19:33 +02:00
Andrii Shvaika
c4b36b0c6f Fix create database in docker images. No more Californium.properties 2020-11-25 18:12:54 +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
7834b92217 Remove unused import 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
Viacheslav Kukhtyn
379ba80b2c Get device profile id before the foreach 2020-11-24 09:59:26 +02:00
Viacheslav Kukhtyn
aa816d61ab Handle device update or delete event in device's session 2020-11-24 09:59:26 +02:00
Andrii Shvaika
4f0253a33a Ack messages that we ignore 2020-11-23 16:24:07 +02:00