summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwangwei <[email protected]>2024-09-24 14:26:43 +0800
committerwangwei <[email protected]>2024-09-24 14:26:43 +0800
commit4e60d66f00af2d2d76b8aac82de4b7f7ecf2c227 (patch)
treef5e4cb7b176b051a70de8be63781df73cbe60da0
parent75dce98d09d2e29fa45c0eb9be5391f03ec5044a (diff)
[Fix][schema] 新增公共字段xx_rule_uuid_list(TSG-22688)
-rw-r--r--config/nacos/config/fixed-127.0.0.1_8848-tsg_nacos/data/config-data-tenant/tsg/Galaxy/monitor_event.json121
-rw-r--r--config/nacos/config/fixed-127.0.0.1_8848-tsg_nacos/data/config-data-tenant/tsg/Galaxy/proxy_event.json142
-rw-r--r--config/nacos/config/fixed-127.0.0.1_8848-tsg_nacos/data/config-data-tenant/tsg/Galaxy/public_schema_info.json99
-rw-r--r--config/nacos/config/fixed-127.0.0.1_8848-tsg_nacos/data/config-data-tenant/tsg/Galaxy/security_event.json128
-rw-r--r--config/nacos/config/fixed-127.0.0.1_8848-tsg_nacos/data/config-data-tenant/tsg/Galaxy/session_record.json202
5 files changed, 652 insertions, 40 deletions
diff --git a/config/nacos/config/fixed-127.0.0.1_8848-tsg_nacos/data/config-data-tenant/tsg/Galaxy/monitor_event.json b/config/nacos/config/fixed-127.0.0.1_8848-tsg_nacos/data/config-data-tenant/tsg/Galaxy/monitor_event.json
index 56ea762a..b12ad17b 100644
--- a/config/nacos/config/fixed-127.0.0.1_8848-tsg_nacos/data/config-data-tenant/tsg/Galaxy/monitor_event.json
+++ b/config/nacos/config/fixed-127.0.0.1_8848-tsg_nacos/data/config-data-tenant/tsg/Galaxy/monitor_event.json
@@ -45,6 +45,7 @@
"c2s_ttl",
"s2c_ttl",
"monitor_rule_list",
+ "monitor_rule_uuid_list",
"client_ip",
"client_ip_tags",
"client_port",
@@ -351,6 +352,7 @@
"c2s_ttl",
"s2c_ttl",
"monitor_rule_list",
+ "monitor_rule_uuid_list",
"monitor_mirrored_pkts",
"monitor_mirrored_bytes",
"client_ip",
@@ -1102,7 +1104,7 @@
},
{
"name": "monitor_rule_id",
- "label": "Monitor Rule ID",
+ "label": "Monitor Rule ID(Deprecated)",
"type": "long",
"doc": {
"allow_query": "false",
@@ -1110,6 +1112,15 @@
}
},
{
+ "name": "monitor_rule_uuid",
+ "label": "Monitor Rule UUID",
+ "type": "string",
+ "doc": {
+ "allow_query": "false",
+ "expression": "arrayJoin(IF(empty(monitor_rule_uuid_list), arrayPushFront(monitor_rule_uuid_list, null),monitor_rule_uuid_list))"
+ }
+ },
+ {
"name": "client_ip_tag",
"label": "Client IP Tag",
"type": "string",
@@ -1531,7 +1542,7 @@
},
{
"name": "security_rule_list",
- "label": "Security Rule List",
+ "label": "Security Rule List(Deprecated)",
"doc": {
"constraints": {
"operator_functions": "has,notEmpty,empty"
@@ -1546,6 +1557,22 @@
}
},
{
+ "name": "security_rule_uuid_list",
+ "label": "Security Rule List",
+ "doc": {
+ "constraints": {
+ "operator_functions": "has,notEmpty,empty"
+ },
+ "visibility": "hidden",
+ "ttl": null
+ },
+ "type": {
+ "type": "array",
+ "items": "string",
+ "logicalType": "array"
+ }
+ },
+ {
"name": "security_action",
"label": "Security Action",
"doc": {
@@ -1562,7 +1589,7 @@
},
{
"name": "monitor_rule_list",
- "label": "Monitor Rule List",
+ "label": "Monitor Rule List(Deprecated)",
"doc": {
"constraints": {
"operator_functions": "has,notEmpty,empty"
@@ -1577,8 +1604,24 @@
}
},
{
+ "name": "monitor_rule_uuid_list",
+ "label": "Monitor Rule List",
+ "doc": {
+ "constraints": {
+ "operator_functions": "has,notEmpty,empty"
+ },
+ "visibility": "enabled",
+ "ttl": null
+ },
+ "type": {
+ "type": "array",
+ "items": "string",
+ "logicalType": "array"
+ }
+ },
+ {
"name": "sc_rule_list",
- "label": "Service Chaining Rule List",
+ "label": "Service Chaining Rule List(Deprecated)",
"doc": {
"constraints": {
"operator_functions": "has,notEmpty,empty"
@@ -1593,8 +1636,24 @@
}
},
{
+ "name": "sc_rule_uuid_list",
+ "label": "Service Chaining Rule List",
+ "doc": {
+ "constraints": {
+ "operator_functions": "has,notEmpty,empty"
+ },
+ "visibility": "hidden",
+ "ttl": null
+ },
+ "type": {
+ "type": "array",
+ "items": "string",
+ "logicalType": "array"
+ }
+ },
+ {
"name": "statistics_rule_list",
- "label": "Statistics Rule List",
+ "label": "Statistics Rule List(Deprecated)",
"doc": {
"constraints": {
"operator_functions": "has,notEmpty,empty"
@@ -1609,6 +1668,22 @@
}
},
{
+ "name": "statistics_rule_uuid_list",
+ "label": "Statistics Rule List",
+ "doc": {
+ "constraints": {
+ "operator_functions": "has,notEmpty,empty"
+ },
+ "visibility": "hidden",
+ "ttl": null
+ },
+ "type": {
+ "type": "array",
+ "items": "string",
+ "logicalType": "array"
+ }
+ },
+ {
"name": "sc_rsp_raw",
"label": "Service Chaining Rendered Service Path(Raw)",
"doc": {
@@ -1642,7 +1717,7 @@
},
{
"name": "shaping_rule_list",
- "label": "Shaping Rule List",
+ "label": "Shaping Rule List(Deprecated)",
"doc": {
"constraints": {
"operator_functions": "has,notEmpty,empty"
@@ -1657,8 +1732,24 @@
}
},
{
+ "name": "shaping_rule_uuid_list",
+ "label": "Shaping Rule List",
+ "doc": {
+ "constraints": {
+ "operator_functions": "has,notEmpty,empty"
+ },
+ "visibility": "hidden",
+ "ttl": null
+ },
+ "type": {
+ "type": "array",
+ "items": "string",
+ "logicalType": "array"
+ }
+ },
+ {
"name": "proxy_rule_list",
- "label": "Proxy Rule List",
+ "label": "Proxy Rule List(Deprecated)",
"doc": {
"constraints": {
"operator_functions": "has,notEmpty,empty"
@@ -1673,6 +1764,22 @@
}
},
{
+ "name": "proxy_rule_uuid_list",
+ "label": "Proxy Rule List",
+ "doc": {
+ "constraints": {
+ "operator_functions": "has,notEmpty,empty"
+ },
+ "visibility": "hidden",
+ "ttl": null
+ },
+ "type": {
+ "type": "array",
+ "items": "string",
+ "logicalType": "array"
+ }
+ },
+ {
"name": "proxy_action",
"label": "Proxy Action",
"doc": {
diff --git a/config/nacos/config/fixed-127.0.0.1_8848-tsg_nacos/data/config-data-tenant/tsg/Galaxy/proxy_event.json b/config/nacos/config/fixed-127.0.0.1_8848-tsg_nacos/data/config-data-tenant/tsg/Galaxy/proxy_event.json
index 8a536503..935459f5 100644
--- a/config/nacos/config/fixed-127.0.0.1_8848-tsg_nacos/data/config-data-tenant/tsg/Galaxy/proxy_event.json
+++ b/config/nacos/config/fixed-127.0.0.1_8848-tsg_nacos/data/config-data-tenant/tsg/Galaxy/proxy_event.json
@@ -40,6 +40,7 @@
"direction",
"vsys_id",
"proxy_rule_list",
+ "proxy_rule_uuid_list",
"proxy_action",
"client_ip",
"client_ip_tags",
@@ -120,7 +121,8 @@
"external_port_list",
"internal_asn_list",
"external_asn_list",
- "proxy_rule_id"
+ "proxy_rule_id",
+ "proxy_rule_uuid"
],
"metrics": [
"log_id",
@@ -177,6 +179,7 @@
"direction",
"vsys_id",
"proxy_rule_list",
+ "proxy_rule_uuid_list",
"proxy_action",
"client_ip",
"client_ip_tags",
@@ -260,7 +263,8 @@
"external_port_list",
"internal_asn_list",
"external_asn_list",
- "proxy_rule_id"
+ "proxy_rule_id",
+ "proxy_rule_uuid"
],
"references": {
"$ref": "public_schema_info.json#/schema_query/references"
@@ -695,7 +699,7 @@
},
{
"name": "proxy_rule_id",
- "label": "Proxy Rule ID",
+ "label": "Proxy Rule ID(Deprecated)",
"type": "long",
"doc": {
"allow_query": "false",
@@ -703,6 +707,15 @@
}
},
{
+ "name": "proxy_rule_uuid",
+ "label": "Proxy Rule UUID",
+ "type": "string",
+ "doc": {
+ "allow_query": "false",
+ "expression": "arrayJoin(IF(empty(proxy_rule_uuid_list), arrayPushFront(proxy_rule_uuid_list, null),proxy_rule_uuid_list))"
+ }
+ },
+ {
"name": "client_ip_tag",
"label": "Client IP Tag",
"type": "string",
@@ -1084,7 +1097,7 @@
},
{
"name": "security_rule_list",
- "label": "Security Rule List",
+ "label": "Security Rule List(Deprecated)",
"doc": {
"constraints": {
"operator_functions": "has,notEmpty,empty"
@@ -1099,6 +1112,37 @@
}
},
{
+ "name": "security_rule_uuid_list",
+ "label": "Security Rule List",
+ "doc": {
+ "constraints": {
+ "operator_functions": "has,notEmpty,empty"
+ },
+ "visibility": "hidden",
+ "ttl": null
+ },
+ "type": {
+ "type": "array",
+ "items": "string",
+ "logicalType": "array"
+ }
+ },
+ {
+ "name": "security_action",
+ "label": "Security Action",
+ "doc": {
+ "visibility": "hidden",
+ "constraints": {
+ "operator_functions": "=,!=,in,not in,notEmpty,empty"
+ },
+ "data": {
+ "$ref": "public_schema_info.json#/fields/security_action/data"
+ },
+ "ttl": null
+ },
+ "type": "string"
+ },
+ {
"name": "security_action",
"label": "Security Action",
"doc": {
@@ -1115,7 +1159,7 @@
},
{
"name": "monitor_rule_list",
- "label": "Monitor Rule List",
+ "label": "Monitor Rule List(Deprecated)",
"doc": {
"constraints": {
"operator_functions": "has,notEmpty,empty"
@@ -1130,8 +1174,24 @@
}
},
{
+ "name": "monitor_rule_uuid_list",
+ "label": "Monitor Rule List",
+ "doc": {
+ "constraints": {
+ "operator_functions": "has,notEmpty,empty"
+ },
+ "visibility": "hidden",
+ "ttl": null
+ },
+ "type": {
+ "type": "array",
+ "items": "string",
+ "logicalType": "array"
+ }
+ },
+ {
"name": "sc_rule_list",
- "label": "Service Chaining Rule List",
+ "label": "Service Chaining Rule List(Deprecated)",
"doc": {
"constraints": {
"operator_functions": "has,notEmpty,empty"
@@ -1146,8 +1206,24 @@
}
},
{
+ "name": "sc_rule_uuid_list",
+ "label": "Service Chaining Rule List",
+ "doc": {
+ "constraints": {
+ "operator_functions": "has,notEmpty,empty"
+ },
+ "visibility": "hidden",
+ "ttl": null
+ },
+ "type": {
+ "type": "array",
+ "items": "string",
+ "logicalType": "array"
+ }
+ },
+ {
"name": "statistics_rule_list",
- "label": "Statistics Rule List",
+ "label": "Statistics Rule List(Deprecated)",
"doc": {
"constraints": {
"operator_functions": "has,notEmpty,empty"
@@ -1162,6 +1238,22 @@
}
},
{
+ "name": "statistics_rule_uuid_list",
+ "label": "Statistics Rule List",
+ "doc": {
+ "constraints": {
+ "operator_functions": "has,notEmpty,empty"
+ },
+ "visibility": "hidden",
+ "ttl": null
+ },
+ "type": {
+ "type": "array",
+ "items": "string",
+ "logicalType": "array"
+ }
+ },
+ {
"name": "sc_rsp_raw",
"label": "Service Chaining Rendered Service Path(Raw)",
"doc": {
@@ -1195,7 +1287,7 @@
},
{
"name": "shaping_rule_list",
- "label": "Shaping Rule List",
+ "label": "Shaping Rule List(Deprecated)",
"doc": {
"constraints": {
"operator_functions": "has,notEmpty,empty"
@@ -1210,8 +1302,24 @@
}
},
{
+ "name": "shaping_rule_uuid_list",
+ "label": "Shaping Rule List",
+ "doc": {
+ "constraints": {
+ "operator_functions": "has,notEmpty,empty"
+ },
+ "visibility": "hidden",
+ "ttl": null
+ },
+ "type": {
+ "type": "array",
+ "items": "string",
+ "logicalType": "array"
+ }
+ },
+ {
"name": "proxy_rule_list",
- "label": "Proxy Rule List",
+ "label": "Proxy Rule List(Deprecated)",
"doc": {
"constraints": {
"operator_functions": "has,notEmpty,empty"
@@ -1226,6 +1334,22 @@
}
},
{
+ "name": "proxy_rule_uuid_list",
+ "label": "Proxy Rule List",
+ "doc": {
+ "constraints": {
+ "operator_functions": "has,notEmpty,empty"
+ },
+ "visibility": "enabled",
+ "ttl": null
+ },
+ "type": {
+ "type": "array",
+ "items": "string",
+ "logicalType": "array"
+ }
+ },
+ {
"name": "proxy_action",
"label": "Proxy Action",
"doc": {
diff --git a/config/nacos/config/fixed-127.0.0.1_8848-tsg_nacos/data/config-data-tenant/tsg/Galaxy/public_schema_info.json b/config/nacos/config/fixed-127.0.0.1_8848-tsg_nacos/data/config-data-tenant/tsg/Galaxy/public_schema_info.json
index 42bf8d57..ebde416f 100644
--- a/config/nacos/config/fixed-127.0.0.1_8848-tsg_nacos/data/config-data-tenant/tsg/Galaxy/public_schema_info.json
+++ b/config/nacos/config/fixed-127.0.0.1_8848-tsg_nacos/data/config-data-tenant/tsg/Galaxy/public_schema_info.json
@@ -403,14 +403,20 @@
"c2s_ttl",
"s2c_ttl",
"security_rule_list",
+ "security_rule_uuid_list",
"security_action",
"monitor_rule_list",
+ "monitor_rule_uuid_list",
"shaping_rule_list",
+ "shaping_rule_uuid_list",
"sc_rule_list",
+ "sc_rule_uuid_list",
"statistics_rule_list",
+ "statistics_rule_uuid_list",
"sc_rsp_raw",
"sc_rsp_decrypted",
"proxy_rule_list",
+ "proxy_rule_uuid_list",
"proxy_action",
"proxy_pinning_status",
"proxy_intercept_status",
@@ -526,14 +532,20 @@
"c2s_ttl",
"s2c_ttl",
"security_rule_list",
+ "security_rule_uuid_list",
"security_action",
"monitor_rule_list",
+ "monitor_rule_uuid_list",
"shaping_rule_list",
+ "shaping_rule_uuid_list",
"sc_rule_list",
+ "sc_rule_uuid_list",
"statistics_rule_list",
+ "statistics_rule_uuid_list",
"sc_rsp_raw",
"sc_rsp_decrypted",
"proxy_rule_list",
+ "proxy_rule_uuid_list",
"proxy_action",
"proxy_pinning_status",
"proxy_intercept_status",
@@ -671,14 +683,20 @@
"c2s_ttl",
"s2c_ttl",
"security_rule_list",
+ "security_rule_uuid_list",
"security_action",
"monitor_rule_list",
+ "monitor_rule_uuid_list",
"shaping_rule_list",
+ "shaping_rule_uuid_list",
"sc_rule_list",
+ "sc_rule_uuid_list",
"statistics_rule_list",
+ "statistics_rule_uuid_list",
"sc_rsp_raw",
"sc_rsp_decrypted",
"proxy_rule_list",
+ "proxy_rule_uuid_list",
"proxy_action",
"proxy_pinning_status",
"proxy_intercept_status",
@@ -812,14 +830,20 @@
"c2s_ttl",
"s2c_ttl",
"security_rule_list",
+ "security_rule_uuid_list",
"security_action",
"monitor_rule_list",
+ "monitor_rule_uuid_list",
"shaping_rule_list",
+ "shaping_rule_uuid_list",
"sc_rule_list",
+ "sc_rule_uuid_list",
"statistics_rule_list",
+ "statistics_rule_uuid_list",
"sc_rsp_raw",
"sc_rsp_decrypted",
"proxy_rule_list",
+ "proxy_rule_uuid_list",
"proxy_action",
"proxy_pinning_status",
"proxy_intercept_status",
@@ -956,14 +980,20 @@
"c2s_ttl",
"s2c_ttl",
"security_rule_list",
+ "security_rule_uuid_list",
"security_action",
"monitor_rule_list",
+ "monitor_rule_uuid_list",
"shaping_rule_list",
+ "shaping_rule_uuid_list",
"sc_rule_list",
+ "sc_rule_uuid_list",
"statistics_rule_list",
+ "statistics_rule_uuid_list",
"sc_rsp_raw",
"sc_rsp_decrypted",
"proxy_rule_list",
+ "proxy_rule_uuid_list",
"proxy_action",
"proxy_pinning_status",
"proxy_intercept_status",
@@ -1093,14 +1123,20 @@
"c2s_ttl",
"s2c_ttl",
"security_rule_list",
+ "security_rule_uuid_list",
"security_action",
"monitor_rule_list",
+ "monitor_rule_uuid_list",
"shaping_rule_list",
+ "shaping_rule_uuid_list",
"sc_rule_list",
+ "sc_rule_uuid_list",
"statistics_rule_list",
+ "statistics_rule_uuid_list",
"sc_rsp_raw",
"sc_rsp_decrypted",
"proxy_rule_list",
+ "proxy_rule_uuid_list",
"proxy_action",
"proxy_pinning_status",
"proxy_intercept_status",
@@ -1227,14 +1263,20 @@
"c2s_ttl",
"s2c_ttl",
"security_rule_list",
+ "security_rule_uuid_list",
"security_action",
"monitor_rule_list",
+ "monitor_rule_uuid_list",
"shaping_rule_list",
+ "shaping_rule_uuid_list",
"sc_rule_list",
+ "sc_rule_uuid_list",
"statistics_rule_list",
+ "statistics_rule_uuid_list",
"sc_rsp_raw",
"sc_rsp_decrypted",
"proxy_rule_list",
+ "proxy_rule_uuid_list",
"proxy_action",
"proxy_pinning_status",
"proxy_intercept_status",
@@ -1354,14 +1396,20 @@
"c2s_ttl",
"s2c_ttl",
"security_rule_list",
+ "security_rule_uuid_list",
"security_action",
"monitor_rule_list",
+ "monitor_rule_uuid_list",
"shaping_rule_list",
+ "shaping_rule_uuid_list",
"sc_rule_list",
+ "sc_rule_uuid_list",
"statistics_rule_list",
+ "statistics_rule_uuid_list",
"sc_rsp_raw",
"sc_rsp_decrypted",
"proxy_rule_list",
+ "proxy_rule_uuid_list",
"proxy_action",
"proxy_pinning_status",
"proxy_intercept_status",
@@ -1481,14 +1529,20 @@
"c2s_ttl",
"s2c_ttl",
"security_rule_list",
+ "security_rule_uuid_list",
"security_action",
"monitor_rule_list",
+ "monitor_rule_uuid_list",
"shaping_rule_list",
+ "shaping_rule_uuid_list",
"sc_rule_list",
+ "sc_rule_uuid_list",
"statistics_rule_list",
+ "statistics_rule_uuid_list",
"sc_rsp_raw",
"sc_rsp_decrypted",
"proxy_rule_list",
+ "proxy_rule_uuid_list",
"proxy_action",
"proxy_pinning_status",
"proxy_intercept_status",
@@ -1622,14 +1676,20 @@
"c2s_ttl",
"s2c_ttl",
"security_rule_list",
+ "security_rule_uuid_list",
"security_action",
"monitor_rule_list",
+ "monitor_rule_uuid_list",
"shaping_rule_list",
+ "shaping_rule_uuid_list",
"sc_rule_list",
+ "sc_rule_uuid_list",
"statistics_rule_list",
+ "statistics_rule_uuid_list",
"sc_rsp_raw",
"sc_rsp_decrypted",
"proxy_rule_list",
+ "proxy_rule_uuid_list",
"proxy_action",
"proxy_pinning_status",
"proxy_intercept_status",
@@ -1751,14 +1811,20 @@
"c2s_ttl",
"s2c_ttl",
"security_rule_list",
+ "security_rule_uuid_list",
"security_action",
"monitor_rule_list",
+ "monitor_rule_uuid_list",
"shaping_rule_list",
+ "shaping_rule_uuid_list",
"sc_rule_list",
+ "sc_rule_uuid_list",
"statistics_rule_list",
+ "statistics_rule_uuid_list",
"sc_rsp_raw",
"sc_rsp_decrypted",
"proxy_rule_list",
+ "proxy_rule_uuid_list",
"proxy_action",
"proxy_pinning_status",
"proxy_intercept_status",
@@ -1885,14 +1951,20 @@
"c2s_ttl",
"s2c_ttl",
"security_rule_list",
+ "security_rule_uuid_list",
"security_action",
"monitor_rule_list",
+ "monitor_rule_uuid_list",
"shaping_rule_list",
+ "shaping_rule_uuid_list",
"sc_rule_list",
+ "sc_rule_uuid_list",
"statistics_rule_list",
+ "statistics_rule_uuid_list",
"sc_rsp_raw",
"sc_rsp_decrypted",
"proxy_rule_list",
+ "proxy_rule_uuid_list",
"proxy_action",
"proxy_pinning_status",
"proxy_intercept_status",
@@ -2015,14 +2087,20 @@
"c2s_ttl",
"s2c_ttl",
"security_rule_list",
+ "security_rule_uuid_list",
"security_action",
"monitor_rule_list",
+ "monitor_rule_uuid_list",
"shaping_rule_list",
+ "shaping_rule_uuid_list",
"sc_rule_list",
+ "sc_rule_uuid_list",
"statistics_rule_list",
+ "statistics_rule_uuid_list",
"sc_rsp_raw",
"sc_rsp_decrypted",
"proxy_rule_list",
+ "proxy_rule_uuid_list",
"proxy_action",
"proxy_pinning_status",
"proxy_intercept_status",
@@ -2151,14 +2229,20 @@
"c2s_ttl",
"s2c_ttl",
"security_rule_list",
+ "security_rule_uuid_list",
"security_action",
"monitor_rule_list",
+ "monitor_rule_uuid_list",
"shaping_rule_list",
+ "shaping_rule_uuid_list",
"sc_rule_list",
+ "sc_rule_uuid_list",
"statistics_rule_list",
+ "statistics_rule_uuid_list",
"sc_rsp_raw",
"sc_rsp_decrypted",
"proxy_rule_list",
+ "proxy_rule_uuid_list",
"proxy_action",
"proxy_pinning_status",
"proxy_intercept_status",
@@ -2269,6 +2353,7 @@
"recv_time",
"log_id",
"proxy_rule_list",
+ "proxy_rule_uuid_list",
"proxy_action",
"client_ip",
"doh_url",
@@ -2305,14 +2390,20 @@
"c2s_ttl",
"s2c_ttl",
"security_rule_list",
+ "security_rule_uuid_list",
"security_action",
"monitor_rule_list",
+ "monitor_rule_uuid_list",
"shaping_rule_list",
+ "shaping_rule_uuid_list",
"sc_rule_list",
+ "sc_rule_uuid_list",
"statistics_rule_list",
+ "statistics_rule_uuid_list",
"sc_rsp_raw",
"sc_rsp_decrypted",
"proxy_rule_list",
+ "proxy_rule_uuid_list",
"proxy_action",
"proxy_pinning_status",
"proxy_intercept_status",
@@ -2454,6 +2545,7 @@
"c2s_ttl",
"s2c_ttl",
"proxy_rule_list",
+ "proxy_rule_uuid_list",
"proxy_action",
"proxy_pinning_status",
"proxy_intercept_status",
@@ -2564,6 +2656,7 @@
"recv_time",
"subscriber_id",
"security_rule_list",
+ "security_rule_uuid_list",
"security_action",
"client_ip",
"client_port",
@@ -2797,14 +2890,20 @@
],
"treatment": [
"security_rule_list",
+ "security_rule_uuid_list",
"security_action",
"monitor_rule_list",
+ "monitor_rule_uuid_list",
"shaping_rule_list",
+ "shaping_rule_uuid_list",
"sc_rule_list",
+ "sc_rule_uuid_list",
"statistics_rule_list",
+ "statistics_rule_uuid_list",
"sc_rsp_raw",
"sc_rsp_decrypted",
"proxy_rule_list",
+ "proxy_rule_uuid_list",
"proxy_action",
"proxy_pinning_status",
"proxy_intercept_status",
diff --git a/config/nacos/config/fixed-127.0.0.1_8848-tsg_nacos/data/config-data-tenant/tsg/Galaxy/security_event.json b/config/nacos/config/fixed-127.0.0.1_8848-tsg_nacos/data/config-data-tenant/tsg/Galaxy/security_event.json
index 74e50b38..644015fb 100644
--- a/config/nacos/config/fixed-127.0.0.1_8848-tsg_nacos/data/config-data-tenant/tsg/Galaxy/security_event.json
+++ b/config/nacos/config/fixed-127.0.0.1_8848-tsg_nacos/data/config-data-tenant/tsg/Galaxy/security_event.json
@@ -46,7 +46,7 @@
"s2c_ttl",
"security_action",
"security_rule_list",
- "monitor_rule_list",
+ "security_rule_uuid_list",
"client_ip",
"client_ip_tags",
"client_port",
@@ -221,7 +221,8 @@
"external_port_list",
"internal_asn_list",
"external_asn_list",
- "security_rule_id"
+ "security_rule_id",
+ "security_rule_uuid"
],
"metrics": [
"log_id",
@@ -356,6 +357,7 @@
"monitor_mirrored_pkts",
"monitor_mirrored_bytes",
"security_rule_list",
+ "security_rule_uuid_list",
"client_ip",
"client_ip_tags",
"client_port",
@@ -554,7 +556,8 @@
"external_port_list",
"internal_asn_list",
"external_asn_list",
- "security_rule_id"
+ "security_rule_id",
+ "security_rule_uuid"
],
"references": {
"$ref": "public_schema_info.json#/schema_query/references"
@@ -1107,7 +1110,7 @@
},
{
"name": "security_rule_id",
- "label": "Security Rule ID",
+ "label": "Security Rule ID(Deprecated)",
"type": "long",
"doc": {
"allow_query": "false",
@@ -1115,6 +1118,15 @@
}
},
{
+ "name": "security_rule_uuid",
+ "label": "Security Rule UUID",
+ "type": "string",
+ "doc": {
+ "allow_query": "false",
+ "expression": "arrayJoin(IF(empty(security_rule_uuid_list), arrayPushFront(security_rule_uuid_list, null),security_rule_uuid_list))"
+ }
+ },
+ {
"name": "client_ip_tag",
"label": "Client IP Tag",
"type": "string",
@@ -1536,7 +1548,7 @@
},
{
"name": "security_rule_list",
- "label": "Security Rule List",
+ "label": "Security Rule List(Deprecated)",
"doc": {
"constraints": {
"operator_functions": "has,notEmpty,empty"
@@ -1551,6 +1563,22 @@
}
},
{
+ "name": "security_rule_uuid_list",
+ "label": "Security Rule List",
+ "doc": {
+ "constraints": {
+ "operator_functions": "has,notEmpty,empty"
+ },
+ "visibility": "enabled",
+ "ttl": null
+ },
+ "type": {
+ "type": "array",
+ "items": "string",
+ "logicalType": "array"
+ }
+ },
+ {
"name": "security_action",
"label": "Security Action",
"doc": {
@@ -1567,7 +1595,7 @@
},
{
"name": "monitor_rule_list",
- "label": "Monitor Rule List",
+ "label": "Monitor Rule List(Deprecated)",
"doc": {
"constraints": {
"operator_functions": "has,notEmpty,empty"
@@ -1582,8 +1610,24 @@
}
},
{
+ "name": "monitor_rule_uuid_list",
+ "label": "Monitor Rule List",
+ "doc": {
+ "constraints": {
+ "operator_functions": "has,notEmpty,empty"
+ },
+ "visibility": "hidden",
+ "ttl": null
+ },
+ "type": {
+ "type": "array",
+ "items": "string",
+ "logicalType": "array"
+ }
+ },
+ {
"name": "sc_rule_list",
- "label": "Service Chaining Rule List",
+ "label": "Service Chaining Rule List(Deprecated)",
"doc": {
"constraints": {
"operator_functions": "has,notEmpty,empty"
@@ -1598,8 +1642,24 @@
}
},
{
+ "name": "sc_rule_uuid_list",
+ "label": "Service Chaining Rule List",
+ "doc": {
+ "constraints": {
+ "operator_functions": "has,notEmpty,empty"
+ },
+ "visibility": "hidden",
+ "ttl": null
+ },
+ "type": {
+ "type": "array",
+ "items": "string",
+ "logicalType": "array"
+ }
+ },
+ {
"name": "statistics_rule_list",
- "label": "Statistics Rule List",
+ "label": "Statistics Rule List(Deprecated)",
"doc": {
"constraints": {
"operator_functions": "has,notEmpty,empty"
@@ -1614,6 +1674,22 @@
}
},
{
+ "name": "statistics_rule_uuid_list",
+ "label": "Statistics Rule List",
+ "doc": {
+ "constraints": {
+ "operator_functions": "has,notEmpty,empty"
+ },
+ "visibility": "hidden",
+ "ttl": null
+ },
+ "type": {
+ "type": "array",
+ "items": "string",
+ "logicalType": "array"
+ }
+ },
+ {
"name": "sc_rsp_raw",
"label": "Service Chaining Rendered Service Path(Raw)",
"doc": {
@@ -1647,7 +1723,7 @@
},
{
"name": "shaping_rule_list",
- "label": "Shaping Rule List",
+ "label": "Shaping Rule List(Deprecated)",
"doc": {
"constraints": {
"operator_functions": "has,notEmpty,empty"
@@ -1662,8 +1738,24 @@
}
},
{
+ "name": "shaping_rule_uuid_list",
+ "label": "Shaping Rule List",
+ "doc": {
+ "constraints": {
+ "operator_functions": "has,notEmpty,empty"
+ },
+ "visibility": "hidden",
+ "ttl": null
+ },
+ "type": {
+ "type": "array",
+ "items": "string",
+ "logicalType": "array"
+ }
+ },
+ {
"name": "proxy_rule_list",
- "label": "Proxy Rule List",
+ "label": "Proxy Rule List(Deprecated)",
"doc": {
"constraints": {
"operator_functions": "has,notEmpty,empty"
@@ -1678,6 +1770,22 @@
}
},
{
+ "name": "proxy_rule_uuid_list",
+ "label": "Proxy Rule List",
+ "doc": {
+ "constraints": {
+ "operator_functions": "has,notEmpty,empty"
+ },
+ "visibility": "hidden",
+ "ttl": null
+ },
+ "type": {
+ "type": "array",
+ "items": "string",
+ "logicalType": "array"
+ }
+ },
+ {
"name": "proxy_action",
"label": "Proxy Action",
"doc": {
diff --git a/config/nacos/config/fixed-127.0.0.1_8848-tsg_nacos/data/config-data-tenant/tsg/Galaxy/session_record.json b/config/nacos/config/fixed-127.0.0.1_8848-tsg_nacos/data/config-data-tenant/tsg/Galaxy/session_record.json
index 64c4283e..1aa03435 100644
--- a/config/nacos/config/fixed-127.0.0.1_8848-tsg_nacos/data/config-data-tenant/tsg/Galaxy/session_record.json
+++ b/config/nacos/config/fixed-127.0.0.1_8848-tsg_nacos/data/config-data-tenant/tsg/Galaxy/session_record.json
@@ -46,14 +46,20 @@
"s2c_ttl",
"security_action",
"security_rule_list",
+ "security_rule_uuid_list",
"monitor_rule_list",
+ "monitor_rule_uuid_list",
"shaping_rule_list",
+ "shaping_rule_uuid_list",
"sc_rule_list",
+ "sc_rule_uuid_list",
"statistics_rule_list",
+ "statistics_rule_uuid_list",
"sc_rsp_raw",
"sc_rsp_decrypted",
"proxy_action",
"proxy_rule_list",
+ "proxy_rule_uuid_list",
"client_ip",
"client_ip_tags",
"client_port",
@@ -229,11 +235,17 @@
"internal_asn_list",
"external_asn_list",
"security_rule_id",
+ "security_rule_uuid",
"monitor_rule_id",
+ "monitor_rule_uuid",
"proxy_rule_id",
+ "proxy_rule_uuid",
"statistics_rule_id",
+ "statistics_rule_uuid",
"shaping_rule_id",
- "sc_rule_id"
+ "shaping_rule_uuid",
+ "sc_rule_id",
+ "sc_rule_uuid"
],
"metrics": [
"log_id",
@@ -364,13 +376,19 @@
"s2c_ttl",
"security_action",
"security_rule_list",
+ "security_rule_uuid_list",
"monitor_rule_list",
+ "monitor_rule_uuid_list",
"shaping_rule_list",
+ "shaping_rule_uuid_list",
"sc_rule_list",
+ "sc_rule_uuid_list",
"statistics_rule_list",
+ "statistics_rule_uuid_list",
"sc_rsp_raw",
"sc_rsp_decrypted",
"proxy_rule_list",
+ "proxy_rule_uuid_list",
"proxy_action",
"monitor_mirrored_pkts",
"monitor_mirrored_bytes",
@@ -571,11 +589,17 @@
"internal_asn_list",
"external_asn_list",
"security_rule_id",
+ "security_rule_uuid",
"monitor_rule_id",
+ "monitor_rule_uuid",
"proxy_rule_id",
+ "proxy_rule_uuid",
"statistics_rule_id",
+ "statistics_rule_uuid",
"shaping_rule_id",
- "sc_rule_id"
+ "shaping_rule_uuid",
+ "sc_rule_id",
+ "sc_rule_uuid"
],
"references": {
"$ref": "public_schema_info.json#/schema_query/references"
@@ -1133,7 +1157,7 @@
},
{
"name": "security_rule_id",
- "label": "Security Rule ID",
+ "label": "Security Rule ID(Deprecated)",
"type": "long",
"doc": {
"allow_query": "false",
@@ -1141,8 +1165,17 @@
}
},
{
+ "name": "security_rule_uuid",
+ "label": "Security Rule UUID",
+ "type": "string",
+ "doc": {
+ "allow_query": "false",
+ "expression": "arrayJoin(IF(empty(security_rule_uuid_list), arrayPushFront(security_rule_uuid_list, null),security_rule_uuid_list))"
+ }
+ },
+ {
"name": "proxy_rule_id",
- "label": "Proxy Rule ID",
+ "label": "Proxy Rule ID(Deprecated)",
"type": "long",
"doc": {
"allow_query": "false",
@@ -1150,8 +1183,17 @@
}
},
{
+ "name": "proxy_rule_uuid",
+ "label": "Proxy Rule UUID",
+ "type": "string",
+ "doc": {
+ "allow_query": "false",
+ "expression": "arrayJoin(IF(empty(proxy_rule_uuid_list), arrayPushFront(proxy_rule_uuid_list, null),proxy_rule_uuid_list))"
+ }
+ },
+ {
"name": "monitor_rule_id",
- "label": "Monitor Rule ID",
+ "label": "Monitor Rule ID(Deprecated)",
"type": "long",
"doc": {
"allow_query": "false",
@@ -1159,8 +1201,17 @@
}
},
{
+ "name": "monitor_rule_uuid",
+ "label": "Monitor Rule UUID",
+ "type": "string",
+ "doc": {
+ "allow_query": "false",
+ "expression": "arrayJoin(IF(empty(monitor_rule_uuid_list), arrayPushFront(monitor_rule_uuid_list, null),monitor_rule_uuid_list))"
+ }
+ },
+ {
"name": "shaping_rule_id",
- "label": "Shaping Rule ID",
+ "label": "Shaping Rule ID(Deprecated)",
"type": "long",
"doc": {
"allow_query": "false",
@@ -1168,8 +1219,17 @@
}
},
{
+ "name": "shaping_rule_uuid",
+ "label": "Shaping Rule UUID",
+ "type": "string",
+ "doc": {
+ "allow_query": "false",
+ "expression": "arrayJoin(IF(empty(shaping_rule_uuid_list), arrayPushFront(shaping_rule_uuid_list, null),shaping_rule_uuid_list))"
+ }
+ },
+ {
"name": "sc_rule_id",
- "label": "Service Chaining Rule ID",
+ "label": "Service Chaining Rule ID(Deprecated)",
"type": "long",
"doc": {
"allow_query": "false",
@@ -1177,8 +1237,17 @@
}
},
{
+ "name": "sc_rule_uuid",
+ "label": "Service Chaining Rule UUID",
+ "type": "string",
+ "doc": {
+ "allow_query": "false",
+ "expression": "arrayJoin(IF(empty(sc_rule_uuid_list), arrayPushFront(sc_rule_uuid_list, null),sc_rule_uuid_list))"
+ }
+ },
+ {
"name": "statistics_rule_id",
- "label": "Statistics Rule ID",
+ "label": "Statistics Rule ID(Deprecated)",
"type": "long",
"doc": {
"allow_query": "false",
@@ -1186,6 +1255,15 @@
}
},
{
+ "name": "statistics_rule_uuid",
+ "label": "Statistics Rule UUID",
+ "type": "string",
+ "doc": {
+ "allow_query": "false",
+ "expression": "arrayJoin(IF(empty(statistics_rule_uuid_list), arrayPushFront(statistics_rule_uuid_list, null),statistics_rule_uuid_list))"
+ }
+ },
+ {
"name": "client_ip_tag",
"label": "Client IP Tag",
"type": "string",
@@ -1607,7 +1685,7 @@
},
{
"name": "security_rule_list",
- "label": "Security Rule List",
+ "label": "Security Rule List(Deprecated)",
"doc": {
"constraints": {
"operator_functions": "has,notEmpty,empty"
@@ -1622,6 +1700,22 @@
}
},
{
+ "name": "security_rule_uuid_list",
+ "label": "Security Rule List",
+ "doc": {
+ "constraints": {
+ "operator_functions": "has,notEmpty,empty"
+ },
+ "visibility": "enabled",
+ "ttl": null
+ },
+ "type": {
+ "type": "array",
+ "items": "string",
+ "logicalType": "array"
+ }
+ },
+ {
"name": "security_action",
"label": "Security Action",
"doc": {
@@ -1638,7 +1732,7 @@
},
{
"name": "monitor_rule_list",
- "label": "Monitor Rule List",
+ "label": "Monitor Rule List(Deprecated)",
"doc": {
"constraints": {
"operator_functions": "has,notEmpty,empty"
@@ -1653,8 +1747,24 @@
}
},
{
+ "name": "monitor_rule_uuid_list",
+ "label": "Monitor Rule List",
+ "doc": {
+ "constraints": {
+ "operator_functions": "has,notEmpty,empty"
+ },
+ "visibility": "enabled",
+ "ttl": null
+ },
+ "type": {
+ "type": "array",
+ "items": "string",
+ "logicalType": "array"
+ }
+ },
+ {
"name": "sc_rule_list",
- "label": "Service Chaining Rule List",
+ "label": "Service Chaining Rule List(Deprecated)",
"doc": {
"constraints": {
"operator_functions": "has,notEmpty,empty"
@@ -1669,8 +1779,24 @@
}
},
{
+ "name": "sc_rule_uuid_list",
+ "label": "Service Chaining Rule List",
+ "doc": {
+ "constraints": {
+ "operator_functions": "has,notEmpty,empty"
+ },
+ "visibility": "enabled",
+ "ttl": null
+ },
+ "type": {
+ "type": "array",
+ "items": "string",
+ "logicalType": "array"
+ }
+ },
+ {
"name": "statistics_rule_list",
- "label": "Statistics Rule List",
+ "label": "Statistics Rule List(Deprecated)",
"doc": {
"constraints": {
"operator_functions": "has,notEmpty,empty"
@@ -1685,6 +1811,22 @@
}
},
{
+ "name": "statistics_rule_uuid_list",
+ "label": "Statistics Rule List",
+ "doc": {
+ "constraints": {
+ "operator_functions": "has,notEmpty,empty"
+ },
+ "visibility": "enabled",
+ "ttl": null
+ },
+ "type": {
+ "type": "array",
+ "items": "string",
+ "logicalType": "array"
+ }
+ },
+ {
"name": "sc_rsp_raw",
"label": "Service Chaining Rendered Service Path(Raw)",
"doc": {
@@ -1718,7 +1860,7 @@
},
{
"name": "shaping_rule_list",
- "label": "Shaping Rule List",
+ "label": "Shaping Rule List(Deprecated)",
"doc": {
"constraints": {
"operator_functions": "has,notEmpty,empty"
@@ -1733,8 +1875,24 @@
}
},
{
+ "name": "shaping_rule_uuid_list",
+ "label": "Shaping Rule List",
+ "doc": {
+ "constraints": {
+ "operator_functions": "has,notEmpty,empty"
+ },
+ "visibility": "enabled",
+ "ttl": null
+ },
+ "type": {
+ "type": "array",
+ "items": "string",
+ "logicalType": "array"
+ }
+ },
+ {
"name": "proxy_rule_list",
- "label": "Proxy Rule List",
+ "label": "Proxy Rule List(Deprecated)",
"doc": {
"constraints": {
"operator_functions": "has,notEmpty,empty"
@@ -1749,6 +1907,22 @@
}
},
{
+ "name": "proxy_rule_uuid_list",
+ "label": "Proxy Rule List",
+ "doc": {
+ "constraints": {
+ "operator_functions": "has,notEmpty,empty"
+ },
+ "visibility": "enabled",
+ "ttl": null
+ },
+ "type": {
+ "type": "array",
+ "items": "string",
+ "logicalType": "array"
+ }
+ },
+ {
"name": "proxy_action",
"label": "Proxy Action",
"doc": {