diff --git a/progs/registry.mtail b/progs/registry.mtail index 4f86259..452605f 100644 --- a/progs/registry.mtail +++ b/progs/registry.mtail @@ -4,26 +4,32 @@ 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]+".*"status":(?P\d+).*"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+)".*"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 +/"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[^"]*)".*"method":"GET".*"path":"\/v2\/(?P.+?)\/manifests\/[^"]+".*"status":(?P\d+)/ { +/"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_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":"PUT".*"path":"\/v2\/(?P.+?)\/manifests\/[^"]+".*"status":(?P\d+)/ { +/"remote_address":"(?P[^"]*)".*"method":"PUT".*"path":"\/v2\/(?P.+?)\/manifests\/[^"]+"/ { registry_requests_total["push_manifest"][$repo][$node]++ } -/"remote_address":"(?P[^"]*)".*"path":"\/v2\/".*"method":"(?P\w+)".*"status":(?P\d+)/ { +/"remote_address":"(?P[^"]*)".*"path":"\/v2\/".*"method":"\w+"/ { registry_requests_total["v2_root"]["none"][$node]++ }