Move panel dimentions to panels in logs lib, making it overridable. (#1440)

v-zhuravlev · web-flow · commit f5a7f451236b · 2025-05-07T20:31:31.000+08:00
diff --git a/logs-lib/logs/dashboards.libsonnet b/logs-lib/logs/dashboards.libsonnet
@@ -16,16 +16,12 @@ function(
         g.util.grid.wrapPanels(
           (
             if showLogsVolume then
-              [panels.logsVolume
-               + g.panel.timeSeries.gridPos.withH(6)
-               + g.panel.timeSeries.gridPos.withW(24)]
+              [panels.logsVolume]
             else []
           )
           +
           [
-            panels.logs
-            + g.panel.logs.gridPos.withH(18)
-            + g.panel.logs.gridPos.withW(24),
+            panels.logs,
           ]
         )
       ),
diff --git a/logs-lib/logs/panels.libsonnet b/logs-lib/logs/panels.libsonnet
@@ -39,6 +39,9 @@ function(
           },
         }
       )
+      // default dimensions
+      + g.panel.timeSeries.gridPos.withH(6)
+      + g.panel.timeSeries.gridPos.withW(24)
       + timeSeries.standardOptions.withOverridesMixin(
         [
           {
@@ -77,7 +80,10 @@ function(
       + logsPanel.options.withEnableLogDetails(true)
       + logsPanel.options.withShowTime(true)
       + logsPanel.options.withWrapLogMessage(true)
-      + logsPanel.options.withPrettifyLogMessage(true),
+      + logsPanel.options.withPrettifyLogMessage(true)
+      // default dimensions
+      + g.panel.logs.gridPos.withH(18)
+      + g.panel.logs.gridPos.withW(24),
 
     logsVolume: self.logsVolumeInit(logsVolumeTarget),
     logs: self.logsInit(logsTarget),

Original file line number	Diff line number	Diff line change
`@@ -16,16 +16,12 @@ function(`
`16`	`16`	`g.util.grid.wrapPanels(`
`17`	`17`	`(`
`18`	`18`	`if showLogsVolume then`
`19`		`- [panels.logsVolume`
`20`		`- + g.panel.timeSeries.gridPos.withH(6)`
`21`		`- + g.panel.timeSeries.gridPos.withW(24)]`
	`19`	`+ [panels.logsVolume]`
`22`	`20`	`else []`
`23`	`21`	`)`
`24`	`22`	`+`
`25`	`23`	`[`
`26`		`- panels.logs`
`27`		`- + g.panel.logs.gridPos.withH(18)`
`28`		`- + g.panel.logs.gridPos.withW(24),`
	`24`	`+ panels.logs,`
`29`	`25`	`]`
`30`	`26`	`)`
`31`	`27`	`),`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,9 @@ function(`
`39`	`39`	`},`
`40`	`40`	`}`
`41`	`41`	`)`
	`42`	`+ // default dimensions`
	`43`	`+ + g.panel.timeSeries.gridPos.withH(6)`
	`44`	`+ + g.panel.timeSeries.gridPos.withW(24)`
`42`	`45`	`+ timeSeries.standardOptions.withOverridesMixin(`
`43`	`46`	`[`
`44`	`47`	`{`
`@@ -77,7 +80,10 @@ function(`
`77`	`80`	`+ logsPanel.options.withEnableLogDetails(true)`
`78`	`81`	`+ logsPanel.options.withShowTime(true)`
`79`	`82`	`+ logsPanel.options.withWrapLogMessage(true)`
`80`		`- + logsPanel.options.withPrettifyLogMessage(true),`
	`83`	`+ + logsPanel.options.withPrettifyLogMessage(true)`
	`84`	`+ // default dimensions`
	`85`	`+ + g.panel.logs.gridPos.withH(18)`
	`86`	`+ + g.panel.logs.gridPos.withW(24),`
`81`	`87`
`82`	`88`	`logsVolume: self.logsVolumeInit(logsVolumeTarget),`
`83`	`89`	`logs: self.logsInit(logsTarget),`