catocli 3.0.10__py3-none-any.whl → 3.0.13__py3-none-any.whl

catocli/Utils/clidriver.py

@@ -53,8 +53,8 @@ from ..parsers.query_xdr import query_xdr_parse
 from ..parsers.query_policy import query_policy_parse
 from ..parsers.query_groups import query_groups_parse
 from ..parsers.mutation_xdr import mutation_xdr_parse
-from ..parsers.mutation_site import mutation_site_parse
 from ..parsers.mutation_policy import mutation_policy_parse
+from ..parsers.mutation_site import mutation_site_parse
 from ..parsers.mutation_sites import mutation_sites_parse
 from ..parsers.mutation_container import mutation_container_parse
 from ..parsers.mutation_admin import mutation_admin_parse
@@ -188,8 +188,8 @@ query_xdr_parser = query_xdr_parse(query_subparsers)
 query_policy_parser = query_policy_parse(query_subparsers)
 query_groups_parser = query_groups_parse(query_subparsers)
 mutation_xdr_parser = mutation_xdr_parse(mutation_subparsers)
-mutation_site_parser = mutation_site_parse(mutation_subparsers)
 mutation_policy_parser = mutation_policy_parse(mutation_subparsers)
+mutation_site_parser = mutation_site_parse(mutation_subparsers)
 mutation_sites_parser = mutation_sites_parse(mutation_subparsers)
 mutation_container_parser = mutation_container_parse(mutation_subparsers)
 mutation_admin_parser = mutation_admin_parse(mutation_subparsers)
@@ -269,7 +269,7 @@ def main(args=None):
             if custom_headers:
                 configuration.custom_headers.update(custom_headers)
             # Handle account ID override (applies to all commands except raw)
-            if args.func.__name__ not in ["createRawRequest"]:
+            if hasattr(args, 'func') and args.func.__name__ not in ["createRawRequest"]:
                 if hasattr(args, 'accountID') and args.accountID is not None:
                     # Command line override takes precedence
                     configuration.accountID = args.accountID
@@ -295,7 +295,7 @@ def main(args=None):
     except Exception as e:
         if isinstance(e, AttributeError):
             print('Missing arguments. Usage: catocli <operation> -h')
-            if args.v==True:
+            if hasattr(args, 'v') and args.v==True:
                 print('ERROR: ',e)
                 traceback.print_exc()
         else:

catocli/Utils/graphql_utils.py

