status-im
/
infra-utils
mirror of https://github.com/status-im/infra-utils.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

esclean.py: fix query argument 

Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2020-05-27 09:22:19 +02:00
parent f0e4fb0846
commit 4f3ccd269e
No known key found for this signature in database
GPG Key ID: 4EF064D0E6D63020
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
elasticsearch/esclean.py
View File

@ -28,7 +28,7 @@ def parse_opts():
help='How old the logs should be, in days.') help='How old the logs should be, in days.')
parser.add_option('-d', '--delete', action='store_true', parser.add_option('-d', '--delete', action='store_true',
help='Delete matching documents.') help='Delete matching documents.')
parser.add_option('-q', '--query', type='int', default=0, parser.add_option('-q', '--query', type='str',
help='Query matching documents.') help='Query matching documents.')
return parser.parse_args() return parser.parse_args()
@ -68,6 +68,8 @@ def main():
queries.append({'term': {'severity_name': opts.severity}}) queries.append({'term': {'severity_name': opts.severity}})
if opts.message: if opts.message:
queries.append({'match_phrase':{'message': opts.message}}) queries.append({'match_phrase':{'message': opts.message}})
if opts.query:
queries.append({'query_string':{'query': opts.query}})
if opts.older_than: if opts.older_than:
queries.append({'range':{ '@timestamp': { queries.append({'range':{ '@timestamp': {
'lt': 'now-{}d'.format(opts.older_than), 'lt': 'now-{}d'.format(opts.older_than),
@ -83,16 +85,16 @@ def main():
count = resp.get('count') count = resp.get('count')
print('{:22} count: {:6}'.format(index, count)) print('{:22} count: {:6}'.format(index, count))
if opts.query > 0: if opts.delete and count > 0:
resp = es.search(index=index, body=body)
print_logs(resp['hits']['hits'])
elif opts.delete and count > 0:
rval = delete_retry(es, index, body) rval = delete_retry(es, index, body)
rval2 = es.indices.forcemerge( rval2 = es.indices.forcemerge(
index=index, index=index,
params={'only_expunge_deletes':'true'} params={'only_expunge_deletes':'true'}
) )
print('{:22} Deleted: {:10} Failed: {}'.format(index, rval['deleted'], rval2['_shards']['failed'])) print('{:22} Deleted: {:10} Failed: {}'.format(index, rval['deleted'], rval2['_shards']['failed']))
#else:
# resp = es.search(index=index, body=body)
# print_logs(resp['hits']['hits'])
if __name__ == '__main__': if __name__ == '__main__':
main() main()