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.

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

Jump to bottom

Add Prometheus metrics take 2 #3708

Merged
merged 4 commits into from
Mar 5, 2024
Merged

Add Prometheus metrics take 2 #3708

merged 4 commits into from
Mar 5, 2024

Conversation

matyasselmeci
Copy link
Collaborator

#2899 but with a dummy class to avoid adding a dependency on prometheus-client to models.py (which is used in scripts such as get-scitokens-mapfile that don't pip install stuff).

@matyasselmeci
Revert "Merge pull request opensciencegrid#2900 from opensciencegrid/…
d53db86 
…revert-2899-prometheus_client"

This reverts commit fc812d0, reversing
changes made to a49de09.

Conflicts fixed:
      requirements-apache.txt
      requirements-rootless.txt
      src/app.py
      src/webapp/models.py
@matyasselmeci
Upgrade prometheus-client
e5fcb22
@matyasselmeci
Add dummy prometheus_client.Summary class if the real one is not avai…
7c00665 
…lable
@matyasselmeci
Handle prometheus-client missing in webapp, too
34db322
brianhlin
brianhlin approved these changes Mar 5, 2024
View reviewed changes
Copy link
Member

@brianhlin brianhlin left a comment

Choose a reason for hiding this comment

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

LGTM

@matyasselmeci matyasselmeci merged commit c74a016 into opensciencegrid:master Mar 5, 2024
2 checks passed
@matyasselmeci matyasselmeci deleted the pr/prometheus-2 branch March 5, 2024 22:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@brianhlin brianhlin brianhlin approved these changes

@bbockelm bbockelm Awaiting requested review from bbockelm

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@matyasselmeci @brianhlin