Skip to content

Commit 3805ed5

Browse files
authored
Bump logs-lib dep to grafana 11 (#1344)
Add wrapPanels to calculate x,y properly
1 parent 7a817b8 commit 3805ed5

File tree

3 files changed

+16
-14
lines changed

3 files changed

+16
-14
lines changed

logs-lib/jsonnetfile.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"source": {
66
"git": {
77
"remote": "https://github.com/grafana/grafonnet.git",
8-
"subdir": "gen/grafonnet-v10.0.0"
8+
"subdir": "gen/grafonnet-v11.0.0"
99
}
1010
},
1111
"version": "main"

logs-lib/logs/dashboards.libsonnet

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,20 @@ function(
1313
+ g.dashboard.withUid(g.util.string.slugify(title))
1414
+ g.dashboard.withVariables(variables.toArray)
1515
+ g.dashboard.withPanels(
16-
(
17-
if showLogsVolume then
18-
[panels.logsVolume
19-
+ g.panel.timeSeries.gridPos.withH(6)
20-
+ g.panel.timeSeries.gridPos.withW(24)]
21-
else []
16+
g.util.grid.wrapPanels(
17+
(
18+
if showLogsVolume then
19+
[panels.logsVolume
20+
+ g.panel.timeSeries.gridPos.withH(6)
21+
+ g.panel.timeSeries.gridPos.withW(24)]
22+
else []
23+
)
24+
+
25+
[
26+
panels.logs
27+
+ g.panel.logs.gridPos.withH(18)
28+
+ g.panel.logs.gridPos.withW(24),
29+
]
2230
)
23-
+
24-
[
25-
panels.logs
26-
+ g.panel.logs.gridPos.withH(18)
27-
+ g.panel.logs.gridPos.withW(24),
28-
]
2931
),
3032
}

logs-lib/logs/g.libsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
import 'github.com/grafana/grafonnet/gen/grafonnet-v10.0.0/main.libsonnet'
1+
import 'github.com/grafana/grafonnet/gen/grafonnet-v11.0.0/main.libsonnet'

0 commit comments

Comments
 (0)