-
Notifications
You must be signed in to change notification settings - Fork 9
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.
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
Auditing timescaledb #565
Draft
Gerrit91
wants to merge
4
commits into
master
Choose a base branch
from
auditing-timescaledb
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+92
−34
Draft
Auditing timescaledb #565
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -29,7 +29,7 @@ | |
"github.com/metal-stack/metal-api/cmd/metal-api/internal/metal" | ||
"github.com/metal-stack/metal-api/cmd/metal-api/internal/metrics" | ||
v1 "github.com/metal-stack/metal-api/pkg/api/v1" | ||
"github.com/metal-stack/metal-lib/auditing" | ||
Check failure on line 32 in cmd/metal-api/internal/grpc/grpc-server.go GitHub Actions / integration
|
||
"github.com/metal-stack/metal-lib/bus" | ||
) | ||
|
||
|
@@ -52,7 +52,7 @@ | |
ResponseInterval time.Duration | ||
CheckInterval time.Duration | ||
BMCSuperUserPasswordFile string | ||
Auditing auditing.Auditing | ||
Auditing []auditing.Auditing | ||
IPMISuperUser metal.MachineIPMISuperUser | ||
} | ||
|
||
|
@@ -121,7 +121,7 @@ | |
logging.UnaryServerInterceptor(interceptorLogger(log)), | ||
recovery.UnaryServerInterceptor(recovery.WithRecoveryHandler(grpcPanicRecoveryHandler)), | ||
} | ||
if cfg.Auditing != nil { | ||
if len(cfg.Auditing) > 0 { | ||
shouldAudit := func(fullMethod string) bool { | ||
switch fullMethod { | ||
case "/api.v1.BootService/Register": | ||
|
@@ -130,16 +130,19 @@ | |
return false | ||
} | ||
} | ||
auditStreamInterceptor, err := auditing.StreamServerInterceptor(cfg.Auditing, log.WithGroup("auditing-grpc"), shouldAudit) | ||
if err != nil { | ||
return err | ||
} | ||
auditUnaryInterceptor, err := auditing.UnaryServerInterceptor(cfg.Auditing, log.WithGroup("auditing-grpc"), shouldAudit) | ||
if err != nil { | ||
return err | ||
|
||
for _, backend := range cfg.Auditing { | ||
auditStreamInterceptor, err := auditing.StreamServerInterceptor(backend, log.WithGroup("auditing-grpc"), shouldAudit) | ||
if err != nil { | ||
return err | ||
} | ||
auditUnaryInterceptor, err := auditing.UnaryServerInterceptor(backend, log.WithGroup("auditing-grpc"), shouldAudit) | ||
if err != nil { | ||
return err | ||
} | ||
streamInterceptors = append(streamInterceptors, auditStreamInterceptor) | ||
unaryInterceptors = append(unaryInterceptors, auditUnaryInterceptor) | ||
} | ||
streamInterceptors = append(streamInterceptors, auditStreamInterceptor) | ||
unaryInterceptors = append(unaryInterceptors, auditUnaryInterceptor) | ||
} | ||
|
||
unaryInterceptors = append(unaryInterceptors, metrics.GrpcMetrics, recovery.UnaryServerInterceptor(recoveryOpt)) | ||
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,7 +9,7 @@ | |
|
||
restfulspec "github.com/emicklei/go-restful-openapi/v2" | ||
restful "github.com/emicklei/go-restful/v3" | ||
"github.com/metal-stack/metal-lib/httperrors" | ||
Check failure on line 12 in cmd/metal-api/internal/service/audit-service.go GitHub Actions / integration
|
||
) | ||
|
||
type auditResource struct { | ||
|
@@ -64,7 +64,7 @@ | |
return | ||
} | ||
|
||
backendResult, err := r.a.Search(auditing.EntryFilter{ | ||
backendResult, err := r.a.Search(request.Request.Context(), auditing.EntryFilter{ | ||
Limit: requestPayload.Limit, | ||
From: requestPayload.From, | ||
To: requestPayload.To, | ||
|
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would prefer to remove the support for meilisearch completely instead of adding the complexity of supporting multiple auditing backends
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe we will have introduce multiple backends though if FI-TS wants to have Splunk connected. But maybe also we want to introduce the buffer service as well, which we were discussing as well.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
in my opinion, metal-api should only have one auditing implementation, if other parties are interested in other auditing backends, then this should be solved at a later layer.
This is why i would like to vote for a dedicated auditing backend which has plug-able backends