diff --git a/progs/registry.mtail b/progs/registry.mtail index a3d2df1..512a192 100644 --- a/progs/registry.mtail +++ b/progs/registry.mtail @@ -1,14 +1,26 @@ 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_pull_blob_bytes_by_digest_total by repo, digest, user, node +counter registry_pull_blob_seconds_by_digest_total by repo, digest, 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.]+)/ { +/"remote_address":"(?P[^"]*)".*"remote_user":"(?P[^"]*)".*"method":"GET".*"path":"\/v2\/(?P.+?)\/blobs\/sha256:[a-f0-9]+".*"docker_content_digest":"(?Psha256:[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_pull_blob_bytes_by_digest_total[$repo][$digest][$user][$node] += $body + registry_pull_blob_seconds_by_digest_total[$repo][$digest][$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]+".*"etag":"\\\"(?Psha256:[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_pull_blob_bytes_by_digest_total[$repo][$digest][$user][$node] += $body + registry_pull_blob_seconds_by_digest_total[$repo][$digest][$user][$node] += $rt registry_requests_total["pull_blob"][$repo][$node]++ }