github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Add Event table printer

Browse Source
This commit is contained in:
Haoran Wang 2017-07-27 15:37:18 +08:00
parent 07ddb3941f
commit 0f69f74c31
1 changed files with 35 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
pkg/printers/internalversion/printers.go
View File

@ -61,7 +61,6 @@ const loadBalancerWidth = 16
// NOTE: When adding a new resource type here, please update the list // NOTE: When adding a new resource type here, please update the list
// pkg/kubectl/cmd/get.go to reflect the new resource type. // pkg/kubectl/cmd/get.go to reflect the new resource type.
var ( var (
eventColumns = []string{"LASTSEEN", "FIRSTSEEN", "COUNT", "NAME", "KIND", "SUBOBJECT", "TYPE", "REASON", "SOURCE", "MESSAGE"}
namespaceColumns = []string{"NAME", "STATUS", "AGE"} namespaceColumns = []string{"NAME", "STATUS", "AGE"}
secretColumns = []string{"NAME", "TYPE", "DATA", "AGE"} secretColumns = []string{"NAME", "TYPE", "DATA", "AGE"}
serviceAccountColumns = []string{"NAME", "SECRETS", "AGE"} serviceAccountColumns = []string{"NAME", "SECRETS", "AGE"}
@ -248,8 +247,21 @@ func AddHandlers(h printers.PrintHandler) {
h.TableHandler(nodeColumnDefinitions, printNode) h.TableHandler(nodeColumnDefinitions, printNode)
h.TableHandler(nodeColumnDefinitions, printNodeList) h.TableHandler(nodeColumnDefinitions, printNodeList)
h.Handler(eventColumns, nil, printEvent) eventColumnDefinitions := []metav1alpha1.TableColumnDefinition{
h.Handler(eventColumns, nil, printEventList) {Name: "Lastseen", Type: "string", Description: apiv1.Event{}.SwaggerDoc()["lastTimestamp"]},
{Name: "Firtseen", Type: "string", Description: apiv1.Event{}.SwaggerDoc()["firstTimestamp"]},
{Name: "Count", Type: "string", Description: apiv1.Event{}.SwaggerDoc()["count"]},
{Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]},
{Name: "Kind", Type: "string", Description: apiv1.Event{}.InvolvedObject.SwaggerDoc()["kind"]},
{Name: "Subobject", Type: "string", Description: apiv1.Event{}.InvolvedObject.SwaggerDoc()["fieldPath"]},
{Name: "Type", Type: "string", Description: apiv1.Event{}.SwaggerDoc()["type"]},
{Name: "Reason", Type: "string", Description: apiv1.Event{}.SwaggerDoc()["reason"]},
{Name: "Source", Type: "string", Description: apiv1.Event{}.SwaggerDoc()["source"]},
{Name: "Message", Type: "string", Description: apiv1.Event{}.SwaggerDoc()["message"]},
}
h.TableHandler(eventColumnDefinitions, printEvent)
h.TableHandler(eventColumnDefinitions, printEventList)
h.Handler(namespaceColumns, nil, printNamespace) h.Handler(namespaceColumns, nil, printNamespace)
h.Handler(namespaceColumns, nil, printNamespaceList) h.Handler(namespaceColumns, nil, printNamespaceList)
h.Handler(secretColumns, nil, printSecret) h.Handler(secretColumns, nil, printSecret)
@ -1177,57 +1189,40 @@ func printPersistentVolumeClaimList(list *api.PersistentVolumeClaimList, w io.Wr
return nil return nil
} }
func printEvent(event *api.Event, w io.Writer, options printers.PrintOptions) error { func printEvent(obj *api.Event, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) {
name := printers.FormatResourceName(options.Kind, event.InvolvedObject.Name, options.WithKind) row := metav1alpha1.TableRow{
Object: runtime.RawExtension{Object: obj},
namespace := event.Namespace
if options.WithNamespace {
if _, err := fmt.Fprintf(w, "%s\t", namespace); err != nil {
return err
} }
}
// While watching event, we should print absolute time. // While watching event, we should print absolute time.
var FirstTimestamp, LastTimestamp string var FirstTimestamp, LastTimestamp string
if options.AbsoluteTimestamps { if options.AbsoluteTimestamps {
FirstTimestamp = event.FirstTimestamp.String() FirstTimestamp = obj.FirstTimestamp.String()
LastTimestamp = event.LastTimestamp.String() LastTimestamp = obj.LastTimestamp.String()
} else { } else {
FirstTimestamp = translateTimestamp(event.FirstTimestamp) FirstTimestamp = translateTimestamp(obj.FirstTimestamp)
LastTimestamp = translateTimestamp(event.LastTimestamp) LastTimestamp = translateTimestamp(obj.LastTimestamp)
} }
row.Cells = append(row.Cells, LastTimestamp, FirstTimestamp,
obj.Count, obj.Name, obj.InvolvedObject.Kind,
obj.InvolvedObject.FieldPath, obj.Type, obj.Reason,
formatEventSource(obj.Source), obj.Message)
if _, err := fmt.Fprintf( return []metav1alpha1.TableRow{row}, nil
w, "%s\t%s\t%d\t%s\t%s\t%s\t%s\t%s\t%s\t%s",
LastTimestamp,
FirstTimestamp,
event.Count,
name,
event.InvolvedObject.Kind,
event.InvolvedObject.FieldPath,
event.Type,
event.Reason,
formatEventSource(event.Source),
event.Message,
); err != nil {
return err
}
if _, err := fmt.Fprint(w, printers.AppendLabels(event.Labels, options.ColumnLabels)); err != nil {
return err
}
_, err := fmt.Fprint(w, printers.AppendAllLabels(options.ShowLabels, event.Labels))
return err
} }
// Sorts and prints the EventList in a human-friendly format. // Sorts and prints the EventList in a human-friendly format.
func printEventList(list *api.EventList, w io.Writer, options printers.PrintOptions) error { func printEventList(list *api.EventList, options printers.PrintOptions) ([]metav1alpha1.TableRow, error) {
sort.Sort(events.SortableEvents(list.Items)) sort.Sort(events.SortableEvents(list.Items))
rows := make([]metav1alpha1.TableRow, 0, len(list.Items))
for i := range list.Items { for i := range list.Items {
if err := printEvent(&list.Items[i], w, options); err != nil { r, err := printEvent(&list.Items[i], options)
return err if err != nil {
return nil, err
} }
rows = append(rows, r...)
} }
return nil return rows, nil
} }
func printRoleBinding(roleBinding *rbac.RoleBinding, w io.Writer, options printers.PrintOptions) error { func printRoleBinding(roleBinding *rbac.RoleBinding, w io.Writer, options printers.PrintOptions) error {