catocli 3.0.29__tar.gz → 3.0.31__tar.gz

{catocli-3.0.29 → catocli-3.0.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: catocli
-Version: 3.0.29
+Version: 3.0.31
 Summary: Cato Networks cli wrapper for the GraphQL API.
 Home-page: https://github.com/Cato-Networks/cato-cli
 Author: Cato Networks

catocli-3.0.31/catocli/__init__.py

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

{catocli-3.0.29 → catocli-3.0.31}/catocli/parsers/custom/export_rules/__init__.py

@@ -56,7 +56,6 @@ Examples:
     
     if_rules_parser.add_argument('-accountID', help='Account ID to export rules from (uses CATO_ACCOUNT_ID environment variable if not specified)', required=False)
     if_rules_parser.add_argument('-v', '--verbose', action='store_true', help='Verbose output')
-    
     if_rules_parser.set_defaults(func=export_rules.export_if_rules_to_json)
     
     # Add wf_rules command
@@ -83,7 +82,33 @@ Examples:
     
     wf_rules_parser.add_argument('-accountID', help='Account ID to export rules from (uses CATO_ACCOUNT_ID environment variable if not specified)', required=False)
     wf_rules_parser.add_argument('-v', '--verbose', action='store_true', help='Verbose output')
-    
     wf_rules_parser.set_defaults(func=export_rules.export_wf_rules_to_json)
+
+    # Add tls_rules command
+    tls_rules_parser = export_subparsers.add_parser(
+        'tls_rules', 
+        help='Export TLS Inspection rules to JSON format',
+        usage='catocli export tls_rules [-accountID <account_id>] [options]',
+        description='''Export TLS Inspection rules to JSON format for backup, analysis, or migration purposes.
+
+Examples:
+  # Basic export (uses CATO_ACCOUNT_ID environment variable)
+  catocli export tls_rules
+  
+  # Export with specific account ID
+  catocli export tls_rules -accountID 12345
+  
+  # Export with verbose output to see detailed progress
+  catocli export tls_rules -v
+  
+  # Export for specific account with full logging
+  catocli export tls_rules -accountID 12345 -v''',
+        formatter_class=__import__('argparse').RawDescriptionHelpFormatter
+    )
     
+    tls_rules_parser.add_argument('-accountID', help='Account ID to export rules from (uses CATO_ACCOUNT_ID environment variable if not specified)', required=False)
+    tls_rules_parser.add_argument('-v', '--verbose', action='store_true', help='Verbose output')
+    tls_rules_parser.set_defaults(func=export_rules.export_tls_rules_to_json)
+
+
     return export_parser

{catocli-3.0.29 → catocli-3.0.31}/catocli/parsers/custom/export_rules/export_rules.py

@@ -7,7 +7,8 @@ from graphql_client.api_client import ApiException
 from ..customLib import writeDataToFile, makeCall, getAccountID
 
 def strip_ids_recursive(data):
-    """Recursively strip id attributes from data structure, but only from objects that contain only 'id' and 'name' keys"""
+    """Recursively strip id attributes from data structure, but only from objects that contain only 'id' and 'name' keys.
+    If a name contains a backslash character, keep the id and remove the name instead."""
     try:
         if isinstance(data, dict):
             # Check if this dict should have its 'id' stripped
@@ -15,10 +16,19 @@ def strip_ids_recursive(data):
             dict_keys = set(data.keys())
             should_strip_id = dict_keys == {'id', 'name'} or dict_keys == {'name', 'id'}
             
+            # Check if name contains backslash
+            name_has_backslash = should_strip_id and 'name' in data and isinstance(data['name'], str) and '\\' in data['name']
+            
             result = {}
             for k, v in data.items():
-                if k == 'id' and should_strip_id:
-                    # Skip this 'id' key only if this object contains only id and name
+                if name_has_backslash:
+                    # If name contains backslash, keep id and skip name
+                    if k == 'name':
+                        continue
+                    else:
+                        result[k] = strip_ids_recursive(v)
+                elif k == 'id' and should_strip_id:
+                    # Normal case: Skip id key if this object contains only id and name
                     continue
                 else:
                     # Keep the key and recursively process the value
@@ -131,7 +141,6 @@ def export_if_rules_to_json(args, configuration):
         print(f"ERROR: {str(e)}")
         return [{"success": False, "error": str(e)}]
 
-
 def export_wf_rules_to_json(args, configuration):
     """
     Export WAN Firewall rules to JSON format
@@ -232,3 +241,103 @@ def export_wf_rules_to_json(args, configuration):
     except Exception as e:
         print(f"ERROR: {str(e)}")
         return [{"success": False, "error": str(e)}]
+
+def export_tls_rules_to_json(args, configuration):
+    """
+    Export TLS Inspection rules to JSON format
+    Adapted from scripts/export_tls_rules_to_json.py
+    """
+    try:
+        account_id = getAccountID(args, configuration)
+        
+        policy_query = {
+            "query": "query policy ( $accountId:ID! ) { policy ( accountId:$accountId ) { tlsInspect { policy { enabled rules { audit { updatedTime updatedBy } rule { id name description index section { id name } enabled source { user { id name } floatingSubnet { id name } globalIpRange { id name } group { id name } host { id name } subnet ipRangeTlsInspectSource: ipRange { from to } networkInterface { id name } site { id name } systemGroup { id name } usersGroup { id name } ip siteNetworkSubnet { id name } } platform country { id name } devicePostureProfile { id name } connectionOrigin application { application { id name } appCategory { id name } country { id name } customApp { id name } customCategory { id name } customServiceIp { name ip ipRange { from to } } domain fqdn subnet ip ipRangeTlsInspectApplication: ipRange { from to } globalIpRange { id name } customService { port portRange { from to } protocol } remoteAsn service { id name } tlsInspectCategory } action untrustedCertificateAction } properties } sections { audit { updatedTime updatedBy } section { id name } properties } audit { publishedTime publishedBy } revision { id name description changes createdTime updatedTime } additionalAttributes { defaultRuleAction defaultRuleUntrustedCertificateAction } } } } }",
+            "variables": {
+                "accountId": account_id
+            },
+            "operationName": "policy"
+        }
+        all_tls_rules = makeCall(args, configuration, policy_query)
+                
+        if not all_tls_rules or 'data' not in all_tls_rules:
+            raise ValueError("Failed to retrieve data from API")
+   
+        # Processing data to strip id attributes
+        processed_data = strip_ids_recursive(all_tls_rules)
+        
+        # Filter out rules with properties[0]=="SYSTEM"
+        filtered_rules = []
+        for rule_data in processed_data['data']['policy']['tlsInspect']['policy']['rules']:
+            rule_properties = rule_data.get('properties', [])
+            # Skip rules where the first property is "SYSTEM"
+            if rule_properties and rule_properties[0] == "SYSTEM":
+                if hasattr(args, 'verbose') and args.verbose:
+                    print(f"Excluding SYSTEM rule: {rule_data['rule']['name']}")
+            else:
+                filtered_rules.append(rule_data)
+        
+        processed_data['data']['policy']['tlsInspect']['policy']['rules'] = filtered_rules
+        
+        # Add index_in_section to each rule
+        # Handle empty section names by assigning a default section name
+        section_counters = {}
+        for rule_data in processed_data['data']['policy']['tlsInspect']['policy']['rules']:
+            section_name = rule_data['rule']['section']['name']
+            # If section name is empty, use "Default Section" as the section name
+            if not section_name or section_name.strip() == "":
+                section_name = "Default Section"
+                rule_data['rule']['section']['name'] = section_name
+            
+            if section_name not in section_counters:
+                section_counters[section_name] = 0
+            section_counters[section_name] += 1
+            rule_data['rule']['index_in_section'] = section_counters[section_name]
+        
+        # Create rules_in_sections array
+        rules_in_sections = []
+        for rule_data in processed_data['data']['policy']['tlsInspect']['policy']['rules']:
+            rule_info = rule_data['rule']
+            rules_in_sections.append({
+                "index_in_section": rule_info['index_in_section'],
+                "section_name": rule_info['section']['name'],
+                "rule_name": rule_info['name']
+            })
+            rule_info.pop("index_in_section", None)
+            rule_info.pop("index", None)
+            # rule_info["enabled"] = True
+
+        # Add rules_in_sections to the policy structure
+        processed_data['data']['policy']['tlsInspect']['policy']['rules_in_sections'] = rules_in_sections
+        
+        # Reformat sections array to have index, section_id and section_name structure
+        # Exclude the first section from export
+        sections_with_ids = all_tls_rules['data']['policy']['tlsInspect']['policy']['sections']
+        processed_sections = [] 
+        for index, section_data in enumerate(sections_with_ids):
+            processed_sections.append({
+                "section_index": index+1,
+                "section_name": section_data['section']['name'],
+                "section_id": section_data['section']['id']
+            })
+        
+        # Replace the original sections array with the reformatted one
+        processed_data['data']['policy']['tlsInspect']['policy']['sections'] = processed_sections
+        
+        # Handle timestamp in filename if requested
+        filename_template = "all_tls_rules_and_sections_{account_id}.json"
+        if hasattr(args, 'append_timestamp') and args.append_timestamp:
+            timestamp = datetime.now().strftime("%Y-%m-%d_%H-%M-%S")
+            filename_template = "all_tls_rules_and_sections_{account_id}_" + timestamp + ".json"
+            
+        output_file = writeDataToFile(
+            data=processed_data,
+            args=args,
+            account_id=account_id,
+            default_filename_template=filename_template,
+            default_directory="config_data"
+        )
+        
+        return [{"success": True, "output_file": output_file, "account_id": account_id}]
+    except Exception as e:
+        print(f"ERROR: {str(e)}")
+        return [{"success": False, "error": str(e)}]

{catocli-3.0.29 → catocli-3.0.31}/catocli/parsers/custom/import_rules_to_tf/__init__.py

@@ -75,4 +75,28 @@ Common Examples:
     
     wf_rules_parser.set_defaults(func=import_rules_to_tf.import_wf_rules_to_tf)
     
+    # Add tls_rules_to_tf command
+    tls_rules_parser = import_subparsers.add_parser(
+        'tls_rules_to_tf', 
+        help='Import TLS Inspectiom rules to Terraform state',
+        usage='catocli import tls_rules_to_tf <json_file> --module-name <module_name> [options]\n\nexample: catocli import tls_rules_to_tf config_data/all_tls_rules_and_sections.json --module-name module.tls_rules'
+    )
+    
+    tls_rules_parser.add_argument('json_file', help='Path to the JSON file containing TLS rules and sections')
+    tls_rules_parser.add_argument('--module-name', required=True, 
+                                help='Terraform module name to import resources into')
+    tls_rules_parser.add_argument('-accountID', help='Account ID (required by CLI framework but not used for import)', required=False)
+    tls_rules_parser.add_argument('--batch-size', type=int, default=10, 
+                                help='Number of imports per batch (default: 10)')
+    tls_rules_parser.add_argument('--delay', type=int, default=2, 
+                                help='Delay between batches in seconds (default: 2)')
+    tls_rules_parser.add_argument('--rules-only', action='store_true', 
+                                help='Import only rules, skip sections')
+    tls_rules_parser.add_argument('--sections-only', action='store_true', 
+                                help='Import only sections, skip rules')
+    tls_rules_parser.add_argument('-v', '--verbose', action='store_true', help='Verbose output')
+    tls_rules_parser.add_argument('--auto-approve', action='store_true', help='Skip confirmation prompt and proceed automatically')
+
+    tls_rules_parser.set_defaults(func=import_rules_to_tf.import_tls_rules_to_tf)    
+
     return import_parser

{catocli-3.0.29 → catocli-3.0.31}/catocli/parsers/custom/import_rules_to_tf/import_rules_to_tf.py

@@ -460,3 +460,181 @@ def import_wf_rules_to_tf(args, configuration):
     except Exception as e:
         print(f"ERROR: {str(e)}")
         return [{"success": False, "error": str(e)}]
+
+
+def load_tls_json_data(json_file):
+    """Load TLS Inspection data from JSON file"""
+    try:
+        with open(json_file, 'r') as f:
+            data = json.load(f)
+            return data['data']['policy']['tlsInspect']['policy']
+    except FileNotFoundError:
+        print(f"Error: JSON file '{json_file}' not found")
+        sys.exit(1)
+    except json.JSONDecodeError as e:
+        print(f"Error: Invalid JSON in '{json_file}': {e}")
+        sys.exit(1)
+    except KeyError as e:
+        print(f"Error: Expected JSON structure not found in '{json_file}': {e}")
+        sys.exit(1)
+
+
+def import_tls_sections(sections, module_name, verbose=False,
+                       resource_type="cato_tls_section", resource_name="sections"):
+    """Import all TLS Inspection sections"""
+    print("\nStarting TLS Inspection section imports...")
+    total_sections = len(sections)
+    successful_imports = 0
+    failed_imports = 0
+    
+    for i, section in enumerate(sections):
+        section_id = section['section_id']
+        section_name = section['section_name']
+        section_index = section['section_index']
+        # Add module. prefix if not present
+        if not module_name.startswith('module.'):
+            module_name = f'module.{module_name}'
+        resource_address = f'{module_name}.{resource_type}.{resource_name}["{section_name}"]'
+        print(f"\n[{i+1}/{total_sections}] Section: {section_name} (index: {section_index})")
+
+        # For sections, we use the section name as the ID since that's how Cato identifies them
+        success, stdout, stderr = run_terraform_import(resource_address, section_id, verbose=verbose)
+        
+        if success:
+            successful_imports += 1
+        else:
+            failed_imports += 1
+    
+    print(f"\nTLS Inspection Section Import Summary: {successful_imports} successful, {failed_imports} failed")
+    return successful_imports, failed_imports
+
+
+def import_tls_rules(rules, module_name, verbose=False,
+                    resource_type="cato_tls_rule", resource_name="rules",
+                    batch_size=10, delay_between_batches=2, auto_approve=False):
+    """Import all TLS Inspection rules in batches"""
+    print("\nStarting TLS Inspection rule imports...")
+    successful_imports = 0
+    failed_imports = 0
+    total_rules = len(rules)
+    
+    for i, rule in enumerate(rules):
+        rule_id = rule['id']
+        rule_name = rule['name']
+        rule_index = find_rule_index(rules, rule_name)
+        terraform_key = sanitize_name_for_terraform(rule_name)
+        
+        # Add module. prefix if not present
+        if not module_name.startswith('module.'):
+            module_name = f'module.{module_name}'
+
+        # Use array index syntax instead of rule ID
+        resource_address = f'{module_name}.{resource_type}.{resource_name}["{str(rule_name)}"]'
+        print(f"\n[{i+1}/{total_rules}] Rule: {rule_name} (index: {rule_index})")
+        
+        success, stdout, stderr = run_terraform_import(resource_address, rule_id, verbose=verbose)
+        
+        if success:
+            successful_imports += 1
+        else:
+            failed_imports += 1
+            
+            # Ask user if they want to continue on failure (unless auto-approved)
+            if failed_imports <= 3 and not auto_approve:  # Only prompt for first few failures
+                response = input(f"\nContinue with remaining imports? (y/n): ").lower()
+                if response == 'n':
+                    print("Import process stopped by user.")
+                    break
+        
+        # Delay between batches
+        if (i + 1) % batch_size == 0 and i < total_rules - 1:
+            print(f"\n   Batch complete. Waiting {delay_between_batches}s before next batch...")
+            time.sleep(delay_between_batches)
+    
+    print(f"\nTLS Inspection Rule Import Summary: {successful_imports} successful, {failed_imports} failed")
+    return successful_imports, failed_imports
+
+
+def import_tls_rules_to_tf(args, configuration):
+    """Main function to orchestrate the TLS Inspection import process"""
+    try:
+        print(" Terraform Import Tool - Cato TLS Inspection Rules & Sections")
+        print("=" * 60)
+        
+        # Load data
+        print(f" Loading data from {args.json_file}...")
+        policy_data = load_tls_json_data(args.json_file)
+        
+        # Extract rules and sections
+        rules, sections = extract_rules_and_sections(policy_data)
+        
+        if hasattr(args, 'verbose') and args.verbose:
+            print(f"section_ids: {json.dumps(policy_data.get('section_ids', {}), indent=2)}")
+        
+        print(f" Found {len(rules)} rules")
+        print(f"  Found {len(sections)} sections")
+        
+        if not rules and not sections:
+            print(" No rules or sections found. Exiting.")
+            return [{"success": False, "error": "No rules or sections found"}]
+        
+        # Validate Terraform environment before proceeding
+        validate_terraform_environment(args.module_name, verbose=args.verbose)
+        
+        # Ask for confirmation (unless auto-approved)
+        if not args.rules_only and not args.sections_only:
+            print(f"\n Ready to import {len(sections)} sections and {len(rules)} rules.")
+        elif args.rules_only:
+            print(f"\n Ready to import {len(rules)} rules only.")
+        elif args.sections_only:
+            print(f"\n Ready to import {len(sections)} sections only.")
+        
+        if hasattr(args, 'auto_approve') and args.auto_approve:
+            print("\nAuto-approve enabled, proceeding with import...")
+        else:
+            confirm = input(f"\nProceed with import? (y/n): ").lower()
+            if confirm != 'y':
+                print("Import cancelled.")
+                return [{"success": False, "error": "Import cancelled by user"}]
+        
+        total_successful = 0
+        total_failed = 0
+        
+        # Import sections first (if not skipped)
+        if not args.rules_only and sections:
+            successful, failed = import_tls_sections(sections, module_name=args.module_name, verbose=args.verbose)
+            total_successful += successful
+            total_failed += failed
+        
+        # Import rules (if not skipped)
+        if not args.sections_only and rules:
+            successful, failed = import_tls_rules(rules, module_name=args.module_name, 
+                                                 verbose=args.verbose, batch_size=args.batch_size, 
+                                                 delay_between_batches=args.delay,
+                                                 auto_approve=getattr(args, 'auto_approve', False))
+            total_successful += successful
+            total_failed += failed
+        
+        # Final summary
+        print("\n" + "=" * 60)
+        print(" FINAL IMPORT SUMMARY")
+        print("=" * 60)
+        print(f" Total successful imports: {total_successful}")
+        print(f" Total failed imports: {total_failed}")
+        print(f" Overall success rate: {(total_successful / (total_successful + total_failed) * 100):.1f}%" if (total_successful + total_failed) > 0 else "N/A")
+        print("\n Import process completed!")
+        
+        return [{
+            "success": True, 
+            "total_successful": total_successful,
+            "total_failed": total_failed,
+            "module_name": args.module_name
+        }]
+    
+    except KeyboardInterrupt:
+        print("\nImport process cancelled by user (Ctrl+C).")
+        print("Partial imports may have been completed.")
+        return [{"success": False, "error": "Import cancelled by user"}]
+    except Exception as e:
+        print(f"ERROR: {str(e)}")
+        return [{"success": False, "error": str(e)}]

{catocli-3.0.29 → catocli-3.0.31}/catocli/parsers/customParserApiClient.py

@@ -262,6 +262,9 @@ def createRequest(args, configuration):
                             json_data
                         )
                         print(f"Sentinel API response code: {result_code}")
+                    
+                    # Return None to prevent JSON output to stdout when streaming to network/sentinel
+                    return None
                 
                 # Apply formatting based on effective format
                 if effective_format == 'raw' or not default_override:

{catocli-3.0.29 → catocli-3.0.31}/catocli/parsers/query_appStatsTimeSeries/README.md

@@ -82,7 +82,6 @@ catocli query appStatsTimeSeries '{
 }' -f csv --csv-filename=appStatsTimeSeries_app_bw.csv
 ```
 
-
 # Traffic patterns throughout the day
 
 ```bash

{catocli-3.0.29 → catocli-3.0.31}/catocli/parsers/query_devices/README.md

@@ -11,7 +11,7 @@ catocli query devices <json>
 
 catocli query devices "$(cat < query.devices.json)"
 
-catocli query devices '{"deviceAttributeCatalogInput":{"pagingInput":{"from":1,"limit":1},"sortOrderInput":{"direction":"ASC","priority":1},"stringFilterInput":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]}},"deviceCsvExportInput":{"deviceV2FilterInput":{"category":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"confidence":{"eq":"LOW","in":"LOW","neq":"LOW","nin":"LOW"},"firstSeen":{"between":["example1","example2"],"eq":"example_value","gt":"example_value","gte":"example_value","in":["example1","example2"],"lt":"example_value","lte":"example_value","neq":"example_value","nin":["example1","example2"]},"hw":{"manufacturer":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"model":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"type":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]}},"id":{"eq":"id","in":["id1","id2"],"neq":"id","nin":["id1","id2"]},"ipAddress":{"between":["example1","example2"],"eq":"example_value","in":["example1","example2"],"neq":"example_value","nin":["example1","example2"],"nwithin":"example_value","within":"example_value"},"isManaged":{"eq":true,"neq":true},"lastSeen":{"between":["example1","example2"],"eq":"example_value","gt":"example_value","gte":"example_value","in":["example1","example2"],"lt":"example_value","lte":"example_value","neq":"example_value","nin":["example1","example2"]},"name":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"network":{"networkName":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"subnet":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]}},"nic":{"macAddress":{"eq":"example_value","in":["example1","example2"],"neq":"example_value","nin":["example1","example2"]},"vendor":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]}},"os":{"product":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"vendor":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"version":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]}},"riskScore":{"between":[1,2],"eq":1,"gt":1,"gte":1,"in":[1,2],"lt":1,"lte":1,"neq":1,"nin":[1,2]},"site":{"eq":{"by":"ID","input":"string"},"in":{"by":"ID","input":"string"},"neq":{"by":"ID","input":"string"},"nin":{"by":"ID","input":"string"}},"user":{"eq":{"by":"ID","input":"string"},"in":{"by":"ID","input":"string"},"neq":{"by":"ID","input":"string"},"nin":{"by":"ID","input":"string"}}}},"deviceV2Input":{"deviceSortInput":{"category":{"direction":"ASC","priority":1},"confidence":{"direction":"ASC","priority":1},"firstSeen":{"direction":"ASC","priority":1},"hw":{"manufacturer":{"direction":"ASC","priority":1},"model":{"direction":"ASC","priority":1},"type":{"direction":"ASC","priority":1}},"id":{"direction":"ASC","priority":1},"ip":{"direction":"ASC","priority":1},"lastSeen":{"direction":"ASC","priority":1},"name":{"direction":"ASC","priority":1},"network":{"networkName":{"direction":"ASC","priority":1},"subnet":{"direction":"ASC","priority":1}},"nic":{"macAddress":{"direction":"ASC","priority":1},"vendor":{"direction":"ASC","priority":1}},"os":{"product":{"direction":"ASC","priority":1},"vendor":{"direction":"ASC","priority":1},"version":{"direction":"ASC","priority":1}},"riskScore":{"direction":"ASC","priority":1},"site":{"id":{"direction":"ASC","priority":1},"name":{"direction":"ASC","priority":1}},"user":{"id":{"direction":"ASC","priority":1},"name":{"direction":"ASC","priority":1}}},"deviceV2FilterInput":{"category":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"confidence":{"eq":"LOW","in":"LOW","neq":"LOW","nin":"LOW"},"firstSeen":{"between":["example1","example2"],"eq":"example_value","gt":"example_value","gte":"example_value","in":["example1","example2"],"lt":"example_value","lte":"example_value","neq":"example_value","nin":["example1","example2"]},"hw":{"manufacturer":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"model":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"type":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]}},"id":{"eq":"id","in":["id1","id2"],"neq":"id","nin":["id1","id2"]},"ipAddress":{"between":["example1","example2"],"eq":"example_value","in":["example1","example2"],"neq":"example_value","nin":["example1","example2"],"nwithin":"example_value","within":"example_value"},"isManaged":{"eq":true,"neq":true},"lastSeen":{"between":["example1","example2"],"eq":"example_value","gt":"example_value","gte":"example_value","in":["example1","example2"],"lt":"example_value","lte":"example_value","neq":"example_value","nin":["example1","example2"]},"name":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"network":{"networkName":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"subnet":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]}},"nic":{"macAddress":{"eq":"example_value","in":["example1","example2"],"neq":"example_value","nin":["example1","example2"]},"vendor":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]}},"os":{"product":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"vendor":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"version":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]}},"riskScore":{"between":[1,2],"eq":1,"gt":1,"gte":1,"in":[1,2],"lt":1,"lte":1,"neq":1,"nin":[1,2]},"site":{"eq":{"by":"ID","input":"string"},"in":{"by":"ID","input":"string"},"neq":{"by":"ID","input":"string"},"nin":{"by":"ID","input":"string"}},"user":{"eq":{"by":"ID","input":"string"},"in":{"by":"ID","input":"string"},"neq":{"by":"ID","input":"string"},"nin":{"by":"ID","input":"string"}}},"pagingInput":{"from":1,"limit":1}},"jobId":"id","sortOrderInput":{"direction":"ASC","priority":1}}'
+catocli query devices '{"deviceAttributeCatalogInput":{"pagingInput":{"from":1,"limit":1},"sortOrderInput":{"direction":"ASC","priority":1},"stringFilterInput":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]}},"deviceCsvExportInput":{"deviceV2FilterInput":{"category":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"complianceState":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"confidence":{"eq":"LOW","in":"LOW","neq":"LOW","nin":"LOW"},"firstSeen":{"between":["example1","example2"],"eq":"example_value","gt":"example_value","gte":"example_value","in":["example1","example2"],"lt":"example_value","lte":"example_value","neq":"example_value","nin":["example1","example2"]},"hw":{"manufacturer":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"model":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"type":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]}},"id":{"eq":"id","in":["id1","id2"],"neq":"id","nin":["id1","id2"]},"ipAddress":{"between":["example1","example2"],"eq":"example_value","in":["example1","example2"],"neq":"example_value","nin":["example1","example2"],"nwithin":"example_value","within":"example_value"},"isManaged":{"eq":true,"neq":true},"lastSeen":{"between":["example1","example2"],"eq":"example_value","gt":"example_value","gte":"example_value","in":["example1","example2"],"lt":"example_value","lte":"example_value","neq":"example_value","nin":["example1","example2"]},"name":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"network":{"networkName":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"subnet":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]}},"nic":{"macAddress":{"eq":"example_value","in":["example1","example2"],"neq":"example_value","nin":["example1","example2"]},"vendor":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]}},"originTypes":{"hasAll":"Unknown","in":"Unknown","nin":"Unknown"},"os":{"product":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"vendor":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"version":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]}},"riskScore":{"between":[1,2],"eq":1,"gt":1,"gte":1,"in":[1,2],"lt":1,"lte":1,"neq":1,"nin":[1,2]},"site":{"eq":{"by":"ID","input":"string"},"in":{"by":"ID","input":"string"},"neq":{"by":"ID","input":"string"},"nin":{"by":"ID","input":"string"}},"user":{"eq":{"by":"ID","input":"string"},"in":{"by":"ID","input":"string"},"neq":{"by":"ID","input":"string"},"nin":{"by":"ID","input":"string"}}}},"deviceV2Input":{"deviceSortInput":{"category":{"direction":"ASC","priority":1},"confidence":{"direction":"ASC","priority":1},"firstSeen":{"direction":"ASC","priority":1},"hw":{"manufacturer":{"direction":"ASC","priority":1},"model":{"direction":"ASC","priority":1},"type":{"direction":"ASC","priority":1}},"id":{"direction":"ASC","priority":1},"ip":{"direction":"ASC","priority":1},"lastSeen":{"direction":"ASC","priority":1},"name":{"direction":"ASC","priority":1},"network":{"networkName":{"direction":"ASC","priority":1},"subnet":{"direction":"ASC","priority":1}},"nic":{"macAddress":{"direction":"ASC","priority":1},"vendor":{"direction":"ASC","priority":1}},"os":{"product":{"direction":"ASC","priority":1},"vendor":{"direction":"ASC","priority":1},"version":{"direction":"ASC","priority":1}},"riskScore":{"direction":"ASC","priority":1},"site":{"id":{"direction":"ASC","priority":1},"name":{"direction":"ASC","priority":1}},"user":{"id":{"direction":"ASC","priority":1},"name":{"direction":"ASC","priority":1}}},"deviceV2FilterInput":{"category":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"complianceState":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"confidence":{"eq":"LOW","in":"LOW","neq":"LOW","nin":"LOW"},"firstSeen":{"between":["example1","example2"],"eq":"example_value","gt":"example_value","gte":"example_value","in":["example1","example2"],"lt":"example_value","lte":"example_value","neq":"example_value","nin":["example1","example2"]},"hw":{"manufacturer":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"model":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"type":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]}},"id":{"eq":"id","in":["id1","id2"],"neq":"id","nin":["id1","id2"]},"ipAddress":{"between":["example1","example2"],"eq":"example_value","in":["example1","example2"],"neq":"example_value","nin":["example1","example2"],"nwithin":"example_value","within":"example_value"},"isManaged":{"eq":true,"neq":true},"lastSeen":{"between":["example1","example2"],"eq":"example_value","gt":"example_value","gte":"example_value","in":["example1","example2"],"lt":"example_value","lte":"example_value","neq":"example_value","nin":["example1","example2"]},"name":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"network":{"networkName":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"subnet":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]}},"nic":{"macAddress":{"eq":"example_value","in":["example1","example2"],"neq":"example_value","nin":["example1","example2"]},"vendor":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]}},"originTypes":{"hasAll":"Unknown","in":"Unknown","nin":"Unknown"},"os":{"product":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"vendor":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]},"version":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"]}},"riskScore":{"between":[1,2],"eq":1,"gt":1,"gte":1,"in":[1,2],"lt":1,"lte":1,"neq":1,"nin":[1,2]},"site":{"eq":{"by":"ID","input":"string"},"in":{"by":"ID","input":"string"},"neq":{"by":"ID","input":"string"},"nin":{"by":"ID","input":"string"}},"user":{"eq":{"by":"ID","input":"string"},"in":{"by":"ID","input":"string"},"neq":{"by":"ID","input":"string"},"nin":{"by":"ID","input":"string"}}},"pagingInput":{"from":1,"limit":1}},"jobId":"id","sortOrderInput":{"direction":"ASC","priority":1}}'
 
 catocli query devices '{
     "deviceAttributeCatalogInput": {
@@ -50,6 +50,18 @@ catocli query devices '{
                     "string2"
                 ]
             },
+            "complianceState": {
+                "eq": "string",
+                "in": [
+                    "string1",
+                    "string2"
+                ],
+                "neq": "string",
+                "nin": [
+                    "string1",
+                    "string2"
+                ]
+            },
             "confidence": {
                 "eq": "LOW",
                 "in": "LOW",
@@ -232,6 +244,11 @@ catocli query devices '{
                     ]
                 }
             },
+            "originTypes": {
+                "hasAll": "Unknown",
+                "in": "Unknown",
+                "nin": "Unknown"
+            },
             "os": {
                 "product": {
                     "eq": "string",
@@ -444,6 +461,18 @@ catocli query devices '{
                     "string2"
                 ]
             },
+            "complianceState": {
+                "eq": "string",
+                "in": [
+                    "string1",
+                    "string2"
+                ],
+                "neq": "string",
+                "nin": [
+                    "string1",
+                    "string2"
+                ]
+            },
             "confidence": {
                 "eq": "LOW",
                 "in": "LOW",
@@ -626,6 +655,11 @@ catocli query devices '{
                     ]
                 }
             },
+            "originTypes": {
+                "hasAll": "Unknown",
+                "in": "Unknown",
+                "nin": "Unknown"
+            },
             "os": {
                 "product": {
                     "eq": "string",