IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

graphite: improved version comparison

Browse Source
This commit is contained in:
Alexander Zobnin
2017-10-20 15:50:44 +03:00
parent c22a192bb8
commit 89aea278a9
4 changed files with 89 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
public/app/plugins/datasource/graphite/gfunc.js
View File

@@ -1,8 +1,9 @@
define([
'lodash',
'jquery'
'jquery',
'app/core/utils/version'
],
function (_, $) {
function (_, $, version) {
'use strict';
var index = [];
@@ -944,13 +945,7 @@ function (_, $) {
};
function isVersionRelatedFunction(func, graphiteVersion) {
return isVersionGreaterOrEqual(graphiteVersion, func.version) || !func.version;
}
function isVersionGreaterOrEqual(a, b) {
var a_num = Number(a);
var b_num = Number(b);
return a_num >= b_num;
return version.isVersionGtOrEq(graphiteVersion, func.version) || !func.version;
}
return {