yusheng-guo/kube-metrics-adapter
1
0
Fork 1
mirror of https://github.com/zalando-incubator/kube-metrics-adapter.git synced 2025-05-12 00:19:49 +00:00
Code Issues 1 Packages Projects Releases Wiki Activity

add commandline flags to set GC interval and metrics TTL

Browse Source 
Signed-off-by: Harman Singh <iamgrewal7@gmail.com>
This commit is contained in:
Harman Singh
2021-04-25 23:53:43 -07:00
parent 76d3726e5b
commit aae3772472
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/provider/hpa.go
View File

@ -62,6 +62,7 @@ type HPAProvider struct {
recorder kube_record.EventRecorder
logger *log.Entry
disregardIncompatibleHPAs bool
gcInterval time.Duration
}
// metricCollection is a container for sending collected metrics across a
@ -72,7 +73,7 @@ type metricCollection struct {
}
// NewHPAProvider initializes a new HPAProvider.
func NewHPAProvider(client kubernetes.Interface, interval, collectorInterval time.Duration, collectorFactory *collector.CollectorFactory, disregardIncompatibleHPAs bool) *HPAProvider {
func NewHPAProvider(client kubernetes.Interface, interval, collectorInterval time.Duration, collectorFactory *collector.CollectorFactory, disregardIncompatibleHPAs bool, metricsTTL time.Duration, gcInterval time.Duration) *HPAProvider {
metricsc := make(chan metricCollection)
return &HPAProvider{
@ -81,12 +82,13 @@ func NewHPAProvider(client kubernetes.Interface, interval, collectorInterval tim
collectorInterval: collectorInterval,
metricSink: metricsc,
metricStore: NewMetricStore(func() time.Time {
return time.Now().UTC().Add(15 * time.Minute)
return time.Now().UTC().Add(metricsTTL)
}),
collectorFactory: collectorFactory,
recorder: recorder.CreateEventRecorder(client),
logger: log.WithFields(log.Fields{"provider": "hpa"}),
disregardIncompatibleHPAs: disregardIncompatibleHPAs,
gcInterval: gcInterval,
}
}
@ -218,7 +220,7 @@ func (p *HPAProvider) collectMetrics(ctx context.Context) {
go func(ctx context.Context) {
for {
select {
case <-time.After(10 * time.Minute):
case <-time.After(p.gcInterval):
p.metricStore.RemoveExpired()
case <-ctx.Done():
p.logger.Info("Stopped metrics store garbage collection.")

6
pkg/provider/hpa_test.go
View File

@ -106,7 +106,7 @@ func TestUpdateHPAs(t *testing.T) {
err = collectorFactory.RegisterPodsCollector("", mockCollectorPlugin{})
require.NoError(t, err)
provider := NewHPAProvider(fakeClient, 1*time.Second, 1*time.Second, collectorFactory, false)
provider := NewHPAProvider(fakeClient, 1*time.Second, 1*time.Second, collectorFactory, false, 1*time.Second, 1*time.Second)
provider.collectorScheduler = NewCollectorScheduler(context.Background(), provider.metricSink)
err = provider.updateHPAs()
@ -171,7 +171,7 @@ func TestUpdateHPAsDisregardingIncompatibleHPA(t *testing.T) {
require.NoError(t, err)
eventRecorder := &mockEventRecorder{}
provider := NewHPAProvider(fakeClient, 1*time.Second, 1*time.Second, collectorFactory, true)
provider := NewHPAProvider(fakeClient, 1*time.Second, 1*time.Second, collectorFactory, true, 1*time.Second, 1*time.Second)
provider.recorder = eventRecorder
provider.collectorScheduler = NewCollectorScheduler(context.Background(), provider.metricSink)
@ -183,7 +183,7 @@ func TestUpdateHPAsDisregardingIncompatibleHPA(t *testing.T) {
// check for events when disregardIncompatibleHPAs=false
eventRecorder = &mockEventRecorder{}
provider = NewHPAProvider(fakeClient, 1*time.Second, 1*time.Second, collectorFactory, false)
provider = NewHPAProvider(fakeClient, 1*time.Second, 1*time.Second, collectorFactory, false, 1*time.Second, 1*time.Second)
provider.recorder = eventRecorder
provider.collectorScheduler = NewCollectorScheduler(context.Background(), provider.metricSink)