catocli 3.0.24__tar.gz → 3.0.25__tar.gz

{catocli-3.0.24 → catocli-3.0.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: catocli
-Version: 3.0.24
+Version: 3.0.25
 Summary: Cato Networks cli wrapper for the GraphQL API.
 Home-page: https://github.com/Cato-Networks/cato-cli
 Author: Cato Networks
@@ -102,7 +102,7 @@ For detailed information about profile management, see [PROFILES.md](PROFILES.md
 |-----------|-------------|--------|
 | [Account Metrics](./catocli_user_guide/account-metrics.md) | Network performance metrics by site, user, or interface | 📊 |
 | [Application Statistics](./catocli_user_guide/app-stats.md) | User activity and application usage analysis | 📱 |
-| [Application Time Series](./catocli_user_guide/app-stats-timeseries.md) | Traffic analysis over time with hourly/daily breakdowns | 📈 |
+| [Application Statistics Time Series](./catocli_user_guide/app-stats-timeseries.md) | Traffic analysis over time with hourly/daily breakdowns | 📈 |
 | [Events Time Series](./catocli_user_guide/events-timeseries.md) | Security events, connectivity, and threat analysis | 🔒 |
 | [Socket Port Metrics](./catocli_user_guide/socket-port-metrics.md) | Socket interface performance and traffic analysis | 🔌 |
 | [Socket Port Time Series](./catocli_user_guide/socket-port-timeseries.md) | Socket performance metrics over time | ⏱️ |
@@ -179,6 +179,3 @@ This CLI is a Python 3 application and has been tested with Python 3.6 -> 3.8
 
 ## Installing the correct version for environment:
 https://www.python.org/downloads/
-
-
-

{catocli-3.0.24 → catocli-3.0.25}/README.md

@@ -68,7 +68,7 @@ For detailed information about profile management, see [PROFILES.md](PROFILES.md
 |-----------|-------------|--------|
 | [Account Metrics](./catocli_user_guide/account-metrics.md) | Network performance metrics by site, user, or interface | 📊 |
 | [Application Statistics](./catocli_user_guide/app-stats.md) | User activity and application usage analysis | 📱 |
-| [Application Time Series](./catocli_user_guide/app-stats-timeseries.md) | Traffic analysis over time with hourly/daily breakdowns | 📈 |
+| [Application Statistics Time Series](./catocli_user_guide/app-stats-timeseries.md) | Traffic analysis over time with hourly/daily breakdowns | 📈 |
 | [Events Time Series](./catocli_user_guide/events-timeseries.md) | Security events, connectivity, and threat analysis | 🔒 |
 | [Socket Port Metrics](./catocli_user_guide/socket-port-metrics.md) | Socket interface performance and traffic analysis | 🔌 |
 | [Socket Port Time Series](./catocli_user_guide/socket-port-timeseries.md) | Socket performance metrics over time | ⏱️ |
@@ -145,6 +145,3 @@ This CLI is a Python 3 application and has been tested with Python 3.6 -> 3.8
 
 ## Installing the correct version for environment:
 https://www.python.org/downloads/
-
-
-

{catocli-3.0.24 → catocli-3.0.25}/catocli/Utils/formatter_app_stats.py

@@ -14,12 +14,12 @@ from typing import Dict, List, Any
 
 # Import shared utility functions
 try:
-    from .formatter_utils import convert_bytes_to_mb
+    from .formatter_utils import convert_bytes_to_mb, is_bytes_measure
 except ImportError:
     try:
-        from catocli.Utils.formatter_utils import convert_bytes_to_mb
+        from catocli.Utils.formatter_utils import convert_bytes_to_mb, is_bytes_measure
     except ImportError:
-        from formatter_utils import convert_bytes_to_mb
+        from formatter_utils import convert_bytes_to_mb, is_bytes_measure
 
 
 def format_app_stats(response_data: Dict[str, Any], output_format: str = 'json') -> str:
@@ -89,24 +89,27 @@ def _format_app_stats_to_json(response_data: Dict[str, Any]) -> str:
         record_data = {}
         
         for i, (field, value) in enumerate(fields_map.items()):
-            # Add unit type information for bytes fields
-            if (i < len(record_unit_types) and record_unit_types[i] == 'bytes'):
-                formatted_mb = convert_bytes_to_mb(value)
-                if formatted_mb and formatted_mb != str(value):
+            # Check if this is a bytes field using both unit type and field name
+            unit_type = record_unit_types[i] if i < len(record_unit_types) else "unknown"
+            is_bytes_field = (unit_type == 'bytes') or is_bytes_measure(field, unit_type)
+            
+            if is_bytes_field:
+                try:
+                    formatted_mb = convert_bytes_to_mb(value)
                     record_data[field] = {
                         "value": value,
                         "formatted_mb": formatted_mb,
                         "unit_type": "bytes"
                     }
-                else:
+                except (ValueError, ZeroDivisionError):
                     record_data[field] = {
                         "value": value,
-                        "unit_type": "bytes"
+                        "unit_type": "bytes_err"
                     }
             else:
                 record_data[field] = {
                     "value": value,
-                    "unit_type": record_unit_types[i] if i < len(record_unit_types) else "unknown"
+                    "unit_type": unit_type
                 }
         
         organized_data["appStats"]["records"].append(record_data)
@@ -155,7 +158,10 @@ def _format_app_stats_to_csv(response_data: Dict[str, Any]) -> str:
     # Create headers with _mb suffix for bytes fields
     headers = []
     for i, field_name in enumerate(field_names):
-        if i < len(field_unit_types) and field_unit_types[i] == 'bytes':
+        unit_type = field_unit_types[i] if i < len(field_unit_types) else "unknown"
+        is_bytes_field = (unit_type == 'bytes') or is_bytes_measure(field_name, unit_type)
+        
+        if is_bytes_field:
             headers.append(f'{field_name}_mb')
         else:
             headers.append(field_name)
@@ -172,12 +178,19 @@ def _format_app_stats_to_csv(response_data: Dict[str, Any]) -> str:
         for i, field in enumerate(field_names):
             value = fields_map.get(field, '')
             
-            # Convert bytes to MB if the field type is bytes
-            if (i < len(record_unit_types) and record_unit_types[i] == 'bytes'):
-                formatted_value = convert_bytes_to_mb(value)
-                row.append(formatted_value if formatted_value else value)
+            # Check if this is a bytes field using both unit type and field name
+            unit_type = record_unit_types[i] if i < len(record_unit_types) else "unknown"
+            is_bytes_field = (unit_type == 'bytes') or is_bytes_measure(field, unit_type)
+            
+            # Convert bytes to MB if the field is a bytes field
+            if is_bytes_field:
+                try:
+                    formatted_value = convert_bytes_to_mb(value) if value != '' else ''
+                    row.append(formatted_value)
+                except (ValueError, ZeroDivisionError):
+                    row.append(str(value) if value != '' else '')
             else:
-                row.append(value)
+                row.append(str(value) if value != '' else '')
         
         writer.writerow(row)
     

{catocli-3.0.24 → catocli-3.0.25}/catocli/Utils/formatter_app_stats_timeseries.py

@@ -16,12 +16,12 @@ from typing import Dict, List, Any, Tuple
 
 # Import shared utility functions
 try:
-    from .formatter_utils import format_timestamp, parse_label_for_dimensions_and_measure
+    from .formatter_utils import format_timestamp, parse_label_for_dimensions_and_measure, is_bytes_measure, convert_bytes_to_mb
 except ImportError:
     try:
-        from catocli.Utils.formatter_utils import format_timestamp, parse_label_for_dimensions_and_measure
+        from catocli.Utils.formatter_utils import format_timestamp, parse_label_for_dimensions_and_measure, is_bytes_measure, convert_bytes_to_mb
     except ImportError:
-        from formatter_utils import format_timestamp, parse_label_for_dimensions_and_measure
+        from formatter_utils import format_timestamp, parse_label_for_dimensions_and_measure, is_bytes_measure, convert_bytes_to_mb
 
 
 def format_app_stats_timeseries(response_data: Dict[str, Any], output_format: str = 'json') -> str:
@@ -170,20 +170,18 @@ def _format_app_stats_timeseries_to_json(response_data: Dict[str, Any]) -> str:
             for timestamp, value in measure_data['data'].items():
                 timestamp_str = format_timestamp(timestamp)
                 
-                if measure in ['downstream', 'upstream', 'traffic'] and value:
+                if is_bytes_measure(measure):
                     try:
-                        mb_value = value
-                        # mb_value = float(value) / 1048576
-                        formatted_value = f"{mb_value:.3f}".rstrip('0').rstrip('.')
+                        converted_value = convert_bytes_to_mb(value)
                         formatted_data[timestamp_str] = {
                             'value': value,
-                            'formatted_mb': formatted_value,
-                            'unit_type': 'mb'
+                            'formatted_mb': converted_value,
+                            'unit_type': 'bytes'
                         }
                     except (ValueError, ZeroDivisionError):
                         formatted_data[timestamp_str] = {
                             'value': value,
-                            'unit_type': 'mb'
+                            'unit_type': 'bytes_err'
                         }
                 else:
                     formatted_data[timestamp_str] = {
@@ -322,20 +320,14 @@ def _format_app_stats_timeseries_to_csv(response_data: Dict[str, Any]) -> str:
                 value = data.get(timestamp, '')
                 
                 # Convert bytes measures to MB and add appropriate suffix
-                if measure in ['downstream', 'upstream', 'traffic']:
-                    if value:
-                        try:
-                            # Current bug in appStatsTimeSeries returning mb indicating unit as bytes
-                            # mb_value = float(value) / 1048576
-                            mb_value = value
-                            formatted_value = f"{mb_value:.3f}".rstrip('0').rstrip('.')
-                            row_data[f'{measure}_mb'] = formatted_value
-                        except (ValueError, ZeroDivisionError):
-                            row_data[f'{measure}_mb'] = value
-                    else:
-                        row_data[f'{measure}_mb'] = value
+                if is_bytes_measure(measure):
+                    try:
+                        converted_value = convert_bytes_to_mb(value) if value != '' else ''
+                        row_data[f'{measure}_mb'] = converted_value
+                    except (ValueError, ZeroDivisionError):
+                        row_data[f'{measure}_mb'] = str(value) if value != '' else ''
                 else:
-                    row_data[measure] = value
+                    row_data[measure] = str(value) if value != '' else ''
             
             rows.append(row_data)
     

{catocli-3.0.24 → catocli-3.0.25}/catocli/Utils/formatter_utils.py

@@ -118,6 +118,7 @@ def is_bytes_measure(measure: str, units: str = "") -> bool:
     """
     bytes_measures = {
         'downstream', 'upstream', 'traffic', 'bytes', 'bytesDownstream', 
+        'bytes_upstream', 'bytes_downstream', 'bytes_total',
         'bytesUpstream', 'bytesTotal', 'throughput_downstream', 'throughput_upstream'
     }
     

catocli-3.0.25/catocli/__init__.py

@@ -0,0 +1,2 @@
+__version__ = "3.0.25"
+__cato_host__ = "https://api.catonetworks.com/api/v1/graphql2"

{catocli-3.0.24 → catocli-3.0.25}/catocli/parsers/query_appStatsTimeSeries/README.md

@@ -58,6 +58,7 @@ catocli query appStatsTimeSeries '{
             "fieldName": "application_name"
         }
     ],
+    "perSecond": false,
     "measure": [
         {
             "aggType": "sum",
@@ -99,6 +100,7 @@ catocli query appStatsTimeSeries '{
             "fieldName": "user_name"
         }
     ],
+    "perSecond": false,
     "measure": [
         {
             "aggType": "sum",

{catocli-3.0.24 → catocli-3.0.25}/models/query.appStats.json

@@ -203,6 +203,12 @@
                                             "isDeprecated": false,
                                             "name": "is_sanctioned_app"
                                         },
+                                        {
+                                            "deprecationReason": null,
+                                            "description": "The ISP related to this event (when the IP address isn't provided by the ISP, then the event message is IP Addresses are assigned statically)",
+                                            "isDeprecated": false,
+                                            "name": "ISP_name"
+                                        },
                                         {
                                             "deprecationReason": null,
                                             "description": "new cloud application identifier",
@@ -245,6 +251,18 @@
                                             "isDeprecated": false,
                                             "name": "socket_interface"
                                         },
+                                        {
+                                            "deprecationReason": null,
+                                            "description": "Country in which the source host is located (detected via public IP address)",
+                                            "isDeprecated": false,
+                                            "name": "src_country"
+                                        },
+                                        {
+                                            "deprecationReason": null,
+                                            "description": "Country Code of country in which the source host is located (detected via public IP address)",
+                                            "isDeprecated": false,
+                                            "name": "src_country_code"
+                                        },
                                         {
                                             "deprecationReason": null,
                                             "description": "IP for source host or Cato Client",
@@ -257,6 +275,12 @@
                                             "isDeprecated": false,
                                             "name": "src_is_site_or_vpn"
                                         },
+                                        {
+                                            "deprecationReason": null,
+                                            "description": "IP address provided by ISP to site or Client",
+                                            "isDeprecated": false,
+                                            "name": "src_isp_ip"
+                                        },
                                         {
                                             "deprecationReason": null,
                                             "description": "Site country code alpha2",
@@ -553,6 +577,12 @@
                                             "isDeprecated": false,
                                             "name": "is_sanctioned_app"
                                         },
+                                        {
+                                            "deprecationReason": null,
+                                            "description": "The ISP related to this event (when the IP address isn't provided by the ISP, then the event message is IP Addresses are assigned statically)",
+                                            "isDeprecated": false,
+                                            "name": "ISP_name"
+                                        },
                                         {
                                             "deprecationReason": null,
                                             "description": "new cloud application identifier",
@@ -595,6 +625,18 @@
                                             "isDeprecated": false,
                                             "name": "socket_interface"
                                         },
+                                        {
+                                            "deprecationReason": null,
+                                            "description": "Country in which the source host is located (detected via public IP address)",
+                                            "isDeprecated": false,
+                                            "name": "src_country"
+                                        },
+                                        {
+                                            "deprecationReason": null,
+                                            "description": "Country Code of country in which the source host is located (detected via public IP address)",
+                                            "isDeprecated": false,
+                                            "name": "src_country_code"
+                                        },
                                         {
                                             "deprecationReason": null,
                                             "description": "IP for source host or Cato Client",
@@ -607,6 +649,12 @@
                                             "isDeprecated": false,
                                             "name": "src_is_site_or_vpn"
                                         },
+                                        {
+                                            "deprecationReason": null,
+                                            "description": "IP address provided by ISP to site or Client",
+                                            "isDeprecated": false,
+                                            "name": "src_isp_ip"
+                                        },
                                         {
                                             "deprecationReason": null,
                                             "description": "Site country code alpha2",
@@ -1119,6 +1167,12 @@
                                             "isDeprecated": false,
                                             "name": "is_sanctioned_app"
                                         },
+                                        {
+                                            "deprecationReason": null,
+                                            "description": "The ISP related to this event (when the IP address isn't provided by the ISP, then the event message is IP Addresses are assigned statically)",
+                                            "isDeprecated": false,
+                                            "name": "ISP_name"
+                                        },
                                         {
                                             "deprecationReason": null,
                                             "description": "new cloud application identifier",
@@ -1161,6 +1215,18 @@
                                             "isDeprecated": false,
                                             "name": "socket_interface"
                                         },
+                                        {
+                                            "deprecationReason": null,
+                                            "description": "Country in which the source host is located (detected via public IP address)",
+                                            "isDeprecated": false,
+                                            "name": "src_country"
+                                        },
+                                        {
+                                            "deprecationReason": null,
+                                            "description": "Country Code of country in which the source host is located (detected via public IP address)",
+                                            "isDeprecated": false,
+                                            "name": "src_country_code"
+                                        },
                                         {
                                             "deprecationReason": null,
                                             "description": "IP for source host or Cato Client",
@@ -1173,6 +1239,12 @@
                                             "isDeprecated": false,
                                             "name": "src_is_site_or_vpn"
                                         },
+                                        {
+                                            "deprecationReason": null,
+                                            "description": "IP address provided by ISP to site or Client",
+                                            "isDeprecated": false,
+                                            "name": "src_isp_ip"
+                                        },
                                         {
                                             "deprecationReason": null,
                                             "description": "Site country code alpha2",
@@ -1487,6 +1559,12 @@
                                             "isDeprecated": false,
                                             "name": "is_sanctioned_app"
                                         },
+                                        {
+                                            "deprecationReason": null,
+                                            "description": "The ISP related to this event (when the IP address isn't provided by the ISP, then the event message is IP Addresses are assigned statically)",
+                                            "isDeprecated": false,
+                                            "name": "ISP_name"
+                                        },
                                         {
                                             "deprecationReason": null,
                                             "description": "new cloud application identifier",
@@ -1529,6 +1607,18 @@
                                             "isDeprecated": false,
                                             "name": "socket_interface"
                                         },
+                                        {
+                                            "deprecationReason": null,
+                                            "description": "Country in which the source host is located (detected via public IP address)",
+                                            "isDeprecated": false,
+                                            "name": "src_country"
+                                        },
+                                        {
+                                            "deprecationReason": null,
+                                            "description": "Country Code of country in which the source host is located (detected via public IP address)",
+                                            "isDeprecated": false,
+                                            "name": "src_country_code"
+                                        },
                                         {
                                             "deprecationReason": null,
                                             "description": "IP for source host or Cato Client",
@@ -1541,6 +1631,12 @@
                                             "isDeprecated": false,
                                             "name": "src_is_site_or_vpn"
                                         },
+                                        {
+                                            "deprecationReason": null,
+                                            "description": "IP address provided by ISP to site or Client",
+                                            "isDeprecated": false,
+                                            "name": "src_isp_ip"
+                                        },
                                         {
                                             "deprecationReason": null,
                                             "description": "Site country code alpha2",
@@ -1926,6 +2022,12 @@
                                             "isDeprecated": false,
                                             "name": "is_sanctioned_app"
                                         },
+                                        {
+                                            "deprecationReason": null,
+                                            "description": "The ISP related to this event (when the IP address isn't provided by the ISP, then the event message is IP Addresses are assigned statically)",
+                                            "isDeprecated": false,
+                                            "name": "ISP_name"
+                                        },
                                         {
                                             "deprecationReason": null,
                                             "description": "new cloud application identifier",
@@ -1968,6 +2070,18 @@
                                             "isDeprecated": false,
                                             "name": "socket_interface"
                                         },
+                                        {
+                                            "deprecationReason": null,
+                                            "description": "Country in which the source host is located (detected via public IP address)",
+                                            "isDeprecated": false,
+                                            "name": "src_country"
+                                        },
+                                        {
+                                            "deprecationReason": null,
+                                            "description": "Country Code of country in which the source host is located (detected via public IP address)",
+                                            "isDeprecated": false,
+                                            "name": "src_country_code"
+                                        },
                                         {
                                             "deprecationReason": null,
                                             "description": "IP for source host or Cato Client",
@@ -1980,6 +2094,12 @@
                                             "isDeprecated": false,
                                             "name": "src_is_site_or_vpn"
                                         },
+                                        {
+                                            "deprecationReason": null,
+                                            "description": "IP address provided by ISP to site or Client",
+                                            "isDeprecated": false,
+                                            "name": "src_isp_ip"
+                                        },
                                         {
                                             "deprecationReason": null,
                                             "description": "Site country code alpha2",
@@ -2401,6 +2521,12 @@
                                             "isDeprecated": false,
                                             "name": "is_sanctioned_app"
                                         },
+                                        {
+                                            "deprecationReason": null,
+                                            "description": "The ISP related to this event (when the IP address isn't provided by the ISP, then the event message is IP Addresses are assigned statically)",
+                                            "isDeprecated": false,
+                                            "name": "ISP_name"
+                                        },
                                         {
                                             "deprecationReason": null,
                                             "description": "new cloud application identifier",
@@ -2443,6 +2569,18 @@
                                             "isDeprecated": false,
                                             "name": "socket_interface"
                                         },
+                                        {
+                                            "deprecationReason": null,
+                                            "description": "Country in which the source host is located (detected via public IP address)",
+                                            "isDeprecated": false,
+                                            "name": "src_country"
+                                        },
+                                        {
+                                            "deprecationReason": null,
+                                            "description": "Country Code of country in which the source host is located (detected via public IP address)",
+                                            "isDeprecated": false,
+                                            "name": "src_country_code"
+                                        },
                                         {
                                             "deprecationReason": null,
                                             "description": "IP for source host or Cato Client",
@@ -2455,6 +2593,12 @@
                                             "isDeprecated": false,
                                             "name": "src_is_site_or_vpn"
                                         },
+                                        {
+                                            "deprecationReason": null,
+                                            "description": "IP address provided by ISP to site or Client",
+                                            "isDeprecated": false,
+                                            "name": "src_isp_ip"
+                                        },
                                         {
                                             "deprecationReason": null,
                                             "description": "Site country code alpha2",
@@ -2795,6 +2939,12 @@
                                             "isDeprecated": false,
                                             "name": "is_sanctioned_app"
                                         },
+                                        {
+                                            "deprecationReason": null,
+                                            "description": "The ISP related to this event (when the IP address isn't provided by the ISP, then the event message is IP Addresses are assigned statically)",
+                                            "isDeprecated": false,
+                                            "name": "ISP_name"
+                                        },
                                         {
                                             "deprecationReason": null,
                                             "description": "new cloud application identifier",
@@ -2837,6 +2987,18 @@
                                             "isDeprecated": false,
                                             "name": "socket_interface"
                                         },
+                                        {
+                                            "deprecationReason": null,
+                                            "description": "Country in which the source host is located (detected via public IP address)",
+                                            "isDeprecated": false,
+                                            "name": "src_country"
+                                        },
+                                        {
+                                            "deprecationReason": null,
+                                            "description": "Country Code of country in which the source host is located (detected via public IP address)",
+                                            "isDeprecated": false,
+                                            "name": "src_country_code"
+                                        },
                                         {
                                             "deprecationReason": null,
                                             "description": "IP for source host or Cato Client",
@@ -2849,6 +3011,12 @@
                                             "isDeprecated": false,
                                             "name": "src_is_site_or_vpn"
                                         },
+                                        {
+                                            "deprecationReason": null,
+                                            "description": "IP address provided by ISP to site or Client",
+                                            "isDeprecated": false,
+                                            "name": "src_isp_ip"
+                                        },
                                         {
                                             "deprecationReason": null,
                                             "description": "Site country code alpha2",
@@ -3272,6 +3440,12 @@
                                             "isDeprecated": false,
                                             "name": "is_sanctioned_app"
                                         },
+                                        {
+                                            "deprecationReason": null,
+                                            "description": "The ISP related to this event (when the IP address isn't provided by the ISP, then the event message is IP Addresses are assigned statically)",
+                                            "isDeprecated": false,
+                                            "name": "ISP_name"
+                                        },
                                         {
                                             "deprecationReason": null,
                                             "description": "new cloud application identifier",
@@ -3314,6 +3488,18 @@
                                             "isDeprecated": false,
                                             "name": "socket_interface"
                                         },
+                                        {
+                                            "deprecationReason": null,
+                                            "description": "Country in which the source host is located (detected via public IP address)",
+                                            "isDeprecated": false,
+                                            "name": "src_country"
+                                        },
+                                        {
+                                            "deprecationReason": null,
+                                            "description": "Country Code of country in which the source host is located (detected via public IP address)",
+                                            "isDeprecated": false,
+                                            "name": "src_country_code"
+                                        },
                                         {
                                             "deprecationReason": null,
                                             "description": "IP for source host or Cato Client",
@@ -3326,6 +3512,12 @@
                                             "isDeprecated": false,
                                             "name": "src_is_site_or_vpn"
                                         },
+                                        {
+                                            "deprecationReason": null,
+                                            "description": "IP address provided by ISP to site or Client",
+                                            "isDeprecated": false,
+                                            "name": "src_isp_ip"
+                                        },
                                         {
                                             "deprecationReason": null,
                                             "description": "Site country code alpha2",
@@ -3762,6 +3954,12 @@
                                                                     "isDeprecated": false,
                                                                     "name": "is_sanctioned_app"
                                                                 },
+                                                                {
+                                                                    "deprecationReason": null,
+                                                                    "description": "The ISP related to this event (when the IP address isn't provided by the ISP, then the event message is IP Addresses are assigned statically)",
+                                                                    "isDeprecated": false,
+                                                                    "name": "ISP_name"
+                                                                },
                                                                 {
                                                                     "deprecationReason": null,
                                                                     "description": "new cloud application identifier",
@@ -3804,6 +4002,18 @@
                                                                     "isDeprecated": false,
                                                                     "name": "socket_interface"
                                                                 },
+                                                                {
+                                                                    "deprecationReason": null,
+                                                                    "description": "Country in which the source host is located (detected via public IP address)",
+                                                                    "isDeprecated": false,
+                                                                    "name": "src_country"
+                                                                },
+                                                                {
+                                                                    "deprecationReason": null,
+                                                                    "description": "Country Code of country in which the source host is located (detected via public IP address)",
+                                                                    "isDeprecated": false,
+                                                                    "name": "src_country_code"
+                                                                },
                                                                 {
                                                                     "deprecationReason": null,
                                                                     "description": "IP for source host or Cato Client",
@@ -3816,6 +4026,12 @@
                                                                     "isDeprecated": false,
                                                                     "name": "src_is_site_or_vpn"
                                                                 },
+                                                                {
+                                                                    "deprecationReason": null,
+                                                                    "description": "IP address provided by ISP to site or Client",
+                                                                    "isDeprecated": false,
+                                                                    "name": "src_isp_ip"
+                                                                },
                                                                 {
                                                                     "deprecationReason": null,
                                                                     "description": "Site country code alpha2",