Merge 5923e43 into 1084b51

moira-alert · May 23, 2019 · 77b2f76 · 77b2f76
2 parents 1084b51 + 5923e43
commit 77b2f76
Show file tree

Hide file tree

Showing 51 changed files with 63 additions and 73 deletions.
diff --git a/api/handler/trigger_render.go b/api/handler/trigger_render.go
@@ -6,15 +6,14 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/beevee/go-chart"
 	"github.com/go-chi/render"
 	"github.com/go-graphite/carbonapi/date"
-	"github.com/moira-alert/moira/metric_source"
-	"github.com/wcharczuk/go-chart"
-
 	"github.com/moira-alert/moira"
 	"github.com/moira-alert/moira/api"
 	"github.com/moira-alert/moira/api/controller"
 	"github.com/moira-alert/moira/api/middleware"
+	"github.com/moira-alert/moira/metric_source"
 	"github.com/moira-alert/moira/plotting"
 )
 

diff --git a/interfaces.go b/interfaces.go
@@ -3,7 +3,7 @@ package moira
 import (
 	"time"
 
-	"github.com/wcharczuk/go-chart"
+	"github.com/beevee/go-chart"
 	"gopkg.in/tomb.v2"
 )
 

diff --git a/notifier/plotting.go b/notifier/plotting.go
@@ -5,11 +5,10 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/beevee/go-chart"
+	"github.com/moira-alert/moira"
 	"github.com/moira-alert/moira/metric_source"
 	"github.com/moira-alert/moira/metric_source/local"
-	"github.com/wcharczuk/go-chart"
-
-	"github.com/moira-alert/moira"
 	"github.com/moira-alert/moira/plotting"
 )
 