@@ -347,11 +347,12 @@ def generateGraphqlPayload(variables_obj, operation, operation_name, renderArgsA
     query_str += f" ( VARIABLES_PLACEHOLDER) {{\n"
     query_str += f"{indent}{operation['name']} ( "
     
-    # Add operation arguments - only include arguments that have actual values
-    # Use operationArgs instead of args to get complete argument list including child operations
-    operation_args = operation.get("operationArgs", operation.get("args", {}))
-    for arg_name in operation_args:
-        arg = operation_args[arg_name]
+    # Add main operation arguments - only include arguments that belong to the root operation field
+    # Arguments for nested fields (like updateRule.input) will be handled in the field rendering process
+    # Use args (not operationArgs) to only get main-level arguments for the root operation field
+    main_args = operation.get("args", {})
+    for arg_name in main_args:
+        arg = main_args[arg_name]
         # Include required arguments always, and optional arguments only when they have meaningful values
         var_name = arg["varName"]
         is_required = arg.get("required", False)
@@ -860,6 +861,10 @@ def renderArgsAndFields(response_arg_str, variables_obj, cur_operation, definiti
                     if dynamic_operation_args is not None and isinstance(dynamic_operation_args, dict):
                         dynamic_operation_args[arg["varName"]] = arg
                     
+                    # CRITICAL FIX: Match JavaScript logic exactly - regenerate responseStr here
+                    # JavaScript line 868: arg.responseStr = arg.name + ":$" + arg.varName + " ";
+                    arg['responseStr'] = arg['name'] + ":$" + arg['varName'] + " "
+                    
                     # Only include arguments that are present in variables_obj and have values
                     # This matches the JavaScript implementation behavior
                     if arg["varName"] in variables_obj and variables_obj[arg["varName"]] is not None and variables_obj[arg["varName"]] != "" and variables_obj[arg["varName"]] != [] and variables_obj[arg["varName"]] != {}:
@@ -955,6 +960,11 @@ def renderArgsAndFields(response_arg_str, variables_obj, cur_operation, definiti
                     for arg_name in subfield['args']:
                         arg = subfield['args'][arg_name]
                         
+                        # CRITICAL: Match JavaScript logic exactly - DO NOT regenerate responseStr for subfield arguments
+                        # JavaScript implementation (lines 901, 904) uses the existing arg.responseStr without modification
+                        # The responseStr should have been set correctly during schema generation
+                        # We only regenerate for NEW arguments discovered dynamically
+                        
                         # NEW: Dynamic argument collection for subfield arguments too
                         if dynamic_operation_args is not None and isinstance(dynamic_operation_args, dict):
                             dynamic_operation_args[arg["varName"]] = arg

catocli/Utils/help_formatter.py

@@ -226,18 +226,23 @@ class UniversalHelpFormatter:
             readme_examples = self._extract_from_readme(command_path)
             if readme_examples:
                 for example in readme_examples:
-                    # Check if this is a multi-line JSON example that can be platform-formatted
-                    json_match = self._extract_json_from_example(example)
-                    if json_match:
-                        # Create JSONExample and apply platform-specific formatting
-                        json_example = JSONExample(json_match)
-                        formatted_examples = json_example.format_for_platform(self.platform_info, command_name)
-                        help_lines.extend(formatted_examples)
-                    elif not ('{' in example and '}' in example):
-                        # Simple command examples without JSON
+                    # Check if this example starts with a comment (lines starting with #)
+                    if example.startswith('#') and '\n' in example:
+                        # This is a comment followed by a command - preserve as-is
                         help_lines.append(example)
+                    elif '{' in example and '}' in example:
+                        # Check if this is a multi-line JSON example that can be platform-formatted
+                        json_match = self._extract_json_from_example(example)
+                        if json_match and not example.startswith('#'):
+                            # Create JSONExample and apply platform-specific formatting
+                            json_example = JSONExample(json_match)
+                            formatted_examples = json_example.format_for_platform(self.platform_info, command_name)
+                            help_lines.extend(formatted_examples)
+                        else:
+                            # Preserve as-is if it has comments or JSON extraction fails
+                            help_lines.append(example)
                     else:
-                        # Fallback: preserve as-is if JSON extraction fails
+                        # Simple command examples without JSON
                         help_lines.append(example)
                     help_lines.append("")  # Add spacing between examples
         
@@ -273,15 +278,20 @@ class UniversalHelpFormatter:
         return "\n".join(help_lines)
 
     def _extract_from_readme(self, command_path: str) -> List[str]:
-        """Extract all catocli examples from README.md files"""
+        """Extract all catocli examples from README.md files with comments"""
         examples = []
         
         # Find README.md file
         base_dir = os.path.dirname(os.path.dirname(__file__))  # Go up from Utils to catocli
         readme_path = os.path.join(base_dir, "parsers", command_path, "README.md")
         
+        # If not found, try custom path (for commands like query_eventsFeed)
         if not os.path.exists(readme_path):
-            return examples
+            custom_readme_path = os.path.join(base_dir, "parsers", "custom", command_path, "README.md")
+            if os.path.exists(custom_readme_path):
+                readme_path = custom_readme_path
+            else:
+                return examples
         
         try:
             with open(readme_path, "r", encoding='utf-8') as f:
@@ -289,24 +299,47 @@ class UniversalHelpFormatter:
             
             command_name = command_path.replace('_', ' ')
             
+            # Check if "### Examples Summary" or "### Additional Examples" sections exist
+            has_examples_summary = "### Examples Summary" in content or "### Additional Examples" in content
+            if has_examples_summary:
+                # Extract and display the examples summary section
+                summary_pattern = r'### (?:Examples Summary|Additional Examples)\n(.*?)(?=\n###|\n## |\Z)'
+                summary_match = re.search(summary_pattern, content, re.DOTALL)
+                if summary_match:
+                    summary_content = summary_match.group(1).strip()
+                    examples.append(f"\n### Examples Summary")
+                    examples.append(summary_content)
+                    examples.append("")  # Add spacing
+            
             # Extract ALL catocli commands from markdown code blocks
             code_block_pattern = r'```(?:bash|shell|json)?\n(.*?)```'
             matches = re.findall(code_block_pattern, content, re.DOTALL)
             
             for match in matches:
-                # Split the match into individual lines and extract catocli commands
+                # Split the match into individual lines and extract catocli commands with comments
                 lines = match.split('\n')
                 current_command = None
+                current_comment = None
                 in_multiline_json = False
                 
                 for i, line in enumerate(lines):
                     stripped_line = line.strip()
                     
-                    if stripped_line.startswith('catocli') and command_name in stripped_line:
+                    # Check for comments that precede catocli commands
+                    if stripped_line.startswith('# ') and not current_command:
+                        current_comment = stripped_line
+                    elif stripped_line.startswith('catocli') and command_name in stripped_line:
                         if current_command:
                             # Save previous multi-line command
                             examples.append(current_command)
-                        current_command = stripped_line
+                        
+                        # Include comment if it exists
+                        if current_comment:
+                            current_command = current_comment + '\n' + stripped_line
+                            current_comment = None  # Reset comment
+                        else:
+                            current_command = stripped_line
+                            
                         # Check if this starts a multi-line JSON command (ends with '{' with optional flags before it)
                         if stripped_line.endswith("'{"):
                             in_multiline_json = True
@@ -320,7 +353,7 @@ class UniversalHelpFormatter:
                         else:
                             # Continue multi-line JSON with exact indentation
                             current_command += '\n' + line
-                    elif current_command and not in_multiline_json and stripped_line and not stripped_line.startswith('catocli'):
+                    elif current_command and not in_multiline_json and stripped_line and not stripped_line.startswith('catocli') and not stripped_line.startswith('# '):
                         # This could be continuation of a single-line command
                         current_command += ' ' + stripped_line
                     elif current_command and (stripped_line.startswith('catocli') or stripped_line == '' or i == len(lines) - 1):
@@ -328,6 +361,13 @@ class UniversalHelpFormatter:
                         if not in_multiline_json:
                             examples.append(current_command)
                             current_command = stripped_line if stripped_line.startswith('catocli') and command_name in stripped_line else None
+                            # Reset comment when starting a new command
+                            if not current_command:
+                                current_comment = None
+                    elif stripped_line == '':
+                        # Reset comment on empty lines if no command is being processed
+                        if not current_command:
+                            current_comment = None
                 
                 # Don't forget the last command
                 if current_command and not in_multiline_json:
@@ -388,8 +428,13 @@ class UniversalHelpFormatter:
         base_dir = os.path.dirname(os.path.dirname(__file__))  # Go up from Utils to catocli
         readme_path = os.path.join(base_dir, "parsers", command_path, "README.md")
         
+        # If not found, try custom path (for commands like query_eventsFeed)
         if not os.path.exists(readme_path):
-            return sections
+            custom_readme_path = os.path.join(base_dir, "parsers", "custom", command_path, "README.md")
+            if os.path.exists(custom_readme_path):
+                readme_path = custom_readme_path
+            else:
+                return sections
         
         try:
             with open(readme_path, "r", encoding='utf-8') as f:

catocli/__init__.py

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

catocli/parsers/custom/__init__.py

@@ -20,7 +20,7 @@ def custom_parse(subparsers):
 				help='entity'+entity+' list', 
 				usage=get_help_custom("entity_"+entity+"_list"))
 
-		item_list_parser.add_argument('-accountID', help='The Account ID.')
+		item_list_parser.add_argument('-accountID', help='The Account ID (optional - defaults to profile setting).')
 		item_list_parser.add_argument('-s', help='Search string', default='', nargs='?')
 		item_list_parser.add_argument('-f', default="csv", choices=["json","csv"], nargs='?', 
 			help='Specify format for output')

catocli/parsers/custom/customLib.py

@@ -18,7 +18,9 @@ def entityTypeList(args, configuration):
             }
         }
     }
