From 44ab671c62911057ce05866e7ef1c6fa5be43ffb Mon Sep 17 00:00:00 2001 From: zino Date: Thu, 14 Aug 2025 19:29:31 +0200 Subject: [PATCH] m --- progs/registry.mtail | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/progs/registry.mtail b/progs/registry.mtail index e366499..c2309cf 100644 --- a/progs/registry.mtail +++ b/progs/registry.mtail @@ -6,23 +6,33 @@ counter registry_push_session_speed_mbps by repo, user, node gauge push_session_bytes by repo, user, node gauge push_session_start by repo, user, node -/"remote_address":"(?P[^"]*)".*"remote_user":"(?P[^"]*)".*"method":"GET".*"path":"\/v2\/(?P.+?)\/blobs\/sha256:[a-f0-9]+".*"body_bytes_sent":(?P\d+).*"request_time":(?P[0-9.]+)/ { +/"remote_address":"(?P[^"]*)".*"remote_user":"(?P[^"]*)".*"method":"GET".*"path":"\/v2\/(?P.+?)\/blobs\/sha256:[a-f0-9]+".*"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["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+)".*"request_time":(?P[0-9.]+)/ { - bytes = int($end) - int($start) + 1 - registry_push_upload_bytes_total[$repo][$user][$node] += bytes - push_session_bytes[$repo][$user][$node] += bytes +/"remote_address":"(?P[^"]*)".*"remote_user":"(?P[^"]*)".*"method":"POST".*"path":"\/v2\/(?P.+?)\/blobs\/uploads\/".*"status":202/ +{ if push_session_start[$repo][$user][$node] == 0 { push_session_start[$repo][$user][$node] = time() } registry_requests_total["push_upload"][$repo][$node]++ } -/"remote_address":"(?P[^"]*)".*"remote_user":"(?P[^"]*)".*"method":"PATCH".*"path":"\/v2\/(?P.+?)\/blobs\/uploads\/[a-f0-9-]+".*"request_length":(?P\d+)/ { +/"remote_address":"(?P[^"]*)".*"remote_user":"(?P[^"]*)".*"method":"PATCH".*"path":"\/v2\/(?P.+?)\/blobs\/uploads\/[a-f0-9-]+".*"upstream_range":"(?P\d+)-(?P\d+)".*"request_time":(?P[0-9.]+)"/ +{ + registry_push_upload_bytes_total[$repo][$user][$node] += int($end) - int($start) + 1 + push_session_bytes[$repo][$user][$node] += int($end) - int($start) + 1 + if push_session_start[$repo][$user][$node] == 0 { + push_session_start[$repo][$user][$node] = time() + } + registry_requests_total["push_upload"][$repo][$node]++ +} + +/"remote_address":"(?P[^"]*)".*"remote_user":"(?P[^"]*)".*"method":"PATCH".*"path":"\/v2\/(?P.+?)\/blobs\/uploads\/[a-f0-9-]+".*"upstream_range":"".*"request_length":(?P\d+)/ +{ registry_push_upload_bytes_total[$repo][$user][$node] += $req push_session_bytes[$repo][$user][$node] += $req if push_session_start[$repo][$user][$node] == 0 { @@ -31,20 +41,22 @@ gauge push_session_start by repo, user, node registry_requests_total["push_upload"][$repo][$node]++ } -/"remote_address":"(?P[^"]*)".*"method":"PUT".*"path":"\/v2\/(?P.+?)\/manifests\/[^"]+"/ { +/"remote_address":"(?P[^"]*)".*"method":"PUT".*"path":"\/v2\/(?P.+?)\/manifests\/[^"]+"/ +{ registry_requests_total["push_manifest"][$repo][$node]++ - duration = time() - push_session_start[$repo][$user][$node] - if duration > 0 && push_session_bytes[$repo][$user][$node] > 0 { - registry_push_session_speed_mbps[$repo][$user][$node] = (push_session_bytes[$repo][$user][$node] * 8) / duration / 1000000 + if push_session_start[$repo][$user][$node] > 0 && push_session_bytes[$repo][$user][$node] > 0 && time() - push_session_start[$repo][$user][$node] > 0 { + registry_push_session_speed_mbps[$repo][$user][$node] = (push_session_bytes[$repo][$user][$node] * 8) / (time() - push_session_start[$repo][$user][$node]) / 1000000 } push_session_bytes[$repo][$user][$node] = 0 push_session_start[$repo][$user][$node] = 0 } -/"remote_address":"(?P[^"]*)".*"method":"GET".*"path":"\/v2\/(?P.+?)\/manifests\/[^"]+"/ { +/"remote_address":"(?P[^"]*)".*"method":"GET".*"path":"\/v2\/(?P.+?)\/manifests\/[^"]+"/ +{ registry_requests_total["pull_manifest"][$repo][$node]++ } -/"remote_address":"(?P[^"]*)".*"path":"\/v2\/".*"method":"\w+"/ { +/"remote_address":"(?P[^"]*)".*"path":"\/v2\/".*"method":"\w+"/ +{ registry_requests_total["v2_root"]["none"][$node]++ }