Dmytro Skarzhynets
|
af18ec1953
|
Merge remote-tracking branch 'upstream/develop/3.5' into feature/enrichment-rule-nodes-improvements
# Conflicts:
# common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java
|
2023-03-23 12:48:04 +02:00 |
|
Dmytro Skarzhynets
|
f29e1f5fef
|
Add fetch to logic, fix and add tests for some rule nodes
|
2023-03-23 12:44:23 +02:00 |
|
Andrii Shvaika
|
69b5a5f425
|
Alarm Service refactoring
|
2023-02-23 19:03:04 +02:00 |
|
Andrii Shvaika
|
c922bbb989
|
Alarm service refactroing
|
2023-02-23 12:31:07 +02:00 |
|
Andrii Shvaika
|
c16dfd4407
|
Alarm query updates
|
2023-02-17 16:15:17 +02:00 |
|
Andrii Shvaika
|
04eb8c989a
|
Revert the AlarmInfo items. We will update the assignee via separate message
|
2023-02-16 18:47:51 +02:00 |
|
zbeacon
|
9250af1904
|
Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning
|
2023-02-13 19:55:24 +02:00 |
|
zbeacon
|
26a9f10109
|
Updated alarm websocket subscriptions
|
2023-01-31 18:41:41 +02:00 |
|
Andrii Shvaika
|
a203c336f1
|
Merge with master
|
2023-01-31 16:20:04 +02:00 |
|
Igor Kulikov
|
cbdc4517e4
|
Update license header year to 2023
|
2023-01-31 10:43:56 +02:00 |
|
zbeacon
|
2524965ea1
|
Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning
|
2023-01-18 16:03:11 +02:00 |
|
ShvaykaD
|
2dcd949921
|
deduplication rule node: first stage without redis
|
2023-01-17 14:47:47 +02:00 |
|
zbeacon
|
44dcda3bc5
|
Changes, accroding to comments
|
2023-01-17 08:15:00 +02:00 |
|
ShvaykaD
|
ea099ae70a
|
deduplication rule node: first stage without redis
|
2023-01-16 15:55:36 +02:00 |
|
zbeacon
|
5494bc7d2b
|
Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning
|
2023-01-16 10:00:45 +02:00 |
|
Andrew Shvayka
|
a190ef3ccf
|
Merge pull request #7762 from dashevchenko/alarmComments
[3.5] Alarm comments feature
|
2023-01-13 18:40:20 +02:00 |
|
zbeacon
|
f9e1077bca
|
Updated findSeverity method
|
2023-01-12 10:03:04 +02:00 |
|
Andrii Shvaika
|
76082c7177
|
Version set to 3.5.0-SNAPSHOT
|
2023-01-10 17:24:26 +02:00 |
|
dashevchenko
|
d3a975770b
|
Merge remote-tracking branch 'upstream/master' into alarmComments
|
2023-01-09 12:38:21 +02:00 |
|
zbeacon
|
d9add9bdf8
|
Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning
|
2022-12-29 20:49:29 +02:00 |
|
Igor Kulikov
|
4c3154da4b
|
Version set to 3.4.4-SNAPSHOT
|
2022-12-28 13:33:57 +02:00 |
|
zbeacon
|
5710f01c03
|
Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning
|
2022-12-22 08:30:42 +02:00 |
|
dashevchenko
|
ed37dc850a
|
merged with master
|
2022-12-20 12:09:34 +02:00 |
|
dashevchenko
|
b567341481
|
added DeviceProfileService and AssetProfileService to TBContext
|
2022-12-15 12:36:23 +02:00 |
|
dashevchenko
|
8a157397d4
|
added rest controller for alarm comments
|
2022-12-08 17:04:30 +02:00 |
|
Igor Kulikov
|
109caee7c7
|
Version set to 3.4.3-SNAPSHOT
|
2022-12-05 17:54:19 +02:00 |
|
zbeacon
|
591708b029
|
Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning
|
2022-12-05 15:23:09 +02:00 |
|
Andrii Shvaika
|
770f069f22
|
Version set to 3.4.2
|
2022-12-01 12:04:14 +02:00 |
|
zbeacon
|
0dcde60443
|
Added alarm assignment feature and tests for it
|
2022-11-30 13:06:00 +02:00 |
|
ShvaykaD
|
3820909d65
|
bugfix: #7683
|
2022-11-25 16:36:32 +02:00 |
|
ShvaykaD
|
2f83810fe4
|
fix compilation error in alarm service & code cleanup
|
2022-11-04 14:54:56 +02:00 |
|
Andrii Shvaika
|
646504ac50
|
Tenant Id Loader fixes
|
2022-11-03 15:51:18 +02:00 |
|
Yuriy Lytvynchuk
|
b5f11f1bd0
|
Merge remote-tracking branch 'upstream/master' into feature/check_tenant_entity_for_nodes
# Conflicts:
# application/src/main/java/org/thingsboard/server/service/apiusage/TbApiUsageStateService.java
# rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java
|
2022-11-03 14:10:48 +02:00 |
|
Yuriy Lytvynchuk
|
8b9eb43322
|
refactor code
|
2022-11-03 14:06:42 +02:00 |
|
Yuriy Lytvynchuk
|
15683504fd
|
refactor & update logic
|
2022-11-02 15:22:33 +02:00 |
|
Yuriy Lytvynchuk
|
4744f93cda
|
Merge remote-tracking branch 'upstream/master' into feature/check_tenant_entity_for_nodes
|
2022-11-01 10:31:05 +02:00 |
|
Andrii Shvaika
|
bfe79780dd
|
MVEL executor improvements
|
2022-10-27 14:03:48 +03:00 |
|
Andrew Shvayka
|
73868338c8
|
Merge pull request #7238 from YuriyLytvynchuk/feature/delete_attributes_node
[3.4.2] Feature: New RuleNode "delete attributes"
|
2022-10-24 13:34:55 +03:00 |
|
Andrii Shvaika
|
3f729a8ca0
|
MVEL improvements
|
2022-10-20 17:05:53 +03:00 |
|
Andrii Shvaika
|
2349b16b55
|
MVEL executor support in rule nodes
|
2022-10-19 17:49:59 +03:00 |
|
Andrii Shvaika
|
d3f06bd3a4
|
MVEL executor implementation
|
2022-10-18 18:39:43 +03:00 |
|
Yuriy Lytvynchuk
|
6edec4a94c
|
1. rename checkTenantEntity -> isTenantEntity
2. Refactor code
|
2022-10-07 11:01:55 +03:00 |
|
Igor Kulikov
|
f14a337c73
|
Merge branch 'master' into feature/math-rule-node
|
2022-09-28 15:01:46 +03:00 |
|
Yuriy Lytvynchuk
|
90fc76e762
|
Merge remote-tracking branch 'upstream/master' into feature/delete_attributes_node
# Conflicts:
# application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java
|
2022-09-28 14:40:40 +03:00 |
|
Yuriy Lytvynchuk
|
ef97f12724
|
add checkTenantEntity
|
2022-09-28 09:55:58 +03:00 |
|
Andrew Shvayka
|
7eaa942036
|
Merge pull request #7342 from thingsboard/feature/assetProfile
[3.4.2] Asset Profiles Feature
|
2022-09-27 17:02:32 +03:00 |
|
Igor Kulikov
|
7d19a1d5e9
|
Update assetCreatedMsg and alarmActionMsg to handle rule chain and queue name from asset profile
|
2022-09-27 16:12:01 +03:00 |
|
Yuriy Lytvynchuk
|
5a6cf5c92f
|
refactor code & test
|
2022-09-26 12:54:17 +03:00 |
|
Andrii Shvaika
|
fb49273bd6
|
Math node implementation
|
2022-09-23 18:06:33 +03:00 |
|
Yuriy Lytvynchuk
|
12148c8a60
|
modify callback
|
2022-09-23 16:39:53 +03:00 |
|