Skip to content

Commit

Permalink
Add Log Label to Audit Logging
Browse files Browse the repository at this point in the history 
Antrea native policies support firewall rule logs. Adding a rule
label to the log allows convenient post-processing of the logs
like grepping the same log labels.

This feature adds a field "logSetting" to the crd, which has two
fields "enabled" and "logLabel". "logSetting" and "enableLogging"
cannot be used at the same time. "enabled" must always be specified
when used. "logLabel" defaults to empty value.

Fixes antrea-io#4652

Signed-off-by: Qiyue Yao <yaoq@vmware.com>
  • Loading branch information
@qiyueyao
qiyueyao committed Mar 30, 2023
1 parent 29b640e commit 6755648
Show file tree
Hide file tree
Showing 47 changed files with 1,451 additions and 344 deletions.
20 changes: 20 additions & 0 deletions build/charts/antrea/crds/clusternetworkpolicy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,16 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
egress:
type: array
items:
Expand Down Expand Up @@ -645,6 +655,16 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
status:
type: object
properties:
Expand Down
20 changes: 20 additions & 0 deletions build/charts/antrea/crds/networkpolicy.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,16 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
egress:
type: array
items:
Expand Down Expand Up @@ -559,6 +569,16 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
status:
type: object
properties:
Expand Down
40 changes: 40 additions & 0 deletions build/yamls/antrea-aks.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -761,6 +761,16 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
egress:
type: array
items:
Expand Down Expand Up @@ -1023,6 +1033,16 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
status:
type: object
properties:
Expand Down Expand Up @@ -1857,6 +1877,16 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
egress:
type: array
items:
Expand Down Expand Up @@ -2090,6 +2120,16 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
status:
type: object
properties:
Expand Down
40 changes: 40 additions & 0 deletions build/yamls/antrea-crds.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -754,6 +754,16 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
egress:
type: array
items:
Expand Down Expand Up @@ -1016,6 +1026,16 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
status:
type: object
properties:
Expand Down Expand Up @@ -1838,6 +1858,16 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
egress:
type: array
items:
Expand Down Expand Up @@ -2071,6 +2101,16 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
status:
type: object
properties:
Expand Down
40 changes: 40 additions & 0 deletions build/yamls/antrea-eks.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -761,6 +761,16 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
egress:
type: array
items:
Expand Down Expand Up @@ -1023,6 +1033,16 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
status:
type: object
properties:
Expand Down Expand Up @@ -1857,6 +1877,16 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
egress:
type: array
items:
Expand Down Expand Up @@ -2090,6 +2120,16 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
status:
type: object
properties:
Expand Down
40 changes: 40 additions & 0 deletions build/yamls/antrea-gke.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -761,6 +761,16 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
egress:
type: array
items:
Expand Down Expand Up @@ -1023,6 +1033,16 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
status:
type: object
properties:
Expand Down Expand Up @@ -1857,6 +1877,16 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
egress:
type: array
items:
Expand Down Expand Up @@ -2090,6 +2120,16 @@ spec:
type: string
enableLogging:
type: boolean
logSetting:
type: object
required:
- enabled
properties:
enabled:
type: boolean
logLabel:
type: string
pattern: "^.{0,32}$"
status:
type: object
properties:
Expand Down
Loading

0 comments on commit 6755648

Please sign in to comment.