-    variablesObj = { "accountID": (params.get("accountID") if params.get("accountID") else params.get("accountId"))}
+    # Use accountID from configuration (profile) or fall back to command line parameter
+    account_id = configuration.accountID if configuration and hasattr(configuration, 'accountID') else (params.get("accountID") or params.get("accountId"))
+    variablesObj = { "accountID": account_id }
 
     # Create the API client instance
     api_client = ApiClient(configuration)

catocli/parsers/mutation_groups_createGroup/README.md

@@ -11,7 +11,7 @@ catocli mutation groups createGroup <json>
 
 catocli mutation groups createGroup "$(cat < mutation.groups.createGroup.json)"
 
-catocli mutation groups createGroup '{"createGroupInput":{"description":"string","groupMemberRefTypedInput":{"by":"ID","input":"string","type":"SITE"},"name":"string"}}'
+catocli mutation groups createGroup '{"createGroupInput":{"description":"string","groupMemberRefTypedInput":{"by":"ID","input":"string","type":"SITE"},"name":"string"},"groupMembersListInput":{"groupMembersListFilterInput":{"name":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"],"regex":"string"},"type":{"eq":"SITE","in":"SITE","neq":"SITE","nin":"SITE"}},"groupMembersListSortInput":{"name":{"direction":"ASC","priority":1},"type":{"direction":"ASC","priority":1}},"pagingInput":{"from":1,"limit":1}}}'
 
 catocli mutation groups createGroup '{
     "createGroupInput": {
@@ -22,6 +22,43 @@ catocli mutation groups createGroup '{
             "type": "SITE"
         },
         "name": "string"
