From dbd7883fe22dfd8c32ecb4565e078e1d80b1edc8 Mon Sep 17 00:00:00 2001 From: zino Date: Wed, 13 Aug 2025 16:34:47 +0200 Subject: [PATCH] m --- progs/registry.mtail | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/progs/registry.mtail b/progs/registry.mtail index 6f6c510..4f86259 100644 --- a/progs/registry.mtail +++ b/progs/registry.mtail @@ -1,4 +1,4 @@ -counter registry_requests_total by method, path_class, status, repo, user, node +counter registry_requests_total by path_class, repo, node counter registry_pull_blob_bytes_total by repo, user, node counter registry_pull_blob_seconds_total by repo, user, node counter registry_push_upload_bytes_total by repo, user, node @@ -7,31 +7,23 @@ counter registry_push_upload_seconds_total by repo, user, node /"remote_address":"(?P[^"]*)".*"remote_user":"(?P[^"]*)".*"method":"GET".*"path":"\/v2\/(?P.+?)\/blobs\/sha256:[a-f0-9]+".*"status":(?P\d+).*"body_bytes_sent":(?P\d+).*"request_time":(?P[0-9.]+)/ { registry_pull_blob_bytes_total[$repo][$user][$node] += $body registry_pull_blob_seconds_total[$repo][$user][$node] += $rt - registry_requests_total["GET"]["pull_blob"][$status][$repo][$user][$node]++ + registry_requests_total["pull_blob"][$repo][$node]++ } /"remote_address":"(?P[^"]*)".*"remote_user":"(?P[^"]*)".*"method":"PATCH".*"path":"\/v2\/(?P.+?)\/blobs\/uploads\/[a-f0-9-]+".*"upstream_range":"(?P\d+)-(?P\d+)".*"status":(?P\d+).*"request_time":(?P[0-9.]+)/ { registry_push_upload_bytes_total[$repo][$user][$node] += int($end) + 1 registry_push_upload_seconds_total[$repo][$user][$node] += $rt - registry_requests_total["PATCH"]["push_upload"][$status][$repo][$user][$node]++ + registry_requests_total["push_upload"][$repo][$node]++ } -/"remote_address":"(?P[^"]*)".*"remote_user":"(?P[^"]*)".*"method":"POST".*"path":"\/v2\/(?P.+?)\/blobs\/uploads\/".*"status":(?P\d+)/ { - registry_requests_total["POST"]["push_start"][$status][$repo][$user][$node]++ +/"remote_address":"(?P[^"]*)".*"method":"GET".*"path":"\/v2\/(?P.+?)\/manifests\/[^"]+".*"status":(?P\d+)/ { + registry_requests_total["pull_manifest"][$repo][$node]++ } -/"remote_address":"(?P[^"]*)".*"remote_user":"(?P[^"]*)".*"method":"PUT".*"path":"\/v2\/(?P.+?)\/blobs\/uploads\/[a-f0-9-]+".*"status":(?P\d+)/ { - registry_requests_total["PUT"]["push_commit"][$status][$repo][$user][$node]++ +/"remote_address":"(?P[^"]*)".*"method":"PUT".*"path":"\/v2\/(?P.+?)\/manifests\/[^"]+".*"status":(?P\d+)/ { + registry_requests_total["push_manifest"][$repo][$node]++ } -/"remote_address":"(?P[^"]*)".*"remote_user":"(?P[^"]*)".*"method":"GET".*"path":"\/v2\/(?P.+?)\/manifests\/[^"]+".*"status":(?P\d+)/ { - registry_requests_total["GET"]["pull_manifest"][$status][$repo][$user][$node]++ -} - -/"remote_address":"(?P[^"]*)".*"remote_user":"(?P[^"]*)".*"method":"PUT".*"path":"\/v2\/(?P.+?)\/manifests\/[^"]+".*"status":(?P\d+)/ { - registry_requests_total["PUT"]["push_manifest"][$status][$repo][$user][$node]++ -} - -/"remote_address":"(?P[^"]*)".*"remote_user":"(?P[^"]*)".*"path":"\/v2\/".*"method":"(?P\w+)".*"status":(?P\d+)/ { - registry_requests_total[$m]["v2_root"][$status]["none"][$user][$node]++ +/"remote_address":"(?P[^"]*)".*"path":"\/v2\/".*"method":"(?P\w+)".*"status":(?P\d+)/ { + registry_requests_total["v2_root"]["none"][$node]++ }