diff --git a/progs/registry.mtail b/progs/registry.mtail index 452605f..5f6aa79 100644 --- a/progs/registry.mtail +++ b/progs/registry.mtail @@ -2,7 +2,6 @@ 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 /"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 @@ -10,15 +9,8 @@ counter registry_push_upload_seconds_total by 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+)".*"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_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 +/"remote_address":"(?P[^"]*)".*"remote_user":"(?P[^"]*)".*"method":"PATCH".*"path":"\/v2\/(?P.+?)\/blobs\/uploads\/[a-f0-9-]+".*"request_length":(?P\d+)/ { + registry_push_upload_bytes_total[$repo][$user][$node] += $req registry_requests_total["push_upload"][$repo][$node]++ }