manage raw display

Author: jpinsonneau

cmd/display.go

@@ -143,18 +143,20 @@ func getTop() tview.Primitive {
 	// enrichment: TODO: replace with dropdowns or popup
 	enrichmentTextView := tview.NewTextView().SetText(getEnrichmentText())
 	enrichmentRow := tview.NewFlex().SetDirection(tview.FlexColumn).
-		AddItem(enrichmentTextView, 0, 1, false).
-		AddItem(tview.NewButton("←").SetSelectedFunc(func() {
-			enrichment.prev()
-			enrichmentTextView.SetText(getEnrichmentText())
-			updateScreen()
-		}), 5, 0, false).
-		AddItem(tview.NewButton("→").SetSelectedFunc(func() {
-			enrichment.next()
-			enrichmentTextView.SetText(getEnrichmentText())
-			updateScreen()
-		}), 5, 0, false)
-
+		AddItem(enrichmentTextView, 0, 1, false)
+	if display.getCurrentItem().name != rawDisplay {
+		enrichmentRow.
+			AddItem(tview.NewButton("←").SetSelectedFunc(func() {
+				enrichment.prev()
+				enrichmentTextView.SetText(getEnrichmentText())
+				updateScreen()
+			}), 5, 0, false).
+			AddItem(tview.NewButton("→").SetSelectedFunc(func() {
+				enrichment.next()
+				enrichmentTextView.SetText(getEnrichmentText())
+				updateScreen()
+			}), 5, 0, false)
+	}
 	flexView.AddItem(enrichmentRow, 0, 1, false)
 
 	return flexView
@@ -235,6 +237,9 @@ func getBottom() tview.Primitive {
 }
 
 func getEnrichmentText() string {
+	if display.getCurrentItem().name == rawDisplay {
+		return "Enrichment: n/a\n"
+	}
 	return fmt.Sprintf("Enrichment: %s\n", enrichment.getCurrentItem().name)
 }
 
@@ -310,47 +315,54 @@ func updateTable() {
 		return
 	}
 
-	// main field, always show the end time
-	cols := []string{
-		"EndTime",
-	}
-
-	// enrichment fields
-	if enrichment.getCurrentItem().name != noOptions {
-		cols = append(cols, enrichment.getCurrentItem().ids...)
+	cols := []string{}
+	if display.getCurrentItem().name == rawDisplay {
+		cols = append(cols,
+			rawDisplay,
+		)
 	} else {
-		// TODO: add a new flag in the config to identify these as default non enriched fields
+		// main field, always show the end time
 		cols = append(cols,
-			"SrcAddr",
-			"SrcPort",
-			"DstAddr",
-			"DstPort",
+			"EndTime",
 		)
-	}
 
-	// append interfaces and their directions between enrichment and features
-	// this is useful for pkt drop, udns etc
-	cols = append(cols,
-		"Interfaces",
-		"IfDirections",
-	)
-
-	// standard / feature fields
-	if display.getCurrentItem().name != standardDisplay {
-		for _, col := range cfg.Columns {
-			if col.Field != "" && slices.Contains(display.getCurrentItem().ids, col.Feature) {
-				cols = append(cols, col.ID)
-			}
+		// enrichment fields
+		if enrichment.getCurrentItem().name != noOptions {
+			cols = append(cols, enrichment.getCurrentItem().ids...)
+		} else {
+			// TODO: add a new flag in the config to identify these as default non enriched fields
+			cols = append(cols,
+				"SrcAddr",
+				"SrcPort",
+				"DstAddr",
+				"DstPort",
+			)
 		}
-	} else {
-		// TODO: add a new flag in the config to identify these as default feature fields
+
+		// append interfaces and their directions between enrichment and features
+		// this is useful for pkt drop, udns etc
 		cols = append(cols,
-			"FlowDirection",
-			"Proto",
-			"Dscp",
-			"Bytes",
-			"Packets",
+			"Interfaces",
+			"IfDirections",
 		)
+
+		// standard / feature fields
+		if display.getCurrentItem().name != standardDisplay {
+			for _, col := range cfg.Columns {
+				if col.Field != "" && slices.Contains(display.getCurrentItem().ids, col.Feature) {
+					cols = append(cols, col.ID)
+				}
+			}
+		} else {
+			// TODO: add a new flag in the config to identify these as default feature fields
+			cols = append(cols,
+				"FlowDirection",
+				"Proto",
+				"Dscp",
+				"Bytes",
+				"Packets",
+			)
+		}
 	}
 
 	// lastFlows may change during the render so we make a copy first

cmd/map_format.go

@@ -462,6 +462,9 @@ func toFieldName(id string) string {
 }
 
 func ellipsize(text string, maxLen int) string {
+	if maxLen == 0 {
+		return text
+	}
 	lastSpaceIx := maxLen
 	len := 0
 	for i, r := range text {
@@ -477,6 +480,9 @@ func ellipsize(text string, maxLen int) string {
 }
 
 func ToColWidth(id string) int {
+	if id == rawDisplay {
+		return 0
+	}
 	colIndex := slices.IndexFunc(cfg.Columns, func(c *ColumnConfig) bool { return c.ID == id })
 	width := 6
 	if colIndex != -1 {
@@ -506,6 +512,8 @@ func ToColValue(genericMap config.GenericMap, id string) string {
 	outputStr := ""
 
 	switch id {
+	case rawDisplay:
+		outputStr = fmt.Sprintf("%v", genericMap)
 	case "EndTime":
 		if captureType == "Flow" {
 			outputStr = toTimeString(genericMap, "TimeFlowEndMs")

cmd/options.go

@@ -48,6 +48,7 @@ var (
 			// no enrichment
 			{name: noOptions},
 			// per field enrichments
+			{name: "IP & Port", ids: []string{"SrcAddr", "SrcPort", "DstAddr", "DstPort"}},
 			{name: "Cluster", ids: []string{"ClusterName"}},
 			{name: "Zone", ids: []string{"SrcZone", "DstZone"}},
 			{name: "Host", ids: []string{"SrcK8S_HostIP", "DstK8S_HostIP", "SrcK8S_HostName", "DstK8S_HostName", "FlowDirection"}},
@@ -69,7 +70,7 @@ var (
 			}},
 		},
 		// resource enrichment by default
-		current: 6,
+		current: 7,
 	}
 )