Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PAPP-32609 changed logic in run_query action in order to decrease mem… #43

Merged
merged 2 commits into from
Feb 6, 2024
Merged

PAPP-32609 changed logic in run_query action in order to decrease mem… #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3573824
PAPP-32609 changed logic in run_query action in order to decrease mem…
tonyc-phantom Feb 1, 2024
0de885c
Update README.md
Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Splunk

Publisher: Splunk
Connector Version: 2.16.0
Connector Version: 2.16.1
Product Vendor: Splunk Inc.
Product Name: Splunk Enterprise
Product Version Supported (regex): ".\*"
Expand Down
5 changes: 4 additions & 1 deletion splunk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,14 @@
},
{
"name": "Bartosz Debek"
},
{
"name": "Tony Cihak"
}
],
"type": "siem",
"main_module": "splunk_connector.py",
"app_version": "2.16.0",
"app_version": "2.16.1",
"utctime_updated": "2022-09-08T08:47:45.000000Z",
"package_name": "phantom_splunk",
"product_name": "Splunk Enterprise",
Expand Down
9 changes: 3 additions & 6 deletions splunk_connector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1321,15 +1321,12 @@ def _run_query(self, search_query, action_result, attach_result=False, kwargs_cr
error_text=self._get_error_message_from_exception(e))
return action_result.set_status(phantom.APP_ERROR, error_text)

data = []

for result in results:

if not isinstance(result, dict):
continue

action_result.add_data(result)
data.append(result)

result_index += 1

Expand All @@ -1338,13 +1335,13 @@ def _run_query(self, search_query, action_result, attach_result=False, kwargs_cr
self.send_progress(status)

if attach_result:
self.add_json_result(action_result, data)
self.add_json_result(action_result)

summary[consts.SPLUNK_JSON_TOTAL_EVENTS] = result_index
self.debug_print('Done run query')
return action_result.set_status(phantom.APP_SUCCESS)

def add_json_result(self, action_result, data):
def add_json_result(self, action_result):

fd, path = tempfile.mkstemp(dir=Vault.get_vault_tmp_dir(), text=True)
vault_attach_dict = {}
Expand All @@ -1354,7 +1351,7 @@ def add_json_result(self, action_result, data):

try:
with open(path, 'w') as f:
json.dump(data, f)
json.dump(action_result.get_data(), f)

except Exception as e:
self._dump_error_log(e, "Error occurred while adding file to Vault.")
Expand Down