dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor refactoring

Browse Source
This commit is contained in:
ViacheslavKlimov 2024-04-16 14:01:11 +03:00
parent c47946948a
commit 0361d34767
6 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/src/test/resources/logback-test.xml
View File

@ -31,6 +31,7 @@
<!-- To reduce logs --> <!-- To reduce logs -->
<logger name="org.apache.catalina.loader.WebappClassLoaderBase" level="ERROR" /> <logger name="org.apache.catalina.loader.WebappClassLoaderBase" level="ERROR" />
<logger name="org.thingsboard.server.service.queue.DefaultTbClusterService" level="ERROR" /> <logger name="org.thingsboard.server.service.queue.DefaultTbClusterService" level="ERROR" />
<logger name="org.thingsboard.server.service.security.auth.jwt.settings.DefaultJwtSettingsService" level="ERROR" />
<!-- Coap client context debug for the test scope --> <!-- Coap client context debug for the test scope -->
<!-- <logger name="org.thingsboard.server.transport.coap.client.DefaultCoapClientContext" level="TRACE" />--> <!-- <logger name="org.thingsboard.server.transport.coap.client.DefaultCoapClientContext" level="TRACE" />-->

2
common/cluster-api/src/main/java/org/thingsboard/server/queue/TbQueueConsumer.java
View File

@ -36,8 +36,6 @@ public interface TbQueueConsumer<T extends TbQueueMsg> {
void commit(); void commit();
boolean isCommitSupported();
boolean isStopped(); boolean isStopped();
List<String> getFullTopicNames(); List<String> getFullTopicNames();

9
common/data/src/main/java/org/thingsboard/server/common/data/housekeeper/HousekeeperTask.java
View File

@ -60,19 +60,10 @@ public class HousekeeperTask implements Serializable {
return new HousekeeperTask(tenantId, entityId, HousekeeperTaskType.DELETE_ATTRIBUTES); return new HousekeeperTask(tenantId, entityId, HousekeeperTaskType.DELETE_ATTRIBUTES);
} }
/**
* Task for telemetry deletion, processed by TelemetryDeletionTaskProcessor.
* The processor will submit separate tasks for each key for latest and ts history deletion,
* processed by LatestTsDeletionTaskProcessor and TsHistoryDeletionTaskProcessor accordingly.
* */
public static HousekeeperTask deleteTelemetry(TenantId tenantId, EntityId entityId) { public static HousekeeperTask deleteTelemetry(TenantId tenantId, EntityId entityId) {
return new HousekeeperTask(tenantId, entityId, HousekeeperTaskType.DELETE_TELEMETRY); return new HousekeeperTask(tenantId, entityId, HousekeeperTaskType.DELETE_TELEMETRY);
} }
/**
* Task for events deletion, processed by EventsDeletionTaskProcessor.
* All types of events will be dropped for this entity.
* */
public static HousekeeperTask deleteEvents(TenantId tenantId, EntityId entityId) { public static HousekeeperTask deleteEvents(TenantId tenantId, EntityId entityId) {
return new HousekeeperTask(tenantId, entityId, HousekeeperTaskType.DELETE_EVENTS); return new HousekeeperTask(tenantId, entityId, HousekeeperTaskType.DELETE_EVENTS);
} }

5
common/queue/src/main/java/org/thingsboard/server/queue/common/AbstractTbQueueConsumerTemplate.java
View File

@ -201,11 +201,6 @@ public abstract class AbstractTbQueueConsumerTemplate<R, T extends TbQueueMsg> i
return partitions.stream().map(TopicPartitionInfo::getFullTopicName).collect(Collectors.toList()); return partitions.stream().map(TopicPartitionInfo::getFullTopicName).collect(Collectors.toList());
} }
@Override
public boolean isCommitSupported() {
return true;
}
protected boolean isLongPollingSupported() { protected boolean isLongPollingSupported() {
return false; return false;
} }

5
common/queue/src/main/java/org/thingsboard/server/queue/memory/InMemoryTbQueueConsumer.java
View File

@ -114,9 +114,4 @@ public class InMemoryTbQueueConsumer<T extends TbQueueMsg> implements TbQueueCon
return partitions.stream().map(TopicPartitionInfo::getFullTopicName).collect(Collectors.toList()); return partitions.stream().map(TopicPartitionInfo::getFullTopicName).collect(Collectors.toList());
} }
@Override
public boolean isCommitSupported() {
return false;
}
} }

6
docker/monitoring/grafana/provisioning/dashboards/housekeeper.json
View File

@ -188,7 +188,7 @@
"uid": "9BonzvTSz" "uid": "9BonzvTSz"
}, },
"exemplar": true, "exemplar": true,
"expr": "sum by (taskType) (increase(housekeeper_total{instance=\"192.168.3.27:8080\",statsName=\"failedProcessing\"}[1m]))", "expr": "sum by (taskType) (increase(housekeeper_total{statsName=\"failedProcessing\"}[1m]))",
"interval": "", "interval": "",
"legendFormat": "{{taskType}}", "legendFormat": "{{taskType}}",
"refId": "A" "refId": "A"
@ -274,7 +274,7 @@
"uid": "9BonzvTSz" "uid": "9BonzvTSz"
}, },
"exemplar": true, "exemplar": true,
"expr": "sum by (taskType) (increase(housekeeper_total{instance=\"192.168.3.27:8080\",statsName=\"reprocessed\"}[1m]))", "expr": "sum by (taskType) (increase(housekeeper_total{statsName=\"reprocessed\"}[1m]))",
"interval": "", "interval": "",
"legendFormat": "{{taskType}}", "legendFormat": "{{taskType}}",
"refId": "A" "refId": "A"
@ -360,7 +360,7 @@
"uid": "9BonzvTSz" "uid": "9BonzvTSz"
}, },
"exemplar": true, "exemplar": true,
"expr": "sum by (taskType) (increase(housekeeper_total{instance=\"192.168.3.27:8080\",statsName=\"failedReprocessing\"}[1m]))", "expr": "sum by (taskType) (increase(housekeeper_total{statsName=\"failedReprocessing\"}[1m]))",
"interval": "", "interval": "",
"legendFormat": "{{taskType}}", "legendFormat": "{{taskType}}",
"refId": "A" "refId": "A"