Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

support json output for log backend of advanced audit #48605

Merged
merged 1 commit into from
Jul 8, 2017
Merged

support json output for log backend of advanced audit #48605

merged 1 commit into from
Jul 8, 2017

Conversation

CaoShuFeng
Copy link
Contributor

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): fixes #

Special notes for your reviewer:

Release note:

Add json format support for advanced audit in apiserver. Use --audit-log-format=json to emit json to log backend.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jul 7, 2017
@k8s-ci-robot
Copy link
Contributor

Hi @CaoShuFeng. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jul 7, 2017
@k8s-github-robot k8s-github-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Jul 7, 2017
@CaoShuFeng CaoShuFeng mentioned this pull request Jul 7, 2017
Merged
crassirostris
crassirostris suggested changes Jul 7, 2017
View reviewed changes
Copy link

@crassirostris crassirostris left a comment

Choose a reason for hiding this comment

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

Several nits, overall SGTM

staging/src/k8s.io/apiserver/plugin/pkg/audit/log/backend.go Outdated
const (
// FormatLegacy saves event in 1-line text format.
FormatLegacy = "legacy"
// ModeJson saves event in structured json format.
Copy link

Choose a reason for hiding this comment

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

ModeJson -> FormatJson

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

staging/src/k8s.io/apiserver/plugin/pkg/audit/log/backend.go Outdated
FormatJson = "json"
)

// AllowedFormats is the formats known by log backend.
Copy link

@crassirostris crassirostris Jul 7, 2017 •
edited

Choose a reason for hiding this comment

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

*are the formats (or is the list of formats)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

sttts
sttts reviewed Jul 7, 2017
View reviewed changes
staging/src/k8s.io/apiserver/pkg/server/options/audit.go
@@ -63,6 +63,7 @@ type AuditLogOptions struct {
MaxAge int
MaxBackups int
MaxSize int
Format string
Copy link
Contributor

Choose a reason for hiding this comment

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

can we use a type alias plus constants?

Copy link
Contributor

Choose a reason for hiding this comment

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

if that plays well with fs.StringVar

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeap, it will get such error:
cannot use &o.Format (type *format) as type *string in argument to fs.StringVar
cannot use o.Format (type format) as type string in argument to fs.StringVar

@sttts
Copy link
Contributor

sttts commented Jul 7, 2017

/ok-to-test

@k8s-ci-robot k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jul 7, 2017
@sttts
Copy link
Contributor

sttts commented Jul 7, 2017

looks good overall 👍

@sttts
Copy link
Contributor

sttts commented Jul 7, 2017

/approve no-issue

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 7, 2017
@sttts
Copy link
Contributor

sttts commented Jul 7, 2017 •
edited

Please also add a release-note text. you did :)

@CaoShuFeng
Copy link
Contributor Author

/test pull-kubernetes-e2e-gce-etcd3
/test pull-kubernetes-federation-e2e-gce
/test pull-kubernetes-kubemark-e2e-gce

@sttts
Copy link
Contributor

sttts commented Jul 8, 2017

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 8, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CaoShuFeng, sttts

Associated issue requirement bypassed by: sttts

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 48583, 48605, 48601)

@k8s-github-robot k8s-github-robot merged commit eab5e06 into kubernetes:master Jul 8, 2017
@sttts sttts mentioned this pull request Aug 7, 2017
Merged
@CaoShuFeng CaoShuFeng deleted the json_log branch November 6, 2017 05:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sttts sttts sttts left review comments

@crassirostris crassirostris crassirostris requested changes

Assignees

@lavalamp lavalamp

@sttts sttts

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@CaoShuFeng @k8s-ci-robot @sttts @k8s-github-robot @crassirostris @lavalamp