Skip to content

Commit 5abe211

Browse files
committed
update ES script to new 8.16 cluster
1 parent be8f838 commit 5abe211

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

requirements-monitoring.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ deprecated==1.2.14
3636
# opentelemetry-exporter-otlp-proto-http
3737
dnspython==2.6.1
3838
# via pymongo
39-
elasticsearch[async]==7.9.1
39+
elasticsearch[async]==8.16.0
4040
# via lta (setup.py)
4141
frozenlist==1.4.1
4242
# via

resources/progress_to_es.py

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ def main():
185185
'CLIENT_SECRET': '',
186186
'OPENID_URL': 'https://keycloak.icecube.wisc.edu/auth/realms/IceCube',
187187
'FILE_CATALOG_URL': 'https://file-catalog.icecube.wisc.edu',
188-
'ES_ADDRESS': 'http://elk-1.icecube.wisc.edu:9200',
188+
'ES_ADDRESS': 'https://elastic.icecube.aq',
189189
'ES_INDEX': 'long-term-archive',
190190
'ES_TIMEOUT': 60.,
191191
'START_DATE': '',
@@ -203,10 +203,22 @@ def main():
203203
parser.add_argument('-n', '--dry-run', default=False, action='store_true',
204204
help='do not ingest into ES, just print')
205205
parser.add_argument('--log-level', default='info', choices=['debug', 'info', 'warning', 'error'])
206+
parser.add_argument('--es_client_id',default=None,
207+
help='ES oauth2 client id')
208+
parser.add_argument('--es_client_secret',default=None,
209+
help='ES oauth2 client secret')
210+
parser.add_argument('--token_url',default=None,
211+
help='ES oauth2 realm token url')
206212
args = parser.parse_args()
207213

208214
logging.basicConfig(level=getattr(logging, args.log_level.upper()), format='%(asctime)s %(levelname)s %(name)s : %(message)s')
209215

216+
es_api = ClientCredentialsAuth(address='https://elasticsearch.icecube.aq',
217+
token_url=args.token_url,
218+
client_secret=args.es_client_secret,
219+
client_id=args.es_client_id)
220+
es_token = es_api.make_access_token()
221+
210222
if args.from_file:
211223
rest_client = None
212224
else:
@@ -225,6 +237,7 @@ def main():
225237
request_timeout=config['ES_TIMEOUT'],
226238
retry_on_timeout=True,
227239
max_retries=2,
240+
bearer_auth=es_token,
228241
)
229242

230243
c = Collect(

0 commit comments

Comments
 (0)