diff --git a/plugins/integrations/prometheus/src/main/java/org/apache/cloudstack/metrics/PrometheusExporterImpl.java b/plugins/integrations/prometheus/src/main/java/org/apache/cloudstack/metrics/PrometheusExporterImpl.java index 92c128b27fe1..6ded6637ea0d 100644 --- a/plugins/integrations/prometheus/src/main/java/org/apache/cloudstack/metrics/PrometheusExporterImpl.java +++ b/plugins/integrations/prometheus/src/main/java/org/apache/cloudstack/metrics/PrometheusExporterImpl.java @@ -32,7 +32,6 @@ import com.cloud.api.query.dao.HostJoinDao; import com.cloud.api.query.dao.StoragePoolJoinDao; import com.cloud.api.query.vo.DomainJoinVO; -import com.cloud.api.query.vo.HostJoinVO; import com.cloud.api.query.vo.StoragePoolJoinVO; import com.cloud.capacity.Capacity; import com.cloud.capacity.CapacityManager; @@ -45,7 +44,9 @@ import com.cloud.dc.dao.DataCenterDao; import com.cloud.dc.dao.DataCenterIpAddressDao; import com.cloud.host.Host; +import com.cloud.host.HostVO; import com.cloud.host.Status; +import com.cloud.host.dao.HostDao; import com.cloud.network.dao.IPAddressDao; import com.cloud.storage.ImageStore; import com.cloud.storage.StorageStats; @@ -73,6 +74,8 @@ public class PrometheusExporterImpl extends ManagerBase implements PrometheusExp @Inject private DataCenterDao dcDao; @Inject + private HostDao hostDao; + @Inject private HostJoinDao hostJoinDao; @Inject private VMInstanceDao vmDao; @@ -101,8 +104,8 @@ private void addHostMetrics(final List metricsList, final long dcId, final int total = 0; int up = 0; int down = 0; - for (final HostJoinVO host : hostJoinDao.listAll()) { - if (host == null || host.getType() != Host.Type.Routing || host.getZoneId() != dcId) { + for (final HostVO host : hostDao.listAll()) { + if (host == null || host.getType() != Host.Type.Routing || host.getDataCenterId() != dcId) { continue; } total++;