Skip to content

Condor status update #30

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jan 2, 2025
Merged

Condor status update #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b97945
begin refactoring condor_status_to_es for new ES cluster
alemsh Dec 16, 2024
7184f1e
update condor_status & glidein_resource ES scripts to ES 8.14
alemsh Jan 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN dnf -y install epel-release && \
dnf clean all && yum clean all && \
ln -s /usr/bin/python3.11 /usr/bin/python && \
wget https://github.com/WIPACrepo/rest-tools/archive/refs/tags/v1.8.2.tar.gz && \
pip3.11 install --no-cache-dir elasticsearch elasticsearch htcondor requests prometheus_client setuptools ./v1.8.2.tar.gz
pip3.11 install --no-cache-dir elasticsearch elasticsearch_dsl htcondor requests prometheus_client setuptools ./v1.8.2.tar.gz

COPY . /monitoring

Expand Down
12 changes: 8 additions & 4 deletions condor_history_to_es.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
parser.add_argument('--client_id',help='oauth2 client id',default=None)
parser.add_argument('--client_secret',help='oauth2 client secret',default=None)
parser.add_argument('--token_url',help='oauth2 realm token url',default=None)
parser.add_argument('--token',help='oauth2 token',default=None)
parser.add_argument("positionals", nargs='+')

options = parser.parse_args()
Expand Down Expand Up @@ -57,8 +58,10 @@ def es_generator(entries):

token = None

if None not in (options.token_url, options.client_secret, options.client_id):
api = ClientCredentialsAuth(address='https://elasticsearch.icecube.aq',
if options.token is not None:
token = options.token
elif None not in (options.token_url, options.client_secret, options.client_id):
api = ClientCredentialsAuth(address='https://elastic.icecube.aq',
token_url=options.token_url,
client_secret=options.client_secret,
client_id=options.client_id)
Expand All @@ -68,7 +71,8 @@ def es_generator(entries):
logging.info('connecting to ES at %s',url)
es = Elasticsearch(hosts=[url],
request_timeout=5000,
bearer_auth=token)
bearer_auth=token,
sniff_on_connection_fail=True)

def es_import(document_generator):
if options.dry_run:
Expand All @@ -78,7 +82,7 @@ def es_import(document_generator):
json.dump(hit, sys.stdout)
success = True
else:
success, _ = bulk(es, document_generator, max_retries=20, initial_backoff=2, max_backoff=360)
success, _ = bulk(es, document_generator, max_retries=20, initial_backoff=10, max_backoff=360)
return success

failed = False
Expand Down
2 changes: 1 addition & 1 deletion condor_queue_to_es.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def es_generator(entries):
es = Elasticsearch(hosts=[url],
timeout=5000,
bearer_auth=token)
es_import = partial(bulk, es, max_retries=20, initial_backoff=2, max_backoff=3600)
es_import = partial(bulk, es, max_retries=20, initial_backoff=10, max_backoff=3600)

failed = False
if options.collectors:
Expand Down
Loading
Loading