From b2341b3281b2ddd2dc751b904de3d8ecdfff69bc Mon Sep 17 00:00:00 2001 From: CharaWein Date: Thu, 12 Nov 2026 14:00:48 +0300 Subject: [PATCH] =?UTF-8?q?lab6:=20=D1=82=D0=B5=D1=81=D1=82=20security=20?= =?UTF-8?q?=D0=B6=D0=B4=D1=91=D1=82=20ready=20(=D0=BA=D0=BB=D1=8E=D1=87=20?= =?UTF-8?q?o/),=20=D0=BE=D1=81=D1=8C=20saturation=200=E2=80=93100%?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- infra/grafana/dashboards/messenger.json | 3 ++- scripts/gen_dashboard.py | 6 ++++-- student-tests/attachments_ops.py | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/infra/grafana/dashboards/messenger.json b/infra/grafana/dashboards/messenger.json index d444351..58c476f 100644 --- a/infra/grafana/dashboards/messenger.json +++ b/infra/grafana/dashboards/messenger.json @@ -1043,7 +1043,8 @@ "mode": "none" } }, - "min": 0 + "min": 0, + "max": 1 }, "overrides": [] }, diff --git a/scripts/gen_dashboard.py b/scripts/gen_dashboard.py index 1ae85f3..1ee7ff7 100644 --- a/scripts/gen_dashboard.py +++ b/scripts/gen_dashboard.py @@ -31,7 +31,7 @@ def row(title): y += 1 -def ts(title, targets, unit, x, w=8, h=8, desc='', stack=False, minv=None): +def ts(title, targets, unit, x, w=8, h=8, desc='', stack=False, minv=None, maxv=None): p = {'type': 'timeseries', 'title': title, 'id': nid(), 'datasource': PROM, 'description': desc, 'gridPos': {'h': h, 'w': w, 'x': x, 'y': y}, 'fieldConfig': {'defaults': {'unit': unit, 'custom': {'fillOpacity': 10, 'showPoints': 'never', @@ -42,6 +42,8 @@ def ts(title, targets, unit, x, w=8, h=8, desc='', stack=False, minv=None): 'exemplar': True} for i, (e, l) in enumerate(targets)]} if minv is not None: p['fieldConfig']['defaults']['min'] = minv + if maxv is not None: + p['fieldConfig']['defaults']['max'] = maxv panels.append(p) @@ -118,7 +120,7 @@ ts('RabbitMQ: сообщения в очередях', 'none', 16) y += 8 ts('Saturation worker (busy / capacity)', - [('sum(messenger_worker_busy) / sum(messenger_worker_capacity)', 'занято слотов')], 'percentunit', 0, minv=0) + [('sum(messenger_worker_busy) / sum(messenger_worker_capacity)', 'занято слотов')], 'percentunit', 0, minv=0, maxv=1) ts('Publish outbox → broker (confirm) p95', [(q('messenger_outbox_publish_duration_seconds_bucket')(0.95), 'p95'), ('sum(rate(messenger_outbox_published_total[$__rate_interval]))', 'сообщений/с')], 's', 8) diff --git a/student-tests/attachments_ops.py b/student-tests/attachments_ops.py index e0f0c6e..d06f1ac 100644 --- a/student-tests/attachments_ops.py +++ b/student-tests/attachments_ops.py @@ -174,6 +174,8 @@ def scenario_db_gap(c): def scenario_security(c): alice, _, _, chat = c.bootstrap() att = upload(c, alice, chat, fixture('small.png'))['json'] + # С lab5 worker переносит оригинал staging s/ → o/: ключ берём после ready. + wait_status(c, alice, att['id'], ('ready',)) key = object_key(att['id']) url = 'http://s3:9000/%s/%s' % (BUCKET, key) # Анонимно изнутри сети стенда (из контейнера API): объект и листинг закрыты.