From 2a21841a6b176e408fd143449458771922a025b4 Mon Sep 17 00:00:00 2001
From: Qiyue Yao <yaoq@vmware.com>
Date: Mon, 15 May 2023 17:16:34 +0800
Subject: [PATCH] Revert LogSettings use LogLabel

Signed-off-by: Qiyue Yao <yaoq@vmware.com>
---
 .../antrea/crds/clusternetworkpolicy.yaml     |  26 +-
 build/charts/antrea/crds/networkpolicy.yaml   |  26 +-
 build/yamls/antrea-aks.yml                    |  52 +-
 build/yamls/antrea-crds.yml                   |  52 +-
 build/yamls/antrea-eks.yml                    |  52 +-
 build/yamls/antrea-gke.yml                    |  52 +-
 build/yamls/antrea-ipsec.yml                  |  52 +-
 build/yamls/antrea.yml                        |  52 +-
 docs/antrea-network-policy.md                 |  34 +-
 .../antrea-multicluster-leader-global.yml     |  92 +--
 ...cluster.crd.antrea.io_resourceexports.yaml |  46 +-
 ...cluster.crd.antrea.io_resourceimports.yaml |  46 +-
 pkg/agent/controller/networkpolicy/cache.go   |  11 +-
 .../networkpolicy/networkpolicy_controller.go |   4 +-
 .../controller/networkpolicy/reconciler.go    |  20 +-
 .../networkpolicy/reconciler_test.go          |   2 +-
 pkg/agent/openflow/network_policy.go          |  30 +-
 pkg/agent/types/networkpolicy.go              |   7 +-
 pkg/apis/controlplane/types.go                |  10 +-
 pkg/apis/controlplane/v1beta2/generated.pb.go | 565 ++++++------------
 pkg/apis/controlplane/v1beta2/generated.proto |  10 +-
 pkg/apis/controlplane/v1beta2/types.go        |  10 +-
 .../v1beta2/zz_generated.conversion.go        |  34 +-
 .../v1beta2/zz_generated.deepcopy.go          |  21 -
 .../controlplane/zz_generated.deepcopy.go     |  21 -
 pkg/apis/crd/v1alpha1/types.go                |  15 +-
 .../crd/v1alpha1/zz_generated.deepcopy.go     |  21 -
 pkg/apiserver/openapi/zz_generated.openapi.go |  30 +-
 .../networkpolicy/antreanetworkpolicy.go      |   4 +-
 .../networkpolicy/antreanetworkpolicy_test.go |  17 +-
 .../networkpolicy/clusternetworkpolicy.go     |   2 +-
 .../clusternetworkpolicy_test.go              |  17 +-
 pkg/controller/networkpolicy/crd_utils.go     |   9 -
 .../networkpolicy/crd_utils_test.go           |  29 -
 .../networkpolicy/networkpolicy_controller.go |  28 +-
 .../networkpolicy_controller_test.go          |  12 +-
 pkg/controller/networkpolicy/validate.go      |  18 -
 pkg/controller/networkpolicy/validate_test.go |  26 -
 test/e2e/utils/anp_spec_builder.go            |   6 +-
 test/e2e/utils/cnp_spec_builder.go            |   6 +-
 40 files changed, 421 insertions(+), 1146 deletions(-)

diff --git a/build/charts/antrea/crds/clusternetworkpolicy.yaml b/build/charts/antrea/crds/clusternetworkpolicy.yaml
index b57a437f897..80643942cd2 100644
--- a/build/charts/antrea/crds/clusternetworkpolicy.yaml
+++ b/build/charts/antrea/crds/clusternetworkpolicy.yaml
@@ -383,16 +383,9 @@ spec:
                         type: string
                       enableLogging:
                         type: boolean
-                      logSetting:
-                        type: object
-                        required:
-                          - enabled
-                        properties:
-                          enabled:
-                            type: boolean
-                          logLabel:
-                            type: string
-                            pattern: "^.{0,32}$"
+                      logLabel:
+                        type: string
+                        pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
                 egress:
                   type: array
                   items:
@@ -655,16 +648,9 @@ spec:
                         type: string
                       enableLogging:
                         type: boolean
-                      logSetting:
-                        type: object
-                        required:
-                          - enabled
-                        properties:
-                          enabled:
-                            type: boolean
-                          logLabel:
-                            type: string
-                            pattern: "^.{0,32}$"
+                      logLabel:
+                        type: string
+                        pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
             status:
               type: object
               properties:
diff --git a/build/charts/antrea/crds/networkpolicy.yaml b/build/charts/antrea/crds/networkpolicy.yaml
index a65da3d85b9..0cc76ff6d3f 100644
--- a/build/charts/antrea/crds/networkpolicy.yaml
+++ b/build/charts/antrea/crds/networkpolicy.yaml
@@ -326,16 +326,9 @@ spec:
                         type: string
                       enableLogging:
                         type: boolean
-                      logSetting:
-                        type: object
-                        required:
-                          - enabled
-                        properties:
-                          enabled:
-                            type: boolean
-                          logLabel:
-                            type: string
-                            pattern: "^.{0,32}$"
+                      logLabel:
+                        type: string
+                        pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
                 egress:
                   type: array
                   items:
@@ -569,16 +562,9 @@ spec:
                         type: string
                       enableLogging:
                         type: boolean
-                      logSetting:
-                        type: object
-                        required:
-                          - enabled
-                        properties:
-                          enabled:
-                            type: boolean
-                          logLabel:
-                            type: string
-                            pattern: "^.{0,32}$"
+                      logLabel:
+                        type: string
+                        pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
             status:
               type: object
               properties:
diff --git a/build/yamls/antrea-aks.yml b/build/yamls/antrea-aks.yml
index 7db5c484a8d..a69ee5d0fc7 100644
--- a/build/yamls/antrea-aks.yml
+++ b/build/yamls/antrea-aks.yml
@@ -761,16 +761,9 @@ spec:
                         type: string
                       enableLogging:
                         type: boolean
-                      logSetting:
-                        type: object
-                        required:
-                          - enabled
-                        properties:
-                          enabled:
-                            type: boolean
-                          logLabel:
-                            type: string
-                            pattern: "^.{0,32}$"
+                      logLabel:
+                        type: string
+                        pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
                 egress:
                   type: array
                   items:
@@ -1033,16 +1026,9 @@ spec:
                         type: string
                       enableLogging:
                         type: boolean
-                      logSetting:
-                        type: object
-                        required:
-                          - enabled
-                        properties:
-                          enabled:
-                            type: boolean
-                          logLabel:
-                            type: string
-                            pattern: "^.{0,32}$"
+                      logLabel:
+                        type: string
+                        pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
             status:
               type: object
               properties:
@@ -1877,16 +1863,9 @@ spec:
                         type: string
                       enableLogging:
                         type: boolean
-                      logSetting:
-                        type: object
-                        required:
-                          - enabled
-                        properties:
-                          enabled:
-                            type: boolean
-                          logLabel:
-                            type: string
-                            pattern: "^.{0,32}$"
+                      logLabel:
+                        type: string
+                        pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
                 egress:
                   type: array
                   items:
@@ -2120,16 +2099,9 @@ spec:
                         type: string
                       enableLogging:
                         type: boolean
-                      logSetting:
-                        type: object
-                        required:
-                          - enabled
-                        properties:
-                          enabled:
-                            type: boolean
-                          logLabel:
-                            type: string
-                            pattern: "^.{0,32}$"
+                      logLabel:
+                        type: string
+                        pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
             status:
               type: object
               properties:
diff --git a/build/yamls/antrea-crds.yml b/build/yamls/antrea-crds.yml
index 726be13f379..756b689a497 100644
--- a/build/yamls/antrea-crds.yml
+++ b/build/yamls/antrea-crds.yml
@@ -754,16 +754,9 @@ spec:
                         type: string
                       enableLogging:
                         type: boolean
-                      logSetting:
-                        type: object
-                        required:
-                          - enabled
-                        properties:
-                          enabled:
-                            type: boolean
-                          logLabel:
-                            type: string
-                            pattern: "^.{0,32}$"
+                      logLabel:
+                        type: string
+                        pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
                 egress:
                   type: array
                   items:
@@ -1026,16 +1019,9 @@ spec:
                         type: string
                       enableLogging:
                         type: boolean
-                      logSetting:
-                        type: object
-                        required:
-                          - enabled
-                        properties:
-                          enabled:
-                            type: boolean
-                          logLabel:
-                            type: string
-                            pattern: "^.{0,32}$"
+                      logLabel:
+                        type: string
+                        pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
             status:
               type: object
               properties:
@@ -1858,16 +1844,9 @@ spec:
                         type: string
                       enableLogging:
                         type: boolean
-                      logSetting:
-                        type: object
-                        required:
-                          - enabled
-                        properties:
-                          enabled:
-                            type: boolean
-                          logLabel:
-                            type: string
-                            pattern: "^.{0,32}$"
+                      logLabel:
+                        type: string
+                        pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
                 egress:
                   type: array
                   items:
@@ -2101,16 +2080,9 @@ spec:
                         type: string
                       enableLogging:
                         type: boolean
-                      logSetting:
-                        type: object
-                        required:
-                          - enabled
-                        properties:
-                          enabled:
-                            type: boolean
-                          logLabel:
-                            type: string
-                            pattern: "^.{0,32}$"
+                      logLabel:
+                        type: string
+                        pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
             status:
               type: object
               properties:
diff --git a/build/yamls/antrea-eks.yml b/build/yamls/antrea-eks.yml
index 3c43a552b0d..71ef07c1ffc 100644
--- a/build/yamls/antrea-eks.yml
+++ b/build/yamls/antrea-eks.yml
@@ -761,16 +761,9 @@ spec:
                         type: string
                       enableLogging:
                         type: boolean
-                      logSetting:
-                        type: object
-                        required:
-                          - enabled
-                        properties:
-                          enabled:
-                            type: boolean
-                          logLabel:
-                            type: string
-                            pattern: "^.{0,32}$"
+                      logLabel:
+                        type: string
+                        pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
                 egress:
                   type: array
                   items:
@@ -1033,16 +1026,9 @@ spec:
                         type: string
                       enableLogging:
                         type: boolean
-                      logSetting:
-                        type: object
-                        required:
-                          - enabled
-                        properties:
-                          enabled:
-                            type: boolean
-                          logLabel:
-                            type: string
-                            pattern: "^.{0,32}$"
+                      logLabel:
+                        type: string
+                        pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
             status:
               type: object
               properties:
@@ -1877,16 +1863,9 @@ spec:
                         type: string
                       enableLogging:
                         type: boolean
-                      logSetting:
-                        type: object
-                        required:
-                          - enabled
-                        properties:
-                          enabled:
-                            type: boolean
-                          logLabel:
-                            type: string
-                            pattern: "^.{0,32}$"
+                      logLabel:
+                        type: string
+                        pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
                 egress:
                   type: array
                   items:
@@ -2120,16 +2099,9 @@ spec:
                         type: string
                       enableLogging:
                         type: boolean
-                      logSetting:
-                        type: object
-                        required:
-                          - enabled
-                        properties:
-                          enabled:
-                            type: boolean
-                          logLabel:
-                            type: string
-                            pattern: "^.{0,32}$"
+                      logLabel:
+                        type: string
+                        pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
             status:
               type: object
               properties:
diff --git a/build/yamls/antrea-gke.yml b/build/yamls/antrea-gke.yml
index 50286a0db7d..4abc4f6a48b 100644
--- a/build/yamls/antrea-gke.yml
+++ b/build/yamls/antrea-gke.yml
@@ -761,16 +761,9 @@ spec:
                         type: string
                       enableLogging:
                         type: boolean
-                      logSetting:
-                        type: object
-                        required:
-                          - enabled
-                        properties:
-                          enabled:
-                            type: boolean
-                          logLabel:
-                            type: string
-                            pattern: "^.{0,32}$"
+                      logLabel:
+                        type: string
+                        pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
                 egress:
                   type: array
                   items:
@@ -1033,16 +1026,9 @@ spec:
                         type: string
                       enableLogging:
                         type: boolean
-                      logSetting:
-                        type: object
-                        required:
-                          - enabled
-                        properties:
-                          enabled:
-                            type: boolean
-                          logLabel:
-                            type: string
-                            pattern: "^.{0,32}$"
+                      logLabel:
+                        type: string
+                        pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
             status:
               type: object
               properties:
@@ -1877,16 +1863,9 @@ spec:
                         type: string
                       enableLogging:
                         type: boolean
-                      logSetting:
-                        type: object
-                        required:
-                          - enabled
-                        properties:
-                          enabled:
-                            type: boolean
-                          logLabel:
-                            type: string
-                            pattern: "^.{0,32}$"
+                      logLabel:
+                        type: string
+                        pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
                 egress:
                   type: array
                   items:
@@ -2120,16 +2099,9 @@ spec:
                         type: string
                       enableLogging:
                         type: boolean
-                      logSetting:
-                        type: object
-                        required:
-                          - enabled
-                        properties:
-                          enabled:
-                            type: boolean
-                          logLabel:
-                            type: string
-                            pattern: "^.{0,32}$"
+                      logLabel:
+                        type: string
+                        pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
             status:
               type: object
               properties:
diff --git a/build/yamls/antrea-ipsec.yml b/build/yamls/antrea-ipsec.yml
index afc067a87ef..85a7e53e226 100644
--- a/build/yamls/antrea-ipsec.yml
+++ b/build/yamls/antrea-ipsec.yml
@@ -761,16 +761,9 @@ spec:
                         type: string
                       enableLogging:
                         type: boolean
-                      logSetting:
-                        type: object
-                        required:
-                          - enabled
-                        properties:
-                          enabled:
-                            type: boolean
-                          logLabel:
-                            type: string
-                            pattern: "^.{0,32}$"
+                      logLabel:
+                        type: string
+                        pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
                 egress:
                   type: array
                   items:
@@ -1033,16 +1026,9 @@ spec:
                         type: string
                       enableLogging:
                         type: boolean
-                      logSetting:
-                        type: object
-                        required:
-                          - enabled
-                        properties:
-                          enabled:
-                            type: boolean
-                          logLabel:
-                            type: string
-                            pattern: "^.{0,32}$"
+                      logLabel:
+                        type: string
+                        pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
             status:
               type: object
               properties:
@@ -1877,16 +1863,9 @@ spec:
                         type: string
                       enableLogging:
                         type: boolean
-                      logSetting:
-                        type: object
-                        required:
-                          - enabled
-                        properties:
-                          enabled:
-                            type: boolean
-                          logLabel:
-                            type: string
-                            pattern: "^.{0,32}$"
+                      logLabel:
+                        type: string
+                        pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
                 egress:
                   type: array
                   items:
@@ -2120,16 +2099,9 @@ spec:
                         type: string
                       enableLogging:
                         type: boolean
-                      logSetting:
-                        type: object
-                        required:
-                          - enabled
-                        properties:
-                          enabled:
-                            type: boolean
-                          logLabel:
-                            type: string
-                            pattern: "^.{0,32}$"
+                      logLabel:
+                        type: string
+                        pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
             status:
               type: object
               properties:
diff --git a/build/yamls/antrea.yml b/build/yamls/antrea.yml
index 016af1895a5..29c80c4041d 100644
--- a/build/yamls/antrea.yml
+++ b/build/yamls/antrea.yml
@@ -761,16 +761,9 @@ spec:
                         type: string
                       enableLogging:
                         type: boolean
-                      logSetting:
-                        type: object
-                        required:
-                          - enabled
-                        properties:
-                          enabled:
-                            type: boolean
-                          logLabel:
-                            type: string
-                            pattern: "^.{0,32}$"
+                      logLabel:
+                        type: string
+                        pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
                 egress:
                   type: array
                   items:
@@ -1033,16 +1026,9 @@ spec:
                         type: string
                       enableLogging:
                         type: boolean
-                      logSetting:
-                        type: object
-                        required:
-                          - enabled
-                        properties:
-                          enabled:
-                            type: boolean
-                          logLabel:
-                            type: string
-                            pattern: "^.{0,32}$"
+                      logLabel:
+                        type: string
+                        pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
             status:
               type: object
               properties:
@@ -1877,16 +1863,9 @@ spec:
                         type: string
                       enableLogging:
                         type: boolean
-                      logSetting:
-                        type: object
-                        required:
-                          - enabled
-                        properties:
-                          enabled:
-                            type: boolean
-                          logLabel:
-                            type: string
-                            pattern: "^.{0,32}$"
+                      logLabel:
+                        type: string
+                        pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
                 egress:
                   type: array
                   items:
@@ -2120,16 +2099,9 @@ spec:
                         type: string
                       enableLogging:
                         type: boolean
-                      logSetting:
-                        type: object
-                        required:
-                          - enabled
-                        properties:
-                          enabled:
-                            type: boolean
-                          logLabel:
-                            type: string
-                            pattern: "^.{0,32}$"
+                      logLabel:
+                        type: string
+                        pattern: "^(([A-Za-z0-9][-A-Za-z0-9_.]{0,61})?[A-Za-z0-9])?$"
             status:
               type: object
               properties:
diff --git a/docs/antrea-network-policy.md b/docs/antrea-network-policy.md
index 1711e65562e..95822ad3cd1 100644
--- a/docs/antrea-network-policy.md
+++ b/docs/antrea-network-policy.md
@@ -553,9 +553,8 @@ spec:
             matchLabels:
               role: db
       name: AllowFromFrontend
-      logSettings:
-        enabled: true
-        logLabel: "frontend-allowed"
+      enableLogging: true
+      logLabel: "frontend-allowed"
 ```
 
 **spec**: The ClusterNetworkPolicy `spec` has all the information needed to
@@ -717,27 +716,24 @@ to select Pods. More details can be found in the [ServiceAccountSelector](#servi
 **Note**: The order in which the egress rules are specified matters, i.e., rules will
 be enforced in the order in which they are written.
 
-**logSettings** and **enableLogging**: The `enableLogging` field was introduced in
-Antrea v0.11.0, and ACNP rule logging can be enabled by setting it. In Antrea
-v1.12.0, we introduced a new `logSettings` field to configure rule logging,
-deprecating `enableLogging`. These two fields should not be set at the same time.
-`logSettings.enabled` and `enableLogging` are equivalent. When either of them is
-set to `true`, the first packet of any connection that matches this rule will be
+**enableLogging** and **logLabel**: Antrea-native policy ingress or egress rules
+can be audited by setting its logging fields. When the `enableLogging` field is set
+to `true`, the first packet of any connection that matches this rule will be
 logged to a file (`/var/log/antrea/networkpolicy/np.log`) on the Node on which the
-rule is applied. The log files can then be used for further analysis. When using
-`logSettings`, `enabled` must be set to `true` to enable logging; if `logLabel` is
-provided, the label will be added in the log, otherwise it defaults to empty value.
-
-In the [ACNP with log settings](#acnp-with-log-settings) traffic that hits the
+rule is enforced. The log files can then be used for further analysis. If `logLabel`
+is provided, the label will be added in the log. For example, in the
+[ACNP with log settings](#acnp-with-log-settings), traffic that hits the
 "AllowFromFrontend" rule will be logged with log label "frontend-allowed".
+
 For drop and reject rules, deduplication is applied to reduce duplicated
-logs, and duplication buffer length is set to 1 second. If a rule name is not
-provided, an identifiable name will be generated for the rule and displayed in the log.
-For rules in layer 7 NetworkPolicy, packets are logged with action `Redirect` prior
-to analysis by the layer 7 engine, and the layer 7 engine can log more information
-in its own logs.
+log messages, and the duplication buffer length is set to 1 second. When a rule
+does not have a name, an identifiable name will be generated for the rule and
+added to the log. For rules in layer 7 NetworkPolicy, packets are logged with
+action `Redirect` prior to analysis by the layer 7 engine, and the layer 7 engine
+can log more information in its own logs.
 
 The rules are logged in the following format:
+
 ```text
     <yyyy/mm/dd> <time> <ovs-table-name> <antrea-native-policy-reference> <rule-name> <action> <openflow-priority> <source-ip> <source-port> <destination-ip> <destination-port> <protocol> <packet-length> <log-label>
     Deduplication:
diff --git a/multicluster/build/yamls/antrea-multicluster-leader-global.yml b/multicluster/build/yamls/antrea-multicluster-leader-global.yml
index 4acab273455..980e43c67e7 100644
--- a/multicluster/build/yamls/antrea-multicluster-leader-global.yml
+++ b/multicluster/build/yamls/antrea-multicluster-leader-global.yml
@@ -784,8 +784,7 @@ spec:
                         enableLogging:
                           description: EnableLogging is used to indicate if agent
                             should generate logs when rules are matched. Should be
-                            default to false. This field can't be used with LogSettings,
-                            will be deprecated.
+                            default to false.
                           type: boolean
                         from:
                           description: Rule is matched if traffic originates from
@@ -1093,22 +1092,10 @@ spec:
                                 type: object
                             type: object
                           type: array
-                        logSetting:
-                          description: LogSettings is used to specify logging behaviors
-                            of the rules when matched. This field can't be used with
-                            EnableLogging.
-                          properties:
-                            enabled:
-                              description: LogEnabled indicates if logs should be
-                                generated when rules are matched.
-                              type: boolean
-                            logLabel:
-                              description: LogLabel is a keyword included in the NetworkPolicy
-                                logs if this rule is matched and has log enabled.
-                              type: string
-                          required:
-                          - enabled
-                          type: object
+                        logLabel:
+                          description: LogLabel is a user-defined arbitrary string
+                            which will be printed in the NetworkPolicy logs.
+                          type: string
                         name:
                           description: Name describes the intention of this rule.
                             Name should be unique within the policy.
