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

2506 Commits

Author SHA1 Message Date
Andrii Shvaika
53eb09bcb9 Improvements to tests due to new architecture 2020-04-21 22:31:25 +03:00
Igor Kulikov
15a31044b2 Cleanup 2020-04-21 11:41:43 +03:00
Volodymyr Babak
7d10134f77 Merge branch 'feature/edge' into develop/3.0-edge 2020-04-20 15:54:18 +03:00
Volodymyr Babak
3da17789aa Test fixed. Increased limit for assigned edges 2020-04-20 15:45:04 +03:00
Volodymyr Babak
767d0cfc58 Merge branch 'feature/edge' into develop/3.0-edge 2020-04-20 14:58:31 +03:00
Andrii Shvaika
0c54f836b3 Fixed tests 2020-04-14 16:17:08 +03:00
Volodymyr Babak
9dbe3d4d6b Fixed fetch or SYSTEM rule chains 2020-04-14 12:53:22 +03:00
Andrii Shvaika
6c4b50a380 Implemented dedicated RE per tenant 2020-04-13 14:59:48 +03:00
hamza.slama
5b8ce2fb69 Move AlarmId To Id Package 2020-04-13 10:40:03 +03:00
Yevhen Bondarenko
7869fb5ef4
added to tenant fields isolatedTbCore and isolatedTbRuleEngine (#2611) 
Co-authored-by: Andrew Shvayka <ashvayka@thingsboard.io>
 2020-04-13 10:24:40 +03:00
Yevhen Bondarenko
8442159811
[2.5] vulnerabilities (#2608) 
* Version updates

* added @Retention(RetentionPolicy.RUNTIME) for all custom Dao annotations.

* changed getId, setId to getUuid, setUuid from BaseEntity, improvement AbstractControllerTest

* fix rabbitmq

* fix RuleChainManagerActor

* refactored InMemory queue

Co-authored-by: Andrii Shvaika <ashvayka@thingsboard.io>
 2020-04-13 09:34:35 +03:00
Igor Kulikov
1b0fabb7ab Merge branch 'master' into develop/3.0 2020-04-10 15:07:44 +03:00
ShvaykaD
11479935c2
SQL TTL Implemenation 
* init commit

* improvements for ttl-functions

* added drop partitions by ttl function

* add load ttl function to upgrade script

* fix typo

* add IF NOT EXISTS for json_v in timescale upgrade

* changed logic for removing customer records from ts_kv

* improvements in upgrade scenario

* improvements

* added intial delay for TTL task execution
 2020-04-07 11:55:26 +03:00
Volodymyr Babak
f3aa410c17 Merge branch 'feature/edge' into develop/3.0-edge 2020-03-25 23:27:26 +02:00
Volodymyr Babak
bfb25845e9 Merge branch 'develop/3.0' into develop/3.0-edge 2020-03-24 11:50:34 +02:00
Volodymyr Babak
660b7fc62b Merge branch 'feature/edge' into feature/edge-last-week 2020-03-17 18:56:46 +02:00
Volodymyr Babak
f5034b4dcd Merge remote-tracking branch 'upstream/master' into feature/edge 2020-03-17 18:43:22 +02:00
Volodymyr Babak
52cbe843dc Fixed import/export rule chain functionality 2020-03-17 17:57:48 +02:00
Igor Kulikov
957a0c9e61 Merge with master 2020-03-11 14:14:46 +02:00
ShvaykaD
188c3e5b63
Upgrade Sql Ts & Timescale improvements (#2495) 
* psql & timescale ts upgrade improved

* fix typo

* fix typo 2

* removed tenant_id from timescale db schema & upgade scipt logic
 2020-03-10 17:49:00 +02:00
YevhenBondarenko
d68ef2333a updated guava and protobuf versions 2020-03-10 16:14:01 +02:00
Volodymyr Babak
6751c511f1 Added default edge root rule chain 2020-03-09 13:57:38 +02:00
Dmytro Shvaika
30ba274eca fix setting additional_info 2020-03-04 17:21:04 +02:00
Dmytro Shvaika
67fa64d448 fix NPE 2020-03-04 17:21:04 +02:00
Dmytro Shvaika
31b06fefdd added InsertRepository for Relation Dao 2020-03-04 17:21:04 +02:00
Igor Kulikov
c9b1e24e24 Merge branch 'master' into develop/3.0 2020-03-04 15:56:30 +02:00
Igor Kulikov
a9df9df99e Remove unnecessary Admin settings validation 2020-03-04 15:56:12 +02:00
Volodymyr Babak
451c158742 Added EDGE backend support 2020-03-03 12:25:44 +02:00
YevhenBondarenko
0e265060f6 added query delete to JavaAttributeDao 2020-03-03 12:12:32 +02:00
YevhenBondarenko
a58db6b7ec added query delete to JavaAttributeDao 2020-03-03 12:12:28 +02:00
YevhenBondarenko
bf755f1c46 remove min and max json query from AggregationRepository 2020-03-02 14:48:04 +02:00
YevhenBondarenko
f522dbca2a Created HsqlEntityDatabaseSchemaService, improvement TimescaleTsDatabaseUpgradeService and TimescaleInsertTsRepository 2020-03-02 14:48:04 +02:00
YevhenBondarenko
118c81da5f remove min and max json query from AggregationRepository 2020-03-02 12:11:09 +02:00
YevhenBondarenko
7de309e217 Created HsqlEntityDatabaseSchemaService, improvement TimescaleTsDatabaseUpgradeService and TimescaleInsertTsRepository 2020-03-02 12:11:09 +02:00
Igor Kulikov
1157df05e9 Entity Admin widgets. Introduce updateAliases method of alias controller. 2020-02-27 17:06:32 +02:00
Igor Kulikov
87ade8ada3 Merge branch 'master' into develop/3.0 2020-02-24 18:27:08 +02:00
Igor Kulikov
7a2b76b8c0 SQL DAO Refactoring 2020-02-24 18:24:40 +02:00
Igor Kulikov
416432e3ed Merge branch 'develop/3.0' of github.com:thingsboard/thingsboard into develop/3.0 2020-02-21 16:31:15 +02:00
Igor Kulikov
bcbc089460 Merge Alarms fetch improvements 2020-02-21 16:31:03 +02:00
Andrii Shvaika
45e3172cb3 Merge branch 'master' into develop/3.0 2020-02-21 15:48:31 +02:00
Andrii Shvaika
f2aefb5570 Fix for PostgreSQL Inserts logic 2020-02-21 15:47:11 +02:00
Andrii Shvaika
5eb24b2e18 Reverted change of the dashboard configuration size 2020-02-21 13:28:39 +02:00
Andrii Shvaika
3f0cd0d555 Reverted change of the dashboard configuration size 2020-02-21 13:28:30 +02:00
Igor Kulikov
e03c6468cb Fix tests 2020-02-20 12:57:20 +02:00
Igor Kulikov
e9b2c3107e Merge with master 2020-02-20 12:33:36 +02:00
Igor Kulikov
3e2a87135f Prepare for merge with master 2020-02-20 10:26:43 +02:00
Igor Kulikov
1e5ee5beb9 Fix conflicts 2020-02-19 15:47:45 +02:00
Yevhen Bondarenko
416c3fd10e
Introduced SMTP TLS version to default mail service and send email node 
* added tlsVersion to TbSendEmailNode

* added tlsVersion to DefaultMailService

* added check tlsVersion for old version
 2020-02-15 11:47:52 +02:00
Andrew Shvayka
03f5375a02
JSON support (#2415) 
* Created JsonDataEntry and added DataType JSON

* Added json to ts and attributes, created sql schema-entities-hsql.sql (json_v varchar)

* refactored

* refactored

* added json array support

* Aggregation improvement

* Changed in JsonDataEntry value type from JsonNode to String

* fix AggregatePartitionsFunction

Co-authored-by: Yevhen Bondarenko <56396344+YevhenBondarenko@users.noreply.github.com>
 2020-02-14 19:18:18 +02:00
Andrii Shvaika
aa0fce8625 Fix for Alarm Ack/Clear/Update when Propagation flag is set and Relation Type Filter is used 2020-02-12 13:19:27 +02:00