summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwangwei <[email protected]>2024-11-26 18:42:50 +0800
committerwangwei <[email protected]>2024-11-26 18:42:50 +0800
commitac7bcf76337c8e1ae915e50ae349bcde487b9c29 (patch)
tree77007da88b33d2d16fc62fe3c27af98572d79bcc
parentb5de715f2430a88ac8696865f4350f2889e0c2d6 (diff)
[Fix][schema] 数组类型字段函数hasAll(TSG-23912)
-rw-r--r--config/nacos/config/fixed-127.0.0.1_8848-tsg_nacos/data/config-data-tenant/tsg/Galaxy/monitor_event.json50
-rw-r--r--config/nacos/config/fixed-127.0.0.1_8848-tsg_nacos/data/config-data-tenant/tsg/Galaxy/proxy_event.json50
-rw-r--r--config/nacos/config/fixed-127.0.0.1_8848-tsg_nacos/data/config-data-tenant/tsg/Galaxy/public_schema_info.json7
-rw-r--r--config/nacos/config/fixed-127.0.0.1_8848-tsg_nacos/data/config-data-tenant/tsg/Galaxy/security_event.json50
-rw-r--r--config/nacos/config/fixed-127.0.0.1_8848-tsg_nacos/data/config-data-tenant/tsg/Galaxy/session_record.json50
5 files changed, 106 insertions, 101 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 f69a6c87..3079d6c1 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
@@ -1019,7 +1019,7 @@
},
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"expression": "array(if(bitAnd(flags, 8)=8, source_ip,''), if(bitAnd(flags, 16)=16, destination_ip,''))"
}
@@ -1034,7 +1034,7 @@
},
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"expression": "array(if(bitAnd(flags, 8)!=8, source_ip,''), if(bitAnd(flags, 16)!=16, destination_ip,''))"
}
@@ -1049,7 +1049,7 @@
},
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"expression": "array(if(bitAnd(flags, 8)=8, source_port, null), if(bitAnd(flags, 16)=16, destination_port, null))"
}
@@ -1064,7 +1064,7 @@
},
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"expression": "array(if(bitAnd(flags, 8)!=8, source_port, null), if(bitAnd(flags, 16)!=16, destination_port, null))"
}
@@ -1079,7 +1079,7 @@
},
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"expression": "array(if(bitAnd(flags, 8)=8, source_asn, null), if(bitAnd(flags, 16)=16, destination_asn, null))"
}
@@ -1094,7 +1094,7 @@
},
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"expression": "array(if(bitAnd(flags, 8)!=8, source_asn, null), if(bitAnd(flags, 16)!=16, destination_asn, null))"
}
@@ -1563,7 +1563,7 @@
"label": "Security Rule List(Deprecated)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1579,7 +1579,7 @@
"label": "Security Rule List",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1610,7 +1610,7 @@
"label": "Monitor Rule List(Deprecated)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "enabled",
"ttl": null
@@ -1626,7 +1626,7 @@
"label": "Monitor Rule List",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "enabled",
"ttl": null
@@ -1642,7 +1642,7 @@
"label": "Service Chaining Rule List(Deprecated)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1658,7 +1658,7 @@
"label": "Service Chaining Rule List",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1674,7 +1674,7 @@
"label": "Statistics Rule List(Deprecated)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1690,7 +1690,7 @@
"label": "Statistics Rule List",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1706,7 +1706,7 @@
"label": "Service Chaining Rendered Service Path(Raw)(Deprecated)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1722,7 +1722,7 @@
"label": "Service Chaining Rendered Service Path(Raw)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1738,7 +1738,7 @@
"label": "Service Chaining Rendered Service Path(Decrypted)(Deprecated)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1754,7 +1754,7 @@
"label": "Service Chaining Rendered Service Path(Decrypted)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1770,7 +1770,7 @@
"label": "Shaping Rule List(Deprecated)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1786,7 +1786,7 @@
"label": "Shaping Rule List",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1802,7 +1802,7 @@
"label": "Proxy Rule List(Deprecated)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1818,7 +1818,7 @@
"label": "Proxy Rule List",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1986,7 +1986,7 @@
"label": "Source IP Tags",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "enabled",
"ttl": null
@@ -2135,7 +2135,7 @@
"label": "Destination IP Tags",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "enabled",
"ttl": null
@@ -2209,7 +2209,7 @@
"label": "Destination FQDN Tags",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "enabled",
"ttl": null
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 f8e7e638..64dcb044 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
@@ -617,7 +617,7 @@
},
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"expression": "array(if(bitAnd(flags, 8)=8, source_ip,''), if(bitAnd(flags, 16)=16, destination_ip,''))"
}
@@ -632,7 +632,7 @@
},
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"expression": "array(if(bitAnd(flags, 8)!=8, source_ip,''), if(bitAnd(flags, 16)!=16, destination_ip,''))"
}
@@ -647,7 +647,7 @@
},
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"expression": "array(if(bitAnd(flags, 8)=8, source_port, null), if(bitAnd(flags, 16)=16, destination_port, null))"
}
@@ -662,7 +662,7 @@
},
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"expression": "array(if(bitAnd(flags, 8)!=8, source_port, null), if(bitAnd(flags, 16)!=16, destination_port, null))"
}
@@ -677,7 +677,7 @@
},
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"expression": "array(if(bitAnd(flags, 8)=8, source_asn, null), if(bitAnd(flags, 16)=16, destination_asn, null))"
}
@@ -692,7 +692,7 @@
},
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"expression": "array(if(bitAnd(flags, 8)!=8, source_asn, null), if(bitAnd(flags, 16)!=16, destination_asn, null))"
}
@@ -1121,7 +1121,7 @@
"label": "Security Rule List(Deprecated)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1137,7 +1137,7 @@
"label": "Security Rule List",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1168,7 +1168,7 @@
"label": "Monitor Rule List(Deprecated)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1184,7 +1184,7 @@
"label": "Monitor Rule List",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1200,7 +1200,7 @@
"label": "Service Chaining Rule List(Deprecated)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1216,7 +1216,7 @@
"label": "Service Chaining Rule List",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1232,7 +1232,7 @@
"label": "Statistics Rule List(Deprecated)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1248,7 +1248,7 @@
"label": "Statistics Rule List",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1264,7 +1264,7 @@
"label": "Service Chaining Rendered Service Path(Raw)(Deprecated)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1280,7 +1280,7 @@
"label": "Service Chaining Rendered Service Path(Raw)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1296,7 +1296,7 @@
"label": "Service Chaining Rendered Service Path(Decrypted)(Deprecated)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1312,7 +1312,7 @@
"label": "Service Chaining Rendered Service Path(Decrypted)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1328,7 +1328,7 @@
"label": "Shaping Rule List(Deprecated)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1344,7 +1344,7 @@
"label": "Shaping Rule List",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1360,7 +1360,7 @@
"label": "Proxy Rule List(Deprecated)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "enabled",
"ttl": null
@@ -1376,7 +1376,7 @@
"label": "Proxy Rule List",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "enabled",
"ttl": null
@@ -1572,7 +1572,7 @@
"label": "Source IP Tags",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1721,7 +1721,7 @@
"label": "Destination IP Tags",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1795,7 +1795,7 @@
"label": "Destination FQDN Tags",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
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 9d141f15..80971963 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
@@ -207,6 +207,11 @@
"function": "has(expr, value)"
},
{
+ "name": "hasAll",
+ "label": "HAS ALL",
+ "function": "hasAll(expr, value)"
+ },
+ {
"name": "in",
"label": "IN",
"function": "expr in (values)"
@@ -345,7 +350,7 @@
},
{
"type": "array",
- "functions": "has,notEmpty,empty"
+ "functions": "hasAll,has,notEmpty,empty"
},
{
"type": "bit",
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 f1cfe8ca..e61154d0 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
@@ -1023,7 +1023,7 @@
},
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"expression": "array(if(bitAnd(flags, 8)=8, source_ip,''), if(bitAnd(flags, 16)=16, destination_ip,''))"
}
@@ -1038,7 +1038,7 @@
},
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"expression": "array(if(bitAnd(flags, 8)!=8, source_ip,''), if(bitAnd(flags, 16)!=16, destination_ip,''))"
}
@@ -1053,7 +1053,7 @@
},
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"expression": "array(if(bitAnd(flags, 8)=8, source_port, null), if(bitAnd(flags, 16)=16, destination_port, null))"
}
@@ -1068,7 +1068,7 @@
},
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"expression": "array(if(bitAnd(flags, 8)!=8, source_port, null), if(bitAnd(flags, 16)!=16, destination_port, null))"
}
@@ -1083,7 +1083,7 @@
},
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"expression": "array(if(bitAnd(flags, 8)=8, source_asn, null), if(bitAnd(flags, 16)=16, destination_asn, null))"
}
@@ -1098,7 +1098,7 @@
},
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"expression": "array(if(bitAnd(flags, 8)!=8, source_asn, null), if(bitAnd(flags, 16)!=16, destination_asn, null))"
}
@@ -1567,7 +1567,7 @@
"label": "Security Rule List(Deprecated)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "enabled",
"ttl": null
@@ -1583,7 +1583,7 @@
"label": "Security Rule List",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "enabled",
"ttl": null
@@ -1614,7 +1614,7 @@
"label": "Monitor Rule List(Deprecated)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1630,7 +1630,7 @@
"label": "Monitor Rule List",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1646,7 +1646,7 @@
"label": "Service Chaining Rule List(Deprecated)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1662,7 +1662,7 @@
"label": "Service Chaining Rule List",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1678,7 +1678,7 @@
"label": "Statistics Rule List(Deprecated)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1694,7 +1694,7 @@
"label": "Statistics Rule List",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1710,7 +1710,7 @@
"label": "Service Chaining Rendered Service Path(Raw)(Deprecated)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1726,7 +1726,7 @@
"label": "Service Chaining Rendered Service Path(Raw)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1742,7 +1742,7 @@
"label": "Service Chaining Rendered Service Path(Decrypted)(Deprecated)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1758,7 +1758,7 @@
"label": "Service Chaining Rendered Service Path(Decrypted)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1774,7 +1774,7 @@
"label": "Shaping Rule List(Deprecated)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1790,7 +1790,7 @@
"label": "Shaping Rule List",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1806,7 +1806,7 @@
"label": "Proxy Rule List(Deprecated)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1822,7 +1822,7 @@
"label": "Proxy Rule List",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "hidden",
"ttl": null
@@ -1990,7 +1990,7 @@
"label": "Source IP Tags",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "enabled",
"ttl": null
@@ -2139,7 +2139,7 @@
"label": "Destination IP Tags",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "enabled",
"ttl": null
@@ -2213,7 +2213,7 @@
"label": "Destination FQDN Tags",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "enabled",
"ttl": null
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 645728cc..d3fb28ec 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
@@ -1074,7 +1074,7 @@
},
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"expression": "array(if(bitAnd(flags, 8)=8, source_ip,''), if(bitAnd(flags, 16)=16, destination_ip,''))"
}
@@ -1089,7 +1089,7 @@
},
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"expression": "array(if(bitAnd(flags, 8)!=8, source_ip,''), if(bitAnd(flags, 16)!=16, destination_ip,''))"
}
@@ -1104,7 +1104,7 @@
},
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"expression": "array(if(bitAnd(flags, 8)=8, source_port, null), if(bitAnd(flags, 16)=16, destination_port, null))"
}
@@ -1119,7 +1119,7 @@
},
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"expression": "array(if(bitAnd(flags, 8)!=8, source_port, null), if(bitAnd(flags, 16)!=16, destination_port, null))"
}
@@ -1134,7 +1134,7 @@
},
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"expression": "array(if(bitAnd(flags, 8)=8, source_asn, null), if(bitAnd(flags, 16)=16, destination_asn, null))"
}
@@ -1149,7 +1149,7 @@
},
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"expression": "array(if(bitAnd(flags, 8)!=8, source_asn, null), if(bitAnd(flags, 16)!=16, destination_asn, null))"
}
@@ -1708,7 +1708,7 @@
"label": "Security Rule List(Deprecated)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "enabled",
"ttl": null
@@ -1724,7 +1724,7 @@
"label": "Security Rule List",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "enabled",
"ttl": null
@@ -1755,7 +1755,7 @@
"label": "Monitor Rule List(Deprecated)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "enabled",
"ttl": null
@@ -1771,7 +1771,7 @@
"label": "Monitor Rule List",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "enabled",
"ttl": null
@@ -1787,7 +1787,7 @@
"label": "Service Chaining Rule List(Deprecated)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "enabled",
"ttl": null
@@ -1803,7 +1803,7 @@
"label": "Service Chaining Rule List",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "enabled",
"ttl": null
@@ -1819,7 +1819,7 @@
"label": "Statistics Rule List(Deprecated)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "enabled",
"ttl": null
@@ -1835,7 +1835,7 @@
"label": "Statistics Rule List",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "enabled",
"ttl": null
@@ -1851,7 +1851,7 @@
"label": "Service Chaining Rendered Service Path(Raw)(Deprecated)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "enabled",
"ttl": null
@@ -1867,7 +1867,7 @@
"label": "Service Chaining Rendered Service Path(Raw)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "enabled",
"ttl": null
@@ -1883,7 +1883,7 @@
"label": "Service Chaining Rendered Service Path(Decrypted)(Deprecated)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "enabled",
"ttl": null
@@ -1899,7 +1899,7 @@
"label": "Service Chaining Rendered Service Path(Decrypted)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "enabled",
"ttl": null
@@ -1915,7 +1915,7 @@
"label": "Shaping Rule List(Deprecated)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "enabled",
"ttl": null
@@ -1931,7 +1931,7 @@
"label": "Shaping Rule List",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "enabled",
"ttl": null
@@ -1947,7 +1947,7 @@
"label": "Proxy Rule List(Deprecated)",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "enabled",
"ttl": null
@@ -1963,7 +1963,7 @@
"label": "Proxy Rule List",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "enabled",
"ttl": null
@@ -2131,7 +2131,7 @@
"label": "Source IP Tags",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "enabled",
"ttl": null
@@ -2280,7 +2280,7 @@
"label": "Destination IP Tags",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "enabled",
"ttl": null
@@ -2354,7 +2354,7 @@
"label": "Destination FQDN Tags",
"doc": {
"constraints": {
- "operator_functions": "has,notEmpty,empty"
+ "operator_functions": "hasAll,has,notEmpty,empty"
},
"visibility": "enabled",
"ttl": null