|
@@ -409,8 +409,8 @@ func (a *apic) SendMetrics() error {
|
|
version := cwversion.VersionStr()
|
|
version := cwversion.VersionStr()
|
|
metric := &models.Metrics{
|
|
metric := &models.Metrics{
|
|
ApilVersion: &version,
|
|
ApilVersion: &version,
|
|
- Machines: make([]*models.MetricsSoftInfo, 0),
|
|
|
|
- Bouncers: make([]*models.MetricsSoftInfo, 0),
|
|
|
|
|
|
+ Machines: make([]*models.MetricsAgentInfo, 0),
|
|
|
|
+ Bouncers: make([]*models.MetricsBouncerInfo, 0),
|
|
}
|
|
}
|
|
machines, err := a.dbClient.ListMachines()
|
|
machines, err := a.dbClient.ListMachines()
|
|
if err != nil {
|
|
if err != nil {
|
|
@@ -421,17 +421,20 @@ func (a *apic) SendMetrics() error {
|
|
return err
|
|
return err
|
|
}
|
|
}
|
|
for _, machine := range machines {
|
|
for _, machine := range machines {
|
|
- m := &models.MetricsSoftInfo{
|
|
|
|
- Version: machine.Version,
|
|
|
|
- Name: machine.MachineId,
|
|
|
|
|
|
+ m := &models.MetricsAgentInfo{
|
|
|
|
+ Version: machine.Version,
|
|
|
|
+ Name: machine.MachineId,
|
|
|
|
+ LastUpdate: machine.UpdatedAt.String(),
|
|
}
|
|
}
|
|
metric.Machines = append(metric.Machines, m)
|
|
metric.Machines = append(metric.Machines, m)
|
|
}
|
|
}
|
|
|
|
|
|
for _, bouncer := range bouncers {
|
|
for _, bouncer := range bouncers {
|
|
- m := &models.MetricsSoftInfo{
|
|
|
|
- Version: bouncer.Version,
|
|
|
|
- Name: bouncer.Type,
|
|
|
|
|
|
+ m := &models.MetricsBouncerInfo{
|
|
|
|
+ Version: bouncer.Version,
|
|
|
|
+ Name: bouncer.Name,
|
|
|
|
+ Type: bouncer.Type,
|
|
|
|
+ LastPull: bouncer.LastPull.String(),
|
|
}
|
|
}
|
|
metric.Bouncers = append(metric.Bouncers, m)
|
|
metric.Bouncers = append(metric.Bouncers, m)
|
|
}
|
|
}
|