New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Graphite 1.0 functions #8987

Merged
merged 5 commits into from Aug 7, 2017

Conversation

Projects
None yet
2 participants
@alexanderzobnin
Contributor

alexanderzobnin commented Aug 4, 2017

This PR adds new Graphite 1.0 functions (issue #8261) and new graphite data source option graphite version, which allows user to specify its' graphite version and filter functions related only to this particular version (issue #4622).

Note: some functions were existed, but caused an error when applying it to graphite 0.9.x. These functions were marked as 1.0-specific.

@alexanderzobnin alexanderzobnin requested a review from torkelo Aug 4, 2017

@@ -11,6 +11,7 @@ export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv
this.basicAuth = instanceSettings.basicAuth;
this.url = instanceSettings.url;
this.name = instanceSettings.name;
this.graphiteVersion = instanceSettings.jsonData.graphiteVersion || '0.9';

This comment has been minimized.

@alexanderzobnin

alexanderzobnin Aug 4, 2017

Contributor

Should we additionally check instanceSettings.jsonData?

instanceSettings.jsonData = instanceSettings.jsonData || {};
@alexanderzobnin

alexanderzobnin Aug 4, 2017

Contributor

Should we additionally check instanceSettings.jsonData?

instanceSettings.jsonData = instanceSettings.jsonData || {};

This comment has been minimized.

@alexanderzobnin

alexanderzobnin Aug 4, 2017

Contributor

I fixed unit tests, but maybe better to check this instead. When I'm loading DS with old settings, seems, instanceSettings contains empty jsonData anyway. But not sure how it works in previous grafana versions.

@alexanderzobnin

alexanderzobnin Aug 4, 2017

Contributor

I fixed unit tests, but maybe better to check this instead. When I'm loading DS with old settings, seems, instanceSettings contains empty jsonData anyway. But not sure how it works in previous grafana versions.

@alexanderzobnin

This comment has been minimized.

Show comment
Hide comment
@alexanderzobnin

alexanderzobnin Aug 4, 2017

Contributor

Also, haven't implemented linearRegressionAnalysis, don't understand is it applied to one series or to seriesList.

Contributor

alexanderzobnin commented Aug 4, 2017

Also, haven't implemented linearRegressionAnalysis, don't understand is it applied to one series or to seriesList.

@torkelo torkelo merged commit 4fe79ed into grafana:master Aug 7, 2017

2 checks passed

ci/circleci Your tests passed on CircleCI!
Details
license/cla Contributor License Agreement is signed.
Details

@torkelo torkelo added this to the 5.0 milestone Aug 7, 2017

@torkelo torkelo modified the milestones: 5.0, 4.5.0 Aug 29, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment