diff --git a/api/controller/trigger_metrics_test.go b/api/controller/trigger_metrics_test.go index 3e05bba3f..e99092f4c 100644 --- a/api/controller/trigger_metrics_test.go +++ b/api/controller/trigger_metrics_test.go @@ -308,7 +308,8 @@ func TestGetTriggerMetrics(t *testing.T) { dataBase.EXPECT().GetMetricsValues([]string{metric}, from, until).Return(dataList, nil) triggerMetrics, err := GetTriggerMetrics(dataBase, remoteCfg, from, until, triggerID) So(err, ShouldBeNil) - So(*triggerMetrics, ShouldResemble, dto.TriggerMetrics{Main: map[string][]*moira.MetricValue{metric: {{Value: 0, Timestamp: 17}, {Value: 1, Timestamp: 27}, {Value: 2, Timestamp: 37}, {Value: 3, Timestamp: 47}, {Value: 4, Timestamp: 57}}}, Additional: make(map[string][]*moira.MetricValue)}) }) + So(*triggerMetrics, ShouldResemble, dto.TriggerMetrics{Main: map[string][]*moira.MetricValue{metric: {{Value: 0, Timestamp: 17}, {Value: 1, Timestamp: 27}, {Value: 2, Timestamp: 37}, {Value: 3, Timestamp: 47}, {Value: 4, Timestamp: 57}}}, Additional: make(map[string][]*moira.MetricValue)}) + }) Convey("GetTrigger error", t, func() { expected := fmt.Errorf("get trigger error") diff --git a/api/handler/trigger_metrics.go b/api/handler/trigger_metrics.go index 7090281aa..14d2ef228 100644 --- a/api/handler/trigger_metrics.go +++ b/api/handler/trigger_metrics.go @@ -59,4 +59,3 @@ func deleteTriggerNodataMetrics(writer http.ResponseWriter, request *http.Reques render.Render(writer, request, err) } } - diff --git a/checker/check_test.go b/checker/check_test.go index 35e374870..3ab4c3d87 100644 --- a/checker/check_test.go +++ b/checker/check_test.go @@ -480,12 +480,12 @@ func TestCheckErrors(t *testing.T) { } lastCheck := moira.CheckData{ - Metrics: triggerChecker.lastCheck.Metrics, - State: EXCEPTION, - Timestamp: triggerChecker.Until, - EventTimestamp: triggerChecker.Until, - Score: 100000, - Message: messageException, + Metrics: triggerChecker.lastCheck.Metrics, + State: EXCEPTION, + Timestamp: triggerChecker.Until, + EventTimestamp: triggerChecker.Until, + Score: 100000, + Message: messageException, LastSuccessfulCheckTimestamp: 0, } @@ -526,11 +526,11 @@ func TestCheckErrors(t *testing.T) { } lastCheck := moira.CheckData{ - Metrics: eventMetrics, - State: OK, - Timestamp: triggerChecker.Until, - EventTimestamp: triggerChecker.Until, - Score: 0, + Metrics: eventMetrics, + State: OK, + Timestamp: triggerChecker.Until, + EventTimestamp: triggerChecker.Until, + Score: 0, LastSuccessfulCheckTimestamp: triggerChecker.Until, } @@ -824,10 +824,10 @@ func TestHandleTrigger(t *testing.T) { checkData, err := triggerChecker.handleMetricsCheck() So(err, ShouldResemble, ErrTriggerHasOnlyWildcards{}) So(checkData, ShouldResemble, moira.CheckData{ - Metrics: lastCheck.Metrics, - Timestamp: triggerChecker.Until, - State: OK, - Score: 0, + Metrics: lastCheck.Metrics, + Timestamp: triggerChecker.Until, + State: OK, + Score: 0, LastSuccessfulCheckTimestamp: 0, }) mockCtrl.Finish() @@ -904,10 +904,10 @@ func TestHandleTrigger(t *testing.T) { checkData, err := triggerChecker.handleMetricsCheck() So(err, ShouldBeNil) So(checkData, ShouldResemble, moira.CheckData{ - Metrics: make(map[string]moira.MetricState), - Timestamp: triggerChecker.Until, - State: OK, - Score: 0, + Metrics: make(map[string]moira.MetricState), + Timestamp: triggerChecker.Until, + State: OK, + Score: 0, LastSuccessfulCheckTimestamp: 0, }) mockCtrl.Finish() @@ -936,9 +936,9 @@ func TestHandleErrorCheck(t *testing.T) { }, } checkData := moira.CheckData{ - State: NODATA, - Timestamp: time.Now().Unix(), - Message: "Trigger has no metrics, check your target", + State: NODATA, + Timestamp: time.Now().Unix(), + Message: "Trigger has no metrics, check your target", LastSuccessfulCheckTimestamp: time.Now().Unix(), } actual, err := triggerChecker.handleTriggerCheck(checkData, ErrTriggerHasNoTimeSeries{}) @@ -955,8 +955,8 @@ func TestHandleErrorCheck(t *testing.T) { trigger: &moira.Trigger{TriggerType: moira.RisingTrigger}, ttlState: NODATA, lastCheck: &moira.CheckData{ - Timestamp: 0, - State: NODATA, + Timestamp: 0, + State: NODATA, LastSuccessfulCheckTimestamp: 0, }, } @@ -977,10 +977,10 @@ func TestHandleErrorCheck(t *testing.T) { dataBase.EXPECT().PushNotificationEvent(event, true).Return(nil) actual, err := triggerChecker.handleTriggerCheck(checkData, ErrTriggerHasNoTimeSeries{}) expected := moira.CheckData{ - State: NODATA, - Timestamp: checkData.Timestamp, - EventTimestamp: checkData.Timestamp, - Message: "Trigger has no metrics, check your target", + State: NODATA, + Timestamp: checkData.Timestamp, + EventTimestamp: checkData.Timestamp, + Message: "Trigger has no metrics, check your target", LastSuccessfulCheckTimestamp: 0, } So(err, ShouldBeNil) @@ -998,8 +998,8 @@ func TestHandleErrorCheck(t *testing.T) { trigger: &moira.Trigger{TriggerType: moira.RisingTrigger}, ttlState: ERROR, lastCheck: &moira.CheckData{ - Timestamp: time.Now().Unix(), - State: OK, + Timestamp: time.Now().Unix(), + State: OK, LastSuccessfulCheckTimestamp: time.Now().Unix(), }, } @@ -1011,10 +1011,10 @@ func TestHandleErrorCheck(t *testing.T) { dataBase.EXPECT().PushNotificationEvent(gomock.Any(), true).Return(nil) actual, err := triggerChecker.handleTriggerCheck(checkData, ErrTriggerHasOnlyWildcards{}) expected := moira.CheckData{ - State: ERROR, - Timestamp: checkData.Timestamp, - EventTimestamp: checkData.Timestamp, - Message: "Trigger never received metrics", + State: ERROR, + Timestamp: checkData.Timestamp, + EventTimestamp: checkData.Timestamp, + Message: "Trigger never received metrics", LastSuccessfulCheckTimestamp: 0, } So(err, ShouldBeNil) @@ -1031,8 +1031,8 @@ func TestHandleErrorCheck(t *testing.T) { trigger: &moira.Trigger{TriggerType: moira.RisingTrigger}, ttlState: NODATA, lastCheck: &moira.CheckData{ - Timestamp: time.Now().Unix(), - State: OK, + Timestamp: time.Now().Unix(), + State: OK, LastSuccessfulCheckTimestamp: time.Now().Unix(), }, } @@ -1066,8 +1066,8 @@ func TestHandleErrorCheck(t *testing.T) { trigger: &moira.Trigger{TriggerType: moira.RisingTrigger}, ttlState: OK, lastCheck: &moira.CheckData{ - Timestamp: time.Now().Unix(), - State: OK, + Timestamp: time.Now().Unix(), + State: OK, LastSuccessfulCheckTimestamp: 0, }, } @@ -1080,11 +1080,11 @@ func TestHandleErrorCheck(t *testing.T) { actual, err := triggerChecker.handleTriggerCheck(checkData, ErrTriggerHasOnlyWildcards{}) expected := moira.CheckData{ - Metrics: checkData.Metrics, - State: OK, - Timestamp: checkData.Timestamp, - EventTimestamp: checkData.Timestamp, - Message: "Trigger never received metrics", + Metrics: checkData.Metrics, + State: OK, + Timestamp: checkData.Timestamp, + EventTimestamp: checkData.Timestamp, + Message: "Trigger never received metrics", LastSuccessfulCheckTimestamp: 0, } So(err, ShouldBeNil) @@ -1133,8 +1133,8 @@ func TestHandleErrorCheck(t *testing.T) { trigger: &moira.Trigger{TriggerType: moira.RisingTrigger}, ttlState: NODATA, lastCheck: &moira.CheckData{ - Timestamp: time.Now().Unix(), - State: OK, + Timestamp: time.Now().Unix(), + State: OK, LastSuccessfulCheckTimestamp: 0, }, } @@ -1147,10 +1147,10 @@ func TestHandleErrorCheck(t *testing.T) { actual, err := triggerChecker.handleTriggerCheck(checkData, target.ErrUnknownFunction{FuncName: "123"}) expected := moira.CheckData{ - State: EXCEPTION, - Timestamp: checkData.Timestamp, - EventTimestamp: checkData.Timestamp, - Message: "Unknown graphite function: \"123\"", + State: EXCEPTION, + Timestamp: checkData.Timestamp, + EventTimestamp: checkData.Timestamp, + Message: "Unknown graphite function: \"123\"", LastSuccessfulCheckTimestamp: 0, } So(err, ShouldBeNil) @@ -1180,10 +1180,10 @@ func TestHandleErrorCheck(t *testing.T) { actual, err := triggerChecker.handleTriggerCheck(checkData, ErrTriggerHasSameTimeSeriesNames{names: []string{"first", "second"}}) expected := moira.CheckData{ - State: ERROR, - Timestamp: checkData.Timestamp, - EventTimestamp: checkData.Timestamp, - Message: "Trigger has same timeseries names: first, second", + State: ERROR, + Timestamp: checkData.Timestamp, + EventTimestamp: checkData.Timestamp, + Message: "Trigger has same timeseries names: first, second", LastSuccessfulCheckTimestamp: 0, } So(err, ShouldBeNil) @@ -1216,10 +1216,10 @@ func TestHandleErrorCheck(t *testing.T) { actual, err := triggerChecker.handleTriggerCheck(checkData, ErrWrongTriggerTargets([]int{2})) expected := moira.CheckData{ - State: ERROR, - Timestamp: checkData.Timestamp, - EventTimestamp: checkData.Timestamp, - Message: "Target t2 has more than one timeseries", + State: ERROR, + Timestamp: checkData.Timestamp, + EventTimestamp: checkData.Timestamp, + Message: "Target t2 has more than one timeseries", LastSuccessfulCheckTimestamp: 0, } So(err, ShouldBeNil) diff --git a/filter/cache_storage.go b/filter/cache_storage.go index 9c0cb6486..441e4c81b 100644 --- a/filter/cache_storage.go +++ b/filter/cache_storage.go @@ -28,7 +28,7 @@ type Storage struct { retentions []retentionMatcher retentionsCache map[string]*retentionCacheItem metricsCache map[string]*moira.MatchedMetric - logger moira.Logger + logger moira.Logger } // NewCacheStorage create new Storage @@ -37,7 +37,7 @@ func NewCacheStorage(logger moira.Logger, metrics *graphite.FilterMetrics, reade retentionsCache: make(map[string]*retentionCacheItem), metricsCache: make(map[string]*moira.MatchedMetric), metrics: metrics, - logger: logger, + logger: logger, } if err := storage.buildRetentions(bufio.NewScanner(reader)); err != nil { @@ -93,7 +93,7 @@ func (storage *Storage) buildRetentions(retentionScanner *bufio.Scanner) error { line2 := retentionScanner.Text() splitted := strings.Split(line2, "=") - if len(splitted) < 2{ + if len(splitted) < 2 { storage.logger.Errorf("Invalid pattern found: '%s'", patternString) continue } diff --git a/filter/patterns_storage_test.go b/filter/patterns_storage_test.go index edfc26198..ef3663d53 100644 --- a/filter/patterns_storage_test.go +++ b/filter/patterns_storage_test.go @@ -2,9 +2,9 @@ package filter import ( "fmt" - "testing" "math/rand" "strconv" + "testing" "github.com/golang/mock/gomock" "github.com/moira-alert/moira/metrics/graphite/go-metrics" @@ -85,7 +85,7 @@ func TestParseMetricFromString(t *testing.T) { // [n=19] One.two.three 123 1234567890.6790847778320312500 for i := 1; i < 20; i++ { - rawTimestamp := strconv.FormatFloat(float64(testTimestamp) + rand.Float64(), 'f', i, 64) + rawTimestamp := strconv.FormatFloat(float64(testTimestamp)+rand.Float64(), 'f', i, 64) rawMetric := "One.two.three 123 " + rawTimestamp validMetric := ValidMetricCase{rawMetric, "One.two.three", 123, testTimestamp} metric, value, timestamp, err := storage.parseMetricFromString([]byte(validMetric.raw)) diff --git a/notifier/notifier.go b/notifier/notifier.go index 6fc130f30..a3ef678a3 100644 --- a/notifier/notifier.go +++ b/notifier/notifier.go @@ -48,7 +48,7 @@ func (pkg NotificationPackage) GetWindow() (from, to int64, err error) { } // GetMetricNames returns all metric names found in package events -func(pkg NotificationPackage) GetMetricNames() []string { +func (pkg NotificationPackage) GetMetricNames() []string { metricNames := make([]string, 0) for _, event := range pkg.Events { metricNames = append(metricNames, event.Metric) diff --git a/plotting/helpers_test.go b/plotting/helpers_test.go index 60c67507c..076b4d777 100644 --- a/plotting/helpers_test.go +++ b/plotting/helpers_test.go @@ -91,7 +91,7 @@ func TestTimeValueFormatter(t *testing.T) { fmt.Printf("%s: %s,\n%s: %s\n\n", timeValue.Location().String(), timeValue.String(), location.String(), formatted) So(formattedMinute, ShouldEqual, timeValue.Minute()) - So(formattedHour, ShouldEqual, timeValue.Add(time.Duration(increment) * time.Hour).Hour()) + So(formattedHour, ShouldEqual, timeValue.Add(time.Duration(increment)*time.Hour).Hour()) } }) } diff --git a/plotting/plot.go b/plotting/plot.go index dee40e4dd..dd2611c98 100644 --- a/plotting/plot.go +++ b/plotting/plot.go @@ -1,8 +1,8 @@ package plotting import ( - "time" "fmt" + "time" "github.com/go-graphite/carbonapi/expr/types" "github.com/wcharczuk/go-chart" @@ -114,7 +114,7 @@ func (plot *Plot) GetRenderable(trigger *moira.Trigger, metricsData []*types.Met } if len(renderable.Series) == 0 { - return renderable, ErrNoPointsToRender{triggerName:trigger.Name} + return renderable, ErrNoPointsToRender{triggerName: trigger.Name} } return renderable, nil diff --git a/plotting/plot_test.go b/plotting/plot_test.go index 03bba721e..902e28f6e 100644 --- a/plotting/plot_test.go +++ b/plotting/plot_test.go @@ -541,7 +541,7 @@ func TestGetRenderable(t *testing.T) { Convey("Test plots hash distances", t, func() { for _, testCase := range plotsHashDistancesTestCases { trigger := moira.Trigger{ - Name: testCase.getTriggerName(), + Name: testCase.getTriggerName(), TriggerType: testCase.triggerType, } if testCase.errorValue != nil { diff --git a/plotting/themes/dark/dark.go b/plotting/themes/dark/dark.go index d602c0853..0d197a3a5 100644 --- a/plotting/themes/dark/dark.go +++ b/plotting/themes/dark/dark.go @@ -62,7 +62,7 @@ func (theme *PlotTheme) GetBackgroundStyle(maxMarkLen int) chart.Style { verticalShift := 40 horizontalShift := 20 if maxMarkLen > 4 { - horizontalShift = horizontalShift/2 + horizontalShift = horizontalShift / 2 } return chart.Style{ FillColor: drawing.ColorFromHex(theme.bgColor), @@ -132,7 +132,7 @@ func (theme *PlotTheme) GetSerieStyles(curveInd int) (chart.Style, chart.Style) pointStyle := chart.Style{ Show: true, StrokeWidth: chart.Disabled, - DotWidth: curveWidth/2, + DotWidth: curveWidth / 2, DotColor: curveColor.WithAlpha(90), } return curveStyle, pointStyle diff --git a/plotting/themes/light/light.go b/plotting/themes/light/light.go index 509e2985c..467bb96d7 100644 --- a/plotting/themes/light/light.go +++ b/plotting/themes/light/light.go @@ -62,7 +62,7 @@ func (theme *PlotTheme) GetBackgroundStyle(maxMarkLen int) chart.Style { verticalShift := 40 horizontalShift := 20 if maxMarkLen > 4 { - horizontalShift = horizontalShift/2 + horizontalShift = horizontalShift / 2 } return chart.Style{ FillColor: drawing.ColorFromHex(theme.bgColor), @@ -132,7 +132,7 @@ func (theme *PlotTheme) GetSerieStyles(curveInd int) (chart.Style, chart.Style) pointStyle := chart.Style{ Show: true, StrokeWidth: chart.Disabled, - DotWidth: curveWidth/2, + DotWidth: curveWidth / 2, DotColor: curveColor.WithAlpha(90), } return curveStyle, pointStyle diff --git a/senders/pushover/pushover.go b/senders/pushover/pushover.go index 6f3eb0f46..43a8cec64 100644 --- a/senders/pushover/pushover.go +++ b/senders/pushover/pushover.go @@ -96,4 +96,3 @@ func (sender *Sender) SendEvents(events moira.NotificationEvents, contact moira. } return nil } - diff --git a/senders/script/script.go b/senders/script/script.go index 6c33a58e5..99d48dbfa 100644 --- a/senders/script/script.go +++ b/senders/script/script.go @@ -86,4 +86,3 @@ func (sender *Sender) SendEvents(events moira.NotificationEvents, contact moira. } return nil } -