13340 Commits

Author SHA1 Message Date
ViacheslavKlimov
470fbfa768 Minor refactoring for monitoring service 2023-04-10 12:12:57 +03:00
ViacheslavKlimov
df16a6a310 Refactoring for monitoring service 2023-04-10 10:57:27 +03:00
ViacheslavKlimov
7a30cc1b68 Merge branch 'develop/3.5' into feature/monitoring-service
# Conflicts:
#	msa/pom.xml
#	rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java
2023-04-07 17:31:26 +03:00
Andrew Shvayka
838c2f5d33
Merge pull request #7857 from ShvaykaD/improvements/report-device-activity-on-rpc-processing
Improvements for reporting device activity during RPC processing
2023-04-07 15:50:28 +03:00
Andrew Shvayka
7c99cfd852
Merge pull request #8327 from adovh/refactor-remove-handleException-and-logs
removed redundant handle exception
2023-04-07 15:01:36 +03:00
Andrew Shvayka
8769911694
Merge pull request #8256 from imbeacon/fix/alarm-assignment-user-issues
Added getting user list for alarm assignment and ability to assign alarms for customer users
2023-04-07 15:00:22 +03:00
Andrew Shvayka
14ed9df205
Merge pull request #6986 from adovh/feature/work-1385-custom-mqtt-subscribe-topic
[3.5] added ability to create&subscribe custom mqtt attributes topics
2023-04-07 13:48:20 +03:00
Andrew Shvayka
a8d0d871e1
Merge pull request #8285 from rusikv/alarm-details-redesign
Alarm details redesign
2023-04-07 13:05:03 +03:00
Andrew Shvayka
43489f8e13
Merge pull request #8294 from ChantsovaEkaterina/improvement/widget-custom-action-help-update-alarm-info-links
Update links for alarm info in widget custom action help
2023-04-07 13:04:24 +03:00
Andrew Shvayka
6bcbfc1b28
Merge pull request #8325 from volodymyr-babak/edge-log-fix
[3.5] Fixed logging of EdgeGrpcSession
2023-04-07 13:01:52 +03:00
Andrew Shvayka
2d9c8d9fb9
Merge pull request #8329 from dashevchenko/mqttSslCertificateIssueLogging
Added logging for invalid mqtt ssl certificates
2023-04-07 12:58:27 +03:00
Andrew Shvayka
a19f1ddc5e
Merge pull request #8333 from vvlladd28/improvement/notification/disable-change-type
Change notification template/rule type disabled in edit mode
2023-04-07 12:57:09 +03:00
Andrew Shvayka
d295844a7a
Merge pull request #8328 from dashevchenko/testFixes
Flaky test fixes
2023-04-07 12:55:48 +03:00
rusikv
1eb7f12310 Amendments after review 2023-04-07 12:15:31 +03:00
Vladyslav_Prykhodko
d8bf2b75f7 UI: Change notification template/rule type disabled in edit mode 2023-04-07 11:18:12 +03:00
dashevchenko
b10ed7621d minor refactoring 2023-04-06 18:34:08 +03:00
dashevchenko
c4a5569650 Added logging for failed mqtt ssl certificates 2023-04-06 18:08:06 +03:00
dashevchenko
c07eb9e920 fixes for flaky tests 2023-04-06 17:57:37 +03:00
dashevchenko
47cf1eac77 fixes for flaky tests 2023-04-06 17:28:30 +03:00
Volodymyr Babak
14b0728018 Merge remote-tracking branch 'upstream/develop/3.5' into edge-log-fix 2023-04-06 16:10:56 +03:00
rusikv
bcee982497 Merge remote-tracking branch 'upstream/develop/3.5' into alarm-details-redesign 2023-04-06 16:08:38 +03:00
Andrew Shvayka
828eb18870
Merge pull request #8326 from vvlladd28/bug/notification/ws-updated
Fixed updated notification when open notifications popover
2023-04-06 15:52:25 +03:00
AndriiD
799eb52893 upd 2023-04-06 15:28:08 +03:00
AndriiD
f2fa3551cf removed redundant try-catches 2023-04-06 13:37:18 +03:00
Vladyslav_Prykhodko
0bdae38d1d UI: Fixed updated notification when open notifications popover 2023-04-06 13:29:04 +03:00
Volodymyr Babak
13c4351024 Fixed logging of EdgeGrpcSession 2023-04-06 13:22:40 +03:00
Andrew Shvayka
42f4c0c2be
Merge pull request #8293 from adovh/bug/fix-1899-rulechain-messages-sent-to-wrong-tenant
fix rulechain messages sent to wrong tenant
2023-04-06 13:09:09 +03:00
Andrew Shvayka
87e48d9803
Merge pull request #8317 from volodymyr-babak/edge-attr-fix
[3.5] Edge processor - delete attribute msg is not properly handled for non device type
2023-04-06 13:04:36 +03:00
Andrii Shvaika
672c05d9b7 clear duplicated attribute keys before loading them from cache to avoid NPE 2023-04-06 12:59:29 +03:00
Andrew Shvayka
34e923422a
Merge pull request #8310 from adovh/bug/fix-1284-func-broken_in_case_E_numbers
[3.5] fix for incorrect long integers, sent on ws to FE
2023-04-06 12:45:51 +03:00
Andrew Shvayka
fe962979d7
Merge pull request #8323 from thingsboard/revert-7527-refactor-remove-handleException-and-logs
Revert "[3.5] removed redundant handleException usages"
2023-04-06 12:39:10 +03:00
Andrew Shvayka
d7b5d89990
Revert "[3.5] removed redundant handleException usages" 2023-04-06 12:38:52 +03:00
Andrii Shvaika
6fc3905fc1 Merge branch 'refactor-remove-handleException-and-logs' of github.com:adovh/thingsboard into develop/3.5 2023-04-06 12:18:17 +03:00
Andrew Shvayka
a36d47cc8c
Merge pull request #8321 from vvlladd28/feature/ui-rule-node/generator-queue
Updated rule node core config
2023-04-06 12:15:20 +03:00
Andrew Shvayka
2ad4ea765a
Merge pull request #8304 from YevhenBondarenko/feature/entity-usage
[3.5]added entity usage
2023-04-06 12:14:19 +03:00
Andrew Shvayka
872a8f0c60
Merge branch 'develop/3.5' into feature/entity-usage 2023-04-06 12:12:49 +03:00
Vladyslav_Prykhodko
61537ac5cb Updated rule node core config 2023-04-06 11:49:36 +03:00
imbeacon
863b7a72ed Merge 2023-04-06 11:48:46 +03:00
Andrii Shvaika
d71307402e Merge with develop/3.5 2023-04-06 11:43:34 +03:00
Andrew Shvayka
de921b4fa1
Merge pull request #8265 from thingsboard/improvements/notification-system
Notification system improvements
2023-04-06 11:13:52 +03:00
Illia Barkov
ae35b45799
Merge branch 'develop/3.5' into fix/alarm-assignment-user-issues 2023-04-06 10:52:57 +03:00
YevhenBondarenko
2e7c132919 improvements 2023-04-06 00:22:46 +02:00
YevhenBondarenko
5075152ce3 customer service improvements 2023-04-06 00:14:43 +02:00
YevhenBondarenko
059fad1421 merge with develop/3.5 2023-04-05 23:29:31 +02:00
YevhenBondarenko
22981e5e39 added count entity cache 2023-04-05 19:00:52 +02:00
Vladyslav_Prykhodko
89362dedf1 UI: Add filter entity type for notification rule 2023-04-05 17:42:14 +03:00
Andrii Shvaika
9165faa341 Improved Platform Updates Service 2023-04-05 17:23:03 +03:00
Vladyslav_Prykhodko
3279b27b73 UI: Fixed minor style in notification 2023-04-05 16:12:36 +03:00
Volodymyr Babak
9e189c30e6 Remove redundant JSON code 2023-04-05 16:09:41 +03:00
Volodymyr Babak
0f5261b8dd Merge branch 'fix-rpc-keep-alive-issue' into edge-attr-fix 2023-04-05 15:52:05 +03:00