diff --git a/progs/registry.mtail b/progs/registry.mtail index e26c58d..9fd6136 100644 --- a/progs/registry.mtail +++ b/progs/registry.mtail @@ -1,41 +1,41 @@ -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 -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 +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 +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 -/"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":"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.]+)/ { -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/[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/\[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":"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($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\[^"]*)".*"method":"GET".\*"path":"/v2/(?P.+?)/manifests/\[^"]+"/ { -registry\_requests\_total\["pull\_manifest"]\[\$repo]\[\$node]++ +/"remote_address":"(?P[^"]*)".*"method":"GET".*"path":"/v2/(?P.+?)/manifests/[^"]+"/ { + registry_requests_total["pull_manifest"][$repo][$node]++ } -/"remote\_address":"(?P\[^"]*)".*"method":"PUT".\*"path":"/v2/(?P.+?)/manifests/\[^"]+"/ { -registry\_requests\_total\["push\_manifest"]\[\$repo]\[\$node]++ +/"remote_address":"(?P[^"]*)".*"method":"PUT".*"path":"/v2/(?P.+?)/manifests/[^"]+"/ { + registry_requests_total["push_manifest"][$repo][$node]++ } -/"remote\_address":"(?P\[^"]*)".*"path":"/v2/".\*"method":"\w+"/ { -registry\_requests\_total\["v2\_root"]\["none"]\[\$node]++ +/"remote_address":"(?P[^"]*)".*"path":"/v2/".*"method":"\w+"/ { + registry_requests_total["v2_root"]["none"][$node]++ }