|
32 | 32 | import com.cloud.api.query.dao.HostJoinDao; |
33 | 33 | import com.cloud.api.query.dao.StoragePoolJoinDao; |
34 | 34 | import com.cloud.api.query.vo.DomainJoinVO; |
35 | | -import com.cloud.api.query.vo.HostJoinVO; |
36 | 35 | import com.cloud.api.query.vo.StoragePoolJoinVO; |
37 | 36 | import com.cloud.capacity.Capacity; |
38 | 37 | import com.cloud.capacity.CapacityManager; |
|
45 | 44 | import com.cloud.dc.dao.DataCenterDao; |
46 | 45 | import com.cloud.dc.dao.DataCenterIpAddressDao; |
47 | 46 | import com.cloud.host.Host; |
| 47 | +import com.cloud.host.HostVO; |
48 | 48 | import com.cloud.host.Status; |
| 49 | +import com.cloud.host.dao.HostDao; |
49 | 50 | import com.cloud.network.dao.IPAddressDao; |
50 | 51 | import com.cloud.storage.ImageStore; |
51 | 52 | import com.cloud.storage.StorageStats; |
@@ -73,6 +74,8 @@ public class PrometheusExporterImpl extends ManagerBase implements PrometheusExp |
73 | 74 | @Inject |
74 | 75 | private DataCenterDao dcDao; |
75 | 76 | @Inject |
| 77 | + private HostDao hostDao; |
| 78 | + @Inject |
76 | 79 | private HostJoinDao hostJoinDao; |
77 | 80 | @Inject |
78 | 81 | private VMInstanceDao vmDao; |
@@ -101,8 +104,8 @@ private void addHostMetrics(final List<Item> metricsList, final long dcId, final |
101 | 104 | int total = 0; |
102 | 105 | int up = 0; |
103 | 106 | int down = 0; |
104 | | - for (final HostJoinVO host : hostJoinDao.listAll()) { |
105 | | - if (host == null || host.getType() != Host.Type.Routing || host.getZoneId() != dcId) { |
| 107 | + for (final HostVO host : hostDao.listAll()) { |
| 108 | + if (host == null || host.getType() != Host.Type.Routing || host.getDataCenterId() != dcId) { |
106 | 109 | continue; |
107 | 110 | } |
108 | 111 | total++; |
|
0 commit comments