From d2b971b8d12ee91dca43be8042fe51e9aa65d6f1 Mon Sep 17 00:00:00 2001 From: zino Date: Thu, 14 Aug 2025 20:34:30 +0200 Subject: [PATCH] m --- progs/registry.mtail | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/progs/registry.mtail b/progs/registry.mtail index 36f2e94..e26c58d 100644 --- a/progs/registry.mtail +++ b/progs/registry.mtail @@ -5,8 +5,6 @@ counter registry\_push\_upload\_bytes\_total by repo, user, node counter registry\_push\_upload\_seconds\_total by repo, user, node counter registry\_push\_session\_bytes\_total by repo, user, node counter registry\_push\_session\_seconds\_total by repo, user, node -gauge registry\_push\_session\_bytes\_tmp by uuid -gauge registry\_push\_session\_seconds\_tmp by uuid /"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 @@ -14,29 +12,22 @@ 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/(?P\[a-f0-9-]+)".*"upstream\_range":"(?P\d+)-(?P\d+)".\*"request\_time":(?P\[0-9.]+)/ { -registry\_push\_session\_bytes\_tmp\[\$uuid] += int(\$end1) - int(\$start1) + 1 -registry\_push\_session\_seconds\_tmp\[\$uuid] += \$rt1 +/"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(\$end1) + 1 registry\_push\_upload\_seconds\_total\[\$repo]\[\$user]\[\$node] += \$rt1 +registry\_push\_session\_bytes\_total\[\$repo]\[\$user]\[\$node] += int(\$end1) - int(\$start1) + 1 +registry\_push\_session\_seconds\_total\[\$repo]\[\$user]\[\$node] += \$rt1 registry\_requests\_total\["push\_upload"]\[\$repo]\[\$node]++ } -/"remote\_address":"(?P\[^"]*)".*"remote\_user":"(?P\[^"]*)".*"method":"PATCH".*"path":"/v2/(?P.+?)/blobs/uploads/(?P\[a-f0-9-]+)".*"request\_time":(?P\[0-9.]+).\*"upstream\_range":"(?P\d+)-(?P\d+)"/ { -registry\_push\_session\_bytes\_tmp\[\$uuid] += int(\$end2) - int(\$start2) + 1 -registry\_push\_session\_seconds\_tmp\[\$uuid] += \$rt2 +/"remote\_address":"(?P\[^"]*)".*"remote\_user":"(?P\[^"]*)".*"method":"PATCH".*"path":"/v2/(?P.+?)/blobs/uploads/\[a-f0-9-]+".*"request\_time":(?P\[0-9.]+).\*"upstream\_range":"(?P\d+)-(?P\d+)"/ { registry\_push\_upload\_bytes\_total\[\$repo]\[\$user]\[\$node] += int(\$end2) + 1 registry\_push\_upload\_seconds\_total\[\$repo]\[\$user]\[\$node] += \$rt2 +registry\_push\_session\_bytes\_total\[\$repo]\[\$user]\[\$node] += int(\$end2) - int(\$start2) + 1 +registry\_push\_session\_seconds\_total\[\$repo]\[\$user]\[\$node] += \$rt2 registry\_requests\_total\["push\_upload"]\[\$repo]\[\$node]++ } -/"remote\_address":"(?P\[^"]*)".*"remote\_user":"(?P\[^"]*)".*"method":"PUT".\*"path":"/v2/(?P.+?)/blobs/uploads/(?P\[a-f0-9-]+)"/ { -registry\_push\_session\_bytes\_total\[\$repo]\[\$user]\[\$node] += registry\_push\_session\_bytes\_tmp\[\$uuid] -registry\_push\_session\_seconds\_total\[\$repo]\[\$user]\[\$node] += registry\_push\_session\_seconds\_tmp\[\$uuid] -registry\_push\_session\_bytes\_tmp\[\$uuid] = 0 -registry\_push\_session\_seconds\_tmp\[\$uuid] = 0 -} - /"remote\_address":"(?P\[^"]*)".*"method":"GET".\*"path":"/v2/(?P.+?)/manifests/\[^"]+"/ { registry\_requests\_total\["pull\_manifest"]\[\$repo]\[\$node]++ } @@ -47,4 +38,4 @@ registry\_requests\_total\["push\_manifest"]\[\$repo]\[\$node]++ /"remote\_address":"(?P\[^"]*)".*"path":"/v2/".\*"method":"\w+"/ { registry\_requests\_total\["v2\_root"]\["none"]\[\$node]++ -} \ No newline at end of file +}