From 80d6a3f98ec0328a9ba56ff70b5cb27e82586ad2 Mon Sep 17 00:00:00 2001 From: Armin Felder Date: Fri, 31 May 2024 15:55:27 +0200 Subject: [PATCH 1/4] set default kafka compression to none, to align it with the ThingsBoard application defaults --- msa/js-executor/config/default.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msa/js-executor/config/default.yml b/msa/js-executor/config/default.yml index 0e15413e31..f5bde183e4 100644 --- a/msa/js-executor/config/default.yml +++ b/msa/js-executor/config/default.yml @@ -34,7 +34,7 @@ kafka: partitions_consumed_concurrently: "1" # (EXPERIMENTAL) increase this value if you are planning to handle more than one partition (scale up, scale down) - this will decrease the latency requestTimeout: "30000" # The default value in kafkajs is: 30000 connectionTimeout: "1000" # The default value in kafkajs is: 1000 - compression: "gzip" # gzip or uncompressed + compression: "none" # gzip or uncompressed topic_properties: "retention.ms:604800000;segment.bytes:52428800;retention.bytes:104857600;partitions:100;min.insync.replicas:1" use_confluent_cloud: false client_id: "kafkajs" #inject pod name to easy identify the client using /opt/kafka/bin/kafka-consumer-groups.sh From 9e8958b6849afbaf4de4df8a80b4b3709e4a25ce Mon Sep 17 00:00:00 2001 From: Ikko Eltociear Ashimine Date: Wed, 14 Aug 2024 00:39:09 +0900 Subject: [PATCH 2/4] chore: update proto_config.proto accesing -> accessing --- .../transport/coap/src/main/proto/efento/proto_config.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/transport/coap/src/main/proto/efento/proto_config.proto b/common/transport/coap/src/main/proto/efento/proto_config.proto index 25dbec883f..5a82ec078c 100644 --- a/common/transport/coap/src/main/proto/efento/proto_config.proto +++ b/common/transport/coap/src/main/proto/efento/proto_config.proto @@ -31,7 +31,7 @@ message ProtoOutputControlState { uint32 channel_state = 2; } -/* Message containing request data for accesing calibration parameters */ +/* Message containing request data for accessing calibration parameters */ message ProtoCalibrationParameters { /* Request details. Bitmask: */ @@ -349,4 +349,4 @@ message ProtoConfig { /* BLE advertising period configuration. */ ProtoBleAdvertisingPeriod ble_advertising_period = 59; -} \ No newline at end of file +} From 455f4e59bee1a48c0df0fa3d79c2e1e1b9f99c83 Mon Sep 17 00:00:00 2001 From: 15608076017 <402106264@qq.com> Date: Tue, 20 Aug 2024 21:46:18 +0800 Subject: [PATCH 3/4] Fixed the problem of getAlarmTypes method query failure in rest-client --- .../java/org/thingsboard/rest/client/RestClient.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java b/rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java index 0aa51402c5..76a5751640 100644 --- a/rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java +++ b/rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java @@ -507,13 +507,16 @@ public class RestClient implements Closeable { return restTemplate.postForEntity(baseURL + "/api/alarm", alarm, Alarm.class).getBody(); } - public List getAlarmTypes(PageLink pageLink) { + public PageData getAlarmTypes(PageLink pageLink) { + Map params = new HashMap<>(); + addPageLinkToParam(params, pageLink); return restTemplate.exchange( baseURL + "/api/alarm/types?" + getUrlParams(pageLink), HttpMethod.GET, HttpEntity.EMPTY, - new ParameterizedTypeReference>() { - }).getBody(); + new ParameterizedTypeReference>() { + }, + params).getBody(); } public AlarmComment saveAlarmComment(AlarmId alarmId, AlarmComment alarmComment) { From 7433b156788e4bd147e002872b872671c639000b Mon Sep 17 00:00:00 2001 From: devaskim Date: Tue, 3 Sep 2024 14:48:03 +0500 Subject: [PATCH 4/4] Added Event and Audit Logs services to services map. --- ui-ngx/src/app/modules/home/models/services.map.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ui-ngx/src/app/modules/home/models/services.map.ts b/ui-ngx/src/app/modules/home/models/services.map.ts index cca04d8dc9..073bbd5b43 100644 --- a/ui-ngx/src/app/modules/home/models/services.map.ts +++ b/ui-ngx/src/app/modules/home/models/services.map.ts @@ -50,6 +50,8 @@ import { TenantService } from '@core/http/tenant.service'; import { TenantProfileService } from '@core/http/tenant-profile.service'; import { UiSettingsService } from '@core/http/ui-settings.service'; import { UsageInfoService } from '@core/http/usage-info.service'; +import { EventService } from '@core/http/event.service'; +import { AuditLogService } from '@core/http/audit-log.service'; export const ServicesMap = new Map>( [ @@ -87,6 +89,8 @@ export const ServicesMap = new Map>( ['userSettingsService', UserSettingsService], ['uiSettingsService', UiSettingsService], ['usageInfoService', UsageInfoService], - ['notificationService', NotificationService] + ['notificationService', NotificationService], + ['eventService', EventService], + ['auditLogService', AuditLogService] ] );