force rfc 3339 date format in metrics push (#2402)
This commit is contained in:
parent
05c1825622
commit
380cbf70a9
|
@ -26,8 +26,8 @@ func (a *apic) GetMetrics() (*models.Metrics, error) {
|
||||||
machinesInfo[i] = &models.MetricsAgentInfo{
|
machinesInfo[i] = &models.MetricsAgentInfo{
|
||||||
Version: machine.Version,
|
Version: machine.Version,
|
||||||
Name: machine.MachineId,
|
Name: machine.MachineId,
|
||||||
LastUpdate: machine.UpdatedAt.String(),
|
LastUpdate: machine.UpdatedAt.Format(time.RFC3339),
|
||||||
LastPush: ptr.OrEmpty(machine.LastPush).String(),
|
LastPush: ptr.OrEmpty(machine.LastPush).Format(time.RFC3339),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@ func (a *apic) GetMetrics() (*models.Metrics, error) {
|
||||||
Version: bouncer.Version,
|
Version: bouncer.Version,
|
||||||
CustomName: bouncer.Name,
|
CustomName: bouncer.Name,
|
||||||
Name: bouncer.Type,
|
Name: bouncer.Type,
|
||||||
LastPull: bouncer.LastPull.String(),
|
LastPull: bouncer.LastPull.Format(time.RFC3339),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -81,7 +81,7 @@ func (a *apic) SendMetrics(stop chan (bool)) {
|
||||||
const checkInt = 20 * time.Second
|
const checkInt = 20 * time.Second
|
||||||
|
|
||||||
// intervals must always be > 0
|
// intervals must always be > 0
|
||||||
metInts := []time.Duration{1*time.Millisecond, a.metricsIntervalFirst, a.metricsInterval}
|
metInts := []time.Duration{1 * time.Millisecond, a.metricsIntervalFirst, a.metricsInterval}
|
||||||
|
|
||||||
log.Infof("Start sending metrics to CrowdSec Central API (interval: %s once, then %s)",
|
log.Infof("Start sending metrics to CrowdSec Central API (interval: %s once, then %s)",
|
||||||
metInts[1].Round(time.Second), metInts[2])
|
metInts[1].Round(time.Second), metInts[2])
|
||||||
|
@ -123,7 +123,7 @@ func (a *apic) SendMetrics(stop chan (bool)) {
|
||||||
reloadMachineIDs()
|
reloadMachineIDs()
|
||||||
if !slices.Equal(oldIDs, machineIDs) {
|
if !slices.Equal(oldIDs, machineIDs) {
|
||||||
log.Infof("capi metrics: machines changed, immediate send")
|
log.Infof("capi metrics: machines changed, immediate send")
|
||||||
metTicker.Reset(1*time.Millisecond)
|
metTicker.Reset(1 * time.Millisecond)
|
||||||
}
|
}
|
||||||
case <-metTicker.C:
|
case <-metTicker.C:
|
||||||
metTicker.Stop()
|
metTicker.Stop()
|
||||||
|
|
|
@ -309,30 +309,30 @@ func TestAPICGetMetrics(t *testing.T) {
|
||||||
Bouncers: []*models.MetricsBouncerInfo{
|
Bouncers: []*models.MetricsBouncerInfo{
|
||||||
{
|
{
|
||||||
CustomName: "1",
|
CustomName: "1",
|
||||||
LastPull: time.Time{}.String(),
|
LastPull: time.Time{}.Format(time.RFC3339),
|
||||||
}, {
|
}, {
|
||||||
CustomName: "2",
|
CustomName: "2",
|
||||||
LastPull: time.Time{}.String(),
|
LastPull: time.Time{}.Format(time.RFC3339),
|
||||||
}, {
|
}, {
|
||||||
CustomName: "3",
|
CustomName: "3",
|
||||||
LastPull: time.Time{}.String(),
|
LastPull: time.Time{}.Format(time.RFC3339),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
Machines: []*models.MetricsAgentInfo{
|
Machines: []*models.MetricsAgentInfo{
|
||||||
{
|
{
|
||||||
Name: "a",
|
Name: "a",
|
||||||
LastPush: time.Time{}.String(),
|
LastPush: time.Time{}.Format(time.RFC3339),
|
||||||
LastUpdate: time.Time{}.String(),
|
LastUpdate: time.Time{}.Format(time.RFC3339),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Name: "b",
|
Name: "b",
|
||||||
LastPush: time.Time{}.String(),
|
LastPush: time.Time{}.Format(time.RFC3339),
|
||||||
LastUpdate: time.Time{}.String(),
|
LastUpdate: time.Time{}.Format(time.RFC3339),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Name: "c",
|
Name: "c",
|
||||||
LastPush: time.Time{}.String(),
|
LastPush: time.Time{}.Format(time.RFC3339),
|
||||||
LastUpdate: time.Time{}.String(),
|
LastUpdate: time.Time{}.Format(time.RFC3339),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in a new issue