From e46ecc0e682b35978d3a41d83d532fa2bc44659e Mon Sep 17 00:00:00 2001 From: DenisN Date: Tue, 10 Jun 2025 05:33:15 -0400 Subject: [PATCH] console. --- src/zvksmetrics/conf/ranges.json | 386 +------------------------ src/zvksmetrics/conf/ranges123.json | 0 src/zvksmetrics/zvksmetrics.service.ts | 12 +- 3 files changed, 8 insertions(+), 390 deletions(-) delete mode 100644 src/zvksmetrics/conf/ranges123.json diff --git a/src/zvksmetrics/conf/ranges.json b/src/zvksmetrics/conf/ranges.json index 7c1fd5c..c2dc6fb 100644 --- a/src/zvksmetrics/conf/ranges.json +++ b/src/zvksmetrics/conf/ranges.json @@ -1,385 +1 @@ -[ - { - "name": "cpu_utilization", - "ranges": [ - {"min": 0, "max": 60, "status": 1}, - {"min": 60, "max": 80, "status": 2}, - {"min": 80, "max": 90, "status": 3}, - {"min": 90, "max": 100, "status": 4} - ] - }, - { - "name": "cpu_load_average_1", - "ranges": [ - {"min": 0, "max": 60, "status": 1}, - {"min": 60, "max": 80, "status": 2}, - {"min": 81, "max": 90, "status": 3}, - {"min": 91, "max": 100, "status": 4} - ] - }, - { - "name": "cpu_load_average_5", - "ranges": [ - {"min": 0, "max": 60, "status": 1}, - {"min": 61, "max": 80, "status": 2}, - {"min": 81, "max": 90, "status": 3}, - {"min": 91, "max": 100, "status": 4} - ] - }, - { - "name": "cpu_load_average_15", - "ranges": [ - {"min": 0, "max": 60, "status": 1}, - {"min": 61, "max": 80, "status": 2}, - {"min": 81, "max": 90, "status": 3}, - {"min": 91, "max": 100, "status": 4} - ] - }, - { - "name": "ram_usage", - "ranges": [ - {"min": 0, "max": 30, "status": 1}, - {"min": 30, "max": 80, "status": 2}, - {"min": 81, "max": 90, "status": 3}, - {"min": 91, "max": 100, "status": 4} - ] - }, - { - "name": "disk_usage", - "ranges": [ - {"min": 0, "max": 70, "status": 1}, - {"min": 71, "max": 80, "status": 2}, - {"min": 81, "max": 90, "status": 3}, - {"min": 91, "max": 100, "status": 4} - ] - }, - { - "name": "disk_read_rate", - "ranges": [ - {"min": 0, "max": 100, "status": 1}, - {"min": 101, "max": 300, "status": 2}, - {"min": 301, "max": 500, "status": 3}, - {"min": 501, "max": 5000, "status": 4} - ] - }, - { - "name": "disk_write_rate", - "ranges": [ - {"min": 0, "max": 100, "status": 1}, - {"min": 101, "max": 300, "status": 2}, - {"min": 301, "max": 500, "status": 3}, - {"min": 501, "max": 5000, "status": 4} - ] - }, - { - "name": "network_interface_rx_Eth_1", - "ranges": [ - {"min": 0, "max": 70, "status": 1}, - {"min": 71, "max": 80, "status": 2}, - {"min": 81, "max": 90, "status": 3}, - {"min": 91, "max": 100, "status": 4} - ] - }, - { - "name": "network_interface_tx_Eth_1", - "ranges": [ - {"min": 0, "max": 70, "status": 1}, - {"min": 71, "max": 80, "status": 2}, - {"min": 81, "max": 90, "status": 3}, - {"min": 91, "max": 100, "status": 4} - ] - }, - { - "name": "network_interface_rx_Eth_2", - "ranges": [ - {"min": 0, "max": 70, "status": 1}, - {"min": 71, "max": 80, "status": 2}, - {"min": 81, "max": 90, "status": 3}, - {"min": 91, "max": 100, "status": 4} - ] - }, - { - "name": "network_interface_tx_Eth_2", - "ranges": [ - {"min": 0, "max": 70, "status": 1}, - {"min": 71, "max": 80, "status": 2}, - {"min": 81, "max": 90, "status": 3}, - {"min": 91, "max": 100, "status": 4} - ] - }, - { - "name": "network_interface_rx_Eth_3", - "ranges": [ - {"min": 0, "max": 70, "status": 1}, - {"min": 71, "max": 80, "status": 2}, - {"min": 81, "max": 90, "status": 3}, - {"min": 91, "max": 100, "status": 4} - ] - }, - { - "name": "network_interface_tx_Eth_3", - "ranges": [ - {"min": 0, "max": 70, "status": 1}, - {"min": 71, "max": 80, "status": 2}, - {"min": 81, "max": 90, "status": 3}, - {"min": 91, "max": 100, "status": 4} - ] - }, - { - "name": "network_interface_rx_Eth_4", - "ranges": [ - {"min": 0, "max": 70, "status": 1}, - {"min": 71, "max": 80, "status": 2}, - {"min": 81, "max": 90, "status": 3}, - {"min": 91, "max": 100, "status": 4} - ] - }, - { - "name": "network_interface_tx_Eth_4", - "ranges": [ - {"min": 0, "max": 70, "status": 1}, - {"min": 71, "max": 80, "status": 2}, - {"min": 81, "max": 90, "status": 3}, - {"min": 91, "max": 100, "status": 4} - ] - }, - { - "name": "network_interfaces_read_packets_errors_Eth_1", - "ranges": [ - {"min": 0, "max": 1, "status": 1}, - {"min": 2, "max": 10, "status": 2}, - {"min": 11, "max": 20, "status": 3}, - {"min": 21, "max": 100, "status": 4} - ] - }, - { - "name": "network_interfaces_write_packets_errors_Eth_1", - "ranges": [ - {"min": 0, "max": 1, "status": 1}, - {"min": 2, "max": 10, "status": 2}, - {"min": 11, "max": 20, "status": 3}, - {"min": 21, "max": 100, "status": 4} - ] - }, - { - "name": "network_interfaces_read_packets_errors_Eth_2", - "ranges": [ - {"min": 0, "max": 1, "status": 1}, - {"min": 2, "max": 10, "status": 2}, - {"min": 11, "max": 20, "status": 3}, - {"min": 21, "max": 100, "status": 4} - ] - }, - { - "name": "network_interfaces_write_packets_errors_Eth_2", - "ranges": [ - {"min": 0, "max": 1, "status": 1}, - {"min": 2, "max": 10, "status": 2}, - {"min": 11, "max": 20, "status": 3}, - {"min": 21, "max": 100, "status": 4} - ] - }, - { - "name": "network_interfaces_read_packets_errors_Eth_3", - "ranges": [ - {"min": 0, "max": 1, "status": 1}, - {"min": 2, "max": 10, "status": 2}, - {"min": 11, "max": 20, "status": 3}, - {"min": 21, "max": 100, "status": 4} - ] - }, - { - "name": "network_interfaces_write_packets_errors_Eth_3", - "ranges": [ - {"min": 0, "max": 1, "status": 1}, - {"min": 2, "max": 10, "status": 2}, - {"min": 11, "max": 20, "status": 3}, - {"min": 21, "max": 100, "status": 4} - ] - }, - { - "name": "network_interfaces_read_packets_errors_Eth_4", - "ranges": [ - {"min": 0, "max": 1, "status": 1}, - {"min": 2, "max": 10, "status": 2}, - {"min": 11, "max": 20, "status": 3}, - {"min": 21, "max": 100, "status": 4} - ] - }, - { - "name": "network_interfaces_write_packets_errors_Eth_4", - "ranges": [ - {"min": 0, "max": 1, "status": 1}, - {"min": 2, "max": 10, "status": 2}, - {"min": 11, "max": 20, "status": 3}, - {"min": 21, "max": 100, "status": 4} - ] - }, - { - "name": "network_interfaces_read_packets_discarded_Eth_1", - "ranges": [ - {"min": 0, "max": 1, "status": 1}, - {"min": 2, "max": 10, "status": 2}, - {"min": 11, "max": 20, "status": 3}, - {"min": 21, "max": 100, "status": 4} - ] - }, - { - "name": "network_interfaces_write_packets_discarded_Eth_1", - "ranges": [ - {"min": 0, "max": 1, "status": 1}, - {"min": 2, "max": 10, "status": 2}, - {"min": 11, "max": 20, "status": 3}, - {"min": 21, "max": 100, "status": 4} - ] - }, - { - "name": "network_interfaces_read_packets_discarded_Eth_2", - "ranges": [ - {"min": 0, "max": 1, "status": 1}, - {"min": 2, "max": 10, "status": 2}, - {"min": 11, "max": 20, "status": 3}, - {"min": 21, "max": 100, "status": 4} - ] - }, - { - "name": "network_interfaces_write_packets_discarded_Eth_2", - "ranges": [ - {"min": 0, "max": 1, "status": 1}, - {"min": 2, "max": 10, "status": 2}, - {"min": 11, "max": 20, "status": 3}, - {"min": 21, "max": 100, "status": 4} - ] - }, - { - "name": "network_interfaces_read_packets_discarded_Eth_3", - "ranges": [ - {"min": 0, "max": 1, "status": 1}, - {"min": 2, "max": 10, "status": 2}, - {"min": 11, "max": 20, "status": 3}, - {"min": 21, "max": 100, "status": 4} - ] - }, - { - "name": "network_interfaces_write_packets_discarded_Eth_3", - "ranges": [ - {"min": 0, "max": 1, "status": 1}, - {"min": 2, "max": 10, "status": 2}, - {"min": 11, "max": 20, "status": 3}, - {"min": 21, "max": 100, "status": 4} - ] - }, - { - "name": "network_interfaces_read_packets_discarded_Eth_4", - "ranges": [ - {"min": 0, "max": 1, "status": 1}, - {"min": 2, "max": 10, "status": 2}, - {"min": 11, "max": 20, "status": 3}, - {"min": 21, "max": 100, "status": 4} - ] - }, - { - "name": "network_interfaces_write_packets_discarded_Eth_4", - "ranges": [ - {"min": 0, "max": 1, "status": 1}, - {"min": 2, "max": 10, "status": 2}, - {"min": 11, "max": 20, "status": 3}, - {"min": 21, "max": 100, "status": 4} - ] - }, - { - "name": "response_icmp", - "ranges": [ - {"min": 0, "max": 100, "status": 1}, - {"min": 101, "max": 200, "status": 2}, - {"min": 201, "max": 300, "status": 3}, - {"min": 301, "max": 1000, "status": 4} - ] - }, - { - "name": "server_uptime", - "ranges": [ - {"min": 0, "max": 0, "status": 4}, - {"min": 1, "max": 1000, "status": 1} - ] - }, - { - "name": "total_participants", - "ranges": [ - {"min": 0, "max": 10, "status": 1}, - {"min": 11, "max": 30, "status": 2}, - {"min": 31, "max": 50, "status": 3}, - {"min": 51, "max": 1000, "status": 4} - ] - }, - { - "name": "registered_abonents", - "ranges": [ - {"min": 0, "max": 10, "status": 1}, - {"min": 11, "max": 30, "status": 2}, - {"min": 31, "max": 50, "status": 3}, - {"min": 51, "max": 1000, "status": 4} - ] - }, - { - "name": "webcasts_HLS_clients", - "ranges": [ - {"min": 0, "max": 10, "status": 1}, - {"min": 11, "max": 30, "status": 2}, - {"min": 31, "max": 50, "status": 3}, - {"min": 51, "max": 1000, "status": 4} - ] - }, - { - "name": "total_P2P_rooms", - "ranges": [ - {"min": 0, "max": 10, "status": 1}, - {"min": 11, "max": 30, "status": 2}, - {"min": 31, "max": 50, "status": 3}, - {"min": 51, "max": 1000, "status": 4} - ] - }, - { - "name": "conferences_total", - "ranges": [ - {"min": 0, "max": 10, "status": 1}, - {"min": 11, "max": 30, "status": 2}, - {"min": 31, "max": 50, "status": 3}, - {"min": 51, "max": 1000, "status": 4} - ] - }, - { - "name": "conferences_active", - "ranges": [ - {"min": 0, "max": 10, "status": 1}, - {"min": 11, "max": 30, "status": 2}, - {"min": 31, "max": 50, "status": 3}, - {"min": 51, "max": 1000, "status": 4} - ] - }, - { - "name": "records_active", - "ranges": [ - {"min": 0, "max": 10, "status": 1}, - {"min": 11, "max": 30, "status": 2}, - {"min": 31, "max": 50, "status": 3}, - {"min": 51, "max": 1000, "status": 4} - ] - }, - { - "name": "number_of_records_saved", - "ranges": [ - {"min": 0, "max": 10, "status": 1}, - {"min": 11, "max": 30, "status": 2}, - {"min": 31, "max": 50, "status": 3}, - {"min": 51, "max": 1000, "status": 4} - ] - }, - { - "name": "replication_status", - "ranges": [ - {"min": 0, "max": 0, "status": 4}, - {"min": 1, "max": 1, "status": 1} - ] - } -] \ No newline at end of file +[{"name":"cpu_utilization","ranges":[{"min":0,"max":60,"status":1},{"min":60,"max":80,"status":2},{"min":80,"max":90,"status":3},{"min":90,"max":100,"status":4}]},{"name":"cpu_load_average_1","ranges":[{"min":0,"max":60,"status":1},{"min":60,"max":80,"status":2},{"min":81,"max":90,"status":3},{"min":91,"max":100,"status":4}]},{"name":"cpu_load_average_5","ranges":[{"min":0,"max":60,"status":1},{"min":61,"max":80,"status":2},{"min":81,"max":90,"status":3},{"min":91,"max":100,"status":4}]},{"name":"cpu_load_average_15","ranges":[{"min":0,"max":60,"status":1},{"min":61,"max":80,"status":2},{"min":81,"max":90,"status":3},{"min":91,"max":100,"status":4}]},{"name":"ram_usage","ranges":[{"min":0,"max":30,"status":1},{"min":30,"max":80,"status":2},{"min":81,"max":90,"status":3},{"min":91,"max":100,"status":4}]},{"name":"disk_usage","ranges":[{"min":0,"max":70,"status":1},{"min":71,"max":80,"status":2},{"min":81,"max":90,"status":3},{"min":91,"max":100,"status":4}]},{"name":"disk_read_rate","ranges":[{"min":0,"max":100,"status":1},{"min":101,"max":300,"status":2},{"min":301,"max":500,"status":3},{"min":501,"max":5000,"status":4}]},{"name":"disk_write_rate","ranges":[{"min":0,"max":100,"status":1},{"min":101,"max":300,"status":2},{"min":301,"max":500,"status":3},{"min":501,"max":5000,"status":4}]},{"name":"network_interface_rx_Eth_1","ranges":[{"min":0,"max":70,"status":1},{"min":71,"max":80,"status":2},{"min":81,"max":90,"status":3},{"min":91,"max":100,"status":4}]},{"name":"network_interface_tx_Eth_1","ranges":[{"min":0,"max":70,"status":1},{"min":71,"max":80,"status":2},{"min":81,"max":90,"status":3},{"min":91,"max":100,"status":4}]},{"name":"network_interface_rx_Eth_2","ranges":[{"min":0,"max":70,"status":1},{"min":71,"max":80,"status":2},{"min":81,"max":90,"status":3},{"min":91,"max":100,"status":4}]},{"name":"network_interface_tx_Eth_2","ranges":[{"min":0,"max":70,"status":1},{"min":71,"max":80,"status":2},{"min":81,"max":90,"status":3},{"min":91,"max":100,"status":4}]},{"name":"network_interface_rx_Eth_3","ranges":[{"min":0,"max":70,"status":1},{"min":71,"max":80,"status":2},{"min":81,"max":90,"status":3},{"min":91,"max":100,"status":4}]},{"name":"network_interface_tx_Eth_3","ranges":[{"min":0,"max":70,"status":1},{"min":71,"max":80,"status":2},{"min":81,"max":90,"status":3},{"min":91,"max":100,"status":4}]},{"name":"network_interface_rx_Eth_4","ranges":[{"min":0,"max":70,"status":1},{"min":71,"max":80,"status":2},{"min":81,"max":90,"status":3},{"min":91,"max":100,"status":4}]},{"name":"network_interface_tx_Eth_4","ranges":[{"min":0,"max":70,"status":1},{"min":71,"max":80,"status":2},{"min":81,"max":90,"status":3},{"min":91,"max":100,"status":4}]},{"name":"network_interfaces_read_packets_errors_Eth_1","ranges":[{"min":0,"max":1,"status":1},{"min":2,"max":10,"status":2},{"min":11,"max":20,"status":3},{"min":21,"max":100,"status":4}]},{"name":"network_interfaces_write_packets_errors_Eth_1","ranges":[{"min":0,"max":1,"status":1},{"min":2,"max":10,"status":2},{"min":11,"max":20,"status":3},{"min":21,"max":100,"status":4}]},{"name":"network_interfaces_read_packets_errors_Eth_2","ranges":[{"min":0,"max":1,"status":1},{"min":2,"max":10,"status":2},{"min":11,"max":20,"status":3},{"min":21,"max":100,"status":4}]},{"name":"network_interfaces_write_packets_errors_Eth_2","ranges":[{"min":0,"max":1,"status":1},{"min":2,"max":10,"status":2},{"min":11,"max":20,"status":3},{"min":21,"max":100,"status":4}]},{"name":"network_interfaces_read_packets_errors_Eth_3","ranges":[{"min":0,"max":1,"status":1},{"min":2,"max":10,"status":2},{"min":11,"max":20,"status":3},{"min":21,"max":100,"status":4}]},{"name":"network_interfaces_write_packets_errors_Eth_3","ranges":[{"min":0,"max":1,"status":1},{"min":2,"max":10,"status":2},{"min":11,"max":20,"status":3},{"min":21,"max":100,"status":4}]},{"name":"network_interfaces_read_packets_errors_Eth_4","ranges":[{"min":0,"max":1,"status":1},{"min":2,"max":10,"status":2},{"min":11,"max":20,"status":3},{"min":21,"max":100,"status":4}]},{"name":"network_interfaces_write_packets_errors_Eth_4","ranges":[{"min":0,"max":1,"status":1},{"min":2,"max":10,"status":2},{"min":11,"max":20,"status":3},{"min":21,"max":100,"status":4}]},{"name":"network_interfaces_read_packets_discarded_Eth_1","ranges":[{"min":0,"max":1,"status":1},{"min":2,"max":10,"status":2},{"min":11,"max":20,"status":3},{"min":21,"max":100,"status":4}]},{"name":"network_interfaces_write_packets_discarded_Eth_1","ranges":[{"min":0,"max":1,"status":1},{"min":2,"max":10,"status":2},{"min":11,"max":20,"status":3},{"min":21,"max":100,"status":4}]},{"name":"network_interfaces_read_packets_discarded_Eth_2","ranges":[{"min":0,"max":1,"status":1},{"min":2,"max":10,"status":2},{"min":11,"max":20,"status":3},{"min":21,"max":100,"status":4}]},{"name":"network_interfaces_write_packets_discarded_Eth_2","ranges":[{"min":0,"max":1,"status":1},{"min":2,"max":10,"status":2},{"min":11,"max":20,"status":3},{"min":21,"max":100,"status":4}]},{"name":"network_interfaces_read_packets_discarded_Eth_3","ranges":[{"min":0,"max":1,"status":1},{"min":2,"max":10,"status":2},{"min":11,"max":20,"status":3},{"min":21,"max":100,"status":4}]},{"name":"network_interfaces_write_packets_discarded_Eth_3","ranges":[{"min":0,"max":1,"status":1},{"min":2,"max":10,"status":2},{"min":11,"max":20,"status":3},{"min":21,"max":100,"status":4}]},{"name":"network_interfaces_read_packets_discarded_Eth_4","ranges":[{"min":0,"max":1,"status":1},{"min":2,"max":10,"status":2},{"min":11,"max":20,"status":3},{"min":21,"max":100,"status":4}]},{"name":"network_interfaces_write_packets_discarded_Eth_4","ranges":[{"min":0,"max":1,"status":1},{"min":2,"max":10,"status":2},{"min":11,"max":20,"status":3},{"min":21,"max":100,"status":4}]},{"name":"response_icmp","ranges":[{"min":0,"max":100,"status":1},{"min":101,"max":200,"status":2},{"min":201,"max":300,"status":3},{"min":301,"max":1000,"status":4}]},{"name":"server_uptime","ranges":[{"min":0,"max":0,"status":4},{"min":1,"max":1000,"status":1}]},{"name":"total_participants","ranges":[{"min":0,"max":10,"status":1},{"min":11,"max":30,"status":2},{"min":31,"max":50,"status":3},{"min":51,"max":1000,"status":4}]},{"name":"registered_abonents","ranges":[{"min":0,"max":10,"status":1},{"min":11,"max":30,"status":2},{"min":31,"max":50,"status":3},{"min":51,"max":1000,"status":4}]},{"name":"webcasts_HLS_clients","ranges":[{"min":0,"max":10,"status":1},{"min":11,"max":30,"status":2},{"min":31,"max":50,"status":3},{"min":51,"max":1000,"status":4}]},{"name":"total_P2P_rooms","ranges":[{"min":0,"max":10,"status":1},{"min":11,"max":30,"status":2},{"min":31,"max":50,"status":3},{"min":51,"max":1000,"status":4}]},{"name":"conferences_total","ranges":[{"min":0,"max":10,"status":1},{"min":11,"max":30,"status":2},{"min":31,"max":50,"status":3},{"min":51,"max":1000,"status":4}]},{"name":"conferences_active","ranges":[{"min":0,"max":10,"status":1},{"min":11,"max":30,"status":2},{"min":31,"max":50,"status":3},{"min":51,"max":1000,"status":4}]},{"name":"records_active","ranges":[{"min":0,"max":10,"status":1},{"min":11,"max":30,"status":2},{"min":31,"max":50,"status":3},{"min":51,"max":1000,"status":4}]},{"name":"number_of_records_saved","ranges":[{"min":0,"max":10,"status":1},{"min":11,"max":30,"status":2},{"min":31,"max":50,"status":3},{"min":51,"max":1000,"status":4}]},{"name":"replication_status","ranges":[{"min":0,"max":0,"status":4},{"min":1,"max":1,"status":1}]}] \ No newline at end of file diff --git a/src/zvksmetrics/conf/ranges123.json b/src/zvksmetrics/conf/ranges123.json deleted file mode 100644 index e69de29..0000000 diff --git a/src/zvksmetrics/zvksmetrics.service.ts b/src/zvksmetrics/zvksmetrics.service.ts index 52b5e49..18e8dff 100644 --- a/src/zvksmetrics/zvksmetrics.service.ts +++ b/src/zvksmetrics/zvksmetrics.service.ts @@ -75,7 +75,7 @@ export class ZvksmetricsService { let intermediate = await this.getComplexMetricsValues(inp, prev, complex, model, scope); - // console.log(intermediate); + console.log(intermediate); // const val = JSON.parse(JSON.stringify(model[0].values)); @@ -143,7 +143,7 @@ export class ZvksmetricsService { } } - console.log(complexData.metrics); + // console.log(complexData.metrics); return complexData; } @@ -231,12 +231,14 @@ export class ZvksmetricsService { return rangesData; } - async saveRanges(inputRanges: any): Promise { + async saveRanges(inputRanges: string): Promise { let ret: any; - let filePath = './src/zvksmetrics/conf/ranges123.json'; + let filePath = './src/zvksmetrics/conf/ranges.json'; console.log(inputRanges); + let inp: string = JSON.stringify(inputRanges); try{ - ret = await writeFile(filePath, inputRanges, 'utf8'); + await writeFile(filePath, inp); + ret = "200 OK"; } catch{ ret = "Error write file";