+    },
+    "groupMembersListInput": {
+        "groupMembersListFilterInput": {
+            "name": {
+                "eq": "string",
+                "in": [
+                    "string1",
+                    "string2"
+                ],
+                "neq": "string",
+                "nin": [
+                    "string1",
+                    "string2"
+                ],
+                "regex": "string"
+            },
+            "type": {
+                "eq": "SITE",
+                "in": "SITE",
+                "neq": "SITE",
+                "nin": "SITE"
+            }
+        },
+        "groupMembersListSortInput": {
+            "name": {
+                "direction": "ASC",
+                "priority": 1
+            },
+            "type": {
+                "direction": "ASC",
+                "priority": 1
+            }
+        },
+        "pagingInput": {
+            "from": 1,
+            "limit": 1
+        }
     }
 }'
 ```
@@ -30,3 +67,4 @@ catocli mutation groups createGroup '{
 
 `accountId` [ID] - (required) N/A    
 `createGroupInput` [CreateGroupInput] - (required) N/A    
+`groupMembersListInput` [GroupMembersListInput] - (required) N/A    

catocli/parsers/mutation_groups_deleteGroup/README.md

@@ -11,9 +11,46 @@ catocli mutation groups deleteGroup <json>
 
 catocli mutation groups deleteGroup "$(cat < mutation.groups.deleteGroup.json)"
 
-catocli mutation groups deleteGroup '{"groupRefInput":{"by":"ID","input":"string"}}'
+catocli mutation groups deleteGroup '{"groupMembersListInput":{"groupMembersListFilterInput":{"name":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"],"regex":"string"},"type":{"eq":"SITE","in":"SITE","neq":"SITE","nin":"SITE"}},"groupMembersListSortInput":{"name":{"direction":"ASC","priority":1},"type":{"direction":"ASC","priority":1}},"pagingInput":{"from":1,"limit":1}},"groupRefInput":{"by":"ID","input":"string"}}'
 
 catocli mutation groups deleteGroup '{
+    "groupMembersListInput": {
+        "groupMembersListFilterInput": {
+            "name": {
+                "eq": "string",
+                "in": [
+                    "string1",
+                    "string2"
+                ],
+                "neq": "string",
+                "nin": [
+                    "string1",
+                    "string2"
+                ],
+                "regex": "string"
+            },
+            "type": {
+                "eq": "SITE",
+                "in": "SITE",
+                "neq": "SITE",
+                "nin": "SITE"
+            }
+        },
+        "groupMembersListSortInput": {
+            "name": {
+                "direction": "ASC",
+                "priority": 1
+            },
+            "type": {
+                "direction": "ASC",
+                "priority": 1
+            }
+        },
+        "pagingInput": {
+            "from": 1,
+            "limit": 1
+        }
+    },
     "groupRefInput": {
         "by": "ID",
         "input": "string"
@@ -24,4 +61,5 @@ catocli mutation groups deleteGroup '{
 #### Operation Arguments for mutation.groups.deleteGroup ####
 
 `accountId` [ID] - (required) N/A    
+`groupMembersListInput` [GroupMembersListInput] - (required) N/A    
 `groupRefInput` [GroupRefInput] - (required) N/A    

catocli/parsers/mutation_groups_updateGroup/README.md

@@ -11,9 +11,46 @@ catocli mutation groups updateGroup <json>
 
 catocli mutation groups updateGroup "$(cat < mutation.groups.updateGroup.json)"
 
-catocli mutation groups updateGroup '{"updateGroupInput":{"description":"string","groupMemberRefTypedInput":{"by":"ID","input":"string","type":"SITE"},"groupRefInput":{"by":"ID","input":"string"},"name":"string"}}'
+catocli mutation groups updateGroup '{"groupMembersListInput":{"groupMembersListFilterInput":{"name":{"eq":"string","in":["string1","string2"],"neq":"string","nin":["string1","string2"],"regex":"string"},"type":{"eq":"SITE","in":"SITE","neq":"SITE","nin":"SITE"}},"groupMembersListSortInput":{"name":{"direction":"ASC","priority":1},"type":{"direction":"ASC","priority":1}},"pagingInput":{"from":1,"limit":1}},"updateGroupInput":{"description":"string","groupMemberRefTypedInput":{"by":"ID","input":"string","type":"SITE"},"groupRefInput":{"by":"ID","input":"string"},"name":"string"}}'
 
 catocli mutation groups updateGroup '{
+    "groupMembersListInput": {
+        "groupMembersListFilterInput": {
+            "name": {
+                "eq": "string",
+                "in": [
+                    "string1",
+                    "string2"
+                ],
+                "neq": "string",
+                "nin": [
+                    "string1",
+                    "string2"
+                ],
+                "regex": "string"
+            },
+            "type": {
+                "eq": "SITE",
+                "in": "SITE",
+                "neq": "SITE",
+                "nin": "SITE"
+            }
+        },
+        "groupMembersListSortInput": {
+            "name": {
+                "direction": "ASC",
+                "priority": 1
+            },
+            "type": {
+                "direction": "ASC",
+                "priority": 1
+            }
+        },
+        "pagingInput": {
+            "from": 1,
+            "limit": 1
+        }
+    },
     "updateGroupInput": {
         "description": "string",
         "groupMemberRefTypedInput": {
@@ -33,4 +70,5 @@ catocli mutation groups updateGroup '{
 #### Operation Arguments for mutation.groups.updateGroup ####
 
 `accountId` [ID] - (required) N/A    
+`groupMembersListInput` [GroupMembersListInput] - (required) N/A    
 `updateGroupInput` [UpdateGroupInput] - (required) N/A    

catocli/parsers/query_accountMetrics/README.md

@@ -11,12 +11,30 @@ catocli query accountMetrics <json>
 
 catocli query accountMetrics "$(cat < query.accountMetrics.json)"
 
-catocli query accountMetrics '{"groupDevices":true,"groupInterfaces":true,"timeFrame":"example_value"}'
+catocli query accountMetrics '{"buckets":1,"groupDevices":true,"groupInterfaces":true,"labels":"bytesUpstream","perSecond":true,"siteIDs":["id1","id2"],"timeFrame":"example_value","toRate":true,"types":["string1","string2"],"useDefaultSizeBucket":true,"userIDs":["id1","id2"],"withMissingData":true}'
 
 catocli query accountMetrics '{
+    "buckets": 1,
     "groupDevices": true,
     "groupInterfaces": true,
-    "timeFrame": "example_value"
+    "labels": "bytesUpstream",
+    "perSecond": true,
+    "siteIDs": [
+        "id1",
+        "id2"
+    ],
+    "timeFrame": "example_value",
+    "toRate": true,
+    "types": [
+        "string1",
+        "string2"
+    ],
+    "useDefaultSizeBucket": true,
+    "userIDs": [
+        "id1",
+        "id2"
+    ],
+    "withMissingData": true
 }'
 ```
 
