Skip to content

Pass all name[] values to the Django metrics view #1250

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

Open
sarankumar1325 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Pass all name[] values to the Django metrics view #1250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion prometheus_client/django/exposition.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ def get(self, request, *args, **kwargs):
registry=self.registry,
accept_header=accept_header,
accept_encoding_header=accept_encoding_header,
params=request.GET,
# QueryDict.__getitem__ returns only the last value, but
# _bake_output expects a list of values per key (like parse_qs).
params=dict(request.GET.lists()),
disable_compression=False,
)
status = int(status.split(" ")[0])
Expand Down
28 changes: 28 additions & 0 deletions tests/test_django.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,31 @@ def test_reports_metrics(self):
response = PrometheusDjangoView.as_view(registry=self.registry)(request)
self.assertEqual(response.status_code, 200)
self.assertEqual(response.content, generate_latest(self.registry, ALLOWUTF8))

def test_restricted_registry(self):
c = Counter('cc', 'A counter', registry=self.registry)
c.inc()
g = Counter('gg', 'Another counter', registry=self.registry)
g.inc()

request = self.factory.get("/metrics", {"name[]": ["cc_total"]})

response = PrometheusDjangoView.as_view(registry=self.registry)(request)
self.assertEqual(response.status_code, 200)
self.assertEqual(
response.content,
generate_latest(self.registry.restricted_registry(["cc_total"]), ALLOWUTF8),
)
self.assertNotIn(b"gg_total", response.content)

def test_restricted_registry_multiple_names(self):
Counter('aa', 'A counter', registry=self.registry).inc()
Counter('bb', 'B counter', registry=self.registry).inc()
Counter('cc', 'C counter', registry=self.registry).inc()

request = self.factory.get("/metrics", {"name[]": ["aa_total", "bb_total"]})

response = PrometheusDjangoView.as_view(registry=self.registry)(request)
self.assertIn(b"aa_total", response.content)
self.assertIn(b"bb_total", response.content)
self.assertNotIn(b"cc_total", response.content)