diff --git a/logs-lib/jsonnetfile.json b/logs-lib/jsonnetfile.json index 115d14345..e822faa8e 100644 --- a/logs-lib/jsonnetfile.json +++ b/logs-lib/jsonnetfile.json @@ -5,7 +5,7 @@ "source": { "git": { "remote": "https://github.com/grafana/grafonnet.git", - "subdir": "gen/grafonnet-v10.0.0" + "subdir": "gen/grafonnet-v11.0.0" } }, "version": "main" diff --git a/logs-lib/logs/dashboards.libsonnet b/logs-lib/logs/dashboards.libsonnet index f721f3a64..f4b139abc 100644 --- a/logs-lib/logs/dashboards.libsonnet +++ b/logs-lib/logs/dashboards.libsonnet @@ -13,18 +13,20 @@ function( + g.dashboard.withUid(g.util.string.slugify(title)) + g.dashboard.withVariables(variables.toArray) + g.dashboard.withPanels( - ( - if showLogsVolume then - [panels.logsVolume - + g.panel.timeSeries.gridPos.withH(6) - + g.panel.timeSeries.gridPos.withW(24)] - else [] + g.util.grid.wrapPanels( + ( + if showLogsVolume then + [panels.logsVolume + + g.panel.timeSeries.gridPos.withH(6) + + g.panel.timeSeries.gridPos.withW(24)] + else [] + ) + + + [ + panels.logs + + g.panel.logs.gridPos.withH(18) + + g.panel.logs.gridPos.withW(24), + ] ) - + - [ - panels.logs - + g.panel.logs.gridPos.withH(18) - + g.panel.logs.gridPos.withW(24), - ] ), } diff --git a/logs-lib/logs/g.libsonnet b/logs-lib/logs/g.libsonnet index 6da9f4eef..f89dcc064 100644 --- a/logs-lib/logs/g.libsonnet +++ b/logs-lib/logs/g.libsonnet @@ -1 +1 @@ -import 'github.com/grafana/grafonnet/gen/grafonnet-v10.0.0/main.libsonnet' +import 'github.com/grafana/grafonnet/gen/grafonnet-v11.0.0/main.libsonnet'