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

Prometheus integration #133

Closed
wants to merge 92 commits into from
Closed
Show file tree
Hide file tree
Changes from 88 commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
b04422c
Add GitHub Actions workflow for multi-arch Docker build
sharonsyh Jul 25, 2024
8bacff9
Edited build action version
sharonsyh Jul 26, 2024
1626d4b
Add GitHub Actions workflow for multi-arch Docker build
sharonsyh Jul 26, 2024
8c343db
Modified tag formats
sharonsyh Jul 26, 2024
fef9050
Removed unneccessary file build.yml -> push_docker.yaml
sharonsyh Jul 26, 2024
085b527
Removed docker login part
sharonsyh Jul 26, 2024
6adaad9
Fixed syntax error
sharonsyh Jul 26, 2024
4a9b348
Added docker login
sharonsyh Jul 26, 2024
e73c8a7
Fixed syntax error
sharonsyh Jul 26, 2024
6f70a0e
Added master branch for the workflow
sharonsyh Jul 26, 2024
2244b55
Build Trial
sharonsyh Jul 26, 2024
5a6dc5e
Build Trial
sharonsyh Jul 26, 2024
412b8ed
Version control
sharonsyh Jul 26, 2024
9b12b24
Version control
sharonsyh Jul 26, 2024
031af2e
Workflow order modified
sharonsyh Jul 26, 2024
bfed73f
Removed build-args
sharonsyh Jul 26, 2024
352b133
Changed the branch to the master
sharonsyh Jul 30, 2024
8edef7f
Modified build-push-action to directly specify the platform
sharonsyh Jul 31, 2024
860ef41
Added branch multi-arch-docker-build to push section in order to test…
sharonsyh Jul 31, 2024
f254c13
Syntax error fixed
sharonsyh Jul 31, 2024
bee2927
Workflow modified to enavle distribute build across multiple runners
sharonsyh Jul 31, 2024
7b33c07
Removed push-by-digest
sharonsyh Jul 31, 2024
7b38f14
Downgraded the version for upload-artifact in order to upload to same…
sharonsyh Jul 31, 2024
608a31a
Modified the username for docker login
sharonsyh Jul 31, 2024
2c95e8b
Syntax error fixed
sharonsyh Jul 31, 2024
bb5c4a6
Added a step to create /tmp/digests directory before using it in both…
sharonsyh Jul 31, 2024
ec8c103
Syntax error fixed
sharonsyh Jul 31, 2024
57865c2
Added outputs parameter for capturing the digest
sharonsyh Aug 1, 2024
1314ea6
Syntax error fixed
sharonsyh Aug 1, 2024
69a0fc6
Removed manual tags option
sharonsyh Aug 1, 2024
df86aa8
Defined environment variable PLATFORM_PAIR
sharonsyh Aug 1, 2024
db2f55c
Seperated commands for creating manifest list
sharonsyh Aug 1, 2024
99ffbd7
Added - name: Prepare
sharonsyh Aug 1, 2024
b014f4f
Additional directory creation deleted
sharonsyh Aug 1, 2024
1058e7e
Modified export command from touch to echo
sharonsyh Aug 1, 2024
f43b19d
Shorten the code for creating manifest list
sharonsyh Aug 1, 2024
9f6540b
Syntax error fixed
sharonsyh Aug 1, 2024
8de8170
Added a line to look for the files /tmp/digests/*.digest
sharonsyh Aug 1, 2024
bc19e06
eval command added for execution of the command
sharonsyh Aug 1, 2024
ef61bd4
Specified digests' name directly when downloading
sharonsyh Aug 1, 2024
6c4278a
Downgraded download-artifact to ensure compatibility with upload-arti…
sharonsyh Aug 1, 2024
cb3247e
Fixed bad substitution error
sharonsyh Aug 1, 2024
0ff2f69
Fixed how digest files are accessed
sharonsyh Aug 1, 2024
156cc86
Modified in order to download each artifact individually
sharonsyh Aug 1, 2024
89004e7
Modified in order to download each artifact individually
sharonsyh Aug 1, 2024
1de5c50
Modified to avoid SHA256 prefix duplication
sharonsyh Aug 1, 2024
d47970a
Upgraded the version for login-action
sharonsyh Aug 1, 2024
fca2fa2
modified the command from touch to echo
sharonsyh Aug 1, 2024
e7b0aea
Upgraded upload-digest and download-digest version
sharonsyh Aug 3, 2024
0337932
Removed multi-arch-docker-build branch from on-push branch
sharonsyh Aug 3, 2024
9230a86
Removed fail-fast from the strategy line
sharonsyh Aug 3, 2024
bdcebd8
Modified to push the image to both mlenergy/zeus and symbioticlab/zeus
sharonsyh Aug 3, 2024
56a94db
Modified to push the image to both mlenergy/zeus and symbioticlab/zeus
sharonsyh Aug 3, 2024
892b164
Added entries for both the primary and secondary registry images
sharonsyh Aug 3, 2024
b923c02
Added entries for both the primary and secondary registry images
sharonsyh Aug 3, 2024
76596e8
Modified to push generated image to both registries
sharonsyh Aug 3, 2024
2ef7b30
Test pushing to both registries
sharonsyh Aug 3, 2024
f03b45e
Test pushing to both registries
sharonsyh Aug 3, 2024
0e010e8
Modified to ensure image is built only once, and the manifest list is…
sharonsyh Aug 3, 2024
4f6ba55
Modified to ensure that the image is pushed to both registries before…
sharonsyh Aug 3, 2024
ed8c075
Added some lines for debugging
sharonsyh Aug 3, 2024
a83bae8
Added lines for a delay before creating the manifest list to ensure t…
sharonsyh Aug 3, 2024
22042bb
Added lines to verify pushed digests
sharonsyh Aug 3, 2024
6469fe9
Added lines for debugging
sharonsyh Aug 3, 2024
7dab0f9
Added delays for docker hub synchronization
sharonsyh Aug 3, 2024
a9a6135
Seperated the loop by each registry for debugging
sharonsyh Aug 4, 2024
77861c8
Syntax error fixed
sharonsyh Aug 4, 2024
38c4dde
Seperated commands for pushing manifest list for both registries
sharonsyh Aug 4, 2024
130cba3
Debug
sharonsyh Aug 4, 2024
18d1d30
Output type specified
sharonsyh Aug 4, 2024
3103aaf
Code optimization
sharonsyh Aug 4, 2024
914d3ba
Syntax error fixed
sharonsyh Aug 4, 2024
46382ee
Modified command for creating manifest list
sharonsyh Aug 4, 2024
2c6e79e
Modified command for creating manifest list
sharonsyh Aug 4, 2024
b5438b3
Modified on-push branch for merge
sharonsyh Aug 4, 2024
e0f10a9
Removed step that lists up downloaded digests (Listing files in /tmp/…
sharonsyh Aug 4, 2024
a324e7f
Printing out tags and removed duplicate push
sharonsyh Aug 5, 2024
c84707c
Included multi-arch-docker-build branch for debugging
sharonsyh Aug 5, 2024
8b36873
Included multi-arch-docker-build branch for debugging
sharonsyh Aug 5, 2024
2b5245e
Renamed the variables
sharonsyh Aug 5, 2024
3b63a6f
Removed multi-arch-docker-build branch for merge
sharonsyh Aug 5, 2024
147cabe
Merge branch 'master' into multi-arch-docker-build
sharonsyh Aug 8, 2024
6ac710c
Update push_docker.yaml
sharonsyh Aug 9, 2024
8f4dac4
Update push_docker.yaml
sharonsyh Aug 9, 2024
fcff8af
Check error
sharonsyh Aug 9, 2024
0e077e0
Check error
sharonsyh Aug 9, 2024
bbd9d60
Add Prometheus integration with metric.py and related configs
sharonsyh Oct 17, 2024
bf548a7
Remove push_docker.yaml from prometheus-integration branch
sharonsyh Oct 17, 2024
a66eb85
Update pyproject.toml
sharonsyh Oct 17, 2024
fe04020
Moved prometheus.yml and docker-compose.yml to docker/prometheus/
sharonsyh Oct 18, 2024
d7e0a41
Removed test codes from metric.py
sharonsyh Oct 18, 2024
1874181
Removed unused random module import
sharonsyh Oct 18, 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
135 changes: 0 additions & 135 deletions .github/workflows/push_docker.yaml

This file was deleted.

1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ migration = ["alembic", "sqlalchemy", "pydantic<2", "python-dotenv"]
lint = ["ruff", "black==22.6.0", "pyright", "pandas-stubs", "transformers"]
test = ["fastapi[all]", "sqlalchemy", "pydantic<2", "pytest==7.3.2", "pytest-mock==3.10.0", "pytest-xdist==3.3.1", "anyio==3.7.1", "aiosqlite==0.20.0"]
docs = ["mkdocs-material[imaging]==9.5.19", "mkdocstrings[python]==0.25.0", "mkdocs-gen-files==0.5.0", "mkdocs-literate-nav==0.6.1", "mkdocs-section-index==0.3.9", "mkdocs-redirects==1.2.1", "urllib3<2", "black"]
prometheus = ["prometheus-client"]
# greenlet is for supporting apple mac silicon for sqlalchemy(https://docs.sqlalchemy.org/en/20/faq/installation.html)
dev = ["zeus-ml[pfo-server,bso,bso-server,migration,lint,test]", "greenlet"]
sharonsyh marked this conversation as resolved.
Show resolved Hide resolved

Expand Down
25 changes: 25 additions & 0 deletions zeus/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
version: '3.7'
services:
prometheus:
image: prom/prometheus
volumes:
- "./prometheus.yml:/etc/prometheus/prometheus.yml"
networks:
- localprom
ports:
- 9090:9090
node-exporter:
image: prom/node-exporter
networks:
- localprom
ports:
- 9100:9100
pushgateway:
image: prom/pushgateway
networks:
- localprom
ports:
- 9091:9091
networks:
localprom:
driver: bridge
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For all files, please make sure they end with a newline. It's an editor issue.

Loading