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

alert: fixes broken link back to grafana

Browse Source 
If Grafana was configured to use a subpath it
was included twice in the link from the
alert notification back to Grafana.

closes #11403
This commit is contained in:
bergquist 2018-03-27 20:24:11 +02:00
parent 95a4d61d10
commit 5596707531
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/models/dashboards.go
View File

@ -209,14 +209,14 @@ func GetDashboardFolderUrl(isFolder bool, uid string, slug string) string {
return GetDashboardUrl(uid, slug) return GetDashboardUrl(uid, slug)
} }
// Return the html url for a dashboard // GetDashboardUrl return the html url for a dashboard
func GetDashboardUrl(uid string, slug string) string { func GetDashboardUrl(uid string, slug string) string {
return fmt.Sprintf("%s/d/%s/%s", setting.AppSubUrl, uid, slug) return fmt.Sprintf("%s/d/%s/%s", setting.AppSubUrl, uid, slug)
} }
// Return the full url for a dashboard // GetFullDashboardUrl return the full url for a dashboard
func GetFullDashboardUrl(uid string, slug string) string { func GetFullDashboardUrl(uid string, slug string) string {
return fmt.Sprintf("%s%s", setting.AppUrl, GetDashboardUrl(uid, slug)) return fmt.Sprintf("%sd/%s/%s", setting.AppUrl, uid, slug)
} }
// GetFolderUrl return the html url for a folder // GetFolderUrl return the html url for a folder

13
pkg/models/dashboards_test.go
View File

@ -4,11 +4,24 @@ import (
"testing" "testing"
"github.com/grafana/grafana/pkg/components/simplejson" "github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/setting"
. "github.com/smartystreets/goconvey/convey" . "github.com/smartystreets/goconvey/convey"
) )
func TestDashboardModel(t *testing.T) { func TestDashboardModel(t *testing.T) {
Convey("Generate full dashboard url", t, func() {
setting.AppUrl = "http://grafana.local/"
fullUrl := GetFullDashboardUrl("uid", "my-dashboard")
So(fullUrl, ShouldEqual, "http://grafana.local/d/uid/my-dashboard")
})
Convey("Generate relative dashboard url", t, func() {
setting.AppUrl = ""
fullUrl := GetDashboardUrl("uid", "my-dashboard")
So(fullUrl, ShouldEqual, "/d/uid/my-dashboard")
})
Convey("When generating slug", t, func() { Convey("When generating slug", t, func() {
dashboard := NewDashboard("Grafana Play Home") dashboard := NewDashboard("Grafana Play Home")
dashboard.UpdateSlug() dashboard.UpdateSlug()