diff --git a/cmd/benchmark/benchmark.go b/cmd/benchmark/benchmark.go
index b299ec2e..ebde491b 100644
--- a/cmd/benchmark/benchmark.go
+++ b/cmd/benchmark/benchmark.go
@@ -223,7 +223,7 @@ func runCmd(cmd *cobra.Command, args []string) error {
var tables []table.TableDefinition
// add system summary table if not disabled
if !flagNoSystemSummary {
- tables = append(tables, common.TableDefinitions[common.BriefSysSummaryTableName])
+ tables = append(tables, common.TableDefinitions[common.SystemSummaryTableName])
}
// add benchmark tables
selectedBenchmarkCount := 0
diff --git a/cmd/flamegraph/flamegraph.go b/cmd/flamegraph/flamegraph.go
index f42c8de7..611e34e7 100644
--- a/cmd/flamegraph/flamegraph.go
+++ b/cmd/flamegraph/flamegraph.go
@@ -179,7 +179,7 @@ func validateFlags(cmd *cobra.Command, args []string) error {
func runCmd(cmd *cobra.Command, args []string) error {
var tables []table.TableDefinition
if !flagNoSystemSummary {
- tables = append(tables, common.TableDefinitions[common.BriefSysSummaryTableName])
+ tables = append(tables, common.TableDefinitions[common.SystemSummaryTableName])
}
tables = append(tables, tableDefinitions[CallStackFrequencyTableName])
reportingCommand := common.ReportingCommand{
diff --git a/cmd/lock/lock.go b/cmd/lock/lock.go
index ba2ad9e4..72ee3f02 100755
--- a/cmd/lock/lock.go
+++ b/cmd/lock/lock.go
@@ -195,7 +195,7 @@ func pullDataFiles(appContext common.AppContext, scriptOutputs map[string]script
func runCmd(cmd *cobra.Command, args []string) error {
var tables []table.TableDefinition
if !flagNoSystemSummary {
- tables = append(tables, common.TableDefinitions[common.BriefSysSummaryTableName])
+ tables = append(tables, common.TableDefinitions[common.SystemSummaryTableName])
}
tables = append(tables, tableDefinitions[KernelLockAnalysisTableName])
reportingCommand := common.ReportingCommand{
diff --git a/cmd/metrics/metadata.go b/cmd/metrics/metadata.go
index 6ee13d3a..fc6328e7 100644
--- a/cmd/metrics/metadata.go
+++ b/cmd/metrics/metadata.go
@@ -173,7 +173,7 @@ func (c *X86MetadataCollector) CollectMetadata(t target.Target, noRoot bool, noS
return Metadata{}, fmt.Errorf("failed to get system summary: %w", err)
}
} else {
- metadata.SystemSummaryFields = [][]string{{"", "System Info Not Available"}}
+ metadata.SystemSummaryFields = [][]string{{"", "System Summary Not Available"}}
}
// Architecture
if metadata.Architecture, err = getArchitecture(scriptOutputs); err != nil {
@@ -352,7 +352,7 @@ func (c *ARMMetadataCollector) CollectMetadata(t target.Target, noRoot bool, noS
return Metadata{}, fmt.Errorf("failed to get system summary: %w", err)
}
} else {
- metadata.SystemSummaryFields = [][]string{{"", "System Info Not Available"}}
+ metadata.SystemSummaryFields = [][]string{{"", "System Summary Not Available"}}
}
// Architecture
if metadata.Architecture, err = getArchitecture(scriptOutputs); err != nil {
@@ -555,7 +555,7 @@ BEGIN {
}
// add the system summary table scripts to the list
if !noSystemSummary {
- for _, scriptName := range common.TableDefinitions[common.BriefSysSummaryTableName].ScriptNames {
+ for _, scriptName := range common.TableDefinitions[common.SystemSummaryTableName].ScriptNames {
scriptDef := script.GetScriptByName(scriptName)
metadataScripts = append(metadataScripts, scriptDef)
}
@@ -637,7 +637,7 @@ func ReadJSONFromFile(path string) (md Metadata, err error) {
// getSystemSummary - retrieves the system summary from the target
func getSystemSummary(scriptOutputs map[string]script.ScriptOutput) (summaryFields [][]string, err error) {
- allTableValues, err := table.ProcessTables([]table.TableDefinition{common.TableDefinitions[common.BriefSysSummaryTableName]}, scriptOutputs)
+ allTableValues, err := table.ProcessTables([]table.TableDefinition{common.TableDefinitions[common.SystemSummaryTableName]}, scriptOutputs)
if err != nil {
err = fmt.Errorf("failed to process script outputs: %w", err)
return
diff --git a/cmd/metrics/resources/base.html b/cmd/metrics/resources/base.html
index 879646c2..14e6b8bc 100644
--- a/cmd/metrics/resources/base.html
+++ b/cmd/metrics/resources/base.html
@@ -168,7 +168,7 @@
const [hasHighlightedMetrics, setHasHighlightedMetrics] = React.useState(false);
const description = <<.DESCRIPTION>>
const metadata = <<.METADATA>>
- const system_info = <<.SYSTEMINFO>>
+ const system_summary = <<.SYSTEMSUMMARY>>
// Check for highlighted metrics whenever current_metrics changes
React.useEffect(() => {
@@ -701,7 +701,7 @@
-
+
@@ -967,7 +967,7 @@
- {system_info && system_info.map(([key, value]) => (
+ {system_summary && system_summary.map(([key, value]) => (
{JSON.stringify(key)}
diff --git a/cmd/metrics/summary.go b/cmd/metrics/summary.go
index c08a231c..e61348cc 100644
--- a/cmd/metrics/summary.go
+++ b/cmd/metrics/summary.go
@@ -629,12 +629,12 @@ func (mg *MetricGroup) loadHTMLTemplateValues(metadata Metadata, metricDefinitio
}
templateVals["METADATA"] = string(jsonMetadata)
- // system info tab
- jsonSystemInfo, err := json.Marshal(metadata.SystemSummaryFields)
+ // system summary tab
+ jsonSystemSummary, err := json.Marshal(metadata.SystemSummaryFields)
if err != nil {
return
}
- templateVals["SYSTEMINFO"] = string(jsonSystemInfo)
+ templateVals["SYSTEMSUMMARY"] = string(jsonSystemSummary)
return
}
diff --git a/cmd/metrics/trim.go b/cmd/metrics/trim.go
index 168a2ab8..0add90de 100644
--- a/cmd/metrics/trim.go
+++ b/cmd/metrics/trim.go
@@ -313,9 +313,9 @@ func loadMetadataFromHTMLSummary(summaryHTMLPath string) (Metadata, error) {
return metadata, fmt.Errorf("failed to read summary HTML file: %w", err)
}
- // assumes system_info comes after metadata in the file
+ // assumes system_summary comes after metadata in the file
const metadataPrefix = "const metadata = "
- const systemInfoPrefix = "const system_info = "
+ const systemSummaryPrefix = "const system_summary = "
for line := range strings.SplitSeq(string(content), "\n") {
line = strings.TrimSpace(line)
if strings.HasPrefix(line, metadataPrefix) {
@@ -327,16 +327,16 @@ func loadMetadataFromHTMLSummary(summaryHTMLPath string) (Metadata, error) {
if err != nil {
return metadata, fmt.Errorf("failed to parse metadata JSON: %w", err)
}
- } else if strings.HasPrefix(line, systemInfoPrefix) {
- // system info
- var systemInfo [][]string
- jsonStart := len(systemInfoPrefix)
+ } else if strings.HasPrefix(line, systemSummaryPrefix) {
+ // system summary
+ var systemSummary [][]string
+ jsonStart := len(systemSummaryPrefix)
jsonString := strings.TrimSpace(line[jsonStart:])
- err = json.Unmarshal([]byte(jsonString), &systemInfo)
+ err = json.Unmarshal([]byte(jsonString), &systemSummary)
if err != nil {
- return metadata, fmt.Errorf("failed to parse system info JSON: %w", err)
+ return metadata, fmt.Errorf("failed to parse system summary JSON: %w", err)
}
- metadata.SystemSummaryFields = systemInfo
+ metadata.SystemSummaryFields = systemSummary
return metadata, nil
}
}
diff --git a/cmd/telemetry/telemetry.go b/cmd/telemetry/telemetry.go
index a2f624e2..56f8edfe 100644
--- a/cmd/telemetry/telemetry.go
+++ b/cmd/telemetry/telemetry.go
@@ -273,7 +273,7 @@ func runCmd(cmd *cobra.Command, args []string) error {
var tables []table.TableDefinition
// add system summary table if not disabled
if !flagNoSystemSummary {
- tables = append(tables, common.TableDefinitions[common.BriefSysSummaryTableName])
+ tables = append(tables, common.TableDefinitions[common.SystemSummaryTableName])
}
// add category tables
for _, cat := range categories {
diff --git a/internal/common/table_defs.go b/internal/common/table_defs.go
index 7bd1c93e..f2daef4b 100644
--- a/internal/common/table_defs.go
+++ b/internal/common/table_defs.go
@@ -9,12 +9,12 @@ import (
"strings"
)
-const BriefSysSummaryTableName = "Brief System Summary"
+const SystemSummaryTableName = "System Summary"
var TableDefinitions = map[string]table.TableDefinition{
- BriefSysSummaryTableName: {
- Name: BriefSysSummaryTableName,
- MenuLabel: BriefSysSummaryTableName,
+ SystemSummaryTableName: {
+ Name: SystemSummaryTableName,
+ MenuLabel: SystemSummaryTableName,
HasRows: false,
ScriptNames: []string{
script.HostnameScriptName,