@@ -44,6 +62,7 @@ Format: `"utc.YYYY-MM-{DD/HH:MM:SS--DD/HH:MM:SS}"`
 #### Operation Arguments for query.accountMetrics ####
 
 `accountID` [ID] - (required) Unique Identifier of Account.    
+`buckets` [Int] - (required) number of buckets, defaults to 10, max 1000    
 `groupDevices` [Boolean] - (required) When the boolean argument groupDevices is set to __true__, then the analytics for all the
 Sockets (usually two in high availability) are aggregated as one result.
 
@@ -51,4 +70,12 @@ For the best results for aggregated Sockets, we recommend that there is consiste
 names and functionality (for example Destination) for the links on both Sockets.    
 `groupInterfaces` [Boolean] - (required) When the boolean argument groupInterfaces is set to __true__, then the data for all the
 interfaces are aggregated to a single interface.    
+`labels` [TimeseriesMetricType[]] - (required) N/A Default Value: ['bytesUpstream', 'bytesDownstream', 'bytesUpstreamMax', 'bytesDownstreamMax', 'packetsUpstream', 'packetsDownstream', 'lostUpstream', 'lostDownstream', 'lostUpstreamPcnt', 'lostDownstreamPcnt', 'packetsDiscardedDownstream', 'packetsDiscardedUpstream', 'packetsDiscardedUpstreamPcnt', 'packetsDiscardedDownstreamPcnt', 'jitterUpstream', 'jitterDownstream', 'bytesTotal', 'rtt', 'health', 'tunnelAge', 'lastMilePacketLoss', 'lastMileLatency']   
+`perSecond` [Boolean] - (required) whether to normalize the data into per second (i.e. divide by granularity)    
+`siteIDs` [ID[]] - (required) A list of unique IDs for each site. If specified, only sites in this list are returned. Otherwise, all sites are returned.    
 `timeFrame` [TimeFrame] - (required) The time frame for the data that the query returns. The argument is in the format type.time value. This argument is mandatory.    
