Skip to content
Open
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions flyteidl2/dataproxy/dataproxy_service.proto
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,15 @@ message TailLogsRequest {
// The attempt number.
uint32 attempt = 2 [(buf.validate.field).uint32.gt = 0];

// The pod name to tail logs from. If not provided, attempt to find the primary pod, else assume the first pod.
string pod_name = 3;
// Selects which pod(s) to tail. If unset, defaults to all_pods.
oneof pod_selector {
Comment thread
pingsutw marked this conversation as resolved.
Outdated
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: maybe we can call this pod_filter and then we can drop the all_pods option altogether since we default to it when no filter is set

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated it

// Tail logs from the primary pod only.
bool primary_pod = 3;
// Tail logs from all pods. This is the default when pod_selector is unset.
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is a departure from the currently checked in behavior - will it cause any issues for older UI clients?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry for the confusion. The default is primary pod (same as before). I just updated the comment

bool all_pods = 4;
// Tail logs from the named pod only.
Comment thread
pingsutw marked this conversation as resolved.
Outdated
string pod_name = 5;
Comment thread
pingsutw marked this conversation as resolved.
Outdated
}
}

// Reponse message for tailing logs.
Expand All @@ -213,6 +220,8 @@ message TailLogsResponse {
message Logs {
// Structured log lines.
repeated flyteidl2.logs.dataplane.LogLine lines = 1;
// Which container these lines are from.
Comment thread
pingsutw marked this conversation as resolved.
flyteidl2.logs.dataplane.ContainerIdentifier container = 2;
Comment thread
pingsutw marked this conversation as resolved.
}

// One or more batches of logs.
Expand Down
4 changes: 2 additions & 2 deletions flyteidl2/logs/dataplane/payload.proto
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ message LoggingContext {

string cluster_name = 3 [(buf.validate.field).string.min_len = 1];
string kubernetes_namespace = 4 [(buf.validate.field).string.min_len = 1];
string kubernetes_pod_name = 5 [(buf.validate.field).string.min_len = 1];
string kubernetes_container_name = 6 [(buf.validate.field).string.min_len = 1];
string kubernetes_pod_name = 5;
string kubernetes_container_name = 6;
google.protobuf.Timestamp execution_attempt_start_time = 7;
google.protobuf.Timestamp execution_attempt_end_time = 8;
map<string, string> kubernetes_pod_labels = 9;
Expand Down
140 changes: 109 additions & 31 deletions gen/go/flyteidl2/dataproxy/dataproxy_service.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

70 changes: 69 additions & 1 deletion gen/go/flyteidl2/dataproxy/dataproxy_service.pb.validate.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading