Skip to content

Commit

Permalink
Removed curator; stupid patch to es_utils that will need fixing
Browse files Browse the repository at this point in the history
  • Loading branch information
carlvitzthum committed Jul 19, 2018
1 parent e701d23 commit 12c860b
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 11 deletions.
2 changes: 1 addition & 1 deletion dcicutils/_version.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""Version information."""

# The following line *must* be the last in the module, exactly as formatted:
__version__ = "0.3.4"
__version__ = "0.3.5"
17 changes: 9 additions & 8 deletions dcicutils/es_utils.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from elasticsearch import Elasticsearch, RequestsHttpConnection
from aws_requests_auth.boto_utils import BotoAWSRequestsAuth
import curator

'''
info about snapshots on AWS
Expand Down Expand Up @@ -37,13 +36,15 @@ def create_es_client(es_url, use_aws_auth=True, **options):


def get_index_list(client, name, days_old=0, timestring='%Y.%m.%d', ilo=None):
if ilo is None:
ilo = curator.IndexList(client)

ilo.filter_by_regex(kind='prefix', value=name)
ilo.filter_by_age(source='name', direction='older', timestring=timestring, unit='days',
unit_count=days_old)
return ilo
return []
# import curator
# if ilo is None:
# ilo = curator.IndexList(client)
#
# ilo.filter_by_regex(kind='prefix', value=name)
# ilo.filter_by_age(source='name', direction='older', timestring=timestring, unit='days',
# unit_count=days_old)
# return ilo


def create_snapshot_repo(client, repo_name, s3_bucket):
Expand Down
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
boto3
elasticsearch>=5.3.0,<6.0.0
elasticsearch-curator==5.*
aws_requests_auth
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
'pytest-runner',
'boto3',
'elasticsearch>=5.3.0,<6.0.0',
'elasticsearch-curator==5.*',
'aws_requests_auth'
]

Expand Down

0 comments on commit 12c860b

Please sign in to comment.