+`toRate` [Boolean] - (required) Normalize collected metrics as per-second values    
+`types` [String[]] - (required) N/A    
+`useDefaultSizeBucket` [Boolean] - (required) In case we want to have the default size bucket (from properties)    
+`userIDs` [ID[]] - (required) A list of unique IDs for each user. If specified, only users in this list are returned. Otherwise, no user metrics are returned.    
+`withMissingData` [Boolean] - (required) If false, the data field will be set to '0' for buckets with no reported data. Otherwise it will be set to -1    

catocli/parsers/query_accountSnapshot/README.md

@@ -11,6 +11,22 @@ catocli query accountSnapshot <json>
 
 catocli query accountSnapshot "$(cat < query.accountSnapshot.json)"
 
+catocli query accountSnapshot '{"siteIDs":["id1","id2"],"userIDs":["id1","id2"]}'
+
+catocli query accountSnapshot '{
+    "siteIDs": [
+        "id1",
+        "id2"
+    ],
+    "userIDs": [
+        "id1",
+        "id2"
+    ]
+}'
+```
+
 #### Operation Arguments for query.accountSnapshot ####
 
 `accountID` [ID] - (required) Unique Identifier of Account.    
+`siteIDs` [ID[]] - (required) List of Unique Site Identifiers. If specified, only sites in list will be returned    
+`userIDs` [ID[]] - (required) request specific IDs, regardless of if connected or not    

catocli/parsers/query_appStats/README.md

@@ -11,7 +11,7 @@ catocli query appStats <json>
 
 catocli query appStats "$(cat < query.appStats.json)"
 
-catocli query appStats '{"appStatsFilter":{"fieldName":"ad_name","operator":"is","values":["string1","string2"]},"appStatsSort":{"fieldName":"ad_name","order":"asc"},"dimension":{"fieldName":"ad_name"},"measure":{"aggType":"sum","fieldName":"ad_name","trend":true},"timeFrame":"example_value"}'
+catocli query appStats '{"appStatsFilter":{"fieldName":"ad_name","operator":"is","values":["string1","string2"]},"appStatsSort":{"fieldName":"ad_name","order":"asc"},"dimension":{"fieldName":"ad_name"},"from":1,"limit":1,"measure":{"aggType":"sum","fieldName":"ad_name","trend":true},"timeFrame":"example_value"}'
 
 catocli query appStats '{
     "appStatsFilter": {
@@ -29,6 +29,8 @@ catocli query appStats '{
     "dimension": {
         "fieldName": "ad_name"
     },
+    "from": 1,
+    "limit": 1,
     "measure": {
         "aggType": "sum",
         "fieldName": "ad_name",
@@ -39,9 +41,14 @@ catocli query appStats '{
 ```
 
 ## Advanced Usage
