-
Notifications
You must be signed in to change notification settings - Fork 2
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.
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
Hc 163 container builder (#20) #21
Merged
Merged
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
* Hc 123 container builder (#9) * added optional argument hysds_io_type to keep functionality of mozart ES for now without compromising the changes in GRQ mapping type removed in es7, is defaulted to _doc now added gitignore stuff * hysds_commons.container_utils to take optional container_type (index type) argument index types defualt to _doc now some formatting stuff * edited config/es_template.json for es7 compatible mapping added optional job_spec_type argument in job_spec_utils.py in case we upgrade to es7 * added mapping template for es7 and header for install_es_template.py * added es_template_es1.json * added headers in requests_utils.requests_json_response removed "standard" in es7 template * added optional headers argument * using elasticsearch-py instead in metadata_rest_utils.py * Hc 134 ondemand (#13) * added check_passthrough_query function for tosca on demand * working on job_iterator.py changes * added elasticsearch_utils file * testing new elasticsearch scrolling in job_iterator * Hc 142 user rules (#14) * added safe mode in get_by_id to return False if _id not found in ES * removed es_type from get_by_id because itll be useless in the future * added es_type back to get_by_id * added _doc to get_hysds_io() in resolve mozart_job * fixed comment in get_by_id function * Hc 152 container builder (#15) * moved cofig/es_template_es7.json to es_template.json * removed es_types from hysds_commons/*_utils.py * removed extra argument from hysds_commons/metadata_rest_utils.py * added _doc argument to metadata rest utils * added warning log to safe mode in get_by_id * refactored metadata_rest_utils to use elasticsearchh-py lib * removed hysds_io_type from job_iterator * Hc 156 elasticsearch (#16) * consolidate elasticsearch code to one utility class * optional logging in ElasticsearchUtility * added better logging and code cleanup * version 0.2.4 -> 0.3.0 for compatibility * moved version from 0.2.4 -> 0.3.0 * forgot to logging in elsticsearch_util.py * fixed small logging bug HC-156_elasticsearch * added search feature in ElasticsearchUtility and also definition for all methods * include_source=True * fixed bugs in elasticsearch_utils and better logging * added delete_by_query in elasticsearch wrapper class * refactored job iterator to fix the passthrough query (#17) * refactored job iterator to fix the passthrough query * nesting query in rules with one more query key * nesting query in rules with one more query key * removed note from delete_by_query * added more exception handling for when an index is not found in get_by_id (ElasticsearchUtility) * added more exception handling for when an index is not found in delete_by_id (ElasticsearchUtility) * added found: false to match elasticsearch's returned error * edited delete_by_id in ES wrapper class * removed doc_type from resolve_mozart_job's get_hysds_io (#18) added more logging in ElasticsearchUtility.get_count cosmetic changes to code to make it more readable * removed unused import statement from metadata_rest_utils * self.logger.exception instead of self.logger.error in ElasticsearchUtility added TODOs on things that need to be done to consolidate hysds_ios and user_rules to mozart es only * refactored job_utils.py to read hysds_ios index depending on component field (mozart/grq), also code cleanup * refactored job_iterator.py to use specific hysds_ios index (hysds_ios-mozart or hysds_ios-grq) * added elasticsearch_connection file to "initialize" elasticsearch connection fixed importing HYSDS_IOS_(MOZART | GRQ) VARIABLES FROM app.conf * removed TODOs * added logger to elasticsearch_connection
pymonger
approved these changes
Mar 31, 2020
DustinKLo
added a commit
that referenced
this pull request
Mar 31, 2020
* Hc 123 container builder (#9) * added optional argument hysds_io_type to keep functionality of mozart ES for now without compromising the changes in GRQ mapping type removed in es7, is defaulted to _doc now added gitignore stuff * hysds_commons.container_utils to take optional container_type (index type) argument index types defualt to _doc now some formatting stuff * edited config/es_template.json for es7 compatible mapping added optional job_spec_type argument in job_spec_utils.py in case we upgrade to es7 * added mapping template for es7 and header for install_es_template.py * added es_template_es1.json * added headers in requests_utils.requests_json_response removed "standard" in es7 template * added optional headers argument * using elasticsearch-py instead in metadata_rest_utils.py * Hc 134 ondemand (#13) * added check_passthrough_query function for tosca on demand * working on job_iterator.py changes * added elasticsearch_utils file * testing new elasticsearch scrolling in job_iterator * Hc 142 user rules (#14) * added safe mode in get_by_id to return False if _id not found in ES * removed es_type from get_by_id because itll be useless in the future * added es_type back to get_by_id * added _doc to get_hysds_io() in resolve mozart_job * fixed comment in get_by_id function * Hc 152 container builder (#15) * moved cofig/es_template_es7.json to es_template.json * removed es_types from hysds_commons/*_utils.py * removed extra argument from hysds_commons/metadata_rest_utils.py * added _doc argument to metadata rest utils * added warning log to safe mode in get_by_id * refactored metadata_rest_utils to use elasticsearchh-py lib * removed hysds_io_type from job_iterator * Hc 156 elasticsearch (#16) * consolidate elasticsearch code to one utility class * optional logging in ElasticsearchUtility * added better logging and code cleanup * version 0.2.4 -> 0.3.0 for compatibility * moved version from 0.2.4 -> 0.3.0 * forgot to logging in elsticsearch_util.py * fixed small logging bug HC-156_elasticsearch * added search feature in ElasticsearchUtility and also definition for all methods * include_source=True * fixed bugs in elasticsearch_utils and better logging * added delete_by_query in elasticsearch wrapper class * refactored job iterator to fix the passthrough query (#17) * refactored job iterator to fix the passthrough query * nesting query in rules with one more query key * nesting query in rules with one more query key * removed note from delete_by_query * added more exception handling for when an index is not found in get_by_id (ElasticsearchUtility) * added more exception handling for when an index is not found in delete_by_id (ElasticsearchUtility) * added found: false to match elasticsearch's returned error * edited delete_by_id in ES wrapper class * removed doc_type from resolve_mozart_job's get_hysds_io (#18) added more logging in ElasticsearchUtility.get_count cosmetic changes to code to make it more readable * removed unused import statement from metadata_rest_utils * self.logger.exception instead of self.logger.error in ElasticsearchUtility added TODOs on things that need to be done to consolidate hysds_ios and user_rules to mozart es only * refactored job_utils.py to read hysds_ios index depending on component field (mozart/grq), also code cleanup * refactored job_iterator.py to use specific hysds_ios index (hysds_ios-mozart or hysds_ios-grq) * added elasticsearch_connection file to "initialize" elasticsearch connection fixed importing HYSDS_IOS_(MOZART | GRQ) VARIABLES FROM app.conf * removed TODOs * added logger to elasticsearch_connection
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.
Hc 123 container builder (Hc 123 container builder #9)
added optional argument hysds_io_type to keep functionality of mozart ES for now without compromising the changes in GRQ
mapping type removed in es7, is defaulted to _doc now
added gitignore stuff
index types defualt to _doc now
some formatting stuff
added optional job_spec_type argument in job_spec_utils.py in case we upgrade to es7
added mapping template for es7 and header for install_es_template.py
added es_template_es1.json
added headers in requests_utils.requests_json_response
removed "standard" in es7 template
added optional headers argument
using elasticsearch-py instead in metadata_rest_utils.py
Hc 134 ondemand (Hc 134 ondemand #13)
added check_passthrough_query function for tosca on demand
working on job_iterator.py changes
added elasticsearch_utils file
testing new elasticsearch scrolling in job_iterator
Hc 142 user rules (Hc 142 user rules #14)
added safe mode in get_by_id to return False if _id not found in ES
removed es_type from get_by_id because itll be useless in the future
added es_type back to get_by_id
added _doc to get_hysds_io() in resolve mozart_job
fixed comment in get_by_id function
Hc 152 container builder (Hc 152 container builder #15)
moved cofig/es_template_es7.json to es_template.json
removed es_types from hysds_commons/*_utils.py
removed extra argument from hysds_commons/metadata_rest_utils.py
added _doc argument to metadata rest utils
added warning log to safe mode in get_by_id
refactored metadata_rest_utils to use elasticsearchh-py lib
removed hysds_io_type from job_iterator
Hc 156 elasticsearch (Hc 156 elasticsearch #16)
consolidate elasticsearch code to one utility class
optional logging in ElasticsearchUtility
added better logging and code cleanup
version 0.2.4 -> 0.3.0 for compatibility
moved version from 0.2.4 -> 0.3.0
forgot to logging in elsticsearch_util.py
fixed small logging bug HC-156_elasticsearch
added search feature in ElasticsearchUtility and also definition for all methods
include_source=True
fixed bugs in elasticsearch_utils and better logging
added delete_by_query in elasticsearch wrapper class
refactored job iterator to fix the passthrough query (refactored job iterator to fix the passthrough query #17)
refactored job iterator to fix the passthrough query
nesting query in rules with one more query key
nesting query in rules with one more query key
removed note from delete_by_query
added more exception handling for when an index is not found in get_by_id (ElasticsearchUtility)
added more exception handling for when an index is not found in delete_by_id (ElasticsearchUtility)
added found: false to match elasticsearch's returned error
edited delete_by_id in ES wrapper class
removed doc_type from resolve_mozart_job's get_hysds_io (removed doc_type from resolve_mozart_job's get_hysds_io #18)
added more logging in ElasticsearchUtility.get_count
cosmetic changes to code to make it more readable
removed unused import statement from metadata_rest_utils
self.logger.exception instead of self.logger.error in ElasticsearchUtility
added TODOs on things that need to be done to consolidate hysds_ios and user_rules to mozart es only
refactored job_utils.py to read hysds_ios index depending on component field (mozart/grq), also code cleanup
refactored job_iterator.py to use specific hysds_ios index (hysds_ios-mozart or hysds_ios-grq)
added elasticsearch_connection file to "initialize" elasticsearch connection
fixed importing HYSDS_IOS_(MOZART | GRQ) VARIABLES FROM app.conf
removed TODOs
added logger to elasticsearch_connection