Skip to content
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

EOSC Accounting #17

Merged
merged 32 commits into from
Aug 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
f3e25f3
Remove shebang
enolfc Jul 18, 2024
1b9cf89
Bring this to more modern packaging
enolfc Jul 18, 2024
20e52f8
Make version discoverable from git
enolfc Jul 18, 2024
4d328d8
Remove version
enolfc Jul 18, 2024
9b41733
Move deps outside
enolfc Jul 19, 2024
d97ee36
Better build
enolfc Jul 19, 2024
bb5eb63
Add flavor to the model
enolfc Jul 19, 2024
0092b11
Remove shebang
enolfc Jul 19, 2024
d4d935e
No executables needed here
enolfc Jul 19, 2024
fd98563
Minor linting fixes
enolfc Jul 22, 2024
ee537c2
Removed value (apparently not used?)
enolfc Jul 22, 2024
9e3141f
Fix the model
enolfc Jul 22, 2024
e0ef8fd
First attempt to get EOSC accounting
enolfc Jul 22, 2024
5cec580
Fix EOSC accounting config
enolfc Jul 22, 2024
21094ab
Introduce dry-run for testing
enolfc Jul 22, 2024
b4699f4
Remove shebang
enolfc Jul 22, 2024
184931a
Reorganise configuration
enolfc Jul 22, 2024
288bbe0
Adapt helm to new code
enolfc Jul 22, 2024
51dd95c
Allow for setting from/to dates
enolfc Jul 22, 2024
cba1332
Add shared volume to the eosc job
enolfc Jul 22, 2024
96c9c85
Self is not a thing here
enolfc Jul 22, 2024
c675c56
Add debug
enolfc Jul 22, 2024
1fae951
Linting fixes
enolfc Jul 22, 2024
295cec5
Linting
enolfc Jul 22, 2024
609809a
even more linting
enolfc Jul 22, 2024
5bdbe9b
Fix this again
enolfc Jul 22, 2024
e96cbc0
Add timestamp file for reporting
enolfc Jul 23, 2024
0efb1ff
Add timestamp to the helm chart
enolfc Jul 23, 2024
3f1e9af
add missing method parameters
andrea-manzi Jul 25, 2024
dcdc7a4
running black
andrea-manzi Jul 25, 2024
27c5614
fix linter error
andrea-manzi Jul 25, 2024
482039b
Report hours, not seconds
enolfc Jul 29, 2024
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
10 changes: 8 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
FROM python:3

COPY . /egi-notebooks-accounting
WORKDIR /egi-notebooks-accounting

RUN pip install --no-cache-dir -e /egi-notebooks-accounting/
COPY requirements.txt .

RUN pip install --no-cache-dir -r requirements.txt

COPY . .

RUN pip install --no-cache-dir .
47 changes: 29 additions & 18 deletions egi_notebooks_accounting/config.ini
Original file line number Diff line number Diff line change
@@ -1,34 +1,45 @@
[prometheus]
[default]
# be verbose
# verbose=0
# site=EGI-NOTEBOOKS
# cloud_type=EGI Notebooks
# cloud_compute_service=
# default_vo=vo.notebooks.egi.eu
# fqan_key=primary_group

# url=http://localhost:8080/
# user=
# password=
# verbose=0
# verify=0
# outputs
# apel_spool=
# notebooks_db=

# filter=pod=~'jupyter-.*'
# range=4h

[VO]
#
# VO section example:
#
# [VO]
# VO1=group1,group2,...
# VO2=group3,group4,...

[prometheus]
# prometheus server URL
# url=http://localhost:8080/
# Server authentication
# user=
# password=
# do verify server
# verify=0
# filters for querying
# filter=pod=~'jupyter-.*'
# range=4h


[eosc]
# token_url=https://aai-demo.eosc-portal.eu/auth/realms/core/protocol/openid-connect/token
# argo_url=https://accounting.devel.argo.grnet.gr
# refresh_token=
# client_secret=
# AAI credentials (client_grant expected)
# token_url=
# client_id=
# client_secret=
# scopes=
# URL of the accounting service
# accounting_url=
# Installation that metrics are reported for
# installaion_id=
# users_metric=
# sessions_metric=

[eosc.flavors]
# add every flavor to be reported as follows
# flavor_name=metric_id
Loading
Loading