Skip to content

Commit 5aa97c1

Browse files
authored
Merge pull request #77 from jtpio/drop-deprecated-endpoint
Drop the deprecated /metrics endpoint 🔥 🔥 🔥
2 parents c7d5970 + 9fbc67b commit 5aa97c1

File tree

3 files changed

+1
-16
lines changed

3 files changed

+1
-16
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ can set the parameter `--ResourceUseDisplay.mem_warning_threshold=0.1`.
6161

6262
### CPU Usage
6363

64-
`jupyter-resource-usage` can also track CPU usage and report a `cpu_percent` value as part of the `/metrics` response.
64+
`jupyter-resource-usage` can also track CPU usage and report a `cpu_percent` value as part of the `/api/metrics/v1` response.
6565

6666
You can set the `cpu_limit` in several ways:
6767

jupyter_resource_usage/__init__.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,6 @@ def load_jupyter_server_extension(nbapp):
4848
nbapp.web_app.settings["jupyter_resource_usage_display_config"] = resuseconfig
4949
base_url = nbapp.web_app.settings["base_url"]
5050

51-
if not resuseconfig.disable_legacy_endpoint:
52-
nbapp.web_app.add_handlers(
53-
".*", [(url_path_join(base_url, "/metrics"), ApiHandler)]
54-
)
55-
5651
nbapp.web_app.add_handlers(
5752
".*", [(url_path_join(base_url, "/api/metrics/v1"), ApiHandler)]
5853
)

jupyter_resource_usage/config.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,6 @@ class ResourceUseDisplay(Configurable):
3737
Holds server-side configuration for jupyter-resource-usage
3838
"""
3939

40-
disable_legacy_endpoint = Bool(
41-
True,
42-
help="""
43-
Disable legacy /metrics endpoint
44-
45-
This prevents jupyter-resource-usage from shadowing the prometheus /metrics endpoint.
46-
""",
47-
config=True,
48-
)
49-
5040
process_memory_metrics = List(
5141
trait=PSUtilMetric(),
5242
default_value=[{"name": "memory_info", "attribute": "rss"}],

0 commit comments

Comments
 (0)