3063 Commits

Author SHA1 Message Date
Andrii Landiak
82c95f519d Merge branch 'develop/3.5' of github.com:AndriiLandiak/thingsboard into feature/x509-device-cert-impr 2023-03-23 15:18:38 +02:00
ViacheslavKlimov
4ea97e6f30 Configured notification delivery methods check 2023-03-23 15:10:18 +02:00
YevhenBondarenko
32278beabc improvements due to comments 2023-03-23 13:56:36 +01:00
ViacheslavKlimov
5e400726d3 Merge branch 'develop/3.5' into feature/notification-system 2023-03-23 12:36:08 +02:00
ViacheslavKlimov
cda1836986 Recipient preview for notification request; template params functions 2023-03-22 18:11:54 +02:00
ViacheslavKlimov
8705a2324e Notification system improvements:
- rate limits
- notify on rule node start failure after attempts ended
- default general template for tenants + entities limit rule
- rename ACTION_TARGET_USER to AFFECTED_USER
2023-03-22 16:48:04 +02:00
deaflynx
038a714e87 Merge remote-tracking branch 'alandiak/feature/x509-device-cert-impr' into feature/x509-device-cert-impr 2023-03-22 12:15:54 +02:00
dashevchenko
b8b1bce667 Merge remote-tracking branch 'upstream/develop/3.5' into alarmCommentFix 2023-03-21 19:18:58 +02:00
YevhenBondarenko
671c7db5c9 added new metrics 2023-03-21 17:19:51 +01:00
Vladyslav_Prykhodko
1b2b84e48e Merge remote-tracking branch 'upstream/develop/3.5' into feature/notification-system 2023-03-21 15:32:23 +02:00
Igor Kulikov
240b0abb2a Merge branch 'develop/3.5' into feature/menu-improvements 2023-03-21 13:34:20 +02:00
dashevchenko
b6adbd6ec8 moved logic to DefaultTbAlarmCommentService 2023-03-21 13:29:46 +02:00
ViacheslavKlimov
0308b0128d Entities limit notifications 2023-03-20 17:33:34 +02:00
nickAS21
d8e97dd74d sparkplug: add getNodeDeviceName() 2023-03-20 17:17:51 +02:00
ViacheslavKlimov
1382c49881 Endpoint to find tenant profiles by ids 2023-03-20 14:06:53 +02:00
ViacheslavKlimov
c34b6623ce Default notification configs; improvements 2023-03-17 17:17:34 +02:00
Igor Kulikov
eac7ce25a8 Add tenantId to device and asset profile info objects 2023-03-17 14:17:24 +02:00
ViacheslavKlimov
3b8ed5fae6 Notification rules improvements; new platform users filters 2023-03-17 14:03:03 +02:00
YevhenBondarenko
535b411b7e Merge branch 'feature/notification-system' of github.com:thingsboard/thingsboard into feature/home-page 2023-03-17 10:01:17 +01:00
AndriiD
07e834bee0 Merge remote-tracking branch 'origin/develop/3.5' into feature/work-1385-custom-mqtt-subscribe-topic
# Conflicts:
#	application/pom.xml
#	application/src/test/java/org/thingsboard/server/controller/BaseDeviceProfileControllerTest.java
#	application/src/test/java/org/thingsboard/server/transport/mqtt/AbstractMqttIntegrationTest.java
#	common/actor/pom.xml
#	common/cache/pom.xml
#	common/cluster-api/pom.xml
#	common/coap-server/pom.xml
#	common/dao-api/pom.xml
#	common/data/pom.xml
#	common/edge-api/pom.xml
#	common/message/pom.xml
#	common/pom.xml
#	common/queue/pom.xml
#	common/stats/pom.xml
#	common/transport/coap/pom.xml
#	common/transport/http/pom.xml
#	common/transport/lwm2m/pom.xml
#	common/transport/mqtt/pom.xml
#	common/transport/pom.xml
#	common/transport/snmp/pom.xml
#	common/transport/transport-api/pom.xml
#	common/util/pom.xml
#	common/version-control/pom.xml
#	dao/pom.xml
#	msa/black-box-tests/pom.xml
#	msa/js-executor/pom.xml
#	msa/pom.xml
#	msa/tb-node/pom.xml
#	msa/tb/pom.xml
#	msa/transport/coap/pom.xml
#	msa/transport/http/pom.xml
#	msa/transport/lwm2m/pom.xml
#	msa/transport/mqtt/pom.xml
#	msa/transport/pom.xml
#	msa/transport/snmp/pom.xml
#	msa/vc-executor-docker/pom.xml
#	msa/vc-executor/pom.xml
#	msa/web-ui/pom.xml
#	netty-mqtt/pom.xml
#	pom.xml
#	rest-client/pom.xml
#	rule-engine/pom.xml
#	rule-engine/rule-engine-api/pom.xml
#	rule-engine/rule-engine-components/pom.xml
#	tools/pom.xml
#	transport/coap/pom.xml
#	transport/http/pom.xml
#	transport/lwm2m/pom.xml
#	transport/mqtt/pom.xml
#	transport/pom.xml
#	transport/snmp/pom.xml
#	ui-ngx/pom.xml
#	ui-ngx/src/assets/locale/locale.constant-zh_CN.json
2023-03-17 04:38:18 +02:00
dashevchenko
ce7d56332b Merge remote-tracking branch 'upstream/develop/3.5' into alarmCommentFix 2023-03-16 13:26:40 +02:00
ViacheslavKlimov
1e7c1a8a5a Merge branch 'develop/3.5' into feature/notification-system 2023-03-16 13:12:35 +02:00
ViacheslavKlimov
4a20adc62e Alarm related notification rules 2023-03-16 13:12:04 +02:00
YevhenBondarenko
118fc1554a added TbCoreComponent to the SystemInfoService 2023-03-15 18:01:29 +01:00
YevhenBondarenko
8ede0b2822 added ability to send system info throw ZK 2023-03-15 16:54:23 +01:00
nickAS21
8236e26e5c sparkplug: delete isSparkplug from transport proto 2023-03-15 14:53:03 +02:00
ViacheslavKlimov
0d07d70818 Merge remote-tracking branch 'origin/feature/notification-system' into feature/notification-system 2023-03-15 12:32:43 +02:00
ViacheslavKlimov
ba8f27fa76 Notification system refactoring and improvements 2023-03-15 12:32:23 +02:00
YevhenBondarenko
0be3c0b5bb removed countEntitiesByTypes and added ability to use Entity count query for sysadmin 2023-03-14 16:26:55 +01:00
Vladyslav_Prykhodko
88128640e9 Merge branch 'feature/notification-system' of github.com:thingsboard/thingsboard into feature/notification-system 2023-03-14 16:37:50 +02:00
nickAS21
2a6000d8ce fix bug close session of device: sessionMetaData.setOverwriteActivityTime(true); 2023-03-14 15:13:55 +02:00
YevhenBondarenko
76c92c9070 Merge branch 'feature/notification-system' of github.com:thingsboard/thingsboard into feature/home-page 2023-03-14 13:59:01 +01:00
dashevchenko
210aae6a86 updated alarm comment deletion 2023-03-14 14:15:37 +02:00
YevhenBondarenko
7cd949edb2 implemented system info 2023-03-13 20:05:49 +01:00
Andrii Shvaika
ab5769a252 Merge with develop/3.5 2023-03-13 15:52:06 +02:00
Andrew Shvayka
494296996e
Merge pull request #8200 from smatvienko-tb/fix/lwm2m-lifecycle-refactor
[3.5] lwm2m lifecycle refactor
2023-03-13 15:20:53 +02:00
YevhenBondarenko
b936d48419 implemented countEntitiesByTypes for SysAdmin 2023-03-13 10:57:04 +01:00
ViacheslavKlimov
378ae47acb Alarm comments rule trigger config, NotificationInfo stateEntityId 2023-03-13 10:41:40 +02:00
YevhenBondarenko
b13c9d7368 added curent tb version to the UpdateMessage 2023-03-11 21:29:39 +01:00
Andrii Landiak
e665917758 Merge branch 'develop/3.5' of github.com:AndriiLandiak/thingsboard into feature/x509-device-cert-impr 2023-03-10 15:46:42 +02:00
Sergey Matvienko
7b32286e4c log trace on destroy for DefaultLwM2MOtaUpdateService 2023-03-10 12:18:47 +01:00
Sergey Matvienko
817487b74d DefaultLwM2mDownlinkMsgHandler - wrapped any exceptions on handleDownlinkError that may fire and prevent graceful server shutdown 2023-03-10 11:52:48 +01:00
Sergey Matvienko
8352be035b LWM2M bean lifecycle dependency fix to avoid executors shutdown before server stop. Dependencies refactored: implementations replaced with interfaces. 2023-03-10 11:52:45 +01:00
Andrew Shvayka
e058786956
Merge pull request #8174 from zzzeebra/feature/junit5-migration-exceptions
[3.5] junit5 migration - exception annotation refactoring
2023-03-10 12:51:03 +02:00
Andrii Shvaika
3477ddac0f Refactoring due to comments 2023-03-08 17:39:39 +02:00
Andrii Shvaika
0f5fd481fc Fix server-side RPC requests handling 2023-03-08 15:37:30 +02:00
Andrii Shvaika
c905f20224 Merge remote-tracking branch 'origin/develop/3.5' into feature/mqtt/sparkplug 2023-03-08 13:27:17 +02:00
ViacheslavKlimov
a56261ac9d Merge with develop/3.5 2023-03-08 13:11:31 +02:00
Andrii Shvaika
aadf7f8295 Merge with develop/3.5 2023-03-06 17:59:37 +02:00
Oleksandra Matviienko
888f026fd6 junit5: UUIDConverterTest annotation exceptions refactoring 2023-03-06 15:12:55 +01:00