use semver when comparing grafana and plugin versions

DanCech · DanCech · commit 1452b412ece4 · 2016-09-22T13:43:48.000-04:00
diff --git a/pkg/plugins/update_checker.go b/pkg/plugins/update_checker.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/log"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/hashicorp/go-version"
 )
 
 type GrafanaNetPlugin struct {
@@ -84,7 +85,15 @@ func checkForUpdates() {
 		for _, gplug := range gNetPlugins {
 			if gplug.Slug == plug.Id {
 				plug.GrafanaNetVersion = gplug.Version
-				plug.GrafanaNetHasUpdate = plug.Info.Version != plug.GrafanaNetVersion
+
+				plugVersion, err1 := version.NewVersion(plug.Info.Version)
+				gplugVersion, err2 := version.NewVersion(gplug.Version)
+
+				if err1 != nil || err2 != nil {
+					plug.GrafanaNetHasUpdate = plug.Info.Version != plug.GrafanaNetVersion
+				} else {
+					plug.GrafanaNetHasUpdate = plugVersion.LessThan(gplugVersion)
+				}
 			}
 		}
 	}
@@ -116,4 +125,11 @@ func checkForUpdates() {
 		GrafanaLatestVersion = githubLatest.Stable
 		GrafanaHasUpdate = githubLatest.Stable != setting.BuildVersion
 	}
+
+	currVersion, err1 := version.NewVersion(setting.BuildVersion)
+	latestVersion, err2 := version.NewVersion(GrafanaLatestVersion)
+
+	if err1 == nil && err2 == nil {
+		GrafanaHasUpdate = currVersion.LessThan(latestVersion)
+	}
 }
diff --git a/public/views/index.html b/public/views/index.html
@@ -64,13 +64,13 @@
 							<a href="http://grafana.org" target="_blank">Grafana</a>
 							<span>v[[.BuildVersion]] (commit: [[.BuildCommit]])</span>
 						</li>
-						<li>
-							[[if .NewGrafanaVersionExists]]
+						[[if .NewGrafanaVersionExists]]
+							<li>
 								<a href="http://grafana.org/download" target="_blank" bs-tooltip="'[[.NewGrafanaVersion]]'">
 									New version available!
 								</a>
-							[[end]]
-						</li>
+							</li>
+						[[end]]
 					</ul>
 				</div>
 			</footer>

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ import (`
`9`	`9`
`10`	`10`	`"github.com/grafana/grafana/pkg/log"`
`11`	`11`	`"github.com/grafana/grafana/pkg/setting"`
	`12`	`+ "github.com/hashicorp/go-version"`
`12`	`13`	`)`
`13`	`14`
`14`	`15`	`type GrafanaNetPlugin struct {`
`@@ -84,7 +85,15 @@ func checkForUpdates() {`
`84`	`85`	`for _, gplug := range gNetPlugins {`
`85`	`86`	`if gplug.Slug == plug.Id {`
`86`	`87`	`plug.GrafanaNetVersion = gplug.Version`
`87`		`- plug.GrafanaNetHasUpdate = plug.Info.Version != plug.GrafanaNetVersion`
	`88`	`+`
	`89`	`+ plugVersion, err1 := version.NewVersion(plug.Info.Version)`
	`90`	`+ gplugVersion, err2 := version.NewVersion(gplug.Version)`
	`91`	`+`
	`92`	`+ if err1 != nil \|\| err2 != nil {`
	`93`	`+ plug.GrafanaNetHasUpdate = plug.Info.Version != plug.GrafanaNetVersion`
	`94`	`+ } else {`
	`95`	`+ plug.GrafanaNetHasUpdate = plugVersion.LessThan(gplugVersion)`
	`96`	`+ }`
`88`	`97`	`}`
`89`	`98`	`}`
`90`	`99`	`}`
`@@ -116,4 +125,11 @@ func checkForUpdates() {`
`116`	`125`	`GrafanaLatestVersion = githubLatest.Stable`
`117`	`126`	`GrafanaHasUpdate = githubLatest.Stable != setting.BuildVersion`
`118`	`127`	`}`
	`128`	`+`
	`129`	`+ currVersion, err1 := version.NewVersion(setting.BuildVersion)`
	`130`	`+ latestVersion, err2 := version.NewVersion(GrafanaLatestVersion)`
	`131`	`+`
	`132`	`+ if err1 == nil && err2 == nil {`
	`133`	`+ GrafanaHasUpdate = currVersion.LessThan(latestVersion)`
	`134`	`+ }`
`119`	`135`	`}`