@@ -1689,8 +1676,7 @@ spec:
                         enableLogging:
                           description: EnableLogging is used to indicate if agent
                             should generate logs when rules are matched. Should be
-                            default to false. This field can't be used with LogSettings,
-                            will be deprecated.
+                            default to false.
                           type: boolean
                         from:
                           description: Rule is matched if traffic originates from
@@ -1998,22 +1984,10 @@ spec:
                                 type: object
                             type: object
                           type: array
-                        logSetting:
-                          description: LogSettings is used to specify logging behaviors
-                            of the rules when matched. This field can't be used with
-                            EnableLogging.
-                          properties:
-                            enabled:
-                              description: LogEnabled indicates if logs should be
-                                generated when rules are matched.
-                              type: boolean
-                            logLabel:
-                              description: LogLabel is a keyword included in the NetworkPolicy
-                                logs if this rule is matched and has log enabled.
-                              type: string
-                          required:
-                          - enabled
-                          type: object
+                        logLabel:
+                          description: LogLabel is a user-defined arbitrary string
+                            which will be printed in the NetworkPolicy logs.
+                          type: string
                         name:
                           description: Name describes the intention of this rule.
                             Name should be unique within the policy.
@@ -3510,8 +3484,7 @@ spec:
                         enableLogging:
                           description: EnableLogging is used to indicate if agent
                             should generate logs when rules are matched. Should be
-                            default to false. This field can't be used with LogSettings,
-                            will be deprecated.
+                            default to false.
                           type: boolean
                         from:
                           description: Rule is matched if traffic originates from
@@ -3819,22 +3792,10 @@ spec:
                                 type: object
                             type: object
                           type: array
-                        logSetting:
-                          description: LogSettings is used to specify logging behaviors
-                            of the rules when matched. This field can't be used with
-                            EnableLogging.
-                          properties:
-                            enabled:
-                              description: LogEnabled indicates if logs should be
-                                generated when rules are matched.
-                              type: boolean
-                            logLabel:
-                              description: LogLabel is a keyword included in the NetworkPolicy
-                                logs if this rule is matched and has log enabled.
-                              type: string
-                          required:
-                          - enabled
-                          type: object
+                        logLabel:
+                          description: LogLabel is a user-defined arbitrary string
+                            which will be printed in the NetworkPolicy logs.
+                          type: string
                         name:
                           description: Name describes the intention of this rule.
                             Name should be unique within the policy.
@@ -4415,8 +4376,7 @@ spec:
                         enableLogging:
                           description: EnableLogging is used to indicate if agent
                             should generate logs when rules are matched. Should be
-                            default to false. This field can't be used with LogSettings,
-                            will be deprecated.
+                            default to false.
                           type: boolean
                         from:
                           description: Rule is matched if traffic originates from
@@ -4724,22 +4684,10 @@ spec:
                                 type: object
                             type: object
                           type: array
-                        logSetting:
-                          description: LogSettings is used to specify logging behaviors
-                            of the rules when matched. This field can't be used with
-                            EnableLogging.
-                          properties:
-                            enabled:
-                              description: LogEnabled indicates if logs should be
-                                generated when rules are matched.
-                              type: boolean
-                            logLabel:
-                              description: LogLabel is a keyword included in the NetworkPolicy
-                                logs if this rule is matched and has log enabled.
-                              type: string
-                          required:
-                          - enabled
-                          type: object
+                        logLabel:
+                          description: LogLabel is a user-defined arbitrary string
+                            which will be printed in the NetworkPolicy logs.
+                          type: string
                         name:
                           description: Name describes the intention of this rule.
                             Name should be unique within the policy.
diff --git a/multicluster/config/crd/bases/multicluster.crd.antrea.io_resourceexports.yaml b/multicluster/config/crd/bases/multicluster.crd.antrea.io_resourceexports.yaml
index 8a6e70fda95..d9e360976e1 100644
--- a/multicluster/config/crd/bases/multicluster.crd.antrea.io_resourceexports.yaml
+++ b/multicluster/config/crd/bases/multicluster.crd.antrea.io_resourceexports.yaml
@@ -479,8 +479,7 @@ spec:
                         enableLogging:
                           description: EnableLogging is used to indicate if agent
                             should generate logs when rules are matched. Should be
-                            default to false. This field can't be used with LogSettings,
-                            will be deprecated.
+                            default to false.
                           type: boolean
                         from:
                           description: Rule is matched if traffic originates from
@@ -788,22 +787,10 @@ spec:
                                 type: object
                             type: object
                           type: array
-                        logSetting:
-                          description: LogSettings is used to specify logging behaviors
-                            of the rules when matched. This field can't be used with
-                            EnableLogging.
-                          properties:
-                            enabled:
-                              description: LogEnabled indicates if logs should be
-                                generated when rules are matched.
-                              type: boolean
-                            logLabel:
-                              description: LogLabel is a keyword included in the NetworkPolicy
-                                logs if this rule is matched and has log enabled.
-                              type: string
-                          required:
-                          - enabled
-                          type: object
+                        logLabel:
+                          description: LogLabel is a user-defined arbitrary string
+                            which will be printed in the NetworkPolicy logs.
+                          type: string
                         name:
                           description: Name describes the intention of this rule.
                             Name should be unique within the policy.
@@ -1384,8 +1371,7 @@ spec:
                         enableLogging:
                           description: EnableLogging is used to indicate if agent
                             should generate logs when rules are matched. Should be
-                            default to false. This field can't be used with LogSettings,
-                            will be deprecated.
+                            default to false.
                           type: boolean
                         from:
                           description: Rule is matched if traffic originates from
@@ -1693,22 +1679,10 @@ spec:
                                 type: object
                             type: object
                           type: array
-                        logSetting:
-                          description: LogSettings is used to specify logging behaviors
-                            of the rules when matched. This field can't be used with
-                            EnableLogging.
-                          properties:
-                            enabled:
-                              description: LogEnabled indicates if logs should be
-                                generated when rules are matched.
-                              type: boolean
-                            logLabel:
-                              description: LogLabel is a keyword included in the NetworkPolicy
-                                logs if this rule is matched and has log enabled.
-                              type: string
-                          required:
-                          - enabled
-                          type: object
+                        logLabel:
+                          description: LogLabel is a user-defined arbitrary string
+                            which will be printed in the NetworkPolicy logs.
+                          type: string
                         name:
                           description: Name describes the intention of this rule.
                             Name should be unique within the policy.
diff --git a/multicluster/config/crd/bases/multicluster.crd.antrea.io_resourceimports.yaml b/multicluster/config/crd/bases/multicluster.crd.antrea.io_resourceimports.yaml
index 64cc53a02a4..0a7a1a80402 100644
--- a/multicluster/config/crd/bases/multicluster.crd.antrea.io_resourceimports.yaml
+++ b/multicluster/config/crd/bases/multicluster.crd.antrea.io_resourceimports.yaml
@@ -477,8 +477,7 @@ spec:
                         enableLogging:
                           description: EnableLogging is used to indicate if agent
                             should generate logs when rules are matched. Should be
-                            default to false. This field can't be used with LogSettings,
-                            will be deprecated.
+                            default to false.
                           type: boolean
                         from:
                           description: Rule is matched if traffic originates from
@@ -786,22 +785,10 @@ spec:
                                 type: object
                             type: object
                           type: array
-                        logSetting:
-                          description: LogSettings is used to specify logging behaviors
-                            of the rules when matched. This field can't be used with
-                            EnableLogging.
-                          properties:
-                            enabled:
-                              description: LogEnabled indicates if logs should be
-                                generated when rules are matched.
-                              type: boolean
-                            logLabel:
-                              description: LogLabel is a keyword included in the NetworkPolicy
-                                logs if this rule is matched and has log enabled.
-                              type: string
-                          required:
-                          - enabled
-                          type: object
+                        logLabel:
+                          description: LogLabel is a user-defined arbitrary string
+                            which will be printed in the NetworkPolicy logs.
+                          type: string
                         name:
                           description: Name describes the intention of this rule.
                             Name should be unique within the policy.
@@ -1382,8 +1369,7 @@ spec:
                         enableLogging:
                           description: EnableLogging is used to indicate if agent
                             should generate logs when rules are matched. Should be
-                            default to false. This field can't be used with LogSettings,
-                            will be deprecated.
+                            default to false.
                           type: boolean
                         from:
                           description: Rule is matched if traffic originates from
@@ -1691,22 +1677,10 @@ spec:
                                 type: object
                             type: object
                           type: array
-                        logSetting:
-                          description: LogSettings is used to specify logging behaviors
-                            of the rules when matched. This field can't be used with
-                            EnableLogging.
-                          properties:
-                            enabled:
-                              description: LogEnabled indicates if logs should be
-                                generated when rules are matched.
-                              type: boolean
-                            logLabel:
-                              description: LogLabel is a keyword included in the NetworkPolicy
-                                logs if this rule is matched and has log enabled.
-                              type: string
-                          required:
-                          - enabled
-                          type: object
+                        logLabel:
+                          description: LogLabel is a user-defined arbitrary string
+                            which will be printed in the NetworkPolicy logs.
+                          type: string
                         name:
                           description: Name describes the intention of this rule.
                             Name should be unique within the policy.
