Skip to content

support json output for log backend of advanced audit#48605

Merged
k8s-github-robot merged 1 commit intokubernetes:masterfrom
CaoShuFeng:json_log
Jul 8, 2017
Merged

support json output for log backend of advanced audit#48605
k8s-github-robot merged 1 commit intokubernetes:masterfrom
CaoShuFeng:json_log

Conversation

@CaoShuFeng
Copy link
Copy Markdown
Contributor

@CaoShuFeng CaoShuFeng commented Jul 7, 2017

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
Copy Markdown
Contributor

k8s-ci-robot commented Jul 7, 2017

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.

Details

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
Copy Markdown

@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
Copy link
Copy Markdown

@crassirostris crassirostris Jul 7, 2017

Choose a reason for hiding this comment

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

ModeJson -> FormatJson

Copy link
Copy Markdown
Contributor Author

@CaoShuFeng CaoShuFeng Jul 8, 2017

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
Copy link
Copy Markdown

@crassirostris crassirostris Jul 7, 2017 •
edited
Loading

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
Copy Markdown
Contributor Author

@CaoShuFeng CaoShuFeng Jul 8, 2017

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 Outdated
Copy link
Copy Markdown
Contributor

@sttts sttts Jul 7, 2017

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
Copy Markdown
Contributor

@sttts sttts Jul 7, 2017

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
Copy Markdown
Contributor Author

@CaoShuFeng CaoShuFeng Jul 8, 2017

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
Copy Markdown
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
Copy Markdown
Contributor

sttts commented Jul 7, 2017

looks good overall 👍

@sttts
Copy link
Copy Markdown
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
Copy Markdown
Contributor

sttts commented Jul 7, 2017 •
edited
Loading

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

@CaoShuFeng
Copy link
Copy Markdown
Contributor Author

CaoShuFeng commented Jul 8, 2017

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

@sttts
Copy link
Copy Markdown
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
Copy Markdown

k8s-github-robot commented Jul 8, 2017

[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.

Details 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
Copy Markdown

k8s-github-robot commented Jul 8, 2017

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

+1 more reviewer

@crassirostris crassirostris crassirostris requested changes

Reviewers whose approvals may not affect merge requirements

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.

6 participants

@CaoShuFeng @k8s-ci-robot @sttts @k8s-github-robot @crassirostris @lavalamp