+### Additional Examples
+- Query to export user activity as in flows_created, for distinct users (user_name) for the last day
+- Query to export application_name, user_name and risk_score with traffic sum(upstream, downstream, trafffic) for last day
+
 # Query to export user activity as in flows_created, for distinct users (user_name) for the last day
 
 ```bash
+# Query to export user activity as in flows_created, for distinct users (user_name) for the last day
 catocli query appStats '{
     "appStatsFilter": [],
     "appStatsSort": [],
@@ -67,6 +74,7 @@ catocli query appStats '{
 # Query to export application_name, user_name and risk_score with traffic sum(upstream, downstream, trafffic) for last day
 
 ```bash
+## Query to export application_name, user_name and risk_score with traffic sum(upstream, downstream, trafffic) for last day
 catocli query appStats '{
     "appStatsFilter": [],
     "appStatsSort": [],
@@ -128,5 +136,7 @@ Format: `"utc.YYYY-MM-{DD/HH:MM:SS--DD/HH:MM:SS}"`
 `appStatsFilter` [AppStatsFilter[]] - (required) N/A    
 `appStatsSort` [AppStatsSort[]] - (required) N/A    
 `dimension` [Dimension[]] - (required) N/A    
+`from` [Int] - (required) N/A    
+`limit` [Int] - (required) N/A    
 `measure` [Measure[]] - (required) N/A    
 `timeFrame` [TimeFrame] - (required) N/A    

catocli/parsers/query_appStatsTimeSeries/README.md

@@ -11,7 +11,7 @@ catocli query appStatsTimeSeries <json>
 
 catocli query appStatsTimeSeries "$(cat < query.appStatsTimeSeries.json)"
 
-catocli query appStatsTimeSeries '{"appStatsFilter":{"fieldName":"ad_name","operator":"is","values":["string1","string2"]},"dimension":{"fieldName":"ad_name"},"measure":{"aggType":"sum","fieldName":"ad_name","trend":true},"timeFrame":"example_value"}'
+catocli query appStatsTimeSeries '{"appStatsFilter":{"fieldName":"ad_name","operator":"is","values":["string1","string2"]},"buckets":1,"dimension":{"fieldName":"ad_name"},"measure":{"aggType":"sum","fieldName":"ad_name","trend":true},"perSecond":true,"timeFrame":"example_value","useDefaultSizeBucket":true,"withMissingData":true}'
 
 catocli query appStatsTimeSeries '{
     "appStatsFilter": {
@@ -22,6 +22,7 @@ catocli query appStatsTimeSeries '{
             "string2"
         ]
     },
+    "buckets": 1,
     "dimension": {
         "fieldName": "ad_name"
     },
@@ -30,14 +31,22 @@ catocli query appStatsTimeSeries '{
         "fieldName": "ad_name",
         "trend": true
     },
-    "timeFrame": "example_value"
+    "perSecond": true,
+    "timeFrame": "example_value",
+    "useDefaultSizeBucket": true,
+    "withMissingData": true
 }'
 ```
 
 ## Advanced Usage
+### Additional Examples
+- Query to export upstream, downstream and traffic for user_name and application_name for last day broken into 1 hour buckets
+- Query to export WANBOUND traffic including upstream, downstream and traffic for user_name and application_name for last day broken into 1 hour buckets
+
 # Query to export upstream, downstream and traffic for user_name and application_name for last day broken into 1 hour buckets
 
 ```bash
+# Query to export upstream, downstream and traffic for user_name and application_name for last day broken into 1 hour buckets
 catocli query appStatsTimeSeries '{
     "appStatsFilter": [],
     "buckets": 24,
@@ -70,6 +79,7 @@ catocli query appStatsTimeSeries '{
 # Query to export WANBOUND traffic including upstream, downstream and traffic for user_name and application_name for last day broken into 1 hour buckets
 
 ```bash
+# Query to export WANBOUND traffic including upstream, downstream and traffic for user_name and application_name for last day broken into 1 hour buckets
 catocli query appStatsTimeSeries '{
     "appStatsFilter": [
         {
@@ -133,6 +143,10 @@ Format: `"utc.YYYY-MM-{DD/HH:MM:SS--DD/HH:MM:SS}"`
 
 `accountID` [ID] - (required) Account ID    
 `appStatsFilter` [AppStatsFilter[]] - (required) N/A    
+`buckets` [Int] - (required) N/A    
 `dimension` [Dimension[]] - (required) N/A    
 `measure` [Measure[]] - (required) N/A    
+`perSecond` [Boolean] - (required) whether to normalize the data into per second (i.e. divide by granularity)    
 `timeFrame` [TimeFrame] - (required) N/A    
+`useDefaultSizeBucket` [Boolean] - (required) In case we want to have the default size bucket (from properties)    
+`withMissingData` [Boolean] - (required) If false, the data field will be set to '0' for buckets with no reported data. Otherwise it will be set to -1    

catocli/parsers/query_auditFeed/README.md

@@ -11,7 +11,7 @@ catocli query auditFeed <json>
 
 catocli query auditFeed "$(cat < query.auditFeed.json)"
 
-catocli query auditFeed '{"accountIDs":["id1","id2"],"auditFieldFilterInput":{"fieldNameInput":{"AuditFieldName":"admin"},"operator":"is","values":["string1","string2"]},"marker":"string","timeFrame":"example_value"}'
+catocli query auditFeed '{"accountIDs":["id1","id2"],"auditFieldFilterInput":{"fieldNameInput":{"AuditFieldName":"admin"},"operator":"is","values":["string1","string2"]},"fieldNames":"admin","marker":"string","timeFrame":"example_value"}'
 
 catocli query auditFeed '{
     "accountIDs": [
@@ -28,6 +28,7 @@ catocli query auditFeed '{
             "string2"
         ]
     },
+    "fieldNames": "admin",
     "marker": "string",
     "timeFrame": "example_value"
 }'
@@ -58,5 +59,6 @@ Format: `"utc.YYYY-MM-{DD/HH:MM:SS--DD/HH:MM:SS}"`
 
 `accountIDs` [ID[]] - (required) List of Unique Account Identifiers.    
 `auditFieldFilterInput` [AuditFieldFilterInput[]] - (required) N/A    
+`fieldNames` [AuditFieldName[]] - (required) N/A Default Value: ['admin', 'apiKey', 'model_name', 'admin_id', 'module', 'audit_creation_type', 'insertion_date', 'change_type', 'creation_date', 'model_type', 'account', 'account_id']   
 `marker` [String] - (required) Marker to use to get results from    
 `timeFrame` [TimeFrame] - (required) N/A