Merge upstream changes #120

carrieedwards · 2022-09-19T17:05:26Z

This PR merges upstream's changes into this fork.

The panic was happening when the window size was greater than the length of the values. Now if that happens no panics occur and the average is returned. This matches graphiteweb.

Fix exponentialMovingAverage panic

…werCase-function Add support for Graphite web toLowerCase function

…perCase-function Add support to Graphite web toUpperCase function

…erge conflict

Apparantly there is a directory that gen.go wasn't expecting and `go generate` in expr/functions produced `glue.go` file that didn't compile fix both generator and glue

…eriesLists-function Add support for Graphite web sumSeriesLists function

This commit adds the files that are specific to Grafana's fork that are not intended to be included in the upstream. This files are already present in the commit history (they were deleted), but this is an attempt of a fresh start on top of the upstream's `main`. At the moment, this should the only commit we expect to skip when sending our changes.

CLAassistant · 2022-09-19T17:05:32Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
2 out of 3 committers have signed the CLA.

✅ npazosmendez
✅ carrieedwards
❌ Civil
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

grafanabot · 2022-09-19T17:05:58Z

Go coverage report:

Click to expand.

File	%
github.com/go-graphite/carbonapi/cmd/carbonapi/http/capability.go	0.0%
github.com/go-graphite/carbonapi/cmd/carbonapi/http/enrichcontext.go	6.7%
github.com/go-graphite/carbonapi/cmd/carbonapi/http/find_handlers.go	33.5%
github.com/go-graphite/carbonapi/cmd/carbonapi/http/functions_handler.go	0.0%
github.com/go-graphite/carbonapi/cmd/carbonapi/http/helper.go	27.3%
github.com/go-graphite/carbonapi/cmd/carbonapi/http/info_handlers.go	53.8%
github.com/go-graphite/carbonapi/cmd/carbonapi/http/init.go	84.6%
github.com/go-graphite/carbonapi/cmd/carbonapi/http/lbcheck_handler.go	0.0%
github.com/go-graphite/carbonapi/cmd/carbonapi/http/metrics.go	0.0%
github.com/go-graphite/carbonapi/cmd/carbonapi/http/render_handler.go	50.0%
github.com/go-graphite/carbonapi/cmd/carbonapi/http/tags_handler.go	0.0%
github.com/go-graphite/carbonapi/cmd/carbonapi/http/usage_handler.go	0.0%
github.com/go-graphite/carbonapi/cmd/carbonapi/http/version_handler.go	0.0%
github.com/go-graphite/carbonapi/date/date.go	78.9%
github.com/go-graphite/carbonapi/expr/consolidations/consolidations.go	45.6%
github.com/go-graphite/carbonapi/expr/expr.go	30.0%
github.com/go-graphite/carbonapi/expr/functions/absolute/function.go	80.0%
github.com/go-graphite/carbonapi/expr/functions/aggregate/function.go	82.2%
github.com/go-graphite/carbonapi/expr/functions/aggregateLine/function.go	81.0%
github.com/go-graphite/carbonapi/expr/functions/aggregateSeriesLists/function.go	73.5%
github.com/go-graphite/carbonapi/expr/functions/aggregateWithWildcards/function.go	86.7%
github.com/go-graphite/carbonapi/expr/functions/alias/function.go	83.3%
github.com/go-graphite/carbonapi/expr/functions/aliasByBase64/function.go	88.6%
github.com/go-graphite/carbonapi/expr/functions/aliasByMetric/function.go	92.9%
github.com/go-graphite/carbonapi/expr/functions/aliasByNode/function.go	84.2%
github.com/go-graphite/carbonapi/expr/functions/aliasByRedis/function.go	72.1%
github.com/go-graphite/carbonapi/expr/functions/aliasSub/function.go	77.4%
github.com/go-graphite/carbonapi/expr/functions/asPercent/function.go	77.4%
github.com/go-graphite/carbonapi/expr/functions/averageOutsidePercentile/function.go	89.3%
github.com/go-graphite/carbonapi/expr/functions/averageSeriesWithWildcards/function.go	89.4%
github.com/go-graphite/carbonapi/expr/functions/below/function.go	91.7%
github.com/go-graphite/carbonapi/expr/functions/cactiStyle/function.go	88.7%
github.com/go-graphite/carbonapi/expr/functions/changed/function.go	92.3%
github.com/go-graphite/carbonapi/expr/functions/constantLine/function.go	88.2%
github.com/go-graphite/carbonapi/expr/functions/delay/function.go	90.6%
github.com/go-graphite/carbonapi/expr/functions/derivative/function.go	93.8%
github.com/go-graphite/carbonapi/expr/functions/divideSeries/function.go	88.9%
github.com/go-graphite/carbonapi/expr/functions/ewma/function.go	90.0%
github.com/go-graphite/carbonapi/expr/functions/exclude/function.go	81.8%
github.com/go-graphite/carbonapi/expr/functions/exp/function.go	90.9%
github.com/go-graphite/carbonapi/expr/functions/exponentialMovingAverage/function.go	73.7%
github.com/go-graphite/carbonapi/expr/functions/fallbackSeries/function.go	88.2%
github.com/go-graphite/carbonapi/expr/functions/filter/function.go	84.4%
github.com/go-graphite/carbonapi/expr/functions/grep/function.go	81.8%
github.com/go-graphite/carbonapi/expr/functions/groupByNode/function.go	86.5%
github.com/go-graphite/carbonapi/expr/functions/groupByTags/function.go	90.0%
github.com/go-graphite/carbonapi/expr/functions/heatMap/function.go	86.4%
github.com/go-graphite/carbonapi/expr/functions/heatMap/helpers.go	84.6%
github.com/go-graphite/carbonapi/expr/functions/highestLowest/function.go	87.1%
github.com/go-graphite/carbonapi/expr/functions/hitcount/function.go	93.8%
github.com/go-graphite/carbonapi/expr/functions/identity/function.go	89.5%
github.com/go-graphite/carbonapi/expr/functions/integral/function.go	94.4%
github.com/go-graphite/carbonapi/expr/functions/integralByInterval/function.go	85.4%
github.com/go-graphite/carbonapi/expr/functions/integralWithReset/function.go	86.1%
github.com/go-graphite/carbonapi/expr/functions/interpolate/function.go	92.1%
github.com/go-graphite/carbonapi/expr/functions/invert/function.go	93.3%
github.com/go-graphite/carbonapi/expr/functions/isNotNull/function.go	93.8%
github.com/go-graphite/carbonapi/expr/functions/join/function.go	89.5%
github.com/go-graphite/carbonapi/expr/functions/keepLastValue/function.go	93.2%
github.com/go-graphite/carbonapi/expr/functions/legendValue/function.go	89.1%
github.com/go-graphite/carbonapi/expr/functions/limit/function.go	82.4%
github.com/go-graphite/carbonapi/expr/functions/linearRegression/function.go	80.0%
github.com/go-graphite/carbonapi/expr/functions/logarithm/function.go	90.9%
github.com/go-graphite/carbonapi/expr/functions/logit/function.go	91.3%
github.com/go-graphite/carbonapi/expr/functions/lowPass/function.go	89.3%
github.com/go-graphite/carbonapi/expr/functions/mapSeries/function.go	88.0%
github.com/go-graphite/carbonapi/expr/functions/minMax/function.go	86.7%
github.com/go-graphite/carbonapi/expr/functions/mostDeviant/function.go	88.6%
github.com/go-graphite/carbonapi/expr/functions/moving/function.go	82.1%
github.com/go-graphite/carbonapi/expr/functions/movingMedian/function.go	86.1%
github.com/go-graphite/carbonapi/expr/functions/multiplySeriesWithWildcards/function.go	90.2%
github.com/go-graphite/carbonapi/expr/functions/nPercentile/function.go	90.0%
github.com/go-graphite/carbonapi/expr/functions/nonNegativeDerivative/function.go	90.5%
github.com/go-graphite/carbonapi/expr/functions/offset/function.go	88.0%
github.com/go-graphite/carbonapi/expr/functions/offsetToZero/function.go	94.1%
github.com/go-graphite/carbonapi/expr/functions/pearson/function.go	86.1%
github.com/go-graphite/carbonapi/expr/functions/pearsonClosest/function.go	75.0%
github.com/go-graphite/carbonapi/expr/functions/perSecond/function.go	90.5%
github.com/go-graphite/carbonapi/expr/functions/percentileOfSeries/function.go	78.3%
github.com/go-graphite/carbonapi/expr/functions/polyfit/function.go	87.3%
github.com/go-graphite/carbonapi/expr/functions/pow/function.go	88.9%
github.com/go-graphite/carbonapi/expr/functions/powSeries/function.go	95.0%
github.com/go-graphite/carbonapi/expr/functions/rangeOfSeries/function.go	94.4%
github.com/go-graphite/carbonapi/expr/functions/removeBelowSeries/function.go	92.3%
github.com/go-graphite/carbonapi/expr/functions/removeBetweenPercentile/function.go	89.5%
github.com/go-graphite/carbonapi/expr/functions/removeEmptySeries/function.go	90.6%
github.com/go-graphite/carbonapi/expr/functions/round/function.go	89.7%
github.com/go-graphite/carbonapi/expr/functions/scale/function.go	88.2%
github.com/go-graphite/carbonapi/expr/functions/scaleToSeconds/function.go	88.5%
github.com/go-graphite/carbonapi/expr/functions/seriesList/function.go	66.1%
github.com/go-graphite/carbonapi/expr/functions/sigmoid/function.go	91.3%
github.com/go-graphite/carbonapi/expr/functions/sinFunction/function.go	86.2%
github.com/go-graphite/carbonapi/expr/functions/slo/function.go	84.0%
github.com/go-graphite/carbonapi/expr/functions/slo/helpers.go	72.0%
github.com/go-graphite/carbonapi/expr/functions/smartSummarize/function.go	89.6%
github.com/go-graphite/carbonapi/expr/functions/sortBy/function.go	86.5%
github.com/go-graphite/carbonapi/expr/functions/sortByName/function.go	85.2%
github.com/go-graphite/carbonapi/expr/functions/squareRoot/function.go	90.5%
github.com/go-graphite/carbonapi/expr/functions/substr/function.go	85.4%
github.com/go-graphite/carbonapi/expr/functions/sumSeriesWithWildcards/function.go	89.1%
github.com/go-graphite/carbonapi/expr/functions/summarize/function.go	90.5%
github.com/go-graphite/carbonapi/expr/functions/timeShift/function.go	78.0%
github.com/go-graphite/carbonapi/expr/functions/timeShiftByMetric/function.go	89.7%
github.com/go-graphite/carbonapi/expr/functions/timeShiftByMetric/misc.go	93.8%
github.com/go-graphite/carbonapi/expr/functions/toLowerCase/function.go	89.3%
github.com/go-graphite/carbonapi/expr/functions/toUpperCase/function.go	89.3%
github.com/go-graphite/carbonapi/expr/functions/transformNull/function.go	88.5%
github.com/go-graphite/carbonapi/expr/functions/tukey/function.go	80.8%
github.com/go-graphite/carbonapi/expr/functions/unique/function.go	88.9%
github.com/go-graphite/carbonapi/expr/functions/weightedAverage/function.go	85.7%
github.com/go-graphite/carbonapi/expr/helper/align.go	58.6%
github.com/go-graphite/carbonapi/expr/helper/helper.go	9.2%
github.com/go-graphite/carbonapi/expr/helper/metric/extract.go	72.7%
github.com/go-graphite/carbonapi/expr/helper/sort.go	0.0%
github.com/go-graphite/carbonapi/expr/rewrite/aboveSeries/function.go	79.3%
github.com/go-graphite/carbonapi/expr/sort.go	96.1%
github.com/go-graphite/carbonapi/expr/tags/helper.go	93.6%
github.com/go-graphite/carbonapi/expr/types/extract.go	87.5%
github.com/go-graphite/carbonapi/expr/types/list.go	0.0%
github.com/go-graphite/carbonapi/expr/types/metricheap.go	0.0%
github.com/go-graphite/carbonapi/expr/types/types.go	31.5%
github.com/go-graphite/carbonapi/expr/types/windowed.go	0.0%
github.com/go-graphite/carbonapi/pkg/parser/define.go	76.9%
github.com/go-graphite/carbonapi/pkg/parser/interface.go	0.0%
github.com/go-graphite/carbonapi/pkg/parser/internal.go	32.2%
github.com/go-graphite/carbonapi/pkg/parser/interval.go	83.8%
github.com/go-graphite/carbonapi/pkg/parser/parser.go	46.5%
github.com/go-graphite/carbonapi/util/pidfile/pidfile.go	100.0%
github.com/go-graphite/carbonapi/zipper/broadcast/broadcast_group.go	38.5%
github.com/go-graphite/carbonapi/zipper/helper/requests.go	13.3%
github.com/go-graphite/carbonapi/zipper/protocols/graphite/msgpack/type_gen.go	57.2%
github.com/go-graphite/carbonapi/zipper/protocols/irondb/irondb_group.go	2.5%
github.com/go-graphite/carbonapi/zipper/protocols/irondb/irondb_helpers.go	81.1%
github.com/go-graphite/carbonapi/zipper/protocols/prometheus/helpers/helpers.go	17.1%
github.com/go-graphite/carbonapi/zipper/protocols/victoriametrics/feature_set.go	19.7%
github.com/go-graphite/carbonapi/zipper/protocols/victoriametrics/fetch.go	0.0%
github.com/go-graphite/carbonapi/zipper/protocols/victoriametrics/find.go	0.0%
github.com/go-graphite/carbonapi/zipper/protocols/victoriametrics/tags.go	0.0%
github.com/go-graphite/carbonapi/zipper/protocols/victoriametrics/victoriametrics_group.go	7.8%
github.com/go-graphite/carbonapi/zipper/types/backend.go	0.0%
github.com/go-graphite/carbonapi/zipper/types/errors.go	0.0%
github.com/go-graphite/carbonapi/zipper/types/lbmethod.go	0.0%
github.com/go-graphite/carbonapi/zipper/types/requests.go	0.0%
github.com/go-graphite/carbonapi/zipper/types/response.go	6.4%
github.com/go-graphite/carbonapi/zipper/types/stats.go	0.0%
github.com/go-graphite/carbonapi/zipper/zipper.go	0.0%
github.com/go-graphite/carbonapi/zipper/zipper_pb3.go	0.0%
total	56.5%

