1565 Commits

Author SHA1 Message Date
ViacheslavKlimov
b7f4ed1e4b Add 'description' to notification target 2023-01-09 13:25:20 +02:00
dashevchenko
0427425f83 Added email for AlarmCommentInfo 2023-01-09 13:06:55 +02:00
dashevchenko
d3a975770b Merge remote-tracking branch 'upstream/master' into alarmComments 2023-01-09 12:38:21 +02:00
ViacheslavKlimov
5c5d683236 Add indexes for notification entities; refactoring 2023-01-08 13:42:43 +02:00
ViacheslavKlimov
1317a8aca9 Rename WebSocket delivery method to push-notification; refactoring 2023-01-06 18:34:35 +02:00
ViacheslavKlimov
654e61683a Improvements and refactoring 2023-01-06 17:50:34 +02:00
Volodymyr Babak
ab924d6e13 Added default edge rule chain to asset/device profiles. Added propagation of software id to edge 2023-01-05 18:05:56 +02:00
Volodymyr Babak
46f8ce990b Added getEdgeDockerInstallInstructions method to RestClient 2023-01-03 11:11:46 +02:00
ViacheslavKlimov
141bd74113 Notification target and template api docs; improvements 2023-01-02 17:25:03 +02:00
zbeacon
d9add9bdf8 Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning 2022-12-29 20:49:29 +02:00
Andrii Shvaika
831f11829c Merge with develop/3.5 2022-12-28 15:35:48 +02:00
Igor Kulikov
4c3154da4b Version set to 3.4.4-SNAPSHOT 2022-12-28 13:33:57 +02:00
ViacheslavKlimov
409976c6a3 Multiple notification targets for request; improvements and refactoring 2022-12-23 18:47:40 +02:00
zbeacon
5710f01c03 Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning 2022-12-22 08:30:42 +02:00
ViacheslavKlimov
7792e80283 Merge branch 'master' into feature/notification-system 2022-12-21 17:53:41 +02:00
ViacheslavKlimov
0a17f99360 Refactoring; TbSlackNode 2022-12-21 15:04:06 +02:00
dashevchenko
df31723f58 pull request comments 2022-12-20 15:37:37 +02:00
dashevchenko
7203c15dec fixed pull request comments 2022-12-20 15:07:50 +02:00
dashevchenko
ed37dc850a merged with master 2022-12-20 12:09:34 +02:00
dashevchenko
81ed6a6702 added tests for alarm comment services 2022-12-20 11:26:11 +02:00
ViacheslavKlimov
738b9dc494 Slack notification channel; refactoring 2022-12-19 19:56:20 +02:00
ViacheslavKlimov
55fc7131fb Validation for rule node configuration; improve validation error message 2022-12-17 16:58:58 +02:00
ViacheslavKlimov
4b39d2a221 Notification request stats 2022-12-15 15:50:01 +02:00
nickAS21
1bf02b75f2 sparkplug: connection 2022-12-15 11:40:04 +02:00
ViacheslavKlimov
a6bfb049aa Improvements for notification templates 2022-12-14 19:02:23 +02:00
ViacheslavKlimov
deb2867df1 Multiple notification delivery methods; notification templates 2022-12-14 14:27:20 +02:00
dashevchenko
201078714c added alarm comment info object, refactoring 2022-12-14 12:20:23 +02:00
zbeacon
f29d1b0eff Added HasLabel, HasEmail, HasTitle interfaces to get correctly label in entityService, refactoring for alarms processing. The main point is swithing from Alarm entity to AlarmInfo 2022-12-13 13:39:09 +02:00
ViacheslavKlimov
1ba77a30d7 Merge branch 'master' into feature/notification-system
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java
#	application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java
2022-12-13 12:55:21 +02:00
Andrew Shvayka
0ee678e234
Merge pull request #7761 from ViacheslavKlimov/fix/entity-view-ts
[3.4.3] Fix no timeseries data in widget for entity view; fix State Chart invalid behavior
2022-12-12 15:54:29 +02:00
zbeacon
08e356a415 Updated alarm assignment to send websocket update on assign, added originator label to alarm info 2022-12-12 13:00:22 +02:00
ViacheslavKlimov
4851f1af9f Fix comparing entity versions: ignore tenantId and createdTime 2022-12-09 19:03:57 +02:00
ViacheslavKlimov
808b1dc0c5 'Show merge commits' option in repository settings 2022-12-09 18:31:59 +02:00
dashevchenko
8a157397d4 added rest controller for alarm comments 2022-12-08 17:04:30 +02:00
nickAS21
e95fed13ed sparkPlug: add to TransportConfiguration sparkPlug 2022-12-08 13:59:11 +02:00
ViacheslavKlimov
28d6e4c736 Copy queryId when updating query 2022-12-08 13:16:34 +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
Igor Kulikov
d10f64c348 Refactor MVEL -> TBEL 2022-11-22 16:38:01 +02:00
Andrew Shvayka
a1c4d29e48
Merge pull request #7636 from ViacheslavKlimov/fix/additional-info-xss
[3.4.2] Validation for entity's additionalInfo
2022-11-17 17:40:46 +02:00
ViacheslavKlimov
e7995fb02c Validation for entity's additionalInfo 2022-11-17 15:33:12 +02:00
Andrii Shvaika
0d1412cd46 Merge branch 'jwt-random' of github.com:smatvienko-tb/thingsboard 2022-11-17 11:50:56 +02:00
Volodymyr Babak
1d9a2bad84 Improve error handling - root cause and stack trace delivered to cloud from edge in case of errors 2022-11-15 14:59:14 +02:00
Sergey Matvienko
7e5ab3bff7 JWT settings refactored packages, Swagger documented, rest client getJwtSettings and saveJwtSettings added 2022-11-14 18:52:57 +01:00
ViacheslavKlimov
684ef4a658 Add ability to update notification request 2022-11-11 14:06:09 +02:00
ViacheslavKlimov
6e8dba6e2c More tests for notifications 2022-11-10 15:42:29 +02:00
Volodymyr Babak
0a56f065f7 Merge RPC request/response actions 2022-11-10 09:35:06 +02:00