Merge branch 'master' into task/4114-gateway-version-compatibility

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;
-}
+}

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

rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java

@@ -515,13 +515,16 @@ public class RestClient implements Closeable {
         return restTemplate.postForEntity(baseURL + "/api/alarm", alarm, Alarm.class).getBody();
     }
 
-    public List<EntitySubtype> getAlarmTypes(PageLink pageLink) {
+    public PageData<EntitySubtype> getAlarmTypes(PageLink pageLink) {
+        Map<String, String> params = new HashMap<>();
+        addPageLinkToParam(params, pageLink);
         return restTemplate.exchange(
                 baseURL + "/api/alarm/types?" + getUrlParams(pageLink),
                 HttpMethod.GET,
                 HttpEntity.EMPTY,
-                new ParameterizedTypeReference<List<EntitySubtype>>() {
-                }).getBody();
+                new ParameterizedTypeReference<PageData<EntitySubtype>>() {
+                },
+                params).getBody();
     }
 
     public AlarmComment saveAlarmComment(AlarmId alarmId, AlarmComment alarmComment) {

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<string, Type<any>>(
   [
@@ -87,6 +89,8 @@ export const ServicesMap = new Map<string, Type<any>>(
    ['userSettingsService', UserSettingsService],
    ['uiSettingsService', UiSettingsService],
    ['usageInfoService', UsageInfoService],
-   ['notificationService', NotificationService]
+   ['notificationService', NotificationService],
+   ['eventService', EventService],
+   ['auditLogService', AuditLogService]
   ]
 );