diff --git a/hertzbeat-e2e/hertzbeat-collector-common-e2e/src/test/java/org/apache/hertzbeat/collector/collect/AbstractCollectE2eTest.java b/hertzbeat-e2e/hertzbeat-collector-common-e2e/src/test/java/org/apache/hertzbeat/collector/collect/AbstractCollectE2eTest.java index 313bcf93fe..ba2357ff21 100644 --- a/hertzbeat-e2e/hertzbeat-collector-common-e2e/src/test/java/org/apache/hertzbeat/collector/collect/AbstractCollectE2eTest.java +++ b/hertzbeat-e2e/hertzbeat-collector-common-e2e/src/test/java/org/apache/hertzbeat/collector/collect/AbstractCollectE2eTest.java @@ -27,6 +27,7 @@ import org.apache.hertzbeat.common.entity.job.Job; import org.apache.hertzbeat.common.entity.job.Metrics; import org.apache.hertzbeat.common.entity.job.protocol.Protocol; import org.apache.hertzbeat.common.entity.message.CollectRep; +import org.apache.hertzbeat.manager.dao.DefineDao; import org.apache.hertzbeat.manager.service.impl.AppServiceImpl; import org.apache.hertzbeat.manager.service.impl.ObjectStoreConfigServiceImpl; import org.junit.jupiter.api.Assertions; @@ -34,6 +35,7 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -63,10 +65,13 @@ public abstract class AbstractCollectE2eTest { private Timeout timeout; @Mock private Job job; + @Mock + private DefineDao defineDao; public void setUp() throws Exception { // Initialize mocks MockitoAnnotations.openMocks(this); + when(defineDao.findAll()).thenReturn(new ArrayList<>()); when(timeout.task()).thenReturn(timerJob); when(timerJob.getJob()).thenReturn(job); metricsCollect = new MetricsCollect(mock(Metrics.class), timeout, mock(CollectDataDispatch.class), null, List.of()); @@ -78,6 +83,7 @@ public abstract class AbstractCollectE2eTest { /** * Validate metrics collection, check if the metrics values are not empty
+ * * @param metricsDef metrics definition * @param metricName metric name * @return metrics data diff --git a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AppServiceImpl.java b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AppServiceImpl.java index c7ed3a92ad..5e0be4bc98 100644 --- a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AppServiceImpl.java +++ b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AppServiceImpl.java @@ -518,7 +518,7 @@ public class AppServiceImpl implements AppService, InitializingBean { */ private void refreshStore(ObjectStoreDTO objectStoreConfig) { if (objectStoreConfig == null) { - appDefineStore = new LocalFileAppDefineStoreImpl(); + appDefineStore = new DatabaseAppDefineStoreImpl(); } else { if (objectStoreConfig.getType() == ObjectStoreDTO.Type.OBS) { appDefineStore = new ObjectStoreAppDefineStoreImpl(); diff --git a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/AppServiceTest.java b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/AppServiceTest.java index ce41c58708..be9b0746f1 100644 --- a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/AppServiceTest.java +++ b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/AppServiceTest.java @@ -17,13 +17,8 @@ package org.apache.hertzbeat.manager.service; -import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.when; -import java.util.Collections; import org.apache.hertzbeat.common.entity.manager.Monitor; +import org.apache.hertzbeat.manager.dao.DefineDao; import org.apache.hertzbeat.manager.dao.MonitorDao; import org.apache.hertzbeat.manager.service.impl.AppServiceImpl; import org.apache.hertzbeat.manager.service.impl.ObjectStoreConfigServiceImpl; @@ -35,6 +30,15 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; +import java.util.ArrayList; +import java.util.Collections; + +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.when; + /** * Test case for {@link AppService} */ @@ -47,6 +51,9 @@ class AppServiceTest { @Mock private MonitorDao monitorDao; + @Mock + private DefineDao defineDao; + @Mock private WarehouseService warehouseService; @@ -55,6 +62,7 @@ class AppServiceTest { @BeforeEach void setUp() throws Exception { + when(defineDao.findAll()).thenReturn(new ArrayList<>()); appService.afterPropertiesSet(); } diff --git a/web-app/src/app/pojo/ObjectStore.ts b/web-app/src/app/pojo/ObjectStore.ts index 0fc00c8eb8..5d89b25b25 100644 --- a/web-app/src/app/pojo/ObjectStore.ts +++ b/web-app/src/app/pojo/ObjectStore.ts @@ -18,7 +18,7 @@ */ export class ObjectStore { - type: ObjectStoreType = ObjectStoreType.FILE; + type: ObjectStoreType = ObjectStoreType.DATABASE; config!: T; appDefineStoreType!: ObjectStoreType; } diff --git a/web-app/src/app/routes/setting/settings/object-store/object-store.component.html b/web-app/src/app/routes/setting/settings/object-store/object-store.component.html index 35b74f6cdc..7f64370f40 100644 --- a/web-app/src/app/routes/setting/settings/object-store/object-store.component.html +++ b/web-app/src/app/routes/setting/settings/object-store/object-store.component.html @@ -31,8 +31,8 @@ [nzDropdownStyle]="{ 'font-weight': 'bolder', 'font-size': 'larger' }" (ngModelChange)="onChange()" > - + diff --git a/web-app/src/assets/i18n/en-US.json b/web-app/src/assets/i18n/en-US.json index 22e51492ad..e1d4259005 100644 --- a/web-app/src/assets/i18n/en-US.json +++ b/web-app/src/assets/i18n/en-US.json @@ -786,8 +786,8 @@ "settings.object-store.obs.secretKey": "SecretKey", "settings.object-store.obs.secretKey.placeholder": "Access Key Secret of HUAWEI CLOUD", "settings.object-store.type": "File Server Provider", - "settings.object-store.type.database": "Local database", - "settings.object-store.type.file": "Local file (default)", + "settings.object-store.type.database": "Local database (default)", + "settings.object-store.type.file": "Local file", "settings.object-store.type.obs": "HUAWEI CLOUD OBS", "settings.server": "Message Server Setting", "settings.server.email": "Email Server", diff --git a/web-app/src/assets/i18n/ja-JP.json b/web-app/src/assets/i18n/ja-JP.json index c1e96ebb3e..4579258aa4 100644 --- a/web-app/src/assets/i18n/ja-JP.json +++ b/web-app/src/assets/i18n/ja-JP.json @@ -786,8 +786,8 @@ "settings.object-store.obs.secretKey": "SecretKey", "settings.object-store.obs.secretKey.placeholder": "HUAWEI CLOUDのAccess Key Secret", "settings.object-store.type": "ファイルサーバープロバイダー", - "settings.object-store.type.database": "ローカルデータベース", - "settings.object-store.type.file": "ローカルファイル(デフォルト)", + "settings.object-store.type.database": "ローカルデータベース(デフォルト)", + "settings.object-store.type.file": "ローカルファイル", "settings.object-store.type.obs": "HUAWEI CLOUD OBS", "settings.server": "メッセージサーバー設定", "settings.server.email": "メールサーバー", diff --git a/web-app/src/assets/i18n/pt-BR.json b/web-app/src/assets/i18n/pt-BR.json index 6a4e2d2f7b..ead120269d 100644 --- a/web-app/src/assets/i18n/pt-BR.json +++ b/web-app/src/assets/i18n/pt-BR.json @@ -808,8 +808,8 @@ "settings.system-config.ok": "Confirmar Atualização", "settings.object-store": "Configuração do Servidor de Arquivos", "settings.object-store.type": "Provedor do Servidor de Arquivos", - "settings.object-store.type.file": "Arquivo local (padrão)", - "settings.object-store.type.database": "Banco de dados local", + "settings.object-store.type.file": "Arquivo local", + "settings.object-store.type.database": "Banco de dados local (padrão)", "settings.object-store.type.obs": "HUAWEI CLOUD OBS", "settings.object-store.obs.accessKey": "AccessKey", "settings.object-store.obs.accessKey.placeholder": "Access Key ID da HUAWEI CLOUD", @@ -1364,8 +1364,8 @@ "settings.system-config.ok": "Confirmar Atualização", "settings.object-store": "Configuração do Servidor de Arquivos", "settings.object-store.type": "Provedor do Servidor de Arquivos", - "settings.object-store.type.file": "Arquivo local (padrão)", - "settings.object-store.type.database": "Banco de dados local", + "settings.object-store.type.file": "Arquivo local", + "settings.object-store.type.database": "Banco de dados local (padrão)", "settings.object-store.type.obs": "HUAWEI CLOUD OBS", "settings.object-store.obs.accessKey": "AccessKey", "settings.object-store.obs.accessKey.placeholder": "Access Key ID da HUAWEI CLOUD", diff --git a/web-app/src/assets/i18n/zh-CN.json b/web-app/src/assets/i18n/zh-CN.json index 8145211598..05b8923d2e 100644 --- a/web-app/src/assets/i18n/zh-CN.json +++ b/web-app/src/assets/i18n/zh-CN.json @@ -786,8 +786,8 @@ "settings.object-store.obs.secretKey": "SecretKey", "settings.object-store.obs.secretKey.placeholder": "华为云的AccessKeySecret", "settings.object-store.type": "文件服务提供商", - "settings.object-store.type.database": "本地数据库", - "settings.object-store.type.file": "本地文件(默认)", + "settings.object-store.type.database": "本地数据库(默认)", + "settings.object-store.type.file": "本地文件", "settings.object-store.type.obs": "华为云OBS", "settings.server": "消息服务配置", "settings.server.email": "邮件服务器", diff --git a/web-app/src/assets/i18n/zh-TW.json b/web-app/src/assets/i18n/zh-TW.json index 99e5c4cc50..27e5f54a65 100644 --- a/web-app/src/assets/i18n/zh-TW.json +++ b/web-app/src/assets/i18n/zh-TW.json @@ -785,8 +785,8 @@ "settings.object-store.obs.secretKey": "SecretKey", "settings.object-store.obs.secretKey.placeholder": "華為雲的AccessKeySecret", "settings.object-store.type": "文件服務提供商", - "settings.object-store.type.database": "本地數據庫", - "settings.object-store.type.file": "本地文件(默認)", + "settings.object-store.type.database": "本地數據庫(默認)", + "settings.object-store.type.file": "本地文件", "settings.object-store.type.obs": "華為雲OBS", "settings.server": "消息服務配置", "settings.server.email": "郵件服務器",