From b5624f0c067ee0c4eefb755f098ccdf3f09458fa Mon Sep 17 00:00:00 2001 From: Vittorio Palmisano Date: Tue, 16 Mar 2021 09:50:28 +0100 Subject: [PATCH] minors --- compose/README.md | 4 +- server/lib/metrics/aggregated.js | 82 ++++++++++++++++---------------- 2 files changed, 44 insertions(+), 42 deletions(-) diff --git a/compose/README.md b/compose/README.md index ed51cdeb..e9a04f3e 100644 --- a/compose/README.md +++ b/compose/README.md @@ -11,11 +11,11 @@ Starting: ```sh CURRENT_USER=$UID:$GID docker-compose up --build -d -docker-compose logs -f edumeet +docker-compose logs -f --tail=50 edumeet ``` Accessing endpoints: - Edumeet: https://127.0.0.1:8443/ - Prometheus: http://127.0.0.1:9090/ -- Grafana: http://127.0.0.1:9091/ +- Grafana: http://127.0.0.1:9091/ (user:pass `admin`:`admin`) diff --git a/server/lib/metrics/aggregated.js b/server/lib/metrics/aggregated.js index 67308752..06138880 100644 --- a/server/lib/metrics/aggregated.js +++ b/server/lib/metrics/aggregated.js @@ -184,51 +184,53 @@ module.exports = function(workers, config) // mediasoup metrics [ - { name: 'workers_cpu', statName: 'workers_cpu', statValue: 'sum' }, - { name: 'workers_memory', statName: 'workers_memory', statValue: 'sum' }, - - { name: 'audio_in_count', statName: 'audio_bitrates_in', statValue: 'length' }, - { name: 'audio_bitrates_in_sum', statName: 'audio_bitrates_in', statValue: 'sum' }, - { name: 'audio_bitrates_in_mean', statName: 'audio_bitrates_in', statValue: 'mean' }, - { name: 'audio_bitrates_in_min', statName: 'audio_bitrates_in', statValue: 'min' }, - { name: 'audio_bitrates_in_max', statName: 'audio_bitrates_in', statValue: 'max' }, - { name: 'audio_bitrates_in_p25', statName: 'audio_bitrates_in', statValue: 'p25' }, - - { name: 'video_in_count', statName: 'video_bitrates_in', statValue: 'length' }, - { name: 'video_bitrates_in_sum', statName: 'video_bitrates_in', statValue: 'sum' }, - { name: 'video_bitrates_in_mean', statName: 'video_bitrates_in', statValue: 'mean' }, - { name: 'video_bitrates_in_min', statName: 'video_bitrates_in', statValue: 'min' }, - { name: 'video_bitrates_in_max', statName: 'video_bitrates_in', statValue: 'max' }, - { name: 'video_bitrates_in_p25', statName: 'video_bitrates_in', statValue: 'p25' }, + { name: 'workers_count', statName: 'workers_cpu', statValue: 'length' }, + { name: 'workers_cpu', statName: 'workers_cpu', statValue: 'sum' }, - { name: 'audio_out_count', statName: 'audio_bitrates_out', statValue: 'length' }, - { name: 'audio_bitrates_out_sum', statName: 'audio_bitrates_out', statValue: 'sum' }, - { name: 'audio_bitrates_out_mean', statName: 'audio_bitrates_out', statValue: 'mean' }, - { name: 'audio_bitrates_out_min', statName: 'audio_bitrates_out', statValue: 'min' }, - { name: 'audio_bitrates_out_max', statName: 'audio_bitrates_out', statValue: 'max' }, - { name: 'audio_bitrates_out_p25', statName: 'audio_bitrates_out', statValue: 'p25' }, + { name: 'workers_memory', statName: 'workers_memory', statValue: 'sum' }, - { name: 'video_out_count', statName: 'video_bitrates_out', statValue: 'length' }, - { name: 'video_bitrates_out_sum', statName: 'video_bitrates_out', statValue: 'sum' }, - { name: 'video_bitrates_out_mean', statName: 'video_bitrates_out', statValue: 'mean' }, - { name: 'video_bitrates_out_min', statName: 'video_bitrates_out', statValue: 'min' }, - { name: 'video_bitrates_out_max', statName: 'video_bitrates_out', statValue: 'max' }, - { name: 'video_bitrates_out_p25', statName: 'video_bitrates_out', statValue: 'p25' }, + { name: 'audio_in_count', statName: 'audio_bitrates_in', statValue: 'length' }, + { name: 'audio_bitrates_in_sum', statName: 'audio_bitrates_in', statValue: 'sum' }, + { name: 'audio_bitrates_in_mean', statName: 'audio_bitrates_in', statValue: 'mean' }, + { name: 'audio_bitrates_in_min', statName: 'audio_bitrates_in', statValue: 'min' }, + { name: 'audio_bitrates_in_max', statName: 'audio_bitrates_in', statValue: 'max' }, + { name: 'audio_bitrates_in_p25', statName: 'audio_bitrates_in', statValue: 'p25' }, - { name: 'spatial_layers_out_mean', statName: 'spatial_layers_out', statValue: 'mean' }, - { name: 'spatial_layers_out_min', statName: 'spatial_layers_out', statValue: 'min' }, - { name: 'spatial_layers_out_max', statName: 'spatial_layers_out', statValue: 'max' }, - { name: 'spatial_layers_out_p25', statName: 'spatial_layers_out', statValue: 'p25' }, + { name: 'video_in_count', statName: 'video_bitrates_in', statValue: 'length' }, + { name: 'video_bitrates_in_sum', statName: 'video_bitrates_in', statValue: 'sum' }, + { name: 'video_bitrates_in_mean', statName: 'video_bitrates_in', statValue: 'mean' }, + { name: 'video_bitrates_in_min', statName: 'video_bitrates_in', statValue: 'min' }, + { name: 'video_bitrates_in_max', statName: 'video_bitrates_in', statValue: 'max' }, + { name: 'video_bitrates_in_p25', statName: 'video_bitrates_in', statValue: 'p25' }, + + { name: 'audio_out_count', statName: 'audio_bitrates_out', statValue: 'length' }, + { name: 'audio_bitrates_out_sum', statName: 'audio_bitrates_out', statValue: 'sum' }, + { name: 'audio_bitrates_out_mean', statName: 'audio_bitrates_out', statValue: 'mean' }, + { name: 'audio_bitrates_out_min', statName: 'audio_bitrates_out', statValue: 'min' }, + { name: 'audio_bitrates_out_max', statName: 'audio_bitrates_out', statValue: 'max' }, + { name: 'audio_bitrates_out_p25', statName: 'audio_bitrates_out', statValue: 'p25' }, - { name: 'temporal_layers_out_mean', statName: 'temporal_layers_out', statValue: 'mean' }, - { name: 'temporal_layers_out_min', statName: 'temporal_layers_out', statValue: 'min' }, - { name: 'temporal_layers_out_max', statName: 'temporal_layers_out', statValue: 'max' }, - { name: 'temporal_layers_out_p25', statName: 'temporal_layers_out', statValue: 'p25' }, + { name: 'video_out_count', statName: 'video_bitrates_out', statValue: 'length' }, + { name: 'video_bitrates_out_sum', statName: 'video_bitrates_out', statValue: 'sum' }, + { name: 'video_bitrates_out_mean', statName: 'video_bitrates_out', statValue: 'mean' }, + { name: 'video_bitrates_out_min', statName: 'video_bitrates_out', statValue: 'min' }, + { name: 'video_bitrates_out_max', statName: 'video_bitrates_out', statValue: 'max' }, + { name: 'video_bitrates_out_p25', statName: 'video_bitrates_out', statValue: 'p25' }, - { name: 'round_trip_times_out_mean', statName: 'round_trip_times_out', statValue: 'mean' }, - { name: 'round_trip_times_out_min', statName: 'round_trip_times_out', statValue: 'min' }, - { name: 'round_trip_times_out_max', statName: 'round_trip_times_out', statValue: 'max' }, - { name: 'round_trip_times_out_p25', statName: 'round_trip_times_out', statValue: 'p25' }, + { name: 'spatial_layers_out_mean', statName: 'spatial_layers_out', statValue: 'mean' }, + { name: 'spatial_layers_out_min', statName: 'spatial_layers_out', statValue: 'min' }, + { name: 'spatial_layers_out_max', statName: 'spatial_layers_out', statValue: 'max' }, + { name: 'spatial_layers_out_p25', statName: 'spatial_layers_out', statValue: 'p25' }, + + { name: 'temporal_layers_out_mean', statName: 'temporal_layers_out', statValue: 'mean' }, + { name: 'temporal_layers_out_min', statName: 'temporal_layers_out', statValue: 'min' }, + { name: 'temporal_layers_out_max', statName: 'temporal_layers_out', statValue: 'max' }, + { name: 'temporal_layers_out_p25', statName: 'temporal_layers_out', statValue: 'p25' }, + + { name: 'round_trip_times_out_mean', statName: 'round_trip_times_out', statValue: 'mean' }, + { name: 'round_trip_times_out_min', statName: 'round_trip_times_out', statValue: 'min' }, + { name: 'round_trip_times_out_max', statName: 'round_trip_times_out', statValue: 'max' }, + { name: 'round_trip_times_out_p25', statName: 'round_trip_times_out', statValue: 'p25' }, ].forEach(({ name, statName, statValue }) => { new promClient.Gauge({