From bd770ff58a1a4ea804ad29164a713ccd35ca3318 Mon Sep 17 00:00:00 2001 From: "Harper, Jason M" Date: Mon, 28 Apr 2025 04:57:45 -0700 Subject: [PATCH 1/2] shorter menu labels for telemetry tables Signed-off-by: Harper, Jason M --- internal/report/table_defs.go | 49 ++++++++++++++++++++++++----------- 1 file changed, 34 insertions(+), 15 deletions(-) diff --git a/internal/report/table_defs.go b/internal/report/table_defs.go index 4e0c4b0c..d1dbcd86 100644 --- a/internal/report/table_defs.go +++ b/internal/report/table_defs.go @@ -107,7 +107,6 @@ const ( SystemEventLogTableName = "System Event Log" KernelLogTableName = "Kernel Log" SystemSummaryTableName = "System Summary" - BriefSysSummaryTableName = "Brief System Summary" // benchmark table names SpeedBenchmarkTableName = "Speed Benchmark" PowerBenchmarkTableName = "Power Benchmark" @@ -133,6 +132,23 @@ const ( CodePathFrequencyTableName = "Code Path Frequency" // lock table names KernelLockAnalysisTableName = "Kernel Lock Analysis" + // common table names + BriefSysSummaryTableName = "Brief System Summary" +) + +// menu labels +const ( + // telemetry table menu labels + CPUUtilizationTelemetryMenuLabel = "CPU Utilization" + UtilizationCategoriesTelemetryMenuLabel = "Utilization Categories" + AverageFrequencyTelemetryMenuLabel = "Average Frequency" + IRQRateTelemetryMenuLabel = "IRQ Rate" + InstructionTelemetryMenuLabel = "Instruction" + DriveTelemetryMenuLabel = "Drive" + NetworkTelemetryMenuLabel = "Network" + MemoryTelemetryMenuLabel = "Memory" + PowerTelemetryMenuLabel = "Power" + GaudiTelemetryMenuLabel = "Gaudi" ) const ( @@ -505,8 +521,9 @@ var tableDefinitions = map[string]TableDefinition{ }, FieldsFunc: systemSummaryTableValues}, BriefSysSummaryTableName: { - Name: BriefSysSummaryTableName, - HasRows: false, + Name: BriefSysSummaryTableName, + MenuLabel: BriefSysSummaryTableName, + HasRows: false, ScriptNames: []string{ script.HostnameScriptName, script.DateScriptName, @@ -633,7 +650,7 @@ var tableDefinitions = map[string]TableDefinition{ // CPUUtilizationTelemetryTableName: { Name: CPUUtilizationTelemetryTableName, - MenuLabel: CPUUtilizationTelemetryTableName, + MenuLabel: CPUUtilizationTelemetryMenuLabel, HasRows: true, ScriptNames: []string{ script.MpstatTelemetryScriptName, @@ -642,7 +659,7 @@ var tableDefinitions = map[string]TableDefinition{ HTMLTableRendererFunc: cpuUtilizationTelemetryTableHTMLRenderer}, UtilizationCategoriesTelemetryTableName: { Name: UtilizationCategoriesTelemetryTableName, - MenuLabel: UtilizationCategoriesTelemetryTableName, + MenuLabel: UtilizationCategoriesTelemetryMenuLabel, HasRows: true, ScriptNames: []string{ script.MpstatTelemetryScriptName, @@ -651,7 +668,7 @@ var tableDefinitions = map[string]TableDefinition{ HTMLTableRendererFunc: utilizationCategoriesTelemetryTableHTMLRenderer}, AverageFrequencyTelemetryTableName: { Name: AverageFrequencyTelemetryTableName, - MenuLabel: AverageFrequencyTelemetryTableName, + MenuLabel: AverageFrequencyTelemetryMenuLabel, HasRows: true, ScriptNames: []string{ script.TurbostatTelemetryScriptName, @@ -660,7 +677,7 @@ var tableDefinitions = map[string]TableDefinition{ HTMLTableRendererFunc: averageFrequencyTelemetryTableHTMLRenderer}, IRQRateTelemetryTableName: { Name: IRQRateTelemetryTableName, - MenuLabel: IRQRateTelemetryTableName, + MenuLabel: IRQRateTelemetryMenuLabel, HasRows: true, ScriptNames: []string{ script.MpstatTelemetryScriptName, @@ -669,7 +686,7 @@ var tableDefinitions = map[string]TableDefinition{ HTMLTableRendererFunc: irqRateTelemetryTableHTMLRenderer}, DriveTelemetryTableName: { Name: DriveTelemetryTableName, - MenuLabel: DriveTelemetryTableName, + MenuLabel: DriveTelemetryMenuLabel, HasRows: true, ScriptNames: []string{ script.IostatTelemetryScriptName, @@ -678,7 +695,7 @@ var tableDefinitions = map[string]TableDefinition{ HTMLTableRendererFunc: driveTelemetryTableHTMLRenderer}, NetworkTelemetryTableName: { Name: NetworkTelemetryTableName, - MenuLabel: NetworkTelemetryTableName, + MenuLabel: NetworkTelemetryMenuLabel, HasRows: true, ScriptNames: []string{ script.NetworkTelemetryScriptName, @@ -687,7 +704,7 @@ var tableDefinitions = map[string]TableDefinition{ HTMLTableRendererFunc: networkTelemetryTableHTMLRenderer}, MemoryTelemetryTableName: { Name: MemoryTelemetryTableName, - MenuLabel: MemoryTelemetryTableName, + MenuLabel: MemoryTelemetryMenuLabel, HasRows: true, ScriptNames: []string{ script.MemoryTelemetryScriptName, @@ -696,7 +713,7 @@ var tableDefinitions = map[string]TableDefinition{ HTMLTableRendererFunc: memoryTelemetryTableHTMLRenderer}, PowerTelemetryTableName: { Name: PowerTelemetryTableName, - MenuLabel: PowerTelemetryTableName, + MenuLabel: PowerTelemetryMenuLabel, HasRows: true, ScriptNames: []string{ script.TurbostatTelemetryScriptName, @@ -705,7 +722,7 @@ var tableDefinitions = map[string]TableDefinition{ HTMLTableRendererFunc: powerTelemetryTableHTMLRenderer}, InstructionTelemetryTableName: { Name: InstructionTelemetryTableName, - MenuLabel: InstructionTelemetryTableName, + MenuLabel: InstructionTelemetryMenuLabel, HasRows: true, ScriptNames: []string{ script.InstructionTelemetryScriptName, @@ -714,7 +731,7 @@ var tableDefinitions = map[string]TableDefinition{ HTMLTableRendererFunc: instructionTelemetryTableHTMLRenderer}, GaudiTelemetryTableName: { Name: GaudiTelemetryTableName, - MenuLabel: GaudiTelemetryTableName, + MenuLabel: GaudiTelemetryMenuLabel, HasRows: true, ScriptNames: []string{ script.GaudiTelemetryScriptName, @@ -726,7 +743,8 @@ var tableDefinitions = map[string]TableDefinition{ // flamegraph tables // CodePathFrequencyTableName: { - Name: CodePathFrequencyTableName, + Name: CodePathFrequencyTableName, + MenuLabel: CodePathFrequencyTableName, ScriptNames: []string{ script.ProfileJavaScriptName, script.ProfileSystemScriptName, @@ -737,7 +755,8 @@ var tableDefinitions = map[string]TableDefinition{ // kernel lock analysis tables // KernelLockAnalysisTableName: { - Name: KernelLockAnalysisTableName, + Name: KernelLockAnalysisTableName, + MenuLabel: KernelLockAnalysisTableName, ScriptNames: []string{ script.ProfileKernelLockScriptName, }, From 334f07b13a1561504f5a1bfc65afacc9ea9ad5a9 Mon Sep 17 00:00:00 2001 From: "Harper, Jason M" Date: Mon, 28 Apr 2025 04:58:01 -0700 Subject: [PATCH 2/2] remove unneeded code Signed-off-by: Harper, Jason M --- internal/common/common.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/internal/common/common.go b/internal/common/common.go index 4e19e50a..731dbc0b 100644 --- a/internal/common/common.go +++ b/internal/common/common.go @@ -340,12 +340,6 @@ func (rc *ReportingCommand) createReports(appContext AppContext, orderedTargetSc } // special case - the summary table is built from the post-processed data, i.e., table values if rc.SummaryFunc != nil { - // override the menu label for the System Summary table to avoid conflict with performance summary table added below - for i, tv := range allTableValues { - if tv.Name == report.SystemSummaryTableName { - allTableValues[i].MenuLabel = "System Summary" - } - } summaryTableValues := rc.SummaryFunc(allTableValues, targetScriptOutputs.scriptOutputs) allTableValues = append(allTableValues, summaryTableValues) }