Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Matrix
- Activity
- Members
- Labels
- Container Registry
- Model registry
- Environments

Snippets Groups Projects

b73dc0ef

Commit b73dc0ef authored 8 years ago by Erik Johnston Committed by GitHub 8 years ago

Downloads
- Plain Diff

Merge pull request #936 from matrix-org/erikj/log_rss

Add metrics for psutil derived memory usage

parents aba0b2a3 499e3281

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

jenkins-unittests.sh 4 additions, 0 deletions

jenkins-unittests.sh
synapse/app/homeserver.py 3 additions, 0 deletions

synapse/app/homeserver.py
synapse/metrics/__init__.py 8 additions, 1 deletion

synapse/metrics/__init__.py
synapse/metrics/metric.py 38 additions, 0 deletions

synapse/metrics/metric.py
synapse/python_dependencies.py 1 addition, 0 deletions

synapse/python_dependencies.py

with 54 additions and 1 deletion

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment