Skip to content

Fixed #240 gridlayout is not compatible with grafana4.6 #242

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.

Sign up for GitHub

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

Open
aiwhj wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed #240 gridlayout is not compatible with grafana4.6 #242

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions grafana/dashboard.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ type Panel struct {
Id int
Type string
Title string
Span int
GridPos GridPos
}

Expand All @@ -62,6 +63,7 @@ type Row struct {
Id int
Showtitle bool
Title string
Height float64
Panels []Panel
}

Expand Down Expand Up @@ -108,14 +110,26 @@ func (dc dashContainer) NewDashboard(variables url.Values) Dashboard {
}

func populatePanelsFromV4JSON(dash Dashboard, dc dashContainer) Dashboard {
lastHeight := 0.0
for _, row := range dc.Dashboard.Rows {
h := row.Height / 80 * 2
lastWeight := 0.0

row.Title = sanitizeLaTexInput(row.Title)
for i, p := range row.Panels {
w := float64(p.Span * 2)
x := lastWeight
y := lastHeight
gridPos := GridPos{h, w, x, y}
p.Title = sanitizeLaTexInput(p.Title)
p.GridPos = gridPos
row.Panels[i] = p
dash.Panels = append(dash.Panels, p)

lastWeight = w
}
dash.Rows = append(dash.Rows, row)
lastHeight = h
}

return dash
Expand Down