etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

plugins: Host is counted twice if it has multiple host tags in Prometheus exporter (#4383) 

* Hosts are counted twice if it has multiple host tags in Prometheus exporter

* Import HostVO and inject HostDao
This commit is contained in:
Wei Zhou 2020-10-14 12:21:15 +02:00 committed by GitHub
parent cdcc914995
commit 55f07030cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/integrations/prometheus/src/main/java/org/apache/cloudstack/metrics/PrometheusExporterImpl.java
View File

@ -32,7 +32,6 @@ import com.cloud.api.query.dao.DomainJoinDao;
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.Vlan;
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 @@ public class PrometheusExporterImpl extends ManagerBase implements PrometheusExp
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++;