Go lint report:

No issues found. 😎

npazosmendez and others added 22 commits September 16, 2022 14:10

Fix exponentialMovingAverage panic

6d20987

The panic was happening when the window size was greater than the length of the values. Now if that happens no panics occur and the average is returned. This matches graphiteweb.

Merge pull request go-graphite#698 from grafana/njpm/fix-ema-panic

cb942f5

Fix exponentialMovingAverage panic

Add support for Graphite web toLowerCase function

b787997

Add tests for toLowerCase function

27fbcdb

Update glue.go

405f2d7

Update COMPATIBILITY.md to show support of toLowerCase

978fed2

Add support for Graphite web toUpperCase function

4510493

Add tests for toUpperCase function

303d8d5

Update glue.go

1596d29

Update COMPATIBILITY.md to include toUpperCase function

5c98794

Add support for Graphite web sumSeriesLists function

e7f0f67

Add tests for sumSeriesLists

1626ef2

Update glue.go

28e2e5b

Update COMPATIBILITY.md to include sumSeriesLists

0107dde

Merge pull request go-graphite#699 from go-graphite/cedwards/add-toLo…

e8ebd53

…werCase-function Add support for Graphite web toLowerCase function

Merge branch 'main' into cedwards/add-toUpperCase-function

c7147c0

Merge pull request go-graphite#700 from go-graphite/cedwards/add-toUp…

ec9a669

…perCase-function Add support to Graphite web toUpperCase function

Fix problems that I accidentally introduced while trying to resolve m…

53ec5fe

…erge conflict

Another attempt to fix previous problem

220b60d

Apparantly there is a directory that gen.go wasn't expecting and `go generate` in expr/functions produced `glue.go` file that didn't compile fix both generator and glue

Merge branch 'main' into cedwards/add-sumSeriesLists-function

547774c

Merge pull request go-graphite#701 from go-graphite/cedwards/add-sumS…

1149075

…eriesLists-function Add support for Graphite web sumSeriesLists function

npazosmendez approved these changes Sep 19, 2022

View reviewed changes

carrieedwards merged commit 4d54761 into main Sep 19, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge upstream changes #120

Merge upstream changes #120

carrieedwards commented Sep 19, 2022

CLAassistant commented Sep 19, 2022

grafanabot commented Sep 19, 2022

Merge upstream changes #120

Merge upstream changes #120

Conversation

carrieedwards commented Sep 19, 2022

CLAassistant commented Sep 19, 2022

grafanabot commented Sep 19, 2022