luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge pull request #7841 from hashicorp/oss-sync/auditing-config 

OSS sync - Auditing config
This commit is contained in:
Kit Patella 2020-05-11 13:44:38 -07:00 committed by GitHub
parent 1173b31949 f82a97f8c8
commit a45b67b40f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
agent/config/builder_oss.go
View File

@ -37,6 +37,9 @@ var (
"acl.tokens.managed_service_provider": func(c *Config) { "acl.tokens.managed_service_provider": func(c *Config) {
c.ACL.Tokens.ManagedServiceProvider = nil c.ACL.Tokens.ManagedServiceProvider = nil
}, },
"audit": func(c *Config) {
c.Audit = Audit{}
},
} }
) )

23
agent/config/config.go
View File

@ -319,15 +319,14 @@ type Config struct {
Version *string `json:"version,omitempty" hcl:"version" mapstructure:"version"` Version *string `json:"version,omitempty" hcl:"version" mapstructure:"version"`
VersionPrerelease *string `json:"version_prerelease,omitempty" hcl:"version_prerelease" mapstructure:"version_prerelease"` VersionPrerelease *string `json:"version_prerelease,omitempty" hcl:"version_prerelease" mapstructure:"version_prerelease"`
// Enterprise Only
Audit Audit `json:"audit,omitempty" hcl:"audit" mapstructure:"audit"`
// Enterprise Only // Enterprise Only
NonVotingServer *bool `json:"non_voting_server,omitempty" hcl:"non_voting_server" mapstructure:"non_voting_server"` NonVotingServer *bool `json:"non_voting_server,omitempty" hcl:"non_voting_server" mapstructure:"non_voting_server"`
// Enterprise Only // Enterprise Only
SegmentName *string `json:"segment,omitempty" hcl:"segment" mapstructure:"segment"` SegmentName *string `json:"segment,omitempty" hcl:"segment" mapstructure:"segment"`
// Enterprise Only // Enterprise Only
Segments []Segment `json:"segments,omitempty" hcl:"segments" mapstructure:"segments"` Segments []Segment `json:"segments,omitempty" hcl:"segments" mapstructure:"segments"`
// enterpriseConfig embeds fields that we only access in consul-enterprise builds
EnterpriseConfig `hcl:",squash" mapstructure:",squash"`
} }
type GossipLANConfig struct { type GossipLANConfig struct {
@ -758,3 +757,21 @@ type ConfigEntries struct {
// unabiguously. // unabiguously.
Bootstrap []map[string]interface{} `json:"bootstrap,omitempty" hcl:"bootstrap" mapstructure:"bootstrap"` Bootstrap []map[string]interface{} `json:"bootstrap,omitempty" hcl:"bootstrap" mapstructure:"bootstrap"`
} }
// Audit allows us to enable and define destinations for auditing
type Audit struct {
Enabled *bool `json:"enabled,omitempty" hcl:"enabled" mapstructure:"enabled"`
Sinks map[string]AuditSink `json:"sink,omitempty" hcl:"sink" mapstructure:"sink"`
}
// AuditSink can be provided multiple times to define pipelines for auditing
type AuditSink struct {
Name *string `json:"name,omitempty" hcl:"name" mapstructure:"name"`
Type *string `json:"type,omitempty" hcl:"type" mapstructure:"type"`
Format *string `json:"format,omitempty" hcl:"format" mapstructure:"format"`
Path *string `json:"path,omitempty" hcl:"path" mapstructure:"path"`
DeliveryGuarantee *string `json:"delivery_guarantee,omitempty" hcl:"delivery_guarantee" mapstructure:"delivery_guarantee"`
RotateBytes *int `json:"rotate_bytes,omitempty" hcl:"rotate_bytes" mapstructure:"rotate_bytes"`
RotateDuration *string `json:"rotate_duration,omitempty" hcl:"rotate_duration" mapstructure:"rotate_duration"`
RotateMaxFiles *int `json:"rotate_max_files,omitempty" hcl:"rotate_max_files" mapstructure:"rotate_max_files"`
}

3
agent/config/config_oss.go
View File

@ -4,9 +4,6 @@ package config
import "github.com/hashicorp/consul/agent/structs" import "github.com/hashicorp/consul/agent/structs"
// EnterpriseMeta provides a stub for the corresponding struct in config_ent.go
type EnterpriseConfig struct{}
// EnterpriseMeta stub // EnterpriseMeta stub
type EnterpriseMeta struct{} type EnterpriseMeta struct{}