Augment session events with cluster name #4994
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
a-palchikov
requested review from
alex-kovoy,
awly,
fspmarshall,
kimlisa,
klizhentas,
r0mant,
russjones and
webvictim
as code owners
r0mant
reviewed
Dec 1, 2020
a-palchikov
force-pushed
the
dmitri/3751-cluster-name
branch
from
70809cb
to
e1eb68b
Compare
awly
reviewed
Dec 1, 2020
lib/events/events.proto
Outdated
| @@ -61,6 +61,9 @@ message ServerMetadata { | |||
| // session occurred on. | |||
| map<string, string> ServerLabels = 5 | |||
| [ (gogoproto.nullable) = false, (gogoproto.jsontag) = "server_labels,omitempty" ]; | |||
|
|
|||
| // ClusterName identifies the originating teleport cluster | |||
| string ClusterName = 6 [ (gogoproto.jsontag) = "cluster_name" ]; | |||
There was a problem hiding this comment.
should this be in just Metadata?
aren't all events cluster-specific?
lib/srv/exec.go
Outdated
| @@ -60,6 +60,8 @@ type ExecResult struct { | |||
|
|
|||
| // Exec executes an "exec" request. | |||
| type Exec interface { | |||
| fmt.Stringer | |||
There was a problem hiding this comment.
no need to add it in the interface
as long as remoteExec implements fmt.Stringer, printing it with %v should pick it up
a-palchikov
force-pushed
the
dmitri/3751-cluster-name
branch
from
e1eb68b
to
fe7f582
Compare
awly
approved these changes
Dec 7, 2020
|
We've a customer that's current aggregating all logs into Splunk for SIEM usage. Would we be able to backport this into 5.1 |
|
@benarent Sure I can submit a backport. |
a-palchikov
added a commit
that referenced
this pull request
Jan 12, 2021
Fix local etcd backend tests (backport of #4986).
a-palchikov
added a commit
that referenced
this pull request
Jan 12, 2021
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR augments session events with a cluster name.
Fixes #3751.