Skip to content
This repository has been archived by the owner on Jun 11, 2021. It is now read-only.

Add SLI source defaults #9

Merged
merged 9 commits into from
Oct 25, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix prometheus library update
Signed-off-by: Xabier Larrakoetxea <slok69@gmail.com>
  • Loading branch information
slok committed Oct 24, 2019
commit 51704095c3ad76dd2c28f57a8b843657d7e21f6e
170 changes: 152 additions & 18 deletions mocks/github.com/prometheus/client_golang/api/prometheus/v1/API.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 22 additions & 9 deletions pkg/service/client/prometheus/fake.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"fmt"
"time"

"github.com/prometheus/client_golang/api"
promv1 "github.com/prometheus/client_golang/api/prometheus/v1"
"github.com/prometheus/common/model"
)
Expand Down Expand Up @@ -49,11 +50,11 @@ type fakeAPICli struct {
queryFuncs map[string]func() float64
}

func (f *fakeAPICli) Query(_ context.Context, query string, ts time.Time) (model.Value, error) {
func (f *fakeAPICli) Query(_ context.Context, query string, ts time.Time) (model.Value, api.Warnings, error) {

fn, ok := f.queryFuncs[query]
if !ok {
return nil, fmt.Errorf("not faked result")
return nil, nil, fmt.Errorf("not faked result")
}

return model.Vector{
Expand All @@ -62,9 +63,12 @@ func (f *fakeAPICli) Query(_ context.Context, query string, ts time.Time) (model
Timestamp: model.Time(time.Now().UTC().Nanosecond()),
Value: model.SampleValue(fn()),
},
}, nil
}, nil, nil
}

func (f *fakeAPICli) Alerts(ctx context.Context) (promv1.AlertsResult, error) {
return promv1.AlertsResult{}, nil
}
func (f *fakeAPICli) AlertManagers(_ context.Context) (promv1.AlertManagersResult, error) {
return promv1.AlertManagersResult{}, nil
}
Expand All @@ -80,18 +84,27 @@ func (f *fakeAPICli) DeleteSeries(_ context.Context, matches []string, startTime
func (f *fakeAPICli) Flags(_ context.Context) (promv1.FlagsResult, error) {
return promv1.FlagsResult{}, nil
}
func (f *fakeAPICli) LabelValues(_ context.Context, label string) (model.LabelValues, error) {
return model.LabelValues{}, nil
func (f *fakeAPICli) LabelNames(ctx context.Context) ([]string, api.Warnings, error) {
return nil, nil, nil
}
func (f *fakeAPICli) QueryRange(_ context.Context, query string, r promv1.Range) (model.Value, error) {
return nil, nil
func (f *fakeAPICli) LabelValues(_ context.Context, label string) (model.LabelValues, api.Warnings, error) {
return model.LabelValues{}, nil, nil
}
func (f *fakeAPICli) QueryRange(_ context.Context, query string, r promv1.Range) (model.Value, api.Warnings, error) {
return nil, nil, nil
}
func (f *fakeAPICli) Series(_ context.Context, matches []string, startTime time.Time, endTime time.Time) ([]model.LabelSet, error) {
return []model.LabelSet{}, nil
func (f *fakeAPICli) Series(_ context.Context, matches []string, startTime time.Time, endTime time.Time) ([]model.LabelSet, api.Warnings, error) {
return []model.LabelSet{}, nil, nil
}
func (f *fakeAPICli) Snapshot(_ context.Context, skipHead bool) (promv1.SnapshotResult, error) {
return promv1.SnapshotResult{}, nil
}
func (f *fakeAPICli) Rules(ctx context.Context) (promv1.RulesResult, error) {
return promv1.RulesResult{}, nil
}
func (f *fakeAPICli) Targets(_ context.Context) (promv1.TargetsResult, error) {
return promv1.TargetsResult{}, nil
}
func (f *fakeAPICli) TargetsMetadata(ctx context.Context, matchTarget string, metric string, limit string) ([]promv1.MetricMetadata, error) {
return nil, nil
}
2 changes: 1 addition & 1 deletion pkg/service/sli/prometheus.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ func (p *prometheus) Retrieve(sli *monitoringv1alpha1.SLI) (Result, error) {

func (p *prometheus) getVectorMetric(ctx context.Context, cli promv1.API, query string) (float64, error) {
// Make the query.
val, err := cli.Query(ctx, query, time.Now())
val, _, err := cli.Query(ctx, query, time.Now())
if err != nil {
return 0, err
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/service/sli/prometheus_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ func TestPrometheusRetrieve(t *testing.T) {
// Mocks.
mapi := &mpromv1.API{}
mpromfactory := &prometheusvc.MockFactory{Cli: mapi}
mapi.On("Query", mock.Anything, test.sli.Prometheus.TotalQuery, mock.Anything).Return(test.totalQueryResult, test.errorQueryErr)
mapi.On("Query", mock.Anything, test.sli.Prometheus.ErrorQuery, mock.Anything).Return(test.errorQueryResult, test.totalQueryErr)
mapi.On("Query", mock.Anything, test.sli.Prometheus.TotalQuery, mock.Anything).Return(test.totalQueryResult, nil, test.errorQueryErr)
mapi.On("Query", mock.Anything, test.sli.Prometheus.ErrorQuery, mock.Anything).Return(test.errorQueryResult, nil, test.totalQueryErr)

retriever := sli.NewPrometheus(mpromfactory, log.Dummy)
res, err := retriever.Retrieve(test.sli)
Expand Down