diff --git a/plotting/_examples/dark.expression.example.png b/plotting/_examples/dark.expression.example.png
diff --git a/plotting/_examples/dark.expression.humanized.example.png b/plotting/_examples/dark.expression.humanized.example.png
diff --git a/plotting/_examples/dark.falling.error.example.png b/plotting/_examples/dark.falling.error.example.png
diff --git a/plotting/_examples/dark.falling.error.humanized.example.png b/plotting/_examples/dark.falling.error.humanized.example.png
diff --git a/plotting/_examples/dark.falling.stateOk.example.png b/plotting/_examples/dark.falling.stateOk.example.png
diff --git a/plotting/_examples/dark.falling.stateOk.humanized.example.png b/plotting/_examples/dark.falling.stateOk.humanized.example.png
diff --git a/plotting/_examples/dark.falling.warn.error.example.png b/plotting/_examples/dark.falling.warn.error.example.png
diff --git a/plotting/_examples/dark.falling.warn.error.humanized.example.png b/plotting/_examples/dark.falling.warn.error.humanized.example.png
diff --git a/plotting/_examples/dark.falling.warn.example.png b/plotting/_examples/dark.falling.warn.example.png
diff --git a/plotting/_examples/dark.falling.warn.humanized.example.png b/plotting/_examples/dark.falling.warn.humanized.example.png
diff --git a/plotting/_examples/dark.rising.error.example.png b/plotting/_examples/dark.rising.error.example.png
diff --git a/plotting/_examples/dark.rising.error.humanized.example.png b/plotting/_examples/dark.rising.error.humanized.example.png
diff --git a/plotting/_examples/dark.rising.stateOk.example.png b/plotting/_examples/dark.rising.stateOk.example.png
diff --git a/plotting/_examples/dark.rising.stateOk.humanized.example.png b/plotting/_examples/dark.rising.stateOk.humanized.example.png
diff --git a/plotting/_examples/dark.rising.warn.error.example.png b/plotting/_examples/dark.rising.warn.error.example.png
diff --git a/plotting/_examples/dark.rising.warn.error.humanized.example.png b/plotting/_examples/dark.rising.warn.error.humanized.example.png
diff --git a/plotting/_examples/dark.rising.warn.example.png b/plotting/_examples/dark.rising.warn.example.png
diff --git a/plotting/_examples/dark.rising.warn.humanized.example.png b/plotting/_examples/dark.rising.warn.humanized.example.png
diff --git a/plotting/_examples/light.expression.example.png b/plotting/_examples/light.expression.example.png
diff --git a/plotting/_examples/light.expression.humanized.example.png b/plotting/_examples/light.expression.humanized.example.png
diff --git a/plotting/_examples/light.falling.error.example.png b/plotting/_examples/light.falling.error.example.png
diff --git a/plotting/_examples/light.falling.error.humanized.example.png b/plotting/_examples/light.falling.error.humanized.example.png
diff --git a/plotting/_examples/light.falling.stateOk.example.png b/plotting/_examples/light.falling.stateOk.example.png
diff --git a/plotting/_examples/light.falling.stateOk.humanized.example.png b/plotting/_examples/light.falling.stateOk.humanized.example.png
diff --git a/plotting/_examples/light.falling.warn.error.example.png b/plotting/_examples/light.falling.warn.error.example.png
diff --git a/plotting/_examples/light.falling.warn.error.humanized.example.png b/plotting/_examples/light.falling.warn.error.humanized.example.png
diff --git a/plotting/_examples/light.falling.warn.example.png b/plotting/_examples/light.falling.warn.example.png
diff --git a/plotting/_examples/light.falling.warn.humanized.example.png b/plotting/_examples/light.falling.warn.humanized.example.png
diff --git a/plotting/_examples/light.rising.error.example.png b/plotting/_examples/light.rising.error.example.png
diff --git a/plotting/_examples/light.rising.error.humanized.example.png b/plotting/_examples/light.rising.error.humanized.example.png
diff --git a/plotting/_examples/light.rising.stateOk.example.png b/plotting/_examples/light.rising.stateOk.example.png
diff --git a/plotting/_examples/light.rising.stateOk.humanized.example.png b/plotting/_examples/light.rising.stateOk.humanized.example.png
diff --git a/plotting/_examples/light.rising.warn.error.example.png b/plotting/_examples/light.rising.warn.error.example.png
diff --git a/plotting/_examples/light.rising.warn.error.humanized.example.png b/plotting/_examples/light.rising.warn.error.humanized.example.png
diff --git a/plotting/_examples/light.rising.warn.example.png b/plotting/_examples/light.rising.warn.example.png
diff --git a/plotting/_examples/light.rising.warn.humanized.example.png b/plotting/_examples/light.rising.warn.humanized.example.png
diff --git a/plotting/curve.go b/plotting/curve.go
@@ -4,10 +4,9 @@ import (
 	"math"
 	"time"
 
-	"github.com/moira-alert/moira/metric_source"
-	"github.com/wcharczuk/go-chart"
-
+	"github.com/beevee/go-chart"
 	"github.com/moira-alert/moira"
+	"github.com/moira-alert/moira/metric_source"
 )
 
 // plotCurve is a single curve for given timeserie

diff --git a/plotting/curve_test.go b/plotting/curve_test.go
@@ -5,11 +5,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/beevee/go-chart"
+	"github.com/moira-alert/moira"
 	"github.com/moira-alert/moira/metric_source"
 	. "github.com/smartystreets/goconvey/convey"
-	"github.com/wcharczuk/go-chart"
-
-	"github.com/moira-alert/moira"
 )
 
 var (

diff --git a/plotting/helpers.go b/plotting/helpers.go
@@ -7,8 +7,8 @@ import (
 	"time"
 	"unicode/utf8"
 
+	"github.com/beevee/go-chart"
 	"github.com/dustin/go-humanize"
-	"github.com/wcharczuk/go-chart"
 )
 
 // sortedByLen represents string array to be sorted by length

diff --git a/plotting/legend.go b/plotting/legend.go
@@ -3,7 +3,7 @@ package plotting
 import (
 	"sort"
 
-	"github.com/wcharczuk/go-chart"
+	"github.com/beevee/go-chart"
 )
 
 const (

diff --git a/plotting/limits.go b/plotting/limits.go
@@ -4,11 +4,10 @@ import (
 	"math"
 	"time"
 
-	"github.com/moira-alert/moira/metric_source"
-	"github.com/wcharczuk/go-chart"
-	"github.com/wcharczuk/go-chart/util"
-
+	"github.com/beevee/go-chart"
+	"github.com/beevee/go-chart/util"
 	"github.com/moira-alert/moira"
+	"github.com/moira-alert/moira/metric_source"
 )
 
 const (
@@ -42,7 +41,7 @@ func resolveLimits(metricsData []*metricSource.MetricData) plotLimits {
 		allTimes = append(allTimes, moira.Int64ToTime(metricData.StartTime))
 		allTimes = append(allTimes, moira.Int64ToTime(metricData.StopTime))
 	}
-	from, to := util.Math.MinAndMaxOfTime(allTimes...)
+	from, to := util.Time.StartAndEnd(allTimes...)
 	lowest, highest := util.Math.MinAndMax(allValues...)
 	if highest == lowest {
 		highest = highest + (defaultRangeDelta / 2)

diff --git a/plotting/limits_test.go b/plotting/limits_test.go
@@ -5,11 +5,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/beevee/go-chart"
+	"github.com/moira-alert/moira"
 	"github.com/moira-alert/moira/metric_source"
 	. "github.com/smartystreets/goconvey/convey"
-	"github.com/wcharczuk/go-chart"
-
-	"github.com/moira-alert/moira"
 )
 
 // TestResolveLimits tests plot limits will be calculated correctly for any metricData array

diff --git a/plotting/plot.go b/plotting/plot.go
@@ -4,10 +4,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/moira-alert/moira/metric_source"
-	"github.com/wcharczuk/go-chart"
-
+	"github.com/beevee/go-chart"
 	"github.com/moira-alert/moira"
+	"github.com/moira-alert/moira/metric_source"
 )
 
 // ErrNoPointsToRender is used to prevent unnecessary render calls
@@ -110,6 +109,7 @@ func (plot *Plot) GetRenderable(trigger *moira.Trigger, metricsData []*metricSou
 				Max: limits.highest,
 				Min: limits.lowest,
 			},
+			EnablePrettyTicks: true,
 		},
 
 		Series: plotSeries,

diff --git a/plotting/plot_test.go b/plotting/plot_test.go
@@ -12,13 +12,12 @@ import (
 	"testing"
 	"time"
 
+	"github.com/beevee/go-chart"
 	"github.com/gotokatsuya/ipare"
 	"github.com/gotokatsuya/ipare/util"
+	"github.com/moira-alert/moira"
 	"github.com/moira-alert/moira/metric_source"
 	. "github.com/smartystreets/goconvey/convey"
-	"github.com/wcharczuk/go-chart"
-
-	"github.com/moira-alert/moira"
 )
 
 const (

diff --git a/plotting/themes/dark/dark.go b/plotting/themes/dark/dark.go
@@ -1,10 +1,9 @@
 package dark
 
 import (
+	"github.com/beevee/go-chart"
+	"github.com/beevee/go-chart/drawing"
 	"github.com/golang/freetype/truetype"
-
-	"github.com/wcharczuk/go-chart"
-	"github.com/wcharczuk/go-chart/drawing"
 )
 
 // PlotTheme implements moira.PlotTheme interface

diff --git a/plotting/themes/light/light.go b/plotting/themes/light/light.go
@@ -1,10 +1,9 @@
 package light
 
 import (
+	"github.com/beevee/go-chart"
+	"github.com/beevee/go-chart/drawing"
 	"github.com/golang/freetype/truetype"
-
-	"github.com/wcharczuk/go-chart"
-	"github.com/wcharczuk/go-chart/drawing"
 )
 
 // PlotTheme implements moira.PlotTheme interface

diff --git a/plotting/threshold.go b/plotting/threshold.go
@@ -3,8 +3,7 @@ package plotting
 import (
 	"time"
 
-	"github.com/wcharczuk/go-chart"
-
+	"github.com/beevee/go-chart"
 	"github.com/moira-alert/moira"
 )
 

diff --git a/vendor/vendor.json b/vendor/vendor.json
@@ -47,6 +47,42 @@
 			"revision": "1fca145dffbcaa8fe914309b1ec0cfc67500fe61",
 			"revisionTime": "2017-07-27T15:54:43Z"
 		},
+		{
+			"checksumSHA1": "xc1qpskje1lGl9fDH4iKnolAyxk=",
+			"path": "github.com/beevee/go-chart",
+			"revision": "3a6bc1cbdb31d4a955a4789acd65b35f91c70822",
+			"revisionTime": "2019-05-23T09:00:23Z"
+		},
+		{
+			"checksumSHA1": "EATdwpdmNIMoRH83jpegphBSLZ0=",
+			"path": "github.com/beevee/go-chart/drawing",
+			"revision": "3a6bc1cbdb31d4a955a4789acd65b35f91c70822",
+			"revisionTime": "2019-05-23T09:00:23Z"
+		},
+		{
+			"checksumSHA1": "sQ45SWP3px236i69OrcwAQSY5es=",
+			"path": "github.com/beevee/go-chart/matrix",
+			"revision": "3a6bc1cbdb31d4a955a4789acd65b35f91c70822",
+			"revisionTime": "2019-05-23T09:00:23Z"
+		},
+		{
+			"checksumSHA1": "R/SvHFvbFSZQuOO+QpozI/yV4VI=",
+			"path": "github.com/beevee/go-chart/roboto",
+			"revision": "3a6bc1cbdb31d4a955a4789acd65b35f91c70822",
+			"revisionTime": "2019-05-23T09:00:23Z"
+		},
+		{
+			"checksumSHA1": "V7cWd6571hW+qFIs8m8zeNLenqA=",
+			"path": "github.com/beevee/go-chart/seq",
+			"revision": "3a6bc1cbdb31d4a955a4789acd65b35f91c70822",
+			"revisionTime": "2019-05-23T09:00:23Z"
+		},
+		{
+			"checksumSHA1": "NMggTt9psQ+Vfilzg9swc4Rql3U=",
+			"path": "github.com/beevee/go-chart/util",
+			"revision": "3a6bc1cbdb31d4a955a4789acd65b35f91c70822",
+			"revisionTime": "2019-05-23T09:00:23Z"
+		},
 		{
 			"checksumSHA1": "xM5+MU1gVB7+aGfVj+J57EgDcAE=",
 			"path": "github.com/blevesearch/bleve",
@@ -1034,42 +1070,6 @@
 			"revision": "ccac7217894801a5a6ceb8602a70ea0d79e975cf",
 			"revisionTime": "2018-07-29T13:10:59Z"
 		},
-		{
-			"checksumSHA1": "qBezoyl/lOefhEanygFUC+VBGpY=",
-			"path": "github.com/wcharczuk/go-chart",
-			"revision": "9e3a080aa3e7573281cf8d65a55305e1148d857d",
-			"revisionTime": "2018-04-15T23:53:01Z"
-		},
-		{
-			"checksumSHA1": "/Amn4XivPItINSALiV/uQF8ogNw=",
-			"path": "github.com/wcharczuk/go-chart/drawing",
-			"revision": "9e3a080aa3e7573281cf8d65a55305e1148d857d",
-			"revisionTime": "2018-04-15T23:53:01Z"
-		},
-		{
-			"checksumSHA1": "kPqs986jHunAn+grWysGPIABnQc=",
-			"path": "github.com/wcharczuk/go-chart/matrix",
-			"revision": "9e3a080aa3e7573281cf8d65a55305e1148d857d",
-			"revisionTime": "2018-04-15T23:53:01Z"
-		},
-		{
-			"checksumSHA1": "XJZ8xjTjszuaBenrG5kB+jO1w/o=",
-			"path": "github.com/wcharczuk/go-chart/roboto",
-			"revision": "9e3a080aa3e7573281cf8d65a55305e1148d857d",
-			"revisionTime": "2018-04-15T23:53:01Z"
-		},
-		{
-			"checksumSHA1": "Nvz05DuOqW3vgIJ6JekXqD0jP20=",
-			"path": "github.com/wcharczuk/go-chart/seq",
-			"revision": "9e3a080aa3e7573281cf8d65a55305e1148d857d",
-			"revisionTime": "2018-04-15T23:53:01Z"
-		},
-		{
-			"checksumSHA1": "Mzvq7OaP/22QA81qZZ48u0e6rX4=",
-			"path": "github.com/wcharczuk/go-chart/util",
-			"revision": "9e3a080aa3e7573281cf8d65a55305e1148d857d",
-			"revisionTime": "2018-04-15T23:53:01Z"
-		},
 		{
 			"checksumSHA1": "hmFg3XngBr7UwrCBQve5JW/gl88=",
 			"path": "github.com/willf/bitset",