diff options
| author | shizhendong <[email protected]> | 2024-09-24 15:10:17 +0800 |
|---|---|---|
| committer | shizhendong <[email protected]> | 2024-09-24 15:23:13 +0800 |
| commit | 60db1d404f1588abf0dc67ff23c959bbc5db2df3 (patch) | |
| tree | b2b7fd5fe30ccf77d6d4844e416b96e422a866ae | |
| parent | 000338d0bced5d5584feafd75d487bbd71a968b1 (diff) | |
Merge "fix: NEZ-3503 asset_ping_interval默认值调整，300->180"dev-3.11
3 files changed, 6 insertions, 6 deletions
diff --git a/nz-admin/src/main/java/com/nis/modules/agent/job/AgentConfigUtil.java b/nz-admin/src/main/java/com/nis/modules/agent/job/AgentConfigUtil.java index ecda465a..75f94ccb 100644 --- a/nz-admin/src/main/java/com/nis/modules/agent/job/AgentConfigUtil.java +++ b/nz-admin/src/main/java/com/nis/modules/agent/job/AgentConfigUtil.java @@ -1483,7 +1483,7 @@ public class AgentConfigUtil { String srcDcName = dcList.stream().filter(dc -> ObjectUtil.equal(dc.getId(), srcAgent.getDcId())).findFirst().get().getName(); // asset_ping_interval - String pingInterval = sysConfService.getValueOrDefault(Constant.SYSCONFIG_KEY_ASSET_PING_INTERVAL, "300"); + String pingInterval = sysConfService.getValueOrDefault(Constant.SYSCONFIG_KEY_ASSET_PING_INTERVAL, "180"); List<Map<String, Object>> pmJobList = ListUtil.list(true); for (Agent destAgent : destAgentList) { diff --git a/nz-admin/src/main/java/com/nis/modules/asset/service/impl/AssetAssetServiceImpl.java b/nz-admin/src/main/java/com/nis/modules/asset/service/impl/AssetAssetServiceImpl.java index fd822303..38789966 100644 --- a/nz-admin/src/main/java/com/nis/modules/asset/service/impl/AssetAssetServiceImpl.java +++ b/nz-admin/src/main/java/com/nis/modules/asset/service/impl/AssetAssetServiceImpl.java @@ -1796,8 +1796,8 @@ public class AssetAssetServiceImpl extends ServiceImpl<AssetAssetDao, AssetAsset List<Dc> dcList = dcService.list(); Map<Integer, Dc> dcIdAndNameMap = dcList.stream().collect(Collectors.toMap(Dc::getId, Function.identity())); - // asset_ping_interval，default = 300 - String assetPingIntervalInConfig = sysConfService.getValueOrDefault(Constant.SYSCONFIG_KEY_ASSET_PING_INTERVAL, "300"); + // asset_ping_interval，default = 180 + String assetPingIntervalInConfig = sysConfService.getValueOrDefault(Constant.SYSCONFIG_KEY_ASSET_PING_INTERVAL, "180"); for (AssetAsset entity : assetList) { entity.setDc(dcIdAndNameMap.get(entity.getDcId())); entity.setAssetPingInterval(assetPingIntervalInConfig); @@ -1817,8 +1817,8 @@ public class AssetAssetServiceImpl extends ServiceImpl<AssetAssetDao, AssetAsset List<Dc> dcList = dcService.list(); Map<Integer, Dc> dcIdAndNameMap = dcList.stream().collect(Collectors.toMap(Dc::getId, Function.identity())); - // asset_ping_interval，default = 300 - String assetPingIntervalInConfig = sysConfService.getValueOrDefault(Constant.SYSCONFIG_KEY_ASSET_PING_INTERVAL, "300"); + // asset_ping_interval，default = 180 + String assetPingIntervalInConfig = sysConfService.getValueOrDefault(Constant.SYSCONFIG_KEY_ASSET_PING_INTERVAL, "180"); for (AssetAsset entity : assetList) { entity.setDc(dcIdAndNameMap.get(entity.getDcId())); entity.setAssetPingInterval(assetPingIntervalInConfig); diff --git a/nz-admin/src/main/java/com/nis/setup/entity/SystemEntity.java b/nz-admin/src/main/java/com/nis/setup/entity/SystemEntity.java index 03c3ff5d..6e033f98 100644 --- a/nz-admin/src/main/java/com/nis/setup/entity/SystemEntity.java +++ b/nz-admin/src/main/java/com/nis/setup/entity/SystemEntity.java @@ -12,7 +12,7 @@ public class SystemEntity implements Serializable { // prometheus_federation_enabled private String federationEnabled = "1"; private String asset_ping_from = "1"; - private String asset_ping_interval = "300"; + private String asset_ping_interval = "180"; private String default_scrape_interval = "30"; private String default_scrape_timeout = "30"; private String snmp_trap_listen_port = "162"; |