GabrielBrascher commented on a change in pull request #3078: Add influxdb to
statscollector
URL: https://github.com/apache/cloudstack/pull/3078#discussion_r239617723
##########
File path: server/src/main/java/com/cloud/server/StatsCollector.java
##########
@@ -420,55 +505,65 @@ protected void runInContext() {
SearchCriteria<HostVO> sc = _hostDao.createSearchCriteria();
sc.addAnd("status", SearchCriteria.Op.EQ,
Status.Up.toString());
sc.addAnd("resourceState", SearchCriteria.Op.NIN,
ResourceState.Maintenance, ResourceState.PrepareForMaintenance,
ResourceState.ErrorInMaintenance);
- sc.addAnd("type", SearchCriteria.Op.NEQ,
Host.Type.Storage.toString());
- sc.addAnd("type", SearchCriteria.Op.NEQ,
Host.Type.ConsoleProxy.toString());
- sc.addAnd("type", SearchCriteria.Op.NEQ,
Host.Type.SecondaryStorage.toString());
- sc.addAnd("type", SearchCriteria.Op.NEQ,
Host.Type.LocalSecondaryStorage.toString());
- sc.addAnd("type", SearchCriteria.Op.NEQ,
Host.Type.TrafficMonitor.toString());
- sc.addAnd("type", SearchCriteria.Op.NEQ,
Host.Type.SecondaryStorageVM.toString());
- sc.addAnd("type", SearchCriteria.Op.NEQ,
Host.Type.ExternalFirewall.toString());
- sc.addAnd("type", SearchCriteria.Op.NEQ,
Host.Type.ExternalLoadBalancer.toString());
- sc.addAnd("type", SearchCriteria.Op.NEQ,
Host.Type.NetScalerControlCenter.toString());
- sc.addAnd("type", SearchCriteria.Op.NEQ,
Host.Type.L2Networking.toString());
- sc.addAnd("type", SearchCriteria.Op.NEQ,
Host.Type.BaremetalDhcp.toString());
- sc.addAnd("type", SearchCriteria.Op.NEQ,
Host.Type.BaremetalPxe.toString());
+ sc.addAnd("type", SearchCriteria.Op.EQ,
Host.Type.Routing.toString());
+
ConcurrentHashMap<Long, HostStats> hostStats = new
ConcurrentHashMap<Long, HostStats>();
+ Map<Object, Object> metrics = new HashMap<>();
List<HostVO> hosts = _hostDao.search(sc, null);
+
for (HostVO host : hosts) {
- HostStatsEntry stats =
(HostStatsEntry)_resourceMgr.getHostStatistics(host.getId());
- if (stats != null) {
- hostStats.put(host.getId(), stats);
+ HostStatsEntry hostStatsEntry =
(HostStatsEntry)_resourceMgr.getHostStatistics(host.getId());
+ if (hostStatsEntry != null) {
+ hostStatsEntry.setHostVo(host);
+ metrics.put(hostStatsEntry.getHostId(),
hostStatsEntry);
+ _hostStats.put(host.getId(), hostStatsEntry);
} else {
s_logger.warn("Received invalid host stats for host: "
+ host.getId());
}
}
- _hostStats = hostStats;
- // Get a subset of hosts with GPU support from the list of
"hosts"
- List<HostVO> gpuEnabledHosts = new ArrayList<HostVO>();
- if (hostIds != null) {
- for (HostVO host : hosts) {
- if (hostIds.contains(host.getId())) {
- gpuEnabledHosts.add(host);
- }
- }
- } else {
- // Check for all the hosts managed by CloudStack.
- gpuEnabledHosts = hosts;
- }
- for (HostVO host : gpuEnabledHosts) {
- HashMap<String, HashMap<String, VgpuTypesInfo>>
groupDetails = _resourceMgr.getGPUStatistics(host);
- if (groupDetails != null) {
- _resourceMgr.updateGPUDetails(host.getId(),
groupDetails);
- }
+
+ if (externalStatsType == ExternalStatsProtocol.INFLUXDB) {
+ sendMetricsToInfluxdb(metrics);
Review comment:
Yes, indeed. Graphite was only receiving data from the VmStatsCollector.
I could have added Graphite on the HostCollector as well, but I think that
is better to leave such addition to another PR.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