diff --git a/pkg/agent/controller/networkpolicy/cache.go b/pkg/agent/controller/networkpolicy/cache.go
index 94e089a9c02..0ccb9b6f4bf 100644
--- a/pkg/agent/controller/networkpolicy/cache.go
+++ b/pkg/agent/controller/networkpolicy/cache.go
@@ -98,8 +98,8 @@ type rule struct {
 	SourceRef *v1beta.NetworkPolicyReference
 	// EnableLogging is a boolean indicating whether logging is required for Antrea Policies. Always false for K8s NetworkPolicy.
 	EnableLogging bool
-	// LogSettings specifies logging behaviors of the rule when matched.
-	LogSettings *v1beta.RuleLogSettings
+	// LogLabel is a string associated to the NetworkPolicy. Used for logging.
+	LogLabel string
 }
 
 func (r *rule) Less(r2 *rule) bool {
@@ -182,11 +182,6 @@ func (r *CompletedRule) isIGMPEgressPolicyRule() bool {
 	return false
 }
 
-// isLogEnabled aggregates whether log is enabled for the rule from EnableLogging and LogSettings.
-func (r *CompletedRule) isLogEnabled() bool {
-	return r.EnableLogging || r.LogSettings != nil
-}
-
 // ruleCache caches Antrea AddressGroups, AppliedToGroups and NetworkPolicies,
 // can construct complete rules that can be used by reconciler to enforce.
 type ruleCache struct {
@@ -694,7 +689,7 @@ func toRule(r *v1beta.NetworkPolicyRule, policy *v1beta.NetworkPolicy, maxPriori
 		PolicyUID:       policy.UID,
 		SourceRef:       policy.SourceRef,
 		EnableLogging:   r.EnableLogging,
-		LogSettings:     r.LogSettings,
+		LogLabel:        r.LogLabel,
 	}
 	rule.ID = hashRule(rule)
 	rule.PolicyName = policy.Name
diff --git a/pkg/agent/controller/networkpolicy/networkpolicy_controller.go b/pkg/agent/controller/networkpolicy/networkpolicy_controller.go
index 7b75b8ab310..c446b074946 100644
--- a/pkg/agent/controller/networkpolicy/networkpolicy_controller.go
+++ b/pkg/agent/controller/networkpolicy/networkpolicy_controller.go
@@ -645,7 +645,7 @@ func (c *Controller) syncRule(key string) error {
 		vlanID := c.l7VlanIDAllocator.allocate(key)
 		rule.L7RuleVlanID = &vlanID
 
-		if err := c.l7RuleReconciler.AddRule(key, rule.SourceRef.ToString(), vlanID, rule.L7Protocols, rule.isLogEnabled()); err != nil {
+		if err := c.l7RuleReconciler.AddRule(key, rule.SourceRef.ToString(), vlanID, rule.L7Protocols, rule.EnableLogging); err != nil {
 			return err
 		}
 	}
@@ -690,7 +690,7 @@ func (c *Controller) syncRules(keys []string) error {
 				vlanID := c.l7VlanIDAllocator.allocate(key)
 				rule.L7RuleVlanID = &vlanID
 
-				if err := c.l7RuleReconciler.AddRule(key, rule.SourceRef.ToString(), vlanID, rule.L7Protocols, rule.isLogEnabled()); err != nil {
+				if err := c.l7RuleReconciler.AddRule(key, rule.SourceRef.ToString(), vlanID, rule.L7Protocols, rule.EnableLogging); err != nil {
 					return err
 				}
 			}
diff --git a/pkg/agent/controller/networkpolicy/reconciler.go b/pkg/agent/controller/networkpolicy/reconciler.go
index a36d91dcb00..7d8b99c2db6 100644
--- a/pkg/agent/controller/networkpolicy/reconciler.go
+++ b/pkg/agent/controller/networkpolicy/reconciler.go
@@ -538,7 +538,7 @@ func (r *reconciler) computeOFRulesForAdd(rule *CompletedRule, ofPriority *uint1
 			TableID:       table,
 			PolicyRef:     rule.SourceRef,
 			EnableLogging: rule.EnableLogging,
-			LogSettings:   rule.LogSettings,
+			LogLabel:      rule.LogLabel,
 		}
 		return ofRuleByServicesMap, lastRealized
 	} else if isIGMP {
@@ -581,7 +581,7 @@ func (r *reconciler) computeOFRulesForAdd(rule *CompletedRule, ofPriority *uint1
 				TableID:       table,
 				PolicyRef:     rule.SourceRef,
 				EnableLogging: rule.EnableLogging,
-				LogSettings:   rule.LogSettings,
+				LogLabel:      rule.LogLabel,
 			}
 		}
 	} else {
@@ -612,7 +612,7 @@ func (r *reconciler) computeOFRulesForAdd(rule *CompletedRule, ofPriority *uint1
 				TableID:       table,
 				PolicyRef:     rule.SourceRef,
 				EnableLogging: rule.EnableLogging,
-				LogSettings:   rule.LogSettings,
+				LogLabel:      rule.LogLabel,
 			}
 		}
 
@@ -637,7 +637,7 @@ func (r *reconciler) computeOFRulesForAdd(rule *CompletedRule, ofPriority *uint1
 					TableID:       table,
 					PolicyRef:     rule.SourceRef,
 					EnableLogging: rule.EnableLogging,
-					LogSettings:   rule.LogSettings,
+					LogLabel:      rule.LogLabel,
 				}
 				ofRuleByServicesMap[svcKey] = ofRule
 			}
@@ -737,7 +737,7 @@ func (r *reconciler) update(lastRealized *lastRealized, newRule *CompletedRule,
 				TableID:       table,
 				PolicyRef:     newRule.SourceRef,
 				EnableLogging: newRule.EnableLogging,
-				LogSettings:   newRule.LogSettings,
+				LogLabel:      newRule.LogLabel,
 			}
 			err := r.idAllocator.allocateForRule(ofRule)
 			if err != nil {
@@ -750,7 +750,7 @@ func (r *reconciler) update(lastRealized *lastRealized, newRule *CompletedRule,
 		} else {
 			addedTo := ofPortsToOFAddresses(newOFPorts.Difference(lastRealized.podOFPorts[igmpServicesKey]))
 			deletedTo := ofPortsToOFAddresses(lastRealized.podOFPorts[igmpServicesKey].Difference(newOFPorts))
-			if err := r.updateOFRule(ofID, nil, addedTo, nil, deletedTo, ofPriority, newRule.isLogEnabled(), false); err != nil {
+			if err := r.updateOFRule(ofID, nil, addedTo, nil, deletedTo, ofPriority, newRule.EnableLogging, false); err != nil {
 				return err
 			}
 		}
@@ -795,7 +795,7 @@ func (r *reconciler) update(lastRealized *lastRealized, newRule *CompletedRule,
 					TableID:       table,
 					PolicyRef:     newRule.SourceRef,
 					EnableLogging: newRule.EnableLogging,
-					LogSettings:   newRule.LogSettings,
+					LogLabel:      newRule.LogLabel,
 				}
 				err := r.idAllocator.allocateForRule(ofRule)
 				if err != nil {
@@ -822,7 +822,7 @@ func (r *reconciler) update(lastRealized *lastRealized, newRule *CompletedRule,
 					addedTo = ofPortsToOFAddresses(newOFPorts.Difference(originalOfPortsSet))
 					deletedTo = ofPortsToOFAddresses(originalOfPortsSet.Difference(newOFPorts))
 				}
-				if err := r.updateOFRule(ofID, addedFrom, addedTo, deletedFrom, deletedTo, ofPriority, newRule.isLogEnabled(), len(newRule.From.LabelIdentities) > 0); err != nil {
+				if err := r.updateOFRule(ofID, addedFrom, addedTo, deletedFrom, deletedTo, ofPriority, newRule.EnableLogging, len(newRule.From.LabelIdentities) > 0); err != nil {
 					return err
 				}
 				// Delete valid servicesKey from staleOFIDs.
@@ -867,7 +867,7 @@ func (r *reconciler) update(lastRealized *lastRealized, newRule *CompletedRule,
 					TableID:       table,
 					PolicyRef:     newRule.SourceRef,
 					EnableLogging: newRule.EnableLogging,
-					LogSettings:   newRule.LogSettings,
+					LogLabel:      newRule.LogLabel,
 				}
 				// If the PolicyRule for the original services doesn't exist and IPBlocks is present, it means the
 				// reconciler hasn't installed flows for IPBlocks, then it must be added to the new PolicyRule.
@@ -915,7 +915,7 @@ func (r *reconciler) update(lastRealized *lastRealized, newRule *CompletedRule,
 					addedTo = svcGroupIDsToOFAddresses(newGroupIDSet.Difference(originalGroupIDSet))
 					deletedTo = svcGroupIDsToOFAddresses(originalGroupIDSet.Difference(newGroupIDSet))
 				}
-				if err := r.updateOFRule(ofID, addedFrom, addedTo, deletedFrom, deletedTo, ofPriority, newRule.isLogEnabled(), false); err != nil {
+				if err := r.updateOFRule(ofID, addedFrom, addedTo, deletedFrom, deletedTo, ofPriority, newRule.EnableLogging, false); err != nil {
 					return err
 				}
 				if r.fqdnController != nil {
diff --git a/pkg/agent/controller/networkpolicy/reconciler_test.go b/pkg/agent/controller/networkpolicy/reconciler_test.go
index 8de61194370..c9d37b7e356 100644
--- a/pkg/agent/controller/networkpolicy/reconciler_test.go
+++ b/pkg/agent/controller/networkpolicy/reconciler_test.go
@@ -2306,7 +2306,7 @@ func (m policyRuleMatcher) Matches(x interface{}) bool {
 		a.PolicyRef != b.PolicyRef ||
 		a.Direction != b.Direction ||
 		a.EnableLogging != b.EnableLogging ||
-		a.LogSettings != b.LogSettings {
+		a.LogLabel != b.LogLabel {
 		return false
 	}
 	return true
diff --git a/pkg/agent/openflow/network_policy.go b/pkg/agent/openflow/network_policy.go
index 38974b9a6e9..83cbba12356 100644
--- a/pkg/agent/openflow/network_policy.go
+++ b/pkg/agent/openflow/network_policy.go
@@ -1174,12 +1174,10 @@ func (f *featureNetworkPolicy) calculateActionFlowChangesForRule(rule *types.Pol
 		return nil
 	}
 	conj = &policyRuleConjunction{
-		id:       ruleOfID,
-		npRef:    rule.PolicyRef,
-		ruleName: rule.Name,
-	}
-	if rule.LogSettings != nil {
-		conj.ruleLogLabel = rule.LogSettings.LogLabel
+		id:           ruleOfID,
+		npRef:        rule.PolicyRef,
+		ruleName:     rule.Name,
+		ruleLogLabel: rule.LogLabel,
 	}
 	nClause, ruleTable, dropTable := conj.calculateClauses(rule)
 	conj.ruleTableID = rule.TableID
@@ -1195,15 +1193,15 @@ func (f *featureNetworkPolicy) calculateActionFlowChangesForRule(rule *types.Pol
 		var metricFlows []binding.Flow
 		if rule.IsAntreaNetworkPolicyRule() && *rule.Action == crdv1alpha1.RuleActionDrop {
 			metricFlows = append(metricFlows, f.denyRuleMetricFlow(ruleOfID, isIngress, rule.TableID))
-			actionFlows = append(actionFlows, f.conjunctionActionDenyFlow(ruleOfID, ruleTable, rule.Priority, DispositionDrop, rule.IsLogEnabled()))
+			actionFlows = append(actionFlows, f.conjunctionActionDenyFlow(ruleOfID, ruleTable, rule.Priority, DispositionDrop, rule.EnableLogging))
 		} else if rule.IsAntreaNetworkPolicyRule() && *rule.Action == crdv1alpha1.RuleActionReject {
 			metricFlows = append(metricFlows, f.denyRuleMetricFlow(ruleOfID, isIngress, rule.TableID))
-			actionFlows = append(actionFlows, f.conjunctionActionDenyFlow(ruleOfID, ruleTable, rule.Priority, DispositionRej, rule.IsLogEnabled()))
+			actionFlows = append(actionFlows, f.conjunctionActionDenyFlow(ruleOfID, ruleTable, rule.Priority, DispositionRej, rule.EnableLogging))
 		} else if rule.IsAntreaNetworkPolicyRule() && *rule.Action == crdv1alpha1.RuleActionPass {
-			actionFlows = append(actionFlows, f.conjunctionActionPassFlow(ruleOfID, ruleTable, rule.Priority, rule.IsLogEnabled()))
+			actionFlows = append(actionFlows, f.conjunctionActionPassFlow(ruleOfID, ruleTable, rule.Priority, rule.EnableLogging))
 		} else {
 			metricFlows = append(metricFlows, f.allowRulesMetricFlows(ruleOfID, isIngress, rule.TableID)...)
-			actionFlows = append(actionFlows, f.conjunctionActionFlow(ruleOfID, ruleTable, dropTable.GetNext(), rule.Priority, rule.IsLogEnabled(), rule.L7RuleVlanID)...)
+			actionFlows = append(actionFlows, f.conjunctionActionFlow(ruleOfID, ruleTable, dropTable.GetNext(), rule.Priority, rule.EnableLogging, rule.L7RuleVlanID)...)
 		}
 		conj.actionFlows = actionFlows
 		conj.metricFlows = metricFlows
@@ -1226,20 +1224,20 @@ func (f *featureNetworkPolicy) addRuleToConjunctiveMatch(conj *policyRuleConjunc
 	if conj.fromClause != nil {
 		for _, addr := range rule.From {
 			match := generateAddressConjMatch(conj.fromClause.ruleTable.GetID(), addr, types.SrcAddress, rule.Priority)
-			f.addActionToConjunctiveMatch(conj.fromClause, match, rule.IsLogEnabled(), isMCNPRule)
+			f.addActionToConjunctiveMatch(conj.fromClause, match, rule.EnableLogging, isMCNPRule)
 		}
 	}
 	if conj.toClause != nil {
 		for _, addr := range rule.To {
 			match := generateAddressConjMatch(conj.toClause.ruleTable.GetID(), addr, types.DstAddress, rule.Priority)
-			f.addActionToConjunctiveMatch(conj.toClause, match, rule.IsLogEnabled(), isMCNPRule)
+			f.addActionToConjunctiveMatch(conj.toClause, match, rule.EnableLogging, isMCNPRule)
 		}
 	}
 	if conj.serviceClause != nil {
 		for _, eachService := range rule.Service {
 			matches := generateServiceConjMatches(conj.serviceClause.ruleTable.GetID(), eachService, rule.Priority, f.ipProtocols, false)
 			for _, match := range matches {
-				f.addActionToConjunctiveMatch(conj.serviceClause, match, rule.IsLogEnabled(), isMCNPRule)
+				f.addActionToConjunctiveMatch(conj.serviceClause, match, rule.EnableLogging, isMCNPRule)
 			}
 		}
 	}
@@ -1460,13 +1458,13 @@ func (c *policyRuleConjunction) calculateChangesForRuleCreation(featureNetworkPo
 	isMCNPRule := containsLabelIdentityAddress(rule.From)
 	var ctxChanges []*conjMatchFlowContextChange
 	if c.fromClause != nil {
-		ctxChanges = append(ctxChanges, c.fromClause.addAddrFlows(featureNetworkPolicy, types.SrcAddress, rule.From, rule.Priority, rule.IsLogEnabled(), isMCNPRule)...)
+		ctxChanges = append(ctxChanges, c.fromClause.addAddrFlows(featureNetworkPolicy, types.SrcAddress, rule.From, rule.Priority, rule.EnableLogging, isMCNPRule)...)
 	}
 	if c.toClause != nil {
-		ctxChanges = append(ctxChanges, c.toClause.addAddrFlows(featureNetworkPolicy, types.DstAddress, rule.To, rule.Priority, rule.IsLogEnabled(), isMCNPRule)...)
+		ctxChanges = append(ctxChanges, c.toClause.addAddrFlows(featureNetworkPolicy, types.DstAddress, rule.To, rule.Priority, rule.EnableLogging, isMCNPRule)...)
 	}
 	if c.serviceClause != nil {
-		ctxChanges = append(ctxChanges, c.serviceClause.addServiceFlows(featureNetworkPolicy, rule.Service, rule.Priority, false, rule.IsLogEnabled())...)
+		ctxChanges = append(ctxChanges, c.serviceClause.addServiceFlows(featureNetworkPolicy, rule.Service, rule.Priority, false, rule.EnableLogging)...)
 	}
 	return ctxChanges
 }
diff --git a/pkg/agent/types/networkpolicy.go b/pkg/agent/types/networkpolicy.go
index 506603445fb..ca25e21df85 100644
--- a/pkg/agent/types/networkpolicy.go
+++ b/pkg/agent/types/networkpolicy.go
@@ -89,7 +89,7 @@ type PolicyRule struct {
 	TableID       uint8
 	PolicyRef     *v1beta2.NetworkPolicyReference
 	EnableLogging bool
-	LogSettings   *v1beta2.RuleLogSettings
+	LogLabel      string
 }
 
 // IsAntreaNetworkPolicyRule returns if a PolicyRule is created for Antrea NetworkPolicy types.
@@ -97,11 +97,6 @@ func (r *PolicyRule) IsAntreaNetworkPolicyRule() bool {
 	return r.PolicyRef.Type != v1beta2.K8sNetworkPolicy
 }
 
-// IsLogEnabled aggregates whether log is enabled from EnableLogging and LogSettings.
-func (r *PolicyRule) IsLogEnabled() bool {
-	return r.EnableLogging || r.LogSettings != nil
-}
-
 // Priority is a struct that is composed of Antrea NetworkPolicy priority, rule priority and Tier priority.
 // It is used as the basic unit for priority sorting.
 type Priority struct {
diff --git a/pkg/apis/controlplane/types.go b/pkg/apis/controlplane/types.go
index 2731aec0cb6..05ee3e1caa4 100644
--- a/pkg/apis/controlplane/types.go
+++ b/pkg/apis/controlplane/types.go
@@ -260,8 +260,8 @@ type NetworkPolicyRule struct {
 	AppliedToGroups []string
 	// L7Protocols is a list of application layer protocols which should be matched.
 	L7Protocols []L7Protocol
-	// LogSettings specifies logging behaviors of the rules when matched.
-	LogSettings *RuleLogSettings
+	// LogLabel is a user-defined arbitrary string which will be printed in the NetworkPolicy logs.
+	LogLabel string
 }
 
 // Protocol defines network protocols supported for things like container ports.
@@ -353,12 +353,6 @@ type IPBlock struct {
 	Except []IPNet
 }
 
-// RuleLogSettings describes logging behaviors. Currently supports log labels.
-type RuleLogSettings struct {
-	// LogLabel is a keyword included in the NetworkPolicy logs if this rule is matched and has log enabled.
-	LogLabel string
-}
-
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // NetworkPolicyList is a list of NetworkPolicy objects.
diff --git a/pkg/apis/controlplane/v1beta2/generated.pb.go b/pkg/apis/controlplane/v1beta2/generated.pb.go
index 8dacbca943b..5da2cb7301c 100644
--- a/pkg/apis/controlplane/v1beta2/generated.pb.go
+++ b/pkg/apis/controlplane/v1beta2/generated.pb.go
@@ -1027,38 +1027,10 @@ func (m *PodReference) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_PodReference proto.InternalMessageInfo
 
-func (m *RuleLogSettings) Reset()      { *m = RuleLogSettings{} }
-func (*RuleLogSettings) ProtoMessage() {}
-func (*RuleLogSettings) Descriptor() ([]byte, []int) {
-	return fileDescriptor_fbaa7d016762fa1d, []int{35}
-}
-func (m *RuleLogSettings) XXX_Unmarshal(b []byte) error {
-	return m.Unmarshal(b)
-}
-func (m *RuleLogSettings) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	b = b[:cap(b)]
-	n, err := m.MarshalToSizedBuffer(b)
-	if err != nil {
-		return nil, err
-	}
-	return b[:n], nil
-}
-func (m *RuleLogSettings) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RuleLogSettings.Merge(m, src)
-}
-func (m *RuleLogSettings) XXX_Size() int {
-	return m.Size()
-}
-func (m *RuleLogSettings) XXX_DiscardUnknown() {
-	xxx_messageInfo_RuleLogSettings.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_RuleLogSettings proto.InternalMessageInfo
-
 func (m *Service) Reset()      { *m = Service{} }
 func (*Service) ProtoMessage() {}
 func (*Service) Descriptor() ([]byte, []int) {
-	return fileDescriptor_fbaa7d016762fa1d, []int{36}
+	return fileDescriptor_fbaa7d016762fa1d, []int{35}
 }
 func (m *Service) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1086,7 +1058,7 @@ var xxx_messageInfo_Service proto.InternalMessageInfo
 func (m *ServiceReference) Reset()      { *m = ServiceReference{} }
 func (*ServiceReference) ProtoMessage() {}
 func (*ServiceReference) Descriptor() ([]byte, []int) {
-	return fileDescriptor_fbaa7d016762fa1d, []int{37}
+	return fileDescriptor_fbaa7d016762fa1d, []int{36}
 }
 func (m *ServiceReference) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1114,7 +1086,7 @@ var xxx_messageInfo_ServiceReference proto.InternalMessageInfo
 func (m *SupportBundleCollection) Reset()      { *m = SupportBundleCollection{} }
 func (*SupportBundleCollection) ProtoMessage() {}
 func (*SupportBundleCollection) Descriptor() ([]byte, []int) {
-	return fileDescriptor_fbaa7d016762fa1d, []int{38}
+	return fileDescriptor_fbaa7d016762fa1d, []int{37}
 }
 func (m *SupportBundleCollection) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1142,7 +1114,7 @@ var xxx_messageInfo_SupportBundleCollection proto.InternalMessageInfo
 func (m *SupportBundleCollectionList) Reset()      { *m = SupportBundleCollectionList{} }
 func (*SupportBundleCollectionList) ProtoMessage() {}
 func (*SupportBundleCollectionList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_fbaa7d016762fa1d, []int{39}
+	return fileDescriptor_fbaa7d016762fa1d, []int{38}
 }
 func (m *SupportBundleCollectionList) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1170,7 +1142,7 @@ var xxx_messageInfo_SupportBundleCollectionList proto.InternalMessageInfo
 func (m *SupportBundleCollectionNodeStatus) Reset()      { *m = SupportBundleCollectionNodeStatus{} }
 func (*SupportBundleCollectionNodeStatus) ProtoMessage() {}
 func (*SupportBundleCollectionNodeStatus) Descriptor() ([]byte, []int) {
-	return fileDescriptor_fbaa7d016762fa1d, []int{40}
+	return fileDescriptor_fbaa7d016762fa1d, []int{39}
 }
 func (m *SupportBundleCollectionNodeStatus) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1198,7 +1170,7 @@ var xxx_messageInfo_SupportBundleCollectionNodeStatus proto.InternalMessageInfo
 func (m *SupportBundleCollectionStatus) Reset()      { *m = SupportBundleCollectionStatus{} }
 func (*SupportBundleCollectionStatus) ProtoMessage() {}
 func (*SupportBundleCollectionStatus) Descriptor() ([]byte, []int) {
-	return fileDescriptor_fbaa7d016762fa1d, []int{41}
+	return fileDescriptor_fbaa7d016762fa1d, []int{40}
 }
 func (m *SupportBundleCollectionStatus) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1259,7 +1231,6 @@ func init() {
 	proto.RegisterType((*NodeStatsSummary)(nil), "antrea_io.antrea.pkg.apis.controlplane.v1beta2.NodeStatsSummary")
 	proto.RegisterType((*PaginationGetOptions)(nil), "antrea_io.antrea.pkg.apis.controlplane.v1beta2.PaginationGetOptions")
 	proto.RegisterType((*PodReference)(nil), "antrea_io.antrea.pkg.apis.controlplane.v1beta2.PodReference")
-	proto.RegisterType((*RuleLogSettings)(nil), "antrea_io.antrea.pkg.apis.controlplane.v1beta2.RuleLogSettings")
 	proto.RegisterType((*Service)(nil), "antrea_io.antrea.pkg.apis.controlplane.v1beta2.Service")
 	proto.RegisterType((*ServiceReference)(nil), "antrea_io.antrea.pkg.apis.controlplane.v1beta2.ServiceReference")
 	proto.RegisterType((*SupportBundleCollection)(nil), "antrea_io.antrea.pkg.apis.controlplane.v1beta2.SupportBundleCollection")
@@ -1273,182 +1244,180 @@ func init() {
 }
 
 var fileDescriptor_fbaa7d016762fa1d = []byte{
-	// 2794 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x3a, 0xcb, 0x73, 0x23, 0xc5,
-	0xdd, 0x3b, 0x96, 0x64, 0x5b, 0x3f, 0xf9, 0xb5, 0x6d, 0x60, 0xfd, 0x01, 0x6b, 0x2f, 0xc3, 0xf7,
-	0x51, 0xfb, 0x7d, 0xc5, 0x27, 0x61, 0x07, 0xd8, 0x0d, 0xcf, 0x58, 0x5e, 0xaf, 0x51, 0xb0, 0x8d,
-	0x68, 0x9b, 0xa2, 0x0a, 0x02, 0x61, 0x3c, 0xd3, 0x92, 0x3a, 0x3b, 0x9a, 0x1e, 0x7a, 0x5a, 0x66,
-	0xcd, 0x21, 0x45, 0x2a, 0x49, 0x55, 0xc8, 0x8b, 0x54, 0x2e, 0xa9, 0xdc, 0x72, 0xcb, 0x25, 0x7f,
-	0x01, 0xb7, 0xdc, 0x38, 0x92, 0x4a, 0xa5, 0xc2, 0xc9, 0x15, 0x9c, 0x0a, 0x29, 0x0e, 0xc9, 0x21,
-	0xb7, 0x6c, 0x2e, 0xa9, 0xee, 0xe9, 0x79, 0xca, 0x5a, 0xaf, 0x6c, 0xaf, 0x53, 0x95, 0x70, 0x92,
-	0xe6, 0xf7, 0xee, 0xee, 0xdf, 0xaf, 0x7f, 0x8f, 0x19, 0x78, 0xce, 0xf2, 0x04, 0x27, 0x56, 0x95,
-	0xb2, 0x5a, 0xf8, 0xaf, 0xe6, 0xdf, 0x68, 0xd7, 0x2c, 0x9f, 0x06, 0x35, 0x9b, 0x79, 0x82, 0x33,
-	0xd7, 0x77, 0x2d, 0x8f, 0xd4, 0x76, 0x17, 0x77, 0x88, 0xb0, 0x96, 0x6a, 0x6d, 0xe2, 0x11, 0x6e,
-	0x09, 0xe2, 0x54, 0x7d, 0xce, 0x04, 0x43, 0xd5, 0x90, 0xeb, 0xeb, 0x94, 0xe9, 0x7f, 0x55, 0xff,
-	0x46, 0xbb, 0x2a, 0xf9, 0xab, 0x69, 0xfe, 0xaa, 0xe6, 0xbf, 0xff, 0xea, 0x60, 0x7d, 0x81, 0xb0,
-	0x44, 0x50, 0xdb, 0x5d, 0xb4, 0x5c, 0xbf, 0x63, 0x2d, 0xe6, 0x35, 0xdd, 0xff, 0xff, 0x6d, 0x2a,
-	0x3a, 0xbd, 0x9d, 0xaa, 0xcd, 0xba, 0xb5, 0x36, 0x6b, 0xb3, 0x9a, 0x02, 0xef, 0xf4, 0x5a, 0xea,
-	0x49, 0x3d, 0xa8, 0x7f, 0x9a, 0xfc, 0xf1, 0x1b, 0x57, 0x03, 0xa5, 0xc5, 0xa7, 0x5d, 0xcb, 0xee,
-	0x50, 0x8f, 0xf0, 0xbd, 0x44, 0x57, 0x97, 0x08, 0xab, 0xb6, 0xdb, 0xaf, 0xa4, 0x36, 0x88, 0x8b,
-	0xf7, 0x3c, 0x41, 0xbb, 0xa4, 0x8f, 0xe1, 0xc9, 0xa3, 0x18, 0x02, 0xbb, 0x43, 0xba, 0x56, 0x1f,
-	0xdf, 0x97, 0x06, 0xf1, 0xf5, 0x04, 0x75, 0x6b, 0xd4, 0x13, 0x81, 0xe0, 0x79, 0x26, 0xf3, 0xcf,
-	0x06, 0x4c, 0x2c, 0x3b, 0x0e, 0x27, 0x41, 0xb0, 0xc6, 0x59, 0xcf, 0x47, 0x6f, 0xc1, 0xb8, 0x5c,
-	0x89, 0x63, 0x09, 0x6b, 0xce, 0xb8, 0x64, 0x5c, 0xae, 0x2c, 0x3d, 0x56, 0x0d, 0x05, 0x57, 0xd3,
-	0x82, 0x93, 0x33, 0x91, 0xd4, 0xd5, 0xdd, 0xc5, 0xea, 0x4b, 0x3b, 0xdf, 0x20, 0xb6, 0xd8, 0x20,
-	0xc2, 0xaa, 0xa3, 0x8f, 0xf6, 0x17, 0xce, 0x1d, 0xec, 0x2f, 0x40, 0x02, 0xc3, 0xb1, 0x54, 0xd4,
-	0x83, 0x89, 0xb6, 0x54, 0xb5, 0x41, 0xba, 0x3b, 0x84, 0x07, 0x73, 0x23, 0x97, 0x0a, 0x97, 0x2b,
-	0x4b, 0x4f, 0x0f, 0x79, 0xec, 0xd5, 0xb5, 0x44, 0x46, 0xfd, 0x1e, 0xad, 0x70, 0x22, 0x05, 0x0c,
-	0x70, 0x46, 0x8d, 0xf9, 0x5b, 0x03, 0x66, 0xd2, 0x2b, 0x5d, 0xa7, 0x81, 0x40, 0x5f, 0xeb, 0x5b,
-	0x6d, 0xf5, 0xce, 0x56, 0x2b, 0xb9, 0xd5, 0x5a, 0x67, 0xb4, 0xea, 0xf1, 0x08, 0x92, 0x5a, 0xa9,
-	0x05, 0x25, 0x2a, 0x48, 0x37, 0x5a, 0xe2, 0x33, 0xc3, 0x2e, 0x31, 0x6d, 0x6e, 0x7d, 0x52, 0x2b,
-	0x2a, 0x35, 0xa4, 0x48, 0x1c, 0x4a, 0x36, 0xdf, 0x2f, 0xc0, 0xf9, 0x34, 0x59, 0xd3, 0x12, 0x76,
-	0xe7, 0x0c, 0x0e, 0xf1, 0x3b, 0x06, 0x9c, 0xb7, 0x1c, 0x87, 0x38, 0x6b, 0xa7, 0x7c, 0x94, 0xff,
-	0xa5, 0xd5, 0xca, 0x55, 0x65, 0xa5, 0xe3, 0x7e, 0x85, 0xe8, 0xfb, 0x06, 0xcc, 0x72, 0xd2, 0x65,
-	0xbb, 0x39, 0x43, 0x0a, 0x27, 0x37, 0xe4, 0x01, 0x6d, 0xc8, 0x2c, 0xee, 0x97, 0x8f, 0x0f, 0x53,
-	0x6a, 0x7e, 0x6e, 0xc0, 0xd4, 0xb2, 0xef, 0xbb, 0x94, 0x38, 0xdb, 0xec, 0xdf, 0x3c, 0x9a, 0x7e,
-	0x6f, 0x00, 0xca, 0xae, 0xf5, 0x0c, 0xe2, 0xc9, 0xce, 0xc6, 0xd3, 0x73, 0x43, 0xc7, 0x53, 0xc6,
-	0xe0, 0x01, 0x11, 0xf5, 0x83, 0x02, 0xcc, 0x66, 0x09, 0xbf, 0x88, 0xa9, 0x7f, 0x5d, 0x4c, 0xbd,
-	0x0d, 0xb3, 0x75, 0x2b, 0xa0, 0xf6, 0x72, 0x4f, 0x74, 0x88, 0x27, 0xa8, 0x6d, 0x09, 0xca, 0x3c,
-	0xf4, 0x28, 0x8c, 0xf7, 0x02, 0xc2, 0x3d, 0xab, 0x4b, 0xd4, 0x61, 0x94, 0x13, 0xbf, 0x79, 0x45,
-	0xc3, 0x71, 0x4c, 0x21, 0xa9, 0x7d, 0x2b, 0x08, 0xde, 0x61, 0xdc, 0x99, 0x1b, 0xc9, 0x52, 0x37,
-	0x35, 0x1c, 0xc7, 0x14, 0xe6, 0x22, 0xcc, 0xd4, 0x7b, 0x9e, 0xe3, 0x92, 0xeb, 0xd4, 0x25, 0x5b,
-	0x84, 0xef, 0x12, 0x8e, 0x2e, 0x42, 0xa1, 0xc7, 0x5d, 0xad, 0xaa, 0xa2, 0x99, 0x0b, 0xaf, 0xe0,
-	0x75, 0x2c, 0xe1, 0xe6, 0x07, 0x23, 0x70, 0x31, 0xe4, 0x09, 0xe9, 0xa5, 0xb5, 0x2b, 0xcc, 0x6b,
-	0xd1, 0x76, 0x8f, 0x87, 0x06, 0x3f, 0x01, 0x95, 0x1d, 0x62, 0x71, 0xc2, 0xb7, 0xd9, 0x0d, 0xe2,
-	0x69, 0x41, 0xb3, 0x5a, 0x50, 0xa5, 0x9e, 0xa0, 0x70, 0x9a, 0x0e, 0x3d, 0x02, 0xa3, 0x96, 0x4f,
-	0x5f, 0x24, 0x7b, 0xda, 0xee, 0x29, 0xcd, 0x31, 0xba, 0xdc, 0x6c, 0xbc, 0x48, 0xf6, 0xb0, 0xc6,
-	0xa2, 0x1f, 0x1b, 0x30, 0xbb, 0xd3, 0xbf, 0x4f, 0x73, 0x05, 0xe5, 0xa8, 0x2b, 0xc3, 0x9e, 0xd9,
-	0x21, 0x5b, 0x5e, 0xbf, 0x20, 0xcf, 0xed, 0x10, 0x04, 0x3e, 0x4c, 0xb1, 0xf9, 0x8b, 0x22, 0xcc,
-	0xae, 0xb8, 0xbd, 0x40, 0x10, 0x9e, 0x71, 0xae, 0xbb, 0x1f, 0x45, 0xdf, 0x32, 0x60, 0x86, 0xb4,
-	0x5a, 0xc4, 0x16, 0x74, 0x97, 0x9c, 0x62, 0x10, 0xcd, 0x69, 0xad, 0x33, 0xab, 0x39, 0xe1, 0xb8,
-	0x4f, 0x1d, 0xfa, 0x26, 0x9c, 0x8f, 0x61, 0x8d, 0x66, 0xdd, 0x65, 0xf6, 0x8d, 0x28, 0x7e, 0x9e,
-	0x18, 0xd6, 0x86, 0x46, 0x73, 0x93, 0x88, 0x24, 0x84, 0x57, 0xf3, 0x72, 0x71, 0xbf, 0x2a, 0x74,
-	0x15, 0x26, 0x04, 0x13, 0x96, 0x1b, 0x2d, 0xbf, 0x78, 0xc9, 0xb8, 0x5c, 0x48, 0xee, 0xf5, 0xed,
-	0x14, 0x0e, 0x67, 0x28, 0xd1, 0x12, 0x80, 0x7a, 0x6e, 0x5a, 0x6d, 0x12, 0xcc, 0x95, 0x14, 0x5f,
-	0xbc, 0xdf, 0xdb, 0x31, 0x06, 0xa7, 0xa8, 0xa4, 0x6f, 0xdb, 0x3d, 0xce, 0x89, 0x27, 0xe4, 0xf3,
-	0xdc, 0xa8, 0x62, 0x8a, 0x7d, 0x7b, 0x25, 0x41, 0xe1, 0x34, 0x9d, 0xf9, 0x99, 0x01, 0x95, 0xd5,
-	0xf6, 0x7f, 0x40, 0xe5, 0xf9, 0x1b, 0x03, 0xa6, 0x53, 0x0b, 0x3d, 0x83, 0x44, 0xf9, 0x56, 0x36,
-	0x51, 0x0e, 0xbd, 0xc2, 0x94, 0xb5, 0x03, 0xb2, 0xe4, 0x0f, 0x0b, 0x30, 0x93, 0xa2, 0x0a, 0x53,
-	0xa4, 0x03, 0xc0, 0xe2, 0x7d, 0x3f, 0xd5, 0x33, 0x4c, 0xc9, 0xfd, 0x22, 0x4d, 0x1e, 0x92, 0x26,
-	0x5d, 0xb8, 0xb0, 0x7a, 0x53, 0xc8, 0x74, 0xe7, 0xae, 0x7a, 0x82, 0x8a, 0x3d, 0x4c, 0x5a, 0x84,
-	0x13, 0xcf, 0x26, 0xe8, 0x12, 0x14, 0x53, 0x69, 0x72, 0x42, 0x8b, 0x2e, 0x6e, 0xca, 0x14, 0xa9,
-	0x30, 0xa8, 0x06, 0x65, 0xf9, 0x1b, 0xf8, 0x96, 0x4d, 0x74, 0x9e, 0x39, 0xaf, 0xc9, 0xca, 0x9b,
-	0x11, 0x02, 0x27, 0x34, 0xe6, 0x3f, 0x0c, 0x98, 0x51, 0xea, 0x97, 0x83, 0x80, 0xd9, 0x34, 0xcc,
-	0x70, 0x67, 0x52, 0x1f, 0xcd, 0x58, 0x5a, 0xa3, 0x5e, 0xff, 0xb1, 0x4b, 0x41, 0xc5, 0x1d, 0x6f,
-	0x52, 0x72, 0xb9, 0x2f, 0xe7, 0xe4, 0xe3, 0x3e, 0x8d, 0xe6, 0x87, 0x45, 0xa8, 0xa4, 0x36, 0x1f,
-	0xbd, 0x0a, 0x05, 0x9f, 0x39, 0x7a, 0xcd, 0x43, 0xf7, 0x78, 0x4d, 0xe6, 0x24, 0x66, 0x8c, 0xc9,
-	0xaa, 0x42, 0x42, 0xa4, 0x44, 0xf4, 0x6d, 0x03, 0xa6, 0x48, 0xe6, 0x54, 0xd5, 0xe9, 0x54, 0x96,
-	0xd6, 0x86, 0x8e, 0xe7, 0xc3, 0x7d, 0xa3, 0x8e, 0x0e, 0xf6, 0x17, 0xa6, 0x72, 0xc8, 0x9c, 0x4a,
-	0xf4, 0x08, 0x14, 0xa8, 0x1f, 0xba, 0xf5, 0x44, 0xfd, 0x1e, 0x69, 0x60, 0xa3, 0x19, 0xdc, 0xda,
-	0x5f, 0x28, 0x37, 0x9a, 0xba, 0xf1, 0xc4, 0x92, 0x00, 0xbd, 0x09, 0x25, 0x9f, 0x71, 0x21, 0x93,
-	0x8d, 0x3c, 0x91, 0x2f, 0x0f, 0x6b, 0xa3, 0xf4, 0x34, 0xa7, 0xc9, 0xb8, 0x48, 0x6e, 0x1c, 0xf9,
-	0x14, 0xe0, 0x50, 0x2c, 0x7a, 0x1d, 0x8a, 0x1e, 0x73, 0x88, 0xca, 0x49, 0x95, 0xa5, 0x67, 0x87,
-	0x16, 0xcf, 0x1c, 0x92, 0x2c, 0x7c, 0x5c, 0x85, 0x80, 0x04, 0x29, 0xa1, 0xa8, 0x0d, 0x63, 0x01,
-	0xe1, 0xbb, 0xd4, 0x0e, 0xd3, 0x57, 0x65, 0xe9, 0x2b, 0xc3, 0xca, 0xdf, 0x0a, 0xd9, 0x13, 0x15,
-	0x95, 0x83, 0xfd, 0x85, 0xb1, 0x08, 0x1a, 0x49, 0x37, 0x7f, 0x69, 0xc0, 0x54, 0xd6, 0xf7, 0xb2,
-	0xe1, 0x67, 0x1c, 0x1d, 0x7e, 0x71, 0x44, 0x8f, 0x0c, 0x8c, 0xe8, 0x3a, 0x14, 0x7a, 0xd4, 0x51,
-	0xd5, 0x5f, 0xb9, 0xfe, 0x58, 0x5c, 0xae, 0x36, 0xae, 0xdd, 0xda, 0x5f, 0x78, 0x68, 0xd0, 0x98,
-	0x48, 0xec, 0xf9, 0x24, 0xa8, 0xbe, 0xd2, 0xb8, 0x86, 0x25, 0xb3, 0xf9, 0x2e, 0x4c, 0xbc, 0xb0,
-	0xbd, 0xdd, 0x6c, 0x72, 0x26, 0x98, 0xcd, 0x5c, 0xa9, 0xb5, 0xc3, 0x02, 0x91, 0xbf, 0x47, 0x5e,
-	0x60, 0x81, 0xc0, 0x0a, 0x23, 0x8b, 0xd5, 0x2e, 0x11, 0x1d, 0xe6, 0xe4, 0x8b, 0xd5, 0x0d, 0x05,
-	0xc5, 0x1a, 0x2b, 0x25, 0xf9, 0x96, 0xe8, 0x68, 0xf3, 0x62, 0x49, 0x4d, 0x4b, 0x74, 0xb0, 0xc2,
-	0x98, 0xbf, 0x36, 0x60, 0x4c, 0x17, 0x33, 0xe8, 0x55, 0x28, 0xda, 0xd4, 0xe1, 0x3a, 0xbe, 0x8e,
-	0x59, 0x3e, 0xc5, 0x4a, 0x56, 0x1a, 0xd7, 0x30, 0x56, 0x02, 0xd1, 0x1b, 0x30, 0x4a, 0x6e, 0xda,
-	0xc4, 0x17, 0xfa, 0x0e, 0x39, 0xa6, 0xe8, 0x78, 0x95, 0xab, 0x4a, 0x18, 0xd6, 0x42, 0xcd, 0x16,
-	0x94, 0x14, 0x01, 0x7a, 0x18, 0x46, 0xa8, 0xaf, 0xcc, 0x9f, 0xa8, 0xcf, 0x1e, 0xec, 0x2f, 0x8c,
-	0x34, 0x9a, 0xd9, 0xf0, 0x19, 0xa1, 0xbe, 0xac, 0xd8, 0x7c, 0x4e, 0x5a, 0xf4, 0xe6, 0x3a, 0xf1,
-	0xda, 0xa2, 0xa3, 0x76, 0xb0, 0x94, 0x54, 0x17, 0xcd, 0x14, 0x0e, 0x67, 0x28, 0xcd, 0x0e, 0xc0,
-	0xfa, 0x95, 0xf8, 0x94, 0x5e, 0x83, 0x62, 0x47, 0x08, 0xff, 0xb8, 0xb7, 0x51, 0xfa, 0xc4, 0xc3,
-	0x20, 0x91, 0x10, 0xac, 0x64, 0x9a, 0x3f, 0x37, 0x00, 0x6d, 0xf4, 0x5c, 0x59, 0xe3, 0x07, 0x42,
-	0x39, 0x71, 0xc3, 0x6b, 0x31, 0xf4, 0x30, 0x94, 0x54, 0xb9, 0xa3, 0x3d, 0x23, 0x8e, 0xde, 0xd0,
-	0xcd, 0x43, 0x1c, 0x7a, 0x13, 0x8a, 0x3e, 0x73, 0x8e, 0x3d, 0x09, 0xcb, 0xdc, 0x92, 0x89, 0xc7,
-	0x30, 0x27, 0xc0, 0x4a, 0xae, 0xf9, 0xbe, 0x01, 0xe5, 0xf8, 0x06, 0x51, 0x1e, 0xc6, 0x78, 0xe8,
-	0xab, 0xa5, 0x34, 0x3d, 0x17, 0x58, 0x61, 0xee, 0x20, 0x86, 0xae, 0xc2, 0xb8, 0xaf, 0x77, 0x42,
-	0x7b, 0xea, 0x83, 0x71, 0xd3, 0xa8, 0xe1, 0xb7, 0x52, 0xff, 0x71, 0x4c, 0x6d, 0xfe, 0xa5, 0x00,
-	0x93, 0x9b, 0x44, 0xbc, 0xc3, 0xf8, 0x8d, 0x26, 0x73, 0xa9, 0xbd, 0x77, 0x06, 0xb9, 0xb1, 0x05,
-	0x25, 0xde, 0x73, 0x49, 0xb4, 0xc1, 0xcb, 0x43, 0x5f, 0x8f, 0x69, 0x7b, 0x71, 0xcf, 0x25, 0xc9,
-	0x39, 0xca, 0xa7, 0x00, 0x87, 0xe2, 0xd1, 0xb3, 0x30, 0x6d, 0x65, 0x86, 0x23, 0x61, 0x66, 0x28,
-	0x2b, 0xcf, 0x9e, 0xce, 0xce, 0x4d, 0x02, 0x9c, 0xa7, 0x45, 0x97, 0xe5, 0xa6, 0x52, 0xc6, 0x65,
-	0x2e, 0x93, 0x4d, 0x89, 0x51, 0x9f, 0x08, 0x37, 0x34, 0x84, 0xe1, 0x18, 0x8b, 0x1e, 0x87, 0x09,
-	0x41, 0x09, 0x8f, 0x30, 0xea, 0xda, 0x2f, 0xd5, 0x67, 0x54, 0xfb, 0x92, 0x82, 0xe3, 0x0c, 0x15,
-	0x0a, 0xa0, 0x1c, 0xb0, 0x1e, 0x57, 0xf7, 0xb0, 0xbe, 0xc9, 0xaf, 0x9f, 0x6c, 0x2b, 0x62, 0xaf,
-	0x9b, 0x94, 0xf7, 0xf1, 0x56, 0x24, 0x1c, 0x27, 0x7a, 0xcc, 0xdf, 0x19, 0x70, 0x3e, 0xc3, 0x74,
-	0x06, 0x15, 0xfe, 0x4e, 0xb6, 0xc2, 0x7f, 0xf6, 0x44, 0x8b, 0x1c, 0x50, 0xe3, 0xff, 0xcd, 0x80,
-	0x0b, 0x19, 0x3a, 0x99, 0x30, 0xb7, 0x84, 0x25, 0x7a, 0x01, 0x7a, 0x14, 0xc6, 0x65, 0xe2, 0xdc,
-	0x3c, 0x64, 0x00, 0xb3, 0xa9, 0xe1, 0x38, 0xa6, 0x90, 0x5d, 0xa5, 0x7e, 0xf1, 0x40, 0x99, 0xa7,
-	0x62, 0x2e, 0xd5, 0x55, 0xae, 0xc5, 0x18, 0x9c, 0xa2, 0x42, 0x5f, 0x05, 0xc4, 0x89, 0xe5, 0xd2,
-	0x77, 0xd5, 0xe3, 0x75, 0x8b, 0xba, 0x3d, 0x4e, 0x54, 0x24, 0x8e, 0xd7, 0xef, 0xd7, 0xbc, 0x08,
-	0xf7, 0x51, 0xe0, 0x43, 0xb8, 0xd0, 0xff, 0xc2, 0x58, 0x97, 0x04, 0x81, 0xec, 0x4e, 0x8b, 0xca,
-	0xd8, 0x69, 0x2d, 0x60, 0x6c, 0x23, 0x04, 0xe3, 0x08, 0xaf, 0x06, 0xea, 0x99, 0x45, 0x37, 0x09,
-	0xe1, 0xe8, 0x0a, 0x4c, 0x5a, 0xa9, 0x29, 0x7b, 0x30, 0x67, 0x28, 0xa7, 0x3f, 0x7f, 0xb0, 0xbf,
-	0x30, 0x99, 0x1e, 0xbf, 0x07, 0x38, 0x4b, 0x87, 0x08, 0x8c, 0x53, 0x5f, 0x0f, 0x00, 0xc2, 0xa3,
-	0xba, 0x32, 0x7c, 0x9a, 0x51, 0xfc, 0xc9, 0x06, 0xc7, 0x9d, 0x7f, 0x2c, 0x1a, 0x2d, 0x40, 0xa9,
-	0xf5, 0xb6, 0xe3, 0x45, 0xc1, 0x58, 0x96, 0x67, 0x79, 0xfd, 0xe5, 0x6b, 0x9b, 0x01, 0x0e, 0xe1,
-	0x48, 0xc8, 0xbe, 0x5e, 0x57, 0x23, 0x51, 0x89, 0x76, 0xf2, 0x1a, 0x27, 0x35, 0x19, 0x88, 0x64,
-	0xe3, 0x94, 0x1e, 0x79, 0x5b, 0xb8, 0xd6, 0x0e, 0x71, 0x1b, 0x0e, 0x91, 0xc5, 0x24, 0x55, 0x23,
-	0x85, 0xc2, 0xe5, 0xc9, 0xf0, 0xb6, 0x58, 0xcf, 0xa2, 0x70, 0x9e, 0xd6, 0xfc, 0xcc, 0x80, 0xfb,
-	0x0e, 0x8f, 0x46, 0xf4, 0x04, 0x14, 0x65, 0xbd, 0xa2, 0x7d, 0xef, 0xa1, 0xe8, 0xfe, 0xde, 0xde,
-	0xf3, 0xc9, 0xad, 0xfd, 0x85, 0xec, 0x09, 0x4a, 0x20, 0x56, 0xe4, 0x43, 0xb7, 0x3a, 0x71, 0x9e,
-	0x28, 0x1c, 0x55, 0x6b, 0x15, 0x4f, 0x52, 0x6b, 0x7d, 0x6f, 0x2c, 0xe7, 0x74, 0xf2, 0xce, 0x45,
-	0xcf, 0x40, 0xd9, 0xa1, 0x9c, 0xd8, 0x2a, 0x68, 0xc2, 0x85, 0xce, 0x47, 0xc6, 0x5e, 0x8b, 0x10,
-	0xb7, 0xd2, 0x0f, 0x38, 0x61, 0x40, 0x36, 0x14, 0x5b, 0x9c, 0x75, 0x75, 0xcb, 0x70, 0xb2, 0x84,
-	0x20, 0x63, 0x20, 0x59, 0xfc, 0x75, 0xce, 0xba, 0x58, 0x09, 0x47, 0x6f, 0xc0, 0x88, 0x60, 0x7a,
-	0xca, 0x78, 0x0a, 0x2a, 0x40, 0xab, 0x18, 0xd9, 0x66, 0x78, 0x44, 0x30, 0x19, 0x3d, 0x41, 0xd6,
-	0x67, 0xaf, 0x1c, 0xd3, 0x67, 0x93, 0xe8, 0x89, 0x1d, 0x35, 0x16, 0xad, 0xe6, 0xc3, 0xb9, 0x3c,
-	0x93, 0xa4, 0xfa, 0xbe, 0xcc, 0xf4, 0x2a, 0x8c, 0x5a, 0xe1, 0x99, 0x8c, 0xaa, 0x33, 0x79, 0x5e,
-	0xcd, 0x63, 0xa3, 0xc3, 0x58, 0xbc, 0xcd, 0xdb, 0x6f, 0xee, 0xc4, 0xef, 0xa2, 0xab, 0xf2, 0x84,
-	0x43, 0x26, 0xac, 0xc5, 0xa1, 0xa7, 0x61, 0x92, 0x78, 0xd6, 0x8e, 0x4b, 0xd6, 0x59, 0xbb, 0x4d,
-	0xbd, 0xf6, 0xdc, 0x98, 0xba, 0xec, 0xee, 0xd5, 0xb6, 0x4c, 0xae, 0xa6, 0x91, 0x38, 0x4b, 0x7b,
-	0x58, 0x62, 0x1e, 0x1f, 0x22, 0x31, 0x47, 0x7e, 0x5e, 0x1e, 0xe8, 0xe7, 0x6f, 0x43, 0xc5, 0x8d,
-	0xeb, 0xcc, 0x60, 0x0e, 0xd4, 0x71, 0x3c, 0x35, 0xec, 0x71, 0x24, 0xa5, 0x6a, 0x32, 0x21, 0x4c,
-	0x60, 0x01, 0x4e, 0xeb, 0x40, 0x1c, 0x2a, 0x2e, 0x6b, 0x6f, 0x11, 0x21, 0xa8, 0xd7, 0x0e, 0xe6,
-	0x2a, 0xca, 0xcd, 0x9e, 0x1f, 0x56, 0xa5, 0xdc, 0xe9, 0xf5, 0x44, 0x4c, 0x7d, 0x5a, 0xe9, 0x4c,
-	0x00, 0x38, 0xad, 0xc4, 0xfc, 0xa0, 0x00, 0x28, 0xe3, 0x98, 0x32, 0xe1, 0x05, 0xb2, 0x17, 0x9f,
-	0xf4, 0xd2, 0x60, 0x9d, 0xd3, 0x4f, 0xab, 0xba, 0x88, 0x0f, 0x39, 0x8b, 0xcf, 0xea, 0x44, 0x3e,
-	0x4c, 0x08, 0x6e, 0xb5, 0x5a, 0xd4, 0x56, 0x56, 0xe9, 0xd8, 0x7e, 0xf2, 0x36, 0x36, 0xa8, 0x2f,
-	0x20, 0xaa, 0xb1, 0xd7, 0x6d, 0xa7, 0xb8, 0x53, 0xf3, 0xe0, 0x14, 0x14, 0x67, 0x34, 0xa0, 0xf7,
-	0x0c, 0x98, 0x91, 0x95, 0x5f, 0x9a, 0x44, 0x8f, 0xb8, 0x9e, 0xba, 0x73, 0xb5, 0x38, 0x27, 0x21,
-	0x99, 0xb7, 0xe4, 0x31, 0xb8, 0x4f, 0x9b, 0xf9, 0x27, 0x03, 0x66, 0xfb, 0x4e, 0xa4, 0x77, 0x16,
-	0xaf, 0x12, 0x5c, 0x28, 0xc9, 0x12, 0x26, 0xca, 0xdc, 0x6b, 0x27, 0x3a, 0xeb, 0xa4, 0x78, 0x4a,
-	0xca, 0x2d, 0x09, 0x0b, 0x70, 0xa8, 0xc4, 0x5c, 0x84, 0xc9, 0xcc, 0x90, 0xe2, 0xe8, 0xc9, 0x9d,
-	0xf9, 0x61, 0x09, 0x66, 0x22, 0xb9, 0xc1, 0x56, 0xaf, 0xdb, 0xb5, 0xf8, 0x59, 0x34, 0x1b, 0xdf,
-	0x35, 0x60, 0x3a, 0xed, 0x98, 0x34, 0xde, 0xa2, 0xfa, 0x89, 0xb6, 0x28, 0xf4, 0x8d, 0x0b, 0x5a,
-	0xf7, 0xf4, 0x66, 0x56, 0x05, 0xce, 0xeb, 0x44, 0xbf, 0x32, 0xe0, 0xc1, 0x50, 0x8b, 0x7e, 0xd5,
-	0x94, 0xe3, 0xd0, 0x8e, 0x7a, 0x1a, 0x46, 0xfd, 0xb7, 0x36, 0xea, 0xc1, 0xe5, 0xdb, 0xe8, 0xc3,
-	0xb7, 0xb5, 0x06, 0xfd, 0xcc, 0x80, 0x7b, 0x43, 0x82, 0xbc, 0x9d, 0xc5, 0x53, 0xb3, 0xf3, 0xa2,
-	0xb6, 0xf3, 0xde, 0xe5, 0xc3, 0x14, 0xe1, 0xc3, 0xf5, 0xcb, 0xb6, 0xa9, 0x1b, 0x35, 0xf6, 0xaa,
-	0x42, 0x3b, 0x86, 0x31, 0xfd, 0x93, 0x81, 0xa4, 0xb4, 0x8a, 0x71, 0x38, 0xd1, 0x63, 0xbe, 0x01,
-	0xf7, 0x34, 0xad, 0x36, 0xf5, 0x54, 0xa5, 0xbe, 0x46, 0xc4, 0x4b, 0xbe, 0xfc, 0x13, 0x84, 0xe3,
-	0xa1, 0x76, 0xe8, 0xf6, 0x85, 0xf4, 0x78, 0xa8, 0x4d, 0xb0, 0xc2, 0xa0, 0x87, 0xa1, 0xe4, 0xd2,
-	0x2e, 0x15, 0xba, 0x93, 0x88, 0xc3, 0x69, 0x5d, 0x02, 0x71, 0x88, 0x33, 0x2d, 0x98, 0x48, 0x4f,
-	0x0d, 0xee, 0xc6, 0x1c, 0xfc, 0x79, 0x98, 0xce, 0x25, 0x17, 0x59, 0x4a, 0xb8, 0xac, 0xad, 0x2a,
-	0xdb, 0x7c, 0x5f, 0xb4, 0xae, 0xe1, 0x38, 0xa6, 0x30, 0xff, 0x3a, 0x02, 0xd1, 0x88, 0x10, 0x3d,
-	0x9e, 0x9a, 0x37, 0x84, 0x9c, 0x73, 0x47, 0xcf, 0x1a, 0xd0, 0xa6, 0x9e, 0x74, 0x8c, 0x1c, 0x11,
-	0xe8, 0x3d, 0x41, 0xdd, 0x6a, 0xf8, 0x0d, 0x58, 0xb5, 0xe1, 0x89, 0x97, 0xf8, 0x96, 0xe0, 0xd4,
-	0x6b, 0x87, 0x33, 0x9e, 0xd4, 0x5c, 0xe4, 0x7f, 0x60, 0x8c, 0x78, 0x6a, 0x88, 0xa2, 0xaa, 0xba,
-	0x52, 0x38, 0xc6, 0x5c, 0x0d, 0x41, 0x38, 0xc2, 0xc9, 0x3e, 0x9e, 0xda, 0x5d, 0x5f, 0x56, 0xd6,
-	0xaa, 0xf2, 0x2d, 0x85, 0x7d, 0x7c, 0x63, 0x65, 0xa3, 0xa9, 0xaa, 0xed, 0x18, 0x1b, 0x51, 0xae,
-	0x44, 0xa3, 0xdb, 0x14, 0xa5, 0x84, 0xe1, 0x18, 0xab, 0x28, 0xdb, 0x5a, 0xe6, 0x68, 0x8a, 0x72,
-	0x2d, 0x96, 0xa9, 0xb1, 0xe8, 0xaa, 0x7e, 0x8f, 0xa7, 0x3b, 0x2f, 0x55, 0x27, 0x95, 0x73, 0xaf,
-	0xe2, 0xa2, 0xe1, 0x5a, 0x86, 0xd2, 0x24, 0x30, 0x93, 0x6f, 0x62, 0xee, 0x86, 0x63, 0x7c, 0x50,
-	0x84, 0x0b, 0x5b, 0x3d, 0x5f, 0xee, 0x68, 0xf8, 0x59, 0xc0, 0x0a, 0x73, 0x5d, 0x5d, 0x97, 0xdf,
-	0xfd, 0xeb, 0xf9, 0x75, 0x28, 0x93, 0x9b, 0x3e, 0xe5, 0xc4, 0x59, 0x8e, 0x1c, 0xe3, 0xff, 0xee,
-	0x4c, 0xc5, 0x36, 0xed, 0x92, 0x64, 0x69, 0xab, 0x91, 0x10, 0x9c, 0xc8, 0x93, 0x7b, 0x11, 0x50,
-	0xcf, 0x26, 0x92, 0x54, 0x77, 0x45, 0x31, 0xc3, 0x56, 0x84, 0xc0, 0x09, 0x8d, 0xec, 0x3c, 0x5b,
-	0xf1, 0x87, 0x14, 0xca, 0x59, 0x8e, 0xd1, 0x79, 0xe6, 0x3f, 0xc8, 0x48, 0x76, 0x20, 0x81, 0xe1,
-	0x94, 0x1e, 0xf4, 0x23, 0x03, 0xa6, 0xac, 0xec, 0xb7, 0x10, 0xe1, 0x8b, 0x83, 0x8d, 0xe3, 0xa9,
-	0x1e, 0xf0, 0x5d, 0x47, 0xfd, 0x3e, 0x6d, 0xc7, 0x54, 0xee, 0xa3, 0x88, 0x9c, 0x72, 0xf3, 0x73,
-	0x03, 0x1e, 0x18, 0xe0, 0x11, 0x67, 0x30, 0x2d, 0x72, 0xb3, 0xd3, 0xa2, 0xa1, 0x0b, 0x99, 0x01,
-	0x96, 0x0f, 0x98, 0x1b, 0xfd, 0x74, 0x04, 0x1e, 0x1a, 0xc0, 0x71, 0xec, 0x09, 0xd2, 0xd3, 0x30,
-	0x19, 0xfd, 0x4f, 0x87, 0x61, 0x52, 0x36, 0xa7, 0x91, 0x38, 0x4b, 0x1b, 0xa9, 0x52, 0x37, 0x4b,
-	0xa1, 0x5f, 0x55, 0x78, 0xbb, 0x44, 0x14, 0xd2, 0xc3, 0x6d, 0xd6, 0xf5, 0x5d, 0x22, 0x48, 0xd8,
-	0xd6, 0x8f, 0x27, 0x1e, 0xbe, 0x12, 0x21, 0x70, 0x42, 0x23, 0xd3, 0x11, 0xe1, 0x9c, 0x71, 0xe5,
-	0x61, 0xa9, 0x01, 0xf8, 0xaa, 0x04, 0xe2, 0x10, 0x67, 0xfe, 0xdd, 0x80, 0x8b, 0x03, 0x36, 0xe5,
-	0xcc, 0xea, 0xd9, 0xdd, 0x6c, 0x3d, 0xfb, 0xf2, 0x29, 0xb9, 0xc1, 0x51, 0x95, 0x6d, 0x7d, 0xfb,
-	0xa3, 0x4f, 0xe7, 0xcf, 0x7d, 0xfc, 0xe9, 0xfc, 0xb9, 0x4f, 0x3e, 0x9d, 0x3f, 0xf7, 0xde, 0xc1,
-	0xbc, 0xf1, 0xd1, 0xc1, 0xbc, 0xf1, 0xf1, 0xc1, 0xbc, 0xf1, 0xc9, 0xc1, 0xbc, 0xf1, 0x87, 0x83,
-	0x79, 0xe3, 0x27, 0x7f, 0x9c, 0x3f, 0xf7, 0x5a, 0x75, 0xb8, 0xef, 0xc6, 0xff, 0x19, 0x00, 0x00,
-	0xff, 0xff, 0x9a, 0xfa, 0x18, 0x97, 0x68, 0x2e, 0x00, 0x00,
+	// 2754 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x1a, 0x4b, 0x73, 0x1c, 0x47,
+	0xd9, 0xb3, 0x0f, 0x49, 0xfb, 0xad, 0x24, 0xcb, 0xad, 0x24, 0x16, 0x49, 0x2c, 0x39, 0x13, 0x48,
+	0x19, 0x2a, 0xec, 0x46, 0x22, 0x89, 0x4d, 0x5e, 0xa0, 0x95, 0x65, 0x65, 0x89, 0xa4, 0x6c, 0x5a,
+	0x4a, 0xa5, 0x2a, 0x21, 0x21, 0xa3, 0x99, 0xde, 0xdd, 0xc6, 0xb3, 0xd3, 0x93, 0x9e, 0x5e, 0xc5,
+	0xca, 0x81, 0x0a, 0x05, 0x1c, 0xc2, 0x2b, 0x14, 0x17, 0x8a, 0x1b, 0x37, 0x2e, 0xfc, 0x82, 0xdc,
+	0xe0, 0x94, 0x63, 0x28, 0x8a, 0x22, 0x27, 0x15, 0x16, 0x45, 0xa8, 0x1c, 0xe0, 0xc0, 0x0d, 0x73,
+	0xa1, 0xba, 0xa7, 0xe7, 0xb5, 0x0f, 0xcb, 0x2b, 0xc9, 0xa2, 0x0a, 0x72, 0xda, 0x9d, 0xef, 0xdd,
+	0xdd, 0xdf, 0xd7, 0xdf, 0x63, 0x06, 0x9e, 0xb3, 0x3c, 0xc1, 0x89, 0x55, 0xa1, 0xac, 0x1a, 0xfe,
+	0xab, 0xfa, 0xd7, 0x5b, 0x55, 0xcb, 0xa7, 0x41, 0xd5, 0x66, 0x9e, 0xe0, 0xcc, 0xf5, 0x5d, 0xcb,
+	0x23, 0xd5, 0xdd, 0xc5, 0x1d, 0x22, 0xac, 0xa5, 0x6a, 0x8b, 0x78, 0x84, 0x5b, 0x82, 0x38, 0x15,
+	0x9f, 0x33, 0xc1, 0x50, 0x25, 0xe4, 0xfa, 0x16, 0x65, 0xfa, 0x5f, 0xc5, 0xbf, 0xde, 0xaa, 0x48,
+	0xfe, 0x4a, 0x9a, 0xbf, 0xa2, 0xf9, 0xef, 0xbf, 0x32, 0x5c, 0x5f, 0x20, 0x2c, 0x11, 0x54, 0x77,
+	0x17, 0x2d, 0xd7, 0x6f, 0x5b, 0x8b, 0xbd, 0x9a, 0xee, 0xff, 0x72, 0x8b, 0x8a, 0x76, 0x77, 0xa7,
+	0x62, 0xb3, 0x4e, 0xb5, 0xc5, 0x5a, 0xac, 0xaa, 0xc0, 0x3b, 0xdd, 0xa6, 0x7a, 0x52, 0x0f, 0xea,
+	0x9f, 0x26, 0x7f, 0xfc, 0xfa, 0x95, 0x40, 0x69, 0xf1, 0x69, 0xc7, 0xb2, 0xdb, 0xd4, 0x23, 0x7c,
+	0x2f, 0xd1, 0xd5, 0x21, 0xc2, 0xaa, 0xee, 0xf6, 0x2b, 0xa9, 0x0e, 0xe3, 0xe2, 0x5d, 0x4f, 0xd0,
+	0x0e, 0xe9, 0x63, 0x78, 0xf2, 0x30, 0x86, 0xc0, 0x6e, 0x93, 0x8e, 0xd5, 0xc7, 0xf7, 0x95, 0x61,
+	0x7c, 0x5d, 0x41, 0xdd, 0x2a, 0xf5, 0x44, 0x20, 0x78, 0x2f, 0x93, 0xf9, 0x37, 0x03, 0x26, 0x97,
+	0x1d, 0x87, 0x93, 0x20, 0x58, 0xe3, 0xac, 0xeb, 0xa3, 0x37, 0x61, 0x42, 0xae, 0xc4, 0xb1, 0x84,
+	0x35, 0x67, 0x5c, 0x34, 0x2e, 0x95, 0x97, 0x1e, 0xab, 0x84, 0x82, 0x2b, 0x69, 0xc1, 0xc9, 0x99,
+	0x48, 0xea, 0xca, 0xee, 0x62, 0xe5, 0xc5, 0x9d, 0x6f, 0x13, 0x5b, 0x6c, 0x10, 0x61, 0xd5, 0xd0,
+	0x87, 0xfb, 0x0b, 0x67, 0x0e, 0xf6, 0x17, 0x20, 0x81, 0xe1, 0x58, 0x2a, 0xea, 0xc2, 0x64, 0x4b,
+	0xaa, 0xda, 0x20, 0x9d, 0x1d, 0xc2, 0x83, 0xb9, 0xdc, 0xc5, 0xfc, 0xa5, 0xf2, 0xd2, 0xd3, 0x23,
+	0x1e, 0x7b, 0x65, 0x2d, 0x91, 0x51, 0xbb, 0x47, 0x2b, 0x9c, 0x4c, 0x01, 0x03, 0x9c, 0x51, 0x63,
+	0xfe, 0xc1, 0x80, 0x99, 0xf4, 0x4a, 0xd7, 0x69, 0x20, 0xd0, 0x37, 0xfb, 0x56, 0x5b, 0xb9, 0xb3,
+	0xd5, 0x4a, 0x6e, 0xb5, 0xd6, 0x19, 0xad, 0x7a, 0x22, 0x82, 0xa4, 0x56, 0x6a, 0x41, 0x91, 0x0a,
+	0xd2, 0x89, 0x96, 0xf8, 0xcc, 0xa8, 0x4b, 0x4c, 0x9b, 0x5b, 0x9b, 0xd2, 0x8a, 0x8a, 0x75, 0x29,
+	0x12, 0x87, 0x92, 0xcd, 0xf7, 0xf2, 0x70, 0x2e, 0x4d, 0xd6, 0xb0, 0x84, 0xdd, 0x3e, 0x85, 0x43,
+	0xfc, 0xbe, 0x01, 0xe7, 0x2c, 0xc7, 0x21, 0xce, 0xda, 0x09, 0x1f, 0xe5, 0xe7, 0xb4, 0x5a, 0xb9,
+	0xaa, 0xac, 0x74, 0xdc, 0xaf, 0x10, 0xfd, 0xd0, 0x80, 0x59, 0x4e, 0x3a, 0x6c, 0xb7, 0xc7, 0x90,
+	0xfc, 0xf1, 0x0d, 0x79, 0x40, 0x1b, 0x32, 0x8b, 0xfb, 0xe5, 0xe3, 0x41, 0x4a, 0xcd, 0x4f, 0x0d,
+	0x98, 0x5e, 0xf6, 0x7d, 0x97, 0x12, 0x67, 0x9b, 0xfd, 0x8f, 0x47, 0xd3, 0x9f, 0x0c, 0x40, 0xd9,
+	0xb5, 0x9e, 0x42, 0x3c, 0xd9, 0xd9, 0x78, 0x7a, 0x6e, 0xe4, 0x78, 0xca, 0x18, 0x3c, 0x24, 0xa2,
+	0x7e, 0x94, 0x87, 0xd9, 0x2c, 0xe1, 0x67, 0x31, 0xf5, 0xdf, 0x8b, 0xa9, 0xb7, 0x60, 0xb6, 0x66,
+	0x05, 0xd4, 0x5e, 0xee, 0x8a, 0x36, 0xf1, 0x04, 0xb5, 0x2d, 0x41, 0x99, 0x87, 0x1e, 0x85, 0x89,
+	0x6e, 0x40, 0xb8, 0x67, 0x75, 0x88, 0x3a, 0x8c, 0x52, 0xe2, 0x37, 0x2f, 0x6b, 0x38, 0x8e, 0x29,
+	0x24, 0xb5, 0x6f, 0x05, 0xc1, 0xdb, 0x8c, 0x3b, 0x73, 0xb9, 0x2c, 0x75, 0x43, 0xc3, 0x71, 0x4c,
+	0x61, 0x2e, 0xc2, 0x4c, 0xad, 0xeb, 0x39, 0x2e, 0xb9, 0x46, 0x5d, 0xb2, 0x45, 0xf8, 0x2e, 0xe1,
+	0xe8, 0x02, 0xe4, 0xbb, 0xdc, 0xd5, 0xaa, 0xca, 0x9a, 0x39, 0xff, 0x32, 0x5e, 0xc7, 0x12, 0x6e,
+	0xbe, 0x9f, 0x83, 0x0b, 0x21, 0x4f, 0x48, 0x2f, 0xad, 0x5d, 0x61, 0x5e, 0x93, 0xb6, 0xba, 0x3c,
+	0x34, 0xf8, 0x09, 0x28, 0xef, 0x10, 0x8b, 0x13, 0xbe, 0xcd, 0xae, 0x13, 0x4f, 0x0b, 0x9a, 0xd5,
+	0x82, 0xca, 0xb5, 0x04, 0x85, 0xd3, 0x74, 0xe8, 0x11, 0x18, 0xb3, 0x7c, 0xfa, 0x02, 0xd9, 0xd3,
+	0x76, 0x4f, 0x6b, 0x8e, 0xb1, 0xe5, 0x46, 0xfd, 0x05, 0xb2, 0x87, 0x35, 0x16, 0xfd, 0xd4, 0x80,
+	0xd9, 0x9d, 0xfe, 0x7d, 0x9a, 0xcb, 0x2b, 0x47, 0x5d, 0x19, 0xf5, 0xcc, 0x06, 0x6c, 0x79, 0xed,
+	0xbc, 0x3c, 0xb7, 0x01, 0x08, 0x3c, 0x48, 0xb1, 0xf9, 0xab, 0x02, 0xcc, 0xae, 0xb8, 0xdd, 0x40,
+	0x10, 0x9e, 0x71, 0xae, 0xbb, 0x1f, 0x45, 0xdf, 0x35, 0x60, 0x86, 0x34, 0x9b, 0xc4, 0x16, 0x74,
+	0x97, 0x9c, 0x60, 0x10, 0xcd, 0x69, 0xad, 0x33, 0xab, 0x3d, 0xc2, 0x71, 0x9f, 0x3a, 0xf4, 0x1d,
+	0x38, 0x17, 0xc3, 0xea, 0x8d, 0x9a, 0xcb, 0xec, 0xeb, 0x51, 0xfc, 0x3c, 0x31, 0xaa, 0x0d, 0xf5,
+	0xc6, 0x26, 0x11, 0x49, 0x08, 0xaf, 0xf6, 0xca, 0xc5, 0xfd, 0xaa, 0xd0, 0x15, 0x98, 0x14, 0x4c,
+	0x58, 0x6e, 0xb4, 0xfc, 0xc2, 0x45, 0xe3, 0x52, 0x3e, 0xb9, 0xd7, 0xb7, 0x53, 0x38, 0x9c, 0xa1,
+	0x44, 0x4b, 0x00, 0xea, 0xb9, 0x61, 0xb5, 0x48, 0x30, 0x57, 0x54, 0x7c, 0xf1, 0x7e, 0x6f, 0xc7,
+	0x18, 0x9c, 0xa2, 0x92, 0xbe, 0x6d, 0x77, 0x39, 0x27, 0x9e, 0x90, 0xcf, 0x73, 0x63, 0x8a, 0x29,
+	0xf6, 0xed, 0x95, 0x04, 0x85, 0xd3, 0x74, 0xe6, 0x27, 0x06, 0x94, 0x57, 0x5b, 0xff, 0x07, 0x95,
+	0xe7, 0xef, 0x0d, 0x38, 0x9b, 0x5a, 0xe8, 0x29, 0x24, 0xca, 0x37, 0xb3, 0x89, 0x72, 0xe4, 0x15,
+	0xa6, 0xac, 0x1d, 0x92, 0x25, 0x7f, 0x9c, 0x87, 0x99, 0x14, 0x55, 0x98, 0x22, 0x1d, 0x00, 0x16,
+	0xef, 0xfb, 0x89, 0x9e, 0x61, 0x4a, 0xee, 0x67, 0x69, 0x72, 0x40, 0x9a, 0x74, 0xe1, 0xfc, 0xea,
+	0x0d, 0x21, 0xd3, 0x9d, 0xbb, 0xea, 0x09, 0x2a, 0xf6, 0x30, 0x69, 0x12, 0x4e, 0x3c, 0x9b, 0xa0,
+	0x8b, 0x50, 0x48, 0xa5, 0xc9, 0x49, 0x2d, 0xba, 0xb0, 0x29, 0x53, 0xa4, 0xc2, 0xa0, 0x2a, 0x94,
+	0xe4, 0x6f, 0xe0, 0x5b, 0x36, 0xd1, 0x79, 0xe6, 0x9c, 0x26, 0x2b, 0x6d, 0x46, 0x08, 0x9c, 0xd0,
+	0x98, 0xff, 0x36, 0x60, 0x46, 0xa9, 0x5f, 0x0e, 0x02, 0x66, 0xd3, 0x30, 0xc3, 0x9d, 0x4a, 0x7d,
+	0x34, 0x63, 0x69, 0x8d, 0x7a, 0xfd, 0x47, 0x2e, 0x05, 0x15, 0x77, 0xbc, 0x49, 0xc9, 0xe5, 0xbe,
+	0xdc, 0x23, 0x1f, 0xf7, 0x69, 0x34, 0x3f, 0x28, 0x40, 0x39, 0xb5, 0xf9, 0xe8, 0x15, 0xc8, 0xfb,
+	0xcc, 0xd1, 0x6b, 0x1e, 0xb9, 0xc7, 0x6b, 0x30, 0x27, 0x31, 0x63, 0x5c, 0x56, 0x15, 0x12, 0x22,
+	0x25, 0xa2, 0xef, 0x19, 0x30, 0x4d, 0x32, 0xa7, 0xaa, 0x4e, 0xa7, 0xbc, 0xb4, 0x36, 0x72, 0x3c,
+	0x0f, 0xf6, 0x8d, 0x1a, 0x3a, 0xd8, 0x5f, 0x98, 0xee, 0x41, 0xf6, 0xa8, 0x44, 0x8f, 0x40, 0x9e,
+	0xfa, 0xa1, 0x5b, 0x4f, 0xd6, 0xee, 0x91, 0x06, 0xd6, 0x1b, 0xc1, 0xad, 0xfd, 0x85, 0x52, 0xbd,
+	0xa1, 0x1b, 0x4f, 0x2c, 0x09, 0xd0, 0x1b, 0x50, 0xf4, 0x19, 0x17, 0x32, 0xd9, 0xc8, 0x13, 0xf9,
+	0xea, 0xa8, 0x36, 0x4a, 0x4f, 0x73, 0x1a, 0x8c, 0x8b, 0xe4, 0xc6, 0x91, 0x4f, 0x01, 0x0e, 0xc5,
+	0xa2, 0xd7, 0xa0, 0xe0, 0x31, 0x87, 0xa8, 0x9c, 0x54, 0x5e, 0x7a, 0x76, 0x64, 0xf1, 0xcc, 0x21,
+	0xc9, 0xc2, 0x27, 0x54, 0x08, 0x48, 0x90, 0x12, 0x8a, 0x5a, 0x30, 0x1e, 0x10, 0xbe, 0x4b, 0xed,
+	0x30, 0x7d, 0x95, 0x97, 0xbe, 0x3e, 0xaa, 0xfc, 0xad, 0x90, 0x3d, 0x51, 0x51, 0x3e, 0xd8, 0x5f,
+	0x18, 0x8f, 0xa0, 0x91, 0x74, 0xf3, 0xd7, 0x06, 0x4c, 0x67, 0x7d, 0x2f, 0x1b, 0x7e, 0xc6, 0xe1,
+	0xe1, 0x17, 0x47, 0x74, 0x6e, 0x68, 0x44, 0xd7, 0x20, 0xdf, 0xa5, 0x8e, 0xaa, 0xfe, 0x4a, 0xb5,
+	0xc7, 0xe2, 0x72, 0xb5, 0x7e, 0xf5, 0xd6, 0xfe, 0xc2, 0x43, 0xc3, 0xc6, 0x44, 0x62, 0xcf, 0x27,
+	0x41, 0xe5, 0xe5, 0xfa, 0x55, 0x2c, 0x99, 0xcd, 0x77, 0x60, 0xf2, 0xf9, 0xed, 0xed, 0x46, 0x83,
+	0x33, 0xc1, 0x6c, 0xe6, 0x4a, 0xad, 0x6d, 0x16, 0x88, 0xde, 0x7b, 0xe4, 0x79, 0x16, 0x08, 0xac,
+	0x30, 0xb2, 0x58, 0xed, 0x10, 0xd1, 0x66, 0x4e, 0x6f, 0xb1, 0xba, 0xa1, 0xa0, 0x58, 0x63, 0xa5,
+	0x24, 0xdf, 0x12, 0x6d, 0x6d, 0x5e, 0x2c, 0xa9, 0x61, 0x89, 0x36, 0x56, 0x18, 0xf3, 0xb7, 0x06,
+	0x8c, 0xeb, 0x62, 0x06, 0xbd, 0x02, 0x05, 0x9b, 0x3a, 0x5c, 0xc7, 0xd7, 0x11, 0xcb, 0xa7, 0x58,
+	0xc9, 0x4a, 0xfd, 0x2a, 0xc6, 0x4a, 0x20, 0x7a, 0x1d, 0xc6, 0xc8, 0x0d, 0x9b, 0xf8, 0x42, 0xdf,
+	0x21, 0x47, 0x14, 0x1d, 0xaf, 0x72, 0x55, 0x09, 0xc3, 0x5a, 0xa8, 0xd9, 0x84, 0xa2, 0x22, 0x40,
+	0x0f, 0x43, 0x8e, 0xfa, 0xca, 0xfc, 0xc9, 0xda, 0xec, 0xc1, 0xfe, 0x42, 0xae, 0xde, 0xc8, 0x86,
+	0x4f, 0x8e, 0xfa, 0xb2, 0x62, 0xf3, 0x39, 0x69, 0xd2, 0x1b, 0xeb, 0xc4, 0x6b, 0x89, 0xb6, 0xda,
+	0xc1, 0x62, 0x52, 0x5d, 0x34, 0x52, 0x38, 0x9c, 0xa1, 0x34, 0xdb, 0x00, 0xeb, 0x97, 0xe3, 0x53,
+	0x7a, 0x15, 0x0a, 0x6d, 0x21, 0xfc, 0xa3, 0xde, 0x46, 0xe9, 0x13, 0x0f, 0x83, 0x44, 0x42, 0xb0,
+	0x92, 0x69, 0xfe, 0xd2, 0x00, 0xb4, 0xd1, 0x75, 0x65, 0x8d, 0x1f, 0x08, 0xe5, 0xc4, 0x75, 0xaf,
+	0xc9, 0xd0, 0xc3, 0x50, 0x54, 0xe5, 0x8e, 0xf6, 0x8c, 0x38, 0x7a, 0x43, 0x37, 0x0f, 0x71, 0xe8,
+	0x0d, 0x28, 0xf8, 0xcc, 0x39, 0xf2, 0x24, 0x2c, 0x73, 0x4b, 0x26, 0x1e, 0xc3, 0x9c, 0x00, 0x2b,
+	0xb9, 0xe6, 0x7b, 0x06, 0x94, 0xe2, 0x1b, 0x44, 0x79, 0x18, 0xe3, 0xa1, 0xaf, 0x16, 0xd3, 0xf4,
+	0x5c, 0x60, 0x85, 0xb9, 0x83, 0x18, 0xba, 0x02, 0x13, 0xbe, 0xde, 0x09, 0xed, 0xa9, 0x0f, 0xc6,
+	0x4d, 0xa3, 0x86, 0xdf, 0x4a, 0xfd, 0xc7, 0x31, 0xb5, 0xf9, 0xf7, 0x3c, 0x4c, 0x6d, 0x12, 0xf1,
+	0x36, 0xe3, 0xd7, 0x1b, 0xcc, 0xa5, 0xf6, 0xde, 0x29, 0xe4, 0xc6, 0x26, 0x14, 0x79, 0xd7, 0x25,
+	0xd1, 0x06, 0x2f, 0x8f, 0x7c, 0x3d, 0xa6, 0xed, 0xc5, 0x5d, 0x97, 0x24, 0xe7, 0x28, 0x9f, 0x02,
+	0x1c, 0x8a, 0x47, 0xcf, 0xc2, 0x59, 0x2b, 0x33, 0x1c, 0x09, 0x33, 0x43, 0x49, 0x79, 0xf6, 0xd9,
+	0xec, 0xdc, 0x24, 0xc0, 0xbd, 0xb4, 0xe8, 0x92, 0xdc, 0x54, 0xca, 0xb8, 0xcc, 0x65, 0xb2, 0x29,
+	0x31, 0x6a, 0x93, 0xe1, 0x86, 0x86, 0x30, 0x1c, 0x63, 0xd1, 0xe3, 0x30, 0x29, 0x28, 0xe1, 0x11,
+	0x46, 0x5d, 0xfb, 0xc5, 0xda, 0x8c, 0x6a, 0x5f, 0x52, 0x70, 0x9c, 0xa1, 0x42, 0x01, 0x94, 0x02,
+	0xd6, 0xe5, 0xea, 0x1e, 0xd6, 0x37, 0xf9, 0xb5, 0xe3, 0x6d, 0x45, 0xec, 0x75, 0x53, 0xf2, 0x3e,
+	0xde, 0x8a, 0x84, 0xe3, 0x44, 0x8f, 0xf9, 0x47, 0x03, 0xce, 0x65, 0x98, 0x4e, 0xa1, 0xc2, 0xdf,
+	0xc9, 0x56, 0xf8, 0xcf, 0x1e, 0x6b, 0x91, 0x43, 0x6a, 0xfc, 0x7f, 0x1a, 0x70, 0x3e, 0x43, 0x27,
+	0x13, 0xe6, 0x96, 0xb0, 0x44, 0x37, 0x40, 0x8f, 0xc2, 0x84, 0x4c, 0x9c, 0x9b, 0x03, 0x06, 0x30,
+	0x9b, 0x1a, 0x8e, 0x63, 0x0a, 0xd9, 0x55, 0xea, 0x17, 0x0f, 0x94, 0x79, 0x2a, 0xe6, 0x52, 0x5d,
+	0xe5, 0x5a, 0x8c, 0xc1, 0x29, 0x2a, 0xf4, 0x0d, 0x40, 0x9c, 0x58, 0x2e, 0x7d, 0x47, 0x3d, 0x5e,
+	0xb3, 0xa8, 0xdb, 0xe5, 0x44, 0x45, 0xe2, 0x44, 0xed, 0x7e, 0xcd, 0x8b, 0x70, 0x1f, 0x05, 0x1e,
+	0xc0, 0x85, 0xbe, 0x08, 0xe3, 0x1d, 0x12, 0x04, 0xb2, 0x3b, 0x2d, 0x28, 0x63, 0xcf, 0x6a, 0x01,
+	0xe3, 0x1b, 0x21, 0x18, 0x47, 0x78, 0x35, 0x50, 0xcf, 0x2c, 0xba, 0x41, 0x08, 0x47, 0x97, 0x61,
+	0xca, 0x4a, 0x4d, 0xd9, 0x83, 0x39, 0x43, 0x39, 0xfd, 0xb9, 0x83, 0xfd, 0x85, 0xa9, 0xf4, 0xf8,
+	0x3d, 0xc0, 0x59, 0x3a, 0x44, 0x60, 0x82, 0xfa, 0x7a, 0x00, 0x10, 0x1e, 0xd5, 0xe5, 0xd1, 0xd3,
+	0x8c, 0xe2, 0x4f, 0x36, 0x38, 0xee, 0xfc, 0x63, 0xd1, 0x68, 0x01, 0x8a, 0xcd, 0xb7, 0x1c, 0x2f,
+	0x0a, 0xc6, 0x92, 0x3c, 0xcb, 0x6b, 0x2f, 0x5d, 0xdd, 0x0c, 0x70, 0x08, 0x47, 0x42, 0xf6, 0xf5,
+	0xba, 0x1a, 0x89, 0x4a, 0xb4, 0xe3, 0xd7, 0x38, 0xa9, 0xc9, 0x40, 0x24, 0x1b, 0xa7, 0xf4, 0xc8,
+	0xdb, 0xc2, 0xb5, 0x76, 0x88, 0x5b, 0x77, 0x88, 0x2c, 0x26, 0xa9, 0x1a, 0x29, 0xe4, 0x2f, 0x4d,
+	0x85, 0xb7, 0xc5, 0x7a, 0x16, 0x85, 0x7b, 0x69, 0xcd, 0x4f, 0x0c, 0xb8, 0x6f, 0x70, 0x34, 0xa2,
+	0x27, 0xa0, 0x20, 0xeb, 0x15, 0xed, 0x7b, 0x0f, 0x45, 0xf7, 0xf7, 0xf6, 0x9e, 0x4f, 0x6e, 0xed,
+	0x2f, 0x64, 0x4f, 0x50, 0x02, 0xb1, 0x22, 0x1f, 0xb9, 0xd5, 0x89, 0xf3, 0x44, 0xfe, 0xb0, 0x5a,
+	0xab, 0x70, 0x9c, 0x5a, 0xeb, 0x77, 0x63, 0x3d, 0x4e, 0x27, 0xef, 0x5c, 0xf4, 0x0c, 0x94, 0x1c,
+	0xca, 0x89, 0xad, 0x82, 0x26, 0x5c, 0xe8, 0x7c, 0x64, 0xec, 0xd5, 0x08, 0x71, 0x2b, 0xfd, 0x80,
+	0x13, 0x06, 0x64, 0x43, 0xa1, 0xc9, 0x59, 0x47, 0xb7, 0x0c, 0xc7, 0x4b, 0x08, 0x32, 0x06, 0x92,
+	0xc5, 0x5f, 0xe3, 0xac, 0x83, 0x95, 0x70, 0xf4, 0x3a, 0xe4, 0x04, 0xd3, 0x53, 0xc6, 0x13, 0x50,
+	0x01, 0x5a, 0x45, 0x6e, 0x9b, 0xe1, 0x9c, 0x60, 0x32, 0x7a, 0x82, 0xac, 0xcf, 0x5e, 0x3e, 0xa2,
+	0xcf, 0x26, 0xd1, 0x13, 0x3b, 0x6a, 0x2c, 0x5a, 0xcd, 0x87, 0x7b, 0xf2, 0x4c, 0x92, 0xea, 0xfb,
+	0x32, 0xd3, 0x2b, 0x30, 0x66, 0x85, 0x67, 0x32, 0xa6, 0xce, 0xe4, 0x6b, 0x6a, 0x1e, 0x1b, 0x1d,
+	0xc6, 0xe2, 0x6d, 0xde, 0x7e, 0x73, 0x27, 0x7e, 0x17, 0x5d, 0x91, 0x27, 0x1c, 0x32, 0x61, 0x2d,
+	0x0e, 0x3d, 0x0d, 0x53, 0xc4, 0xb3, 0x76, 0x5c, 0xb2, 0xce, 0x5a, 0x2d, 0xea, 0xb5, 0xe6, 0xc6,
+	0xd5, 0x65, 0x77, 0xaf, 0xb6, 0x65, 0x6a, 0x35, 0x8d, 0xc4, 0x59, 0xda, 0x41, 0x89, 0x79, 0x62,
+	0x84, 0xc4, 0x1c, 0xf9, 0x79, 0x69, 0xa8, 0x9f, 0xbf, 0x05, 0x65, 0x37, 0xae, 0x33, 0x83, 0x39,
+	0x50, 0xc7, 0xf1, 0xd4, 0xa8, 0xc7, 0x91, 0x94, 0xaa, 0xc9, 0x84, 0x30, 0x81, 0x05, 0x38, 0xad,
+	0x43, 0x9e, 0x8b, 0xcb, 0x5a, 0xea, 0x9a, 0x98, 0x2b, 0x67, 0x93, 0xcc, 0xba, 0x86, 0xe3, 0x98,
+	0xc2, 0x7c, 0x3f, 0x0f, 0x28, 0xe3, 0x52, 0x32, 0x55, 0x05, 0xb2, 0x8b, 0x9e, 0xf2, 0xd2, 0x60,
+	0x9d, 0x8d, 0x4f, 0xaa, 0x2e, 0x88, 0x8f, 0x27, 0x8b, 0xcf, 0xea, 0x44, 0x3e, 0x4c, 0x0a, 0x6e,
+	0x35, 0x9b, 0xd4, 0x56, 0x56, 0xe9, 0xa8, 0x7c, 0xf2, 0x36, 0x36, 0xa8, 0x6f, 0x17, 0x2a, 0xb1,
+	0xbf, 0x6c, 0xa7, 0xb8, 0x53, 0x93, 0xdc, 0x14, 0x14, 0x67, 0x34, 0xa0, 0x77, 0x0d, 0x98, 0x91,
+	0x35, 0x5b, 0x9a, 0x44, 0x0f, 0xa7, 0x9e, 0xba, 0x73, 0xb5, 0xb8, 0x47, 0x42, 0x32, 0x29, 0xe9,
+	0xc5, 0xe0, 0x3e, 0x6d, 0xe6, 0x5f, 0x0d, 0x98, 0xed, 0x3b, 0x91, 0xee, 0x69, 0xbc, 0x04, 0x70,
+	0xa1, 0x28, 0x8b, 0x8f, 0x28, 0xe7, 0xae, 0x1d, 0xeb, 0xac, 0x93, 0xb2, 0x27, 0x29, 0x94, 0x24,
+	0x2c, 0xc0, 0xa1, 0x12, 0x73, 0x11, 0xa6, 0x32, 0xe3, 0x85, 0xc3, 0x67, 0x6e, 0xe6, 0x07, 0x45,
+	0x98, 0x89, 0xe4, 0x06, 0x5b, 0xdd, 0x4e, 0xc7, 0xe2, 0xa7, 0xd1, 0x26, 0xfc, 0xc0, 0x80, 0xb3,
+	0x69, 0xc7, 0xa4, 0xf1, 0x16, 0xd5, 0x8e, 0xb5, 0x45, 0xa1, 0x6f, 0x9c, 0xd7, 0xba, 0xcf, 0x6e,
+	0x66, 0x55, 0xe0, 0x5e, 0x9d, 0xe8, 0x37, 0x06, 0x3c, 0x18, 0x6a, 0xd1, 0x2f, 0x89, 0x7a, 0x38,
+	0xb4, 0xa3, 0x9e, 0x84, 0x51, 0x9f, 0xd7, 0x46, 0x3d, 0xb8, 0x7c, 0x1b, 0x7d, 0xf8, 0xb6, 0xd6,
+	0xa0, 0x5f, 0x18, 0x70, 0x6f, 0x48, 0xd0, 0x6b, 0x67, 0xe1, 0xc4, 0xec, 0xbc, 0xa0, 0xed, 0xbc,
+	0x77, 0x79, 0x90, 0x22, 0x3c, 0x58, 0xbf, 0x6c, 0x78, 0x3a, 0x51, 0x4b, 0xae, 0x6a, 0xab, 0x23,
+	0x18, 0xd3, 0xdf, 0xd3, 0x27, 0x45, 0x51, 0x8c, 0xc3, 0x89, 0x1e, 0xf3, 0x75, 0xb8, 0xa7, 0x61,
+	0xb5, 0xa8, 0xa7, 0x6a, 0xec, 0x35, 0x22, 0x5e, 0xf4, 0xe5, 0x9f, 0x20, 0x1c, 0xec, 0xb4, 0x42,
+	0xb7, 0xcf, 0xa7, 0x07, 0x3b, 0x2d, 0x82, 0x15, 0x06, 0x3d, 0x0c, 0x45, 0x97, 0x76, 0xa8, 0xd0,
+	0x3d, 0x40, 0x1c, 0x4e, 0xeb, 0x12, 0x88, 0x43, 0x9c, 0x69, 0xc1, 0x64, 0xba, 0xdf, 0xbf, 0x1b,
+	0x13, 0xec, 0x7f, 0xe4, 0x20, 0x9a, 0xcd, 0xa1, 0xc7, 0x53, 0x8d, 0x7e, 0xa8, 0x62, 0xee, 0xf0,
+	0x26, 0x1f, 0x6d, 0xea, 0x11, 0x43, 0xee, 0x90, 0x38, 0xed, 0x0a, 0xea, 0x56, 0xc2, 0x8f, 0xaf,
+	0x2a, 0x75, 0x4f, 0xbc, 0xc8, 0xb7, 0x04, 0xa7, 0x5e, 0x2b, 0x1c, 0xae, 0xa4, 0x06, 0x12, 0x5f,
+	0x80, 0x71, 0xe2, 0xa9, 0xe9, 0x85, 0x2a, 0xa7, 0x8a, 0xe1, 0xfc, 0x70, 0x35, 0x04, 0xe1, 0x08,
+	0x27, 0x1b, 0x68, 0x6a, 0x77, 0x7c, 0x59, 0xd2, 0xaa, 0x92, 0xb3, 0x18, 0x36, 0xd0, 0xf5, 0x95,
+	0x8d, 0x86, 0x2a, 0x73, 0x63, 0x6c, 0x44, 0xb9, 0x12, 0xcd, 0x4c, 0x53, 0x94, 0x12, 0x86, 0x63,
+	0xac, 0xa2, 0x6c, 0x69, 0x99, 0x63, 0x29, 0xca, 0xb5, 0x58, 0xa6, 0xc6, 0xa2, 0x2b, 0xfa, 0x05,
+	0x9a, 0x6e, 0x79, 0x54, 0x81, 0x52, 0xea, 0x79, 0x07, 0x16, 0x4d, 0xb5, 0x32, 0x94, 0x26, 0x81,
+	0x99, 0xde, 0xee, 0xe1, 0x6e, 0x9c, 0xeb, 0xfb, 0x05, 0x38, 0xbf, 0xd5, 0xf5, 0xe5, 0x8e, 0x86,
+	0xef, 0xe3, 0x57, 0x98, 0xeb, 0xea, 0x82, 0xf8, 0xee, 0xdf, 0xae, 0xaf, 0x41, 0x89, 0xdc, 0xf0,
+	0x29, 0x27, 0xce, 0x72, 0xe4, 0x18, 0x5f, 0xba, 0x33, 0x15, 0xdb, 0xb4, 0x43, 0x92, 0xa5, 0xad,
+	0x46, 0x42, 0x70, 0x22, 0x4f, 0xee, 0x45, 0x40, 0x3d, 0x9b, 0x48, 0x52, 0xdd, 0x8e, 0xc4, 0x0c,
+	0x5b, 0x11, 0x02, 0x27, 0x34, 0xb2, 0xe5, 0x6b, 0xc6, 0x5f, 0x30, 0x28, 0x67, 0x39, 0x42, 0xcb,
+	0xd7, 0xfb, 0x25, 0x44, 0xb2, 0x03, 0x09, 0x0c, 0xa7, 0xf4, 0xa0, 0x9f, 0x18, 0x30, 0x6d, 0x65,
+	0x3f, 0x42, 0x08, 0x27, 0xf6, 0x1b, 0x47, 0x53, 0x3d, 0xe4, 0x83, 0x8a, 0xda, 0x7d, 0xda, 0x8e,
+	0xe9, 0x9e, 0xaf, 0x11, 0x7a, 0x94, 0x9b, 0x9f, 0x1a, 0xf0, 0xc0, 0x10, 0x8f, 0x38, 0x85, 0x31,
+	0x8d, 0x9b, 0x1d, 0xd3, 0x8c, 0x5c, 0x87, 0x0c, 0xb1, 0x7c, 0xc8, 0xc0, 0xe6, 0xe7, 0x39, 0x78,
+	0x68, 0x08, 0xc7, 0x91, 0x47, 0x37, 0x4f, 0xc3, 0x54, 0xf4, 0x3f, 0x1d, 0x86, 0x49, 0xd5, 0x9b,
+	0x46, 0xe2, 0x2c, 0x6d, 0xa4, 0x4a, 0xdd, 0x2c, 0xf9, 0x7e, 0x55, 0xe1, 0xed, 0x12, 0x51, 0x48,
+	0x0f, 0xb7, 0x59, 0xc7, 0x77, 0x89, 0x20, 0x61, 0x3f, 0x3d, 0x91, 0x78, 0xf8, 0x4a, 0x84, 0xc0,
+	0x09, 0x8d, 0xcc, 0x26, 0x84, 0x73, 0xc6, 0x95, 0x87, 0xa5, 0x26, 0xcf, 0xab, 0x12, 0x88, 0x43,
+	0x9c, 0xf9, 0x2f, 0x03, 0x2e, 0x0c, 0xd9, 0x94, 0x53, 0x2b, 0x47, 0x77, 0xb3, 0xe5, 0xe8, 0x4b,
+	0x27, 0xe4, 0x06, 0x87, 0x15, 0xa6, 0xb5, 0xed, 0x0f, 0x6f, 0xce, 0x9f, 0xf9, 0xe8, 0xe6, 0xfc,
+	0x99, 0x8f, 0x6f, 0xce, 0x9f, 0x79, 0xf7, 0x60, 0xde, 0xf8, 0xf0, 0x60, 0xde, 0xf8, 0xe8, 0x60,
+	0xde, 0xf8, 0xf8, 0x60, 0xde, 0xf8, 0xf3, 0xc1, 0xbc, 0xf1, 0xb3, 0xbf, 0xcc, 0x9f, 0x79, 0xb5,
+	0x32, 0xda, 0x07, 0xdb, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0xeb, 0x2a, 0x76, 0xac, 0xe1, 0x2d,
+	0x00, 0x00,
 }
 
 func (m *AddressGroup) Marshal() (dAtA []byte, err error) {
@@ -2844,18 +2813,11 @@ func (m *NetworkPolicyRule) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
-	if m.LogSettings != nil {
-		{
-			size, err := m.LogSettings.MarshalToSizedBuffer(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = encodeVarintGenerated(dAtA, i, uint64(size))
-		}
-		i--
-		dAtA[i] = 0x5a
-	}
+	i -= len(m.LogLabel)
+	copy(dAtA[i:], m.LogLabel)
+	i = encodeVarintGenerated(dAtA, i, uint64(len(m.LogLabel)))
+	i--
+	dAtA[i] = 0x5a
 	if len(m.L7Protocols) > 0 {
 		for iNdEx := len(m.L7Protocols) - 1; iNdEx >= 0; iNdEx-- {
 			{
@@ -3227,34 +3189,6 @@ func (m *PodReference) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	return len(dAtA) - i, nil
 }
 
-func (m *RuleLogSettings) Marshal() (dAtA []byte, err error) {
-	size := m.Size()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBuffer(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *RuleLogSettings) MarshalTo(dAtA []byte) (int, error) {
-	size := m.Size()
-	return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *RuleLogSettings) MarshalToSizedBuffer(dAtA []byte) (int, error) {
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	i -= len(m.LogLabel)
-	copy(dAtA[i:], m.LogLabel)
-	i = encodeVarintGenerated(dAtA, i, uint64(len(m.LogLabel)))
-	i--
-	dAtA[i] = 0xa
-	return len(dAtA) - i, nil
-}
-
 func (m *Service) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
@@ -4147,10 +4081,8 @@ func (m *NetworkPolicyRule) Size() (n int) {
 			n += 1 + l + sovGenerated(uint64(l))
 		}
 	}
-	if m.LogSettings != nil {
-		l = m.LogSettings.Size()
-		n += 1 + l + sovGenerated(uint64(l))
-	}
+	l = len(m.LogLabel)
+	n += 1 + l + sovGenerated(uint64(l))
 	return n
 }
 
@@ -4260,17 +4192,6 @@ func (m *PodReference) Size() (n int) {
 	return n
 }
 
-func (m *RuleLogSettings) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	l = len(m.LogLabel)
-	n += 1 + l + sovGenerated(uint64(l))
-	return n
-}
-
 func (m *Service) Size() (n int) {
 	if m == nil {
 		return 0
@@ -4859,7 +4780,7 @@ func (this *NetworkPolicyRule) String() string {
 		`AppliedToGroups:` + fmt.Sprintf("%v", this.AppliedToGroups) + `,`,
 		`Name:` + fmt.Sprintf("%v", this.Name) + `,`,
 		`L7Protocols:` + repeatedStringForL7Protocols + `,`,
-		`LogSettings:` + strings.Replace(this.LogSettings.String(), "RuleLogSettings", "RuleLogSettings", 1) + `,`,
+		`LogLabel:` + fmt.Sprintf("%v", this.LogLabel) + `,`,
 		`}`,
 	}, "")
 	return s
@@ -4963,16 +4884,6 @@ func (this *PodReference) String() string {
 	}, "")
 	return s
 }
-func (this *RuleLogSettings) String() string {
-	if this == nil {
-		return "nil"
-	}
-	s := strings.Join([]string{`&RuleLogSettings{`,
-		`LogLabel:` + fmt.Sprintf("%v", this.LogLabel) + `,`,
-		`}`,
-	}, "")
-	return s
-}
 func (this *Service) String() string {
 	if this == nil {
 		return "nil"
@@ -9371,9 +9282,9 @@ func (m *NetworkPolicyRule) Unmarshal(dAtA []byte) error {
 			iNdEx = postIndex
 		case 11:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field LogSettings", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field LogLabel", wireType)
 			}
-			var msglen int
+			var stringLen uint64
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
 					return ErrIntOverflowGenerated
@@ -9383,27 +9294,23 @@ func (m *NetworkPolicyRule) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				msglen |= int(b&0x7F) << shift
+				stringLen |= uint64(b&0x7F) << shift
 				if b < 0x80 {
 					break
 				}
 			}
-			if msglen < 0 {
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
 				return ErrInvalidLengthGenerated
 			}
-			postIndex := iNdEx + msglen
+			postIndex := iNdEx + intStringLen
 			if postIndex < 0 {
 				return ErrInvalidLengthGenerated
 			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			if m.LogSettings == nil {
-				m.LogSettings = &RuleLogSettings{}
-			}
-			if err := m.LogSettings.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
-				return err
-			}
+			m.LogLabel = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
@@ -10196,88 +10103,6 @@ func (m *PodReference) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
-func (m *RuleLogSettings) Unmarshal(dAtA []byte) error {
-	l := len(dAtA)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflowGenerated
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= uint64(b&0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: RuleLogSettings: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: RuleLogSettings: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field LogLabel", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowGenerated
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				stringLen |= uint64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthGenerated
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthGenerated
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.LogLabel = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
-		default:
-			iNdEx = preIndex
-			skippy, err := skipGenerated(dAtA[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if (skippy < 0) || (iNdEx+skippy) < 0 {
-				return ErrInvalidLengthGenerated
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			iNdEx += skippy
-		}
-	}
-
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
 func (m *Service) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
diff --git a/pkg/apis/controlplane/v1beta2/generated.proto b/pkg/apis/controlplane/v1beta2/generated.proto
index eee0c3541c8..c8a3950c6ef 100644
--- a/pkg/apis/controlplane/v1beta2/generated.proto
+++ b/pkg/apis/controlplane/v1beta2/generated.proto
@@ -362,8 +362,8 @@ message NetworkPolicyRule {
   // L7Protocols is a list of application layer protocols which should be matched.
   repeated L7Protocol l7Protocols = 10;
 
-  // LogSettings specifies logging behaviors of the rules when matched.
-  optional RuleLogSettings logSettings = 11;
+  // LogLabel is a user-defined arbitrary string which will be printed in the NetworkPolicy logs.
+  optional string logLabel = 11;
 }
 
 // NetworkPolicyStats contains the information and traffic stats of a NetworkPolicy.
@@ -424,12 +424,6 @@ message PodReference {
   optional string namespace = 2;
 }
 
-// RuleLogSettings describes logging behaviors. Currently supports log labels.
-message RuleLogSettings {
-  // LogLabel is a keyword included in the NetworkPolicy logs if this rule is matched and has log enabled.
-  optional string logLabel = 1;
-}
-
 // Service describes a port to allow traffic on.
 message Service {
   // The protocol (TCP, UDP, SCTP, or ICMP) which traffic must match. If not specified, this
diff --git a/pkg/apis/controlplane/v1beta2/types.go b/pkg/apis/controlplane/v1beta2/types.go
index eed6c4eec78..dc675d31d0e 100644
--- a/pkg/apis/controlplane/v1beta2/types.go
+++ b/pkg/apis/controlplane/v1beta2/types.go
@@ -258,8 +258,8 @@ type NetworkPolicyRule struct {
 	Name string `json:"name,omitempty" protobuf:"bytes,9,opt,name=name"`
 	// L7Protocols is a list of application layer protocols which should be matched.
 	L7Protocols []L7Protocol `json:"l7Protocols,omitempty" protobuf:"bytes,10,rep,name=l7Protocols"`
-	// LogSettings specifies logging behaviors of the rules when matched.
-	LogSettings *RuleLogSettings `json:"logSettings,omitempty" protobuf:"bytes,11,opt,name=logSettings"`
+	// LogLabel is a user-defined arbitrary string which will be printed in the NetworkPolicy logs.
+	LogLabel string `json:"logLabel,omitempty" protobuf:"bytes,11,opt,name=logLabel"`
 }
 
 // Protocol defines network protocols supported for things like container ports.
@@ -351,12 +351,6 @@ type IPBlock struct {
 	Except []IPNet `json:"except,omitempty" protobuf:"bytes,2,rep,name=except"`
 }
 
-// RuleLogSettings describes logging behaviors. Currently supports log labels.
-type RuleLogSettings struct {
-	// LogLabel is a keyword included in the NetworkPolicy logs if this rule is matched and has log enabled.
-	LogLabel string `json:"logLabel,omitempty" protobuf:"bytes,1,opt,name=logLabel"`
-}
-
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // NetworkPolicyList is a list of NetworkPolicy objects.
diff --git a/pkg/apis/controlplane/v1beta2/zz_generated.conversion.go b/pkg/apis/controlplane/v1beta2/zz_generated.conversion.go
index 3c320b2ea42..f3ae431e7f6 100644
--- a/pkg/apis/controlplane/v1beta2/zz_generated.conversion.go
+++ b/pkg/apis/controlplane/v1beta2/zz_generated.conversion.go
@@ -389,16 +389,6 @@ func RegisterConversions(s *runtime.Scheme) error {
 	}); err != nil {
 		return err
 	}
-	if err := s.AddGeneratedConversionFunc((*RuleLogSettings)(nil), (*controlplane.RuleLogSettings)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_v1beta2_RuleLogSettings_To_controlplane_RuleLogSettings(a.(*RuleLogSettings), b.(*controlplane.RuleLogSettings), scope)
-	}); err != nil {
-		return err
-	}
-	if err := s.AddGeneratedConversionFunc((*controlplane.RuleLogSettings)(nil), (*RuleLogSettings)(nil), func(a, b interface{}, scope conversion.Scope) error {
-		return Convert_controlplane_RuleLogSettings_To_v1beta2_RuleLogSettings(a.(*controlplane.RuleLogSettings), b.(*RuleLogSettings), scope)
-	}); err != nil {
-		return err
-	}
 	if err := s.AddGeneratedConversionFunc((*Service)(nil), (*controlplane.Service)(nil), func(a, b interface{}, scope conversion.Scope) error {
 		return Convert_v1beta2_Service_To_controlplane_Service(a.(*Service), b.(*controlplane.Service), scope)
 	}); err != nil {
@@ -1450,7 +1440,7 @@ func autoConvert_v1beta2_NetworkPolicyRule_To_controlplane_NetworkPolicyRule(in
 	out.AppliedToGroups = *(*[]string)(unsafe.Pointer(&in.AppliedToGroups))
 	out.Name = in.Name
 	out.L7Protocols = *(*[]controlplane.L7Protocol)(unsafe.Pointer(&in.L7Protocols))
-	out.LogSettings = (*controlplane.RuleLogSettings)(unsafe.Pointer(in.LogSettings))
+	out.LogLabel = in.LogLabel
 	return nil
 }
 
@@ -1474,7 +1464,7 @@ func autoConvert_controlplane_NetworkPolicyRule_To_v1beta2_NetworkPolicyRule(in
 	out.EnableLogging = in.EnableLogging
 	out.AppliedToGroups = *(*[]string)(unsafe.Pointer(&in.AppliedToGroups))
 	out.L7Protocols = *(*[]L7Protocol)(unsafe.Pointer(&in.L7Protocols))
-	out.LogSettings = (*RuleLogSettings)(unsafe.Pointer(in.LogSettings))
+	out.LogLabel = in.LogLabel
 	return nil
 }
 
@@ -1650,26 +1640,6 @@ func Convert_controlplane_PodReference_To_v1beta2_PodReference(in *controlplane.
 	return autoConvert_controlplane_PodReference_To_v1beta2_PodReference(in, out, s)
 }
 
-func autoConvert_v1beta2_RuleLogSettings_To_controlplane_RuleLogSettings(in *RuleLogSettings, out *controlplane.RuleLogSettings, s conversion.Scope) error {
-	out.LogLabel = in.LogLabel
-	return nil
-}
-
-// Convert_v1beta2_RuleLogSettings_To_controlplane_RuleLogSettings is an autogenerated conversion function.
-func Convert_v1beta2_RuleLogSettings_To_controlplane_RuleLogSettings(in *RuleLogSettings, out *controlplane.RuleLogSettings, s conversion.Scope) error {
-	return autoConvert_v1beta2_RuleLogSettings_To_controlplane_RuleLogSettings(in, out, s)
-}
-
-func autoConvert_controlplane_RuleLogSettings_To_v1beta2_RuleLogSettings(in *controlplane.RuleLogSettings, out *RuleLogSettings, s conversion.Scope) error {
-	out.LogLabel = in.LogLabel
-	return nil
-}
-
-// Convert_controlplane_RuleLogSettings_To_v1beta2_RuleLogSettings is an autogenerated conversion function.
-func Convert_controlplane_RuleLogSettings_To_v1beta2_RuleLogSettings(in *controlplane.RuleLogSettings, out *RuleLogSettings, s conversion.Scope) error {
-	return autoConvert_controlplane_RuleLogSettings_To_v1beta2_RuleLogSettings(in, out, s)
-}
-
 func autoConvert_v1beta2_Service_To_controlplane_Service(in *Service, out *controlplane.Service, s conversion.Scope) error {
 	out.Protocol = (*controlplane.Protocol)(unsafe.Pointer(in.Protocol))
 	out.Port = (*intstr.IntOrString)(unsafe.Pointer(in.Port))
diff --git a/pkg/apis/controlplane/v1beta2/zz_generated.deepcopy.go b/pkg/apis/controlplane/v1beta2/zz_generated.deepcopy.go
index a467322bccb..4738b0b870e 100644
--- a/pkg/apis/controlplane/v1beta2/zz_generated.deepcopy.go
+++ b/pkg/apis/controlplane/v1beta2/zz_generated.deepcopy.go
@@ -881,11 +881,6 @@ func (in *NetworkPolicyRule) DeepCopyInto(out *NetworkPolicyRule) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
-	if in.LogSettings != nil {
-		in, out := &in.LogSettings, &out.LogSettings
-		*out = new(RuleLogSettings)
-		**out = **in
-	}
 	return
 }
 
@@ -1064,22 +1059,6 @@ func (in *PodReference) DeepCopy() *PodReference {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *RuleLogSettings) DeepCopyInto(out *RuleLogSettings) {
-	*out = *in
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RuleLogSettings.
-func (in *RuleLogSettings) DeepCopy() *RuleLogSettings {
-	if in == nil {
-		return nil
-	}
-	out := new(RuleLogSettings)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Service) DeepCopyInto(out *Service) {
 	*out = *in
diff --git a/pkg/apis/controlplane/zz_generated.deepcopy.go b/pkg/apis/controlplane/zz_generated.deepcopy.go
index 5634cb7efbf..05082480e97 100644
--- a/pkg/apis/controlplane/zz_generated.deepcopy.go
+++ b/pkg/apis/controlplane/zz_generated.deepcopy.go
@@ -881,11 +881,6 @@ func (in *NetworkPolicyRule) DeepCopyInto(out *NetworkPolicyRule) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
-	if in.LogSettings != nil {
-		in, out := &in.LogSettings, &out.LogSettings
-		*out = new(RuleLogSettings)
-		**out = **in
-	}
 	return
 }
 
@@ -1064,22 +1059,6 @@ func (in *PodReference) DeepCopy() *PodReference {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *RuleLogSettings) DeepCopyInto(out *RuleLogSettings) {
-	*out = *in
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RuleLogSettings.
-func (in *RuleLogSettings) DeepCopy() *RuleLogSettings {
-	if in == nil {
-		return nil
-	}
-	out := new(RuleLogSettings)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Service) DeepCopyInto(out *Service) {
 	*out = *in
diff --git a/pkg/apis/crd/v1alpha1/types.go b/pkg/apis/crd/v1alpha1/types.go
index 5f0d9f56360..8b7dff4d583 100644
--- a/pkg/apis/crd/v1alpha1/types.go
+++ b/pkg/apis/crd/v1alpha1/types.go
@@ -430,13 +430,11 @@ type Rule struct {
 	Name string `json:"name,omitempty"`
 	// EnableLogging is used to indicate if agent should generate logs
 	// when rules are matched. Should be default to false.
-	// This field can't be used with LogSettings, will be deprecated.
 	// +optional
 	EnableLogging bool `json:"enableLogging"`
-	// LogSettings is used to specify logging behaviors of the rules when matched.
-	// This field can't be used with EnableLogging.
+	// LogLabel is a user-defined arbitrary string which will be printed in the NetworkPolicy logs.
 	// +optional
-	LogSettings *RuleLogSettings `json:"logSetting,omitempty"`
+	LogLabel string `json:"logLabel,omitempty"`
 	// Select workloads on which this rule will be applied to. Cannot be set in
 	// conjunction with NetworkPolicySpec/ClusterNetworkPolicySpec.AppliedTo.
 	// +optional
@@ -925,12 +923,3 @@ type HTTPProtocol struct {
 	// Path represents the URI path to match (Ex. "/index.html", "/admin").
 	Path string `json:"path,omitempty"`
 }
-
-// RuleLogSettings describes logging behaviors. Currently supports log labels.
-type RuleLogSettings struct {
-	// LogEnabled indicates if logs should be generated when rules are matched.
-	LogEnabled bool `json:"enabled"`
-	// LogLabel is a keyword included in the NetworkPolicy logs if this rule is matched and has log enabled.
-	// +optional
-	LogLabel string `json:"logLabel,omitempty"`
-}
diff --git a/pkg/apis/crd/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/crd/v1alpha1/zz_generated.deepcopy.go
index 7e055438d5c..064ade764eb 100644
--- a/pkg/apis/crd/v1alpha1/zz_generated.deepcopy.go
+++ b/pkg/apis/crd/v1alpha1/zz_generated.deepcopy.go
@@ -929,11 +929,6 @@ func (in *Rule) DeepCopyInto(out *Rule) {
 		*out = make([]PeerService, len(*in))
 		copy(*out, *in)
 	}
-	if in.LogSettings != nil {
-		in, out := &in.LogSettings, &out.LogSettings
-		*out = new(RuleLogSettings)
-		**out = **in
-	}
 	if in.AppliedTo != nil {
 		in, out := &in.AppliedTo, &out.AppliedTo
 		*out = make([]AppliedTo, len(*in))
@@ -954,22 +949,6 @@ func (in *Rule) DeepCopy() *Rule {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *RuleLogSettings) DeepCopyInto(out *RuleLogSettings) {
-	*out = *in
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RuleLogSettings.
-func (in *RuleLogSettings) DeepCopy() *RuleLogSettings {
-	if in == nil {
-		return nil
-	}
-	out := new(RuleLogSettings)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Source) DeepCopyInto(out *Source) {
 	*out = *in
diff --git a/pkg/apiserver/openapi/zz_generated.openapi.go b/pkg/apiserver/openapi/zz_generated.openapi.go
index 118f81a9fd3..22a8267f829 100644
--- a/pkg/apiserver/openapi/zz_generated.openapi.go
+++ b/pkg/apiserver/openapi/zz_generated.openapi.go
@@ -65,7 +65,6 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA
 		"antrea.io/antrea/pkg/apis/controlplane/v1beta2.NodeStatsSummary":                  schema_pkg_apis_controlplane_v1beta2_NodeStatsSummary(ref),
 		"antrea.io/antrea/pkg/apis/controlplane/v1beta2.PaginationGetOptions":              schema_pkg_apis_controlplane_v1beta2_PaginationGetOptions(ref),
 		"antrea.io/antrea/pkg/apis/controlplane/v1beta2.PodReference":                      schema_pkg_apis_controlplane_v1beta2_PodReference(ref),
-		"antrea.io/antrea/pkg/apis/controlplane/v1beta2.RuleLogSettings":                   schema_pkg_apis_controlplane_v1beta2_RuleLogSettings(ref),
 		"antrea.io/antrea/pkg/apis/controlplane/v1beta2.Service":                           schema_pkg_apis_controlplane_v1beta2_Service(ref),
 		"antrea.io/antrea/pkg/apis/controlplane/v1beta2.ServiceReference":                  schema_pkg_apis_controlplane_v1beta2_ServiceReference(ref),
 		"antrea.io/antrea/pkg/apis/controlplane/v1beta2.SupportBundleCollection":           schema_pkg_apis_controlplane_v1beta2_SupportBundleCollection(ref),
@@ -1752,10 +1751,11 @@ func schema_pkg_apis_controlplane_v1beta2_NetworkPolicyRule(ref common.Reference
 							},
 						},
 					},
-					"logSettings": {
+					"logLabel": {
 						SchemaProps: spec.SchemaProps{
-							Description: "LogSettings specifies logging behaviors of the rules when matched.",
-							Ref:         ref("antrea.io/antrea/pkg/apis/controlplane/v1beta2.RuleLogSettings"),
+							Description: "LogLabel is a user-defined arbitrary string which will be printed in the NetworkPolicy logs and exported in flow records.",
+							Type:        []string{"string"},
+							Format:      "",
 						},
 					},
 				},
@@ -1763,7 +1763,7 @@ func schema_pkg_apis_controlplane_v1beta2_NetworkPolicyRule(ref common.Reference
 			},
 		},
 		Dependencies: []string{
-			"antrea.io/antrea/pkg/apis/controlplane/v1beta2.L7Protocol", "antrea.io/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicyPeer", "antrea.io/antrea/pkg/apis/controlplane/v1beta2.RuleLogSettings", "antrea.io/antrea/pkg/apis/controlplane/v1beta2.Service"},
+			"antrea.io/antrea/pkg/apis/controlplane/v1beta2.L7Protocol", "antrea.io/antrea/pkg/apis/controlplane/v1beta2.NetworkPolicyPeer", "antrea.io/antrea/pkg/apis/controlplane/v1beta2.Service"},
 	}
 }
 
@@ -2038,26 +2038,6 @@ func schema_pkg_apis_controlplane_v1beta2_PodReference(ref common.ReferenceCallb
 	}
 }
 
-func schema_pkg_apis_controlplane_v1beta2_RuleLogSettings(ref common.ReferenceCallback) common.OpenAPIDefinition {
-	return common.OpenAPIDefinition{
-		Schema: spec.Schema{
-			SchemaProps: spec.SchemaProps{
-				Description: "RuleLogSettings describes logging behaviors. Currently supports log labels.",
-				Type:        []string{"object"},
-				Properties: map[string]spec.Schema{
-					"logLabel": {
-						SchemaProps: spec.SchemaProps{
-							Description: "LogLabel is a keyword included in the NetworkPolicy logs if this rule is matched and has log enabled.",
-							Type:        []string{"string"},
-							Format:      "",
-						},
-					},
-				},
-			},
-		},
-	}
-}
-
 func schema_pkg_apis_controlplane_v1beta2_Service(ref common.ReferenceCallback) common.OpenAPIDefinition {
 	return common.OpenAPIDefinition{
 		Schema: spec.Schema{
diff --git a/pkg/controller/networkpolicy/antreanetworkpolicy.go b/pkg/controller/networkpolicy/antreanetworkpolicy.go
index 066eac824ae..b1cafd5fd72 100644
--- a/pkg/controller/networkpolicy/antreanetworkpolicy.go
+++ b/pkg/controller/networkpolicy/antreanetworkpolicy.go
@@ -116,7 +116,7 @@ func (n *NetworkPolicyController) processAntreaNetworkPolicy(np *crdv1alpha1.Net
 			EnableLogging:   ingressRule.EnableLogging,
 			AppliedToGroups: getAppliedToGroupNames(atgs),
 			L7Protocols:     toAntreaL7ProtocolsForCRD(ingressRule.L7Protocols),
-			LogSettings:     toAntreaLogSettingForCRD(ingressRule.LogSettings),
+			LogLabel:        ingressRule.LogLabel,
 		})
 	}
 	// Compute NetworkPolicyRule for Egress Rule.
@@ -148,7 +148,7 @@ func (n *NetworkPolicyController) processAntreaNetworkPolicy(np *crdv1alpha1.Net
 			EnableLogging:   egressRule.EnableLogging,
 			AppliedToGroups: getAppliedToGroupNames(atgs),
 			L7Protocols:     toAntreaL7ProtocolsForCRD(egressRule.L7Protocols),
-			LogSettings:     toAntreaLogSettingForCRD(egressRule.LogSettings),
+			LogLabel:        egressRule.LogLabel,
 		})
 	}
 	tierPriority := n.getTierPriority(np.Spec.Tier)
diff --git a/pkg/controller/networkpolicy/antreanetworkpolicy_test.go b/pkg/controller/networkpolicy/antreanetworkpolicy_test.go
index 3f471644b74..5e906f3ad69 100644
--- a/pkg/controller/networkpolicy/antreanetworkpolicy_test.go
+++ b/pkg/controller/networkpolicy/antreanetworkpolicy_test.go
@@ -695,11 +695,9 @@ func TestProcessAntreaNetworkPolicy(t *testing.T) {
 									NamespaceSelector: &selectorC,
 								},
 							},
-							Action: &allowAction,
-							LogSettings: &crdv1alpha1.RuleLogSettings{
-								LogEnabled: true,
-								LogLabel:   "test-log-label",
-							},
+							Action:        &allowAction,
+							EnableLogging: true,
+							LogLabel:      "test-log-label",
 						},
 					},
 				},
@@ -727,11 +725,10 @@ func TestProcessAntreaNetworkPolicy(t *testing.T) {
 								Port:     &int80,
 							},
 						},
-						Priority: 0,
-						Action:   &allowAction,
-						LogSettings: &controlplane.RuleLogSettings{
-							LogLabel: "test-log-label",
-						},
+						Priority:      0,
+						Action:        &allowAction,
+						EnableLogging: true,
+						LogLabel:      "test-log-label",
 					},
 				},
 				AppliedToGroups: []string{getNormalizedUID(antreatypes.NewGroupSelector("ns9", &selectorA, nil, nil, nil).NormalizedName)},
diff --git a/pkg/controller/networkpolicy/clusternetworkpolicy.go b/pkg/controller/networkpolicy/clusternetworkpolicy.go
index c1569666f0f..03ce2284e98 100644
--- a/pkg/controller/networkpolicy/clusternetworkpolicy.go
+++ b/pkg/controller/networkpolicy/clusternetworkpolicy.go
@@ -377,7 +377,7 @@ func (n *NetworkPolicyController) processClusterNetworkPolicy(cnp *crdv1alpha1.C
 					EnableLogging:   cnpRule.EnableLogging,
 					AppliedToGroups: getAppliedToGroupNames(ruleAppliedTos),
 					L7Protocols:     toAntreaL7ProtocolsForCRD(cnpRule.L7Protocols),
-					LogSettings:     toAntreaLogSettingForCRD(cnpRule.LogSettings),
+					LogLabel:        cnpRule.LogLabel,
 				}
 				if dir == controlplane.DirectionIn {
 					rule.From = *peer
diff --git a/pkg/controller/networkpolicy/clusternetworkpolicy_test.go b/pkg/controller/networkpolicy/clusternetworkpolicy_test.go
index a03d4fcff56..0a769bff0ec 100644
--- a/pkg/controller/networkpolicy/clusternetworkpolicy_test.go
+++ b/pkg/controller/networkpolicy/clusternetworkpolicy_test.go
@@ -1647,11 +1647,9 @@ func TestProcessClusterNetworkPolicy(t *testing.T) {
 									NamespaceSelector: &selectorC,
 								},
 							},
-							Action: &allowAction,
-							LogSettings: &crdv1alpha1.RuleLogSettings{
-								LogEnabled: true,
-								LogLabel:   "test-log-label",
-							},
+							Action:        &allowAction,
+							EnableLogging: true,
+							LogLabel:      "test-log-label",
 						},
 					},
 				},
@@ -1678,11 +1676,10 @@ func TestProcessClusterNetworkPolicy(t *testing.T) {
 								Port:     &int80,
 							},
 						},
-						Priority: 0,
-						Action:   &allowAction,
-						LogSettings: &controlplane.RuleLogSettings{
-							LogLabel: "test-log-label",
-						},
+						Priority:      0,
+						Action:        &allowAction,
+						EnableLogging: true,
+						LogLabel:      "test-log-label",
 					},
 				},
 				AppliedToGroups: []string{getNormalizedUID(antreatypes.NewGroupSelector("", &selectorA, nil, nil, nil).NormalizedName)},
diff --git a/pkg/controller/networkpolicy/crd_utils.go b/pkg/controller/networkpolicy/crd_utils.go
index 90a8b61edab..51eacd5db6f 100644
--- a/pkg/controller/networkpolicy/crd_utils.go
+++ b/pkg/controller/networkpolicy/crd_utils.go
@@ -122,15 +122,6 @@ func toAntreaL7ProtocolsForCRD(l7Protocols []v1alpha1.L7Protocol) []controlplane
 	return antreaL7Protocols
 }
 
-func toAntreaLogSettingForCRD(logSetting *v1alpha1.RuleLogSettings) *controlplane.RuleLogSettings {
-	if logSetting != nil && logSetting.LogEnabled {
-		return &controlplane.RuleLogSettings{
-			LogLabel: logSetting.LogLabel,
-		}
-	}
-	return nil
-}
-
 // toAntreaIPBlockForCRD converts a v1alpha1.IPBlock to an Antrea IPBlock.
 func toAntreaIPBlockForCRD(ipBlock *v1alpha1.IPBlock) (*controlplane.IPBlock, error) {
 	// Convert the allowed IPBlock to networkpolicy.IPNet.
diff --git a/pkg/controller/networkpolicy/crd_utils_test.go b/pkg/controller/networkpolicy/crd_utils_test.go
index 85070871af5..9391e899c69 100644
--- a/pkg/controller/networkpolicy/crd_utils_test.go
+++ b/pkg/controller/networkpolicy/crd_utils_test.go
@@ -226,35 +226,6 @@ func TestToAntreaL7ProtocolsForCRD(t *testing.T) {
 	}
 }
 
-func TestToAntreaLogSettingForCRD(t *testing.T) {
-	tables := []struct {
-		name       string
-		logSetting *crdv1alpha1.RuleLogSettings
-		expValue   *controlplane.RuleLogSettings
-	}{
-		{
-			name: "Set logSetting not enabled",
-			logSetting: &crdv1alpha1.RuleLogSettings{
-				LogEnabled: false,
-			},
-		},
-		{
-			name: "Set logSetting log label",
-			logSetting: &crdv1alpha1.RuleLogSettings{
-				LogEnabled: true,
-				LogLabel:   "test-log-label",
-			},
-			expValue: &controlplane.RuleLogSettings{
-				LogLabel: "test-log-label",
-			},
-		},
-	}
-	for _, table := range tables {
-		gotValue := toAntreaLogSettingForCRD(table.logSetting)
-		assert.Equal(t, table.expValue, gotValue)
-	}
-}
-
 func TestToAntreaIPBlockForCRD(t *testing.T) {
 	expIPNet := controlplane.IPNet{
 		IP:           ipStrToIPAddress("10.0.0.0"),
diff --git a/pkg/controller/networkpolicy/networkpolicy_controller.go b/pkg/controller/networkpolicy/networkpolicy_controller.go
index 992dd87c982..629016f3aed 100644
--- a/pkg/controller/networkpolicy/networkpolicy_controller.go
+++ b/pkg/controller/networkpolicy/networkpolicy_controller.go
@@ -650,10 +650,10 @@ func (n *NetworkPolicyController) processNetworkPolicy(np *networkingv1.NetworkP
 	appliedToGroups = mergeAppliedToGroups(appliedToGroups, newAppliedToGroup)
 	rules := make([]controlplane.NetworkPolicyRule, 0, len(np.Spec.Ingress)+len(np.Spec.Egress))
 	// Retrieve Namespace logging annotation.
-	logSettings := &secv1alpha1.RuleLogSettings{}
+	enableLogging := false
 	namespace, err := n.namespaceLister.Get(np.Namespace)
 	if err == nil {
-		logSettings.LogEnabled, _ = strconv.ParseBool(namespace.Annotations[EnableNPLoggingAnnotationKey])
+		enableLogging, _ = strconv.ParseBool(namespace.Annotations[EnableNPLoggingAnnotationKey])
 	}
 	var ingressRuleExists, egressRuleExists bool
 	// Compute NetworkPolicyRule for Ingress Rule.
@@ -663,12 +663,12 @@ func (n *NetworkPolicyController) processNetworkPolicy(np *networkingv1.NetworkP
 		peer, newAddressGroups := n.toAntreaPeer(ingressRule.From, np, controlplane.DirectionIn, namedPortExists)
 		addressGroups = mergeAddressGroups(addressGroups, newAddressGroups...)
 		rules = append(rules, controlplane.NetworkPolicyRule{
-			Direction:   controlplane.DirectionIn,
-			From:        *peer,
-			Services:    services,
-			Priority:    defaultRulePriority,
-			Action:      &defaultAction,
-			LogSettings: toAntreaLogSettingForCRD(logSettings),
+			Direction:     controlplane.DirectionIn,
+			From:          *peer,
+			Services:      services,
+			Priority:      defaultRulePriority,
+			Action:        &defaultAction,
+			EnableLogging: enableLogging,
 		})
 	}
 	// Compute NetworkPolicyRule for Egress Rule.
@@ -678,12 +678,12 @@ func (n *NetworkPolicyController) processNetworkPolicy(np *networkingv1.NetworkP
 		peer, newAddressGroups := n.toAntreaPeer(egressRule.To, np, controlplane.DirectionOut, namedPortExists)
 		addressGroups = mergeAddressGroups(addressGroups, newAddressGroups...)
 		rules = append(rules, controlplane.NetworkPolicyRule{
-			Direction:   controlplane.DirectionOut,
-			To:          *peer,
-			Services:    services,
-			Priority:    defaultRulePriority,
-			Action:      &defaultAction,
-			LogSettings: toAntreaLogSettingForCRD(logSettings),
+			Direction:     controlplane.DirectionOut,
+			To:            *peer,
+			Services:      services,
+			Priority:      defaultRulePriority,
+			Action:        &defaultAction,
+			EnableLogging: enableLogging,
 		})
 	}
 
diff --git a/pkg/controller/networkpolicy/networkpolicy_controller_test.go b/pkg/controller/networkpolicy/networkpolicy_controller_test.go
index 2d029bb13e2..bf0e1931468 100644
--- a/pkg/controller/networkpolicy/networkpolicy_controller_test.go
+++ b/pkg/controller/networkpolicy/networkpolicy_controller_test.go
@@ -2169,12 +2169,12 @@ func TestProcessNetworkPolicy(t *testing.T) {
 					UID:       "uidA",
 				},
 				Rules: []controlplane.NetworkPolicyRule{{
-					Direction:   controlplane.DirectionIn,
-					From:        matchAllPeer,
-					Services:    nil,
-					Priority:    defaultRulePriority,
-					Action:      &defaultAction,
-					LogSettings: &controlplane.RuleLogSettings{},
+					Direction:     controlplane.DirectionIn,
+					From:          matchAllPeer,
+					Services:      nil,
+					Priority:      defaultRulePriority,
+					Action:        &defaultAction,
+					EnableLogging: true,
 				}},
 				AppliedToGroups: []string{getNormalizedUID(antreatypes.NewGroupSelector("nsA", &metav1.LabelSelector{}, nil, nil, nil).NormalizedName)},
 			},
diff --git a/pkg/controller/networkpolicy/validate.go b/pkg/controller/networkpolicy/validate.go
index e98df9a68e2..a76a4188de7 100644
--- a/pkg/controller/networkpolicy/validate.go
+++ b/pkg/controller/networkpolicy/validate.go
@@ -453,10 +453,6 @@ func (v *antreaPolicyValidator) createValidate(curObj interface{}, userInfo auth
 	if !allowed {
 		return reason, allowed
 	}
-	reason, allowed = v.validateLogSettings(ingress, egress)
-	if !allowed {
-		return reason, allowed
-	}
 	if err := v.validatePort(ingress, egress); err != nil {
 		return err.Error(), false
 	}
@@ -805,16 +801,6 @@ func (v *antreaPolicyValidator) validateL7Protocols(ingressRules, egressRules []
 	return "", true
 }
 
-// validateLogSettings validates the enableLogging field and logSetting field do not conflict.
-func (v *antreaPolicyValidator) validateLogSettings(ingressRules, egressRules []crdv1alpha1.Rule) (string, bool) {
-	for _, r := range append(ingressRules, egressRules...) {
-		if r.EnableLogging && r.LogSettings != nil {
-			return "enableLogging and logSetting can not be set at the same time", false
-		}
-	}
-	return "", true
-}
-
 // validateFQDNSelectors validates the toFQDN field set in Antrea-native policy egress rules are valid.
 func (v *antreaPolicyValidator) validateFQDNSelectors(egressRules []crdv1alpha1.Rule) (string, bool) {
 	for _, r := range egressRules {
@@ -873,10 +859,6 @@ func (v *antreaPolicyValidator) updateValidate(curObj, oldObj interface{}, userI
 	if !allowed {
 		return reason, allowed
 	}
-	reason, allowed = v.validateLogSettings(ingress, egress)
-	if !allowed {
-		return reason, allowed
-	}
 	if err := v.validatePort(ingress, egress); err != nil {
 		return err.Error(), false
 	}
diff --git a/pkg/controller/networkpolicy/validate_test.go b/pkg/controller/networkpolicy/validate_test.go
index b829fd6179f..dcddd52f23c 100644
--- a/pkg/controller/networkpolicy/validate_test.go
+++ b/pkg/controller/networkpolicy/validate_test.go
@@ -1436,32 +1436,6 @@ func TestValidateAntreaPolicy(t *testing.T) {
 			},
 			expectedReason: "layer 7 protocols can only be used when L7NetworkPolicy is enabled",
 		},
-		{
-			name: "logSetting used with enableLogging",
-			policy: &crdv1alpha1.ClusterNetworkPolicy{
-				ObjectMeta: metav1.ObjectMeta{
-					Name: "egress-rule-logging",
-				},
-				Spec: crdv1alpha1.ClusterNetworkPolicySpec{
-					AppliedTo: []crdv1alpha1.AppliedTo{
-						{
-							NamespaceSelector: &metav1.LabelSelector{},
-						},
-					},
-					Egress: []crdv1alpha1.Rule{
-						{
-							Action:        &allowAction,
-							EnableLogging: true,
-							LogSettings: &crdv1alpha1.RuleLogSettings{
-								LogEnabled: true,
-								LogLabel:   "test-log-label",
-							},
-						},
-					},
-				},
-			},
-			expectedReason: "enableLogging and logSetting can not be set at the same time",
-		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
diff --git a/test/e2e/utils/anp_spec_builder.go b/test/e2e/utils/anp_spec_builder.go
index 51eedf84b79..0533bc107ba 100644
--- a/test/e2e/utils/anp_spec_builder.go
+++ b/test/e2e/utils/anp_spec_builder.go
@@ -208,10 +208,8 @@ func (b *AntreaNetworkPolicySpecBuilder) AddToServicesRule(svcRefs []crdv1alpha1
 
 func (b *AntreaNetworkPolicySpecBuilder) AddEgressLogging(logLabel string) *AntreaNetworkPolicySpecBuilder {
 	for i, e := range b.Spec.Egress {
-		e.LogSettings = &crdv1alpha1.RuleLogSettings{
-			LogEnabled: true,
-			LogLabel:   logLabel,
-		}
+		e.EnableLogging = true
+		e.LogLabel = logLabel
 		b.Spec.Egress[i] = e
 	}
 	return b
diff --git a/test/e2e/utils/cnp_spec_builder.go b/test/e2e/utils/cnp_spec_builder.go
index 54391cda4dc..56afbf0fd97 100644
--- a/test/e2e/utils/cnp_spec_builder.go
+++ b/test/e2e/utils/cnp_spec_builder.go
@@ -301,10 +301,8 @@ func (b *ClusterNetworkPolicySpecBuilder) WithEgressDNS() *ClusterNetworkPolicyS
 
 func (b *ClusterNetworkPolicySpecBuilder) AddEgressLogging(logLabel string) *ClusterNetworkPolicySpecBuilder {
 	for i, e := range b.Spec.Egress {
-		e.LogSettings = &crdv1alpha1.RuleLogSettings{
-			LogEnabled: true,
-			LogLabel:   logLabel,
-		}
+		e.EnableLogging = true
+		e.LogLabel = logLabel
 		b.Spec.Egress[i] = e
 	}
 	return b