Add Alarms dashboard. Modify exportAssets.py to export all references #117
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Schatzman
suggested changes
Sep 23, 2019
scripts/exportAssets.py
Outdated
| @@ -30,6 +30,16 @@ def check_elasticsearch_health(): | |||
| logger.warning('[exportAssets.py] Caught HTTP exception: {0}'.format(err)) | |||
| return False | |||
|
|
|||
| def asset_object_received(response_json): | |||
| if response_json['hits']['total']['value'] == 1: | |||
There was a problem hiding this comment.
If the response doesn't come back with the right structure, this function will throw an exception. Are there circumstances where this response might not contain ['hits']['total']['value']?
If you use the dict built-in get(), it will return None in the case of a missing key rather than throw an exception. Could do something like:
if response_json.get('hits'):
if response_json['hits']['total']['value'] == 1:
# do stuff
If 'hits' is in the response, then there better be total and value or ES is very broken...
There was a problem hiding this comment.
Changed to check for existence of hits.
scripts/exportAssets.py
Outdated
| panel_type = UTIL.safe_list_read(list_ob=db_panels_json[index], key='type') | ||
| panels_with_type[panel_id] = panel_type | ||
| return panels_with_type | ||
| def get_asset_references(asset_str): |
There was a problem hiding this comment.
We call the parameter for this function asset_str but then below on line 119 we assign its value to db_asset_json... Remove the assignment on line 119 and just call the param db_asset_json maybe?
craig-cogdill
suggested changes
Sep 23, 2019
| @@ -44,8 +44,8 @@ | |||
| "optionsJSON": "{\"hidePanelTitles\":false,\"useMargins\":true}", | |||
| "version": 1, | |||
| "kibanaSavedObjectMeta": { | |||
| "searchSourceJSON": "{\"filter\":[{\"meta\":{\"alias\":\"Pcap Captured\",\"negate\":false,\"type\":\"phrase\",\"key\":\"Captured\",\"value\":\"true\",\"params\":{\"query\":true},\"disabled\":false,\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index\"},\"query\":{\"match\":{\"Captured\":{\"query\":true,\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}},{\"range\":{\"TimeStartRaw\":{\"gte\":\"1568688732\"}},\"meta\":{\"type\":\"range\",\"disabled\":false,\"negate\":false,\"alias\":\"Pcap Available on Disk\",\"key\":\"TimeStartRaw\",\"value\":\"1,566,770,100 to +\u221e\",\"params\":{\"gte\":\"1568688732\"},\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index\"},\"$state\":{\"store\":\"appState\"}},{\"meta\":{\"alias\":\"Pcap Written to Disk\",\"negate\":false,\"type\":\"phrase\",\"key\":\"Written\",\"value\":\"true\",\"params\":{\"query\":true},\"disabled\":false,\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.filter[2].meta.index\"},\"query\":{\"match\":{\"Written\":{\"query\":true,\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}}],\"query\":{\"language\":\"lucene\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\",\"time_zone\":\"America/Denver\"}}}}" | |||
| "searchSourceJSON": "{\"filter\":[{\"meta\":{\"alias\":\"Pcap Captured\",\"negate\":false,\"type\":\"phrase\",\"key\":\"Captured\",\"value\":\"true\",\"params\":{\"query\":true},\"disabled\":false,\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index\"},\"query\":{\"match\":{\"Captured\":{\"query\":true,\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}},{\"range\":{\"TimeStartRaw\":{\"gte\":\"1568951703\"}},\"meta\":{\"type\":\"range\",\"disabled\":false,\"negate\":false,\"alias\":\"Pcap Available on Disk\",\"key\":\"TimeStartRaw\",\"value\":\"1,566,770,100 to +\u221e\",\"params\":{\"gte\":\"1568688732\"},\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.filter[1].meta.index\"},\"$state\":{\"store\":\"appState\"}},{\"meta\":{\"alias\":\"Pcap Written to Disk\",\"negate\":false,\"type\":\"phrase\",\"key\":\"Written\",\"value\":\"true\",\"params\":{\"query\":true},\"disabled\":false,\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.filter[2].meta.index\"},\"query\":{\"match\":{\"Written\":{\"query\":true,\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}}],\"query\":{\"language\":\"lucene\",\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\",\"time_zone\":\"America/Denver\"}}}}" | |||
There was a problem hiding this comment.
This and the File Reconstruction Dashboard currently have the captured timestamp of your dev box saved by default. We should change these references to TimeStartRaw: { gte: 0 } for the checked in versions.
|
Built and tested, looks great, all dashboards were there, no errors for the startup inserts in KibanaStartup.log after installing this rpm. Prior to this rpm I saw a couple of: Which I believe you're already discussing with Craig. 👍 |
Schatzman
approved these changes
Sep 23, 2019
craig-cogdill
approved these changes
Sep 23, 2019
sperry94
pushed a commit
that referenced
this pull request
Jan 30, 2020
Add Alarms dashboard. Modify exportAssets.py to export all references
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See user story: https://rally1.rallydev.com/#/detail/userstory/334308455668