From 818900f2764d3094d0f75bb1bceeda372d4dff2b Mon Sep 17 00:00:00 2001 From: DenisN Date: Wed, 16 Jul 2025 07:39:52 -0400 Subject: [PATCH] CorrectionDBrecords --- src/database/clickhouse/clickhouse.service.ts | 1 + src/zvksmetrics/conf/ranges.json | 2 +- src/zvksmetrics/zvksmetrics.controller.ts | 2 +- src/zvksmetrics/zvksmetrics.service.ts | 8 ++++---- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/database/clickhouse/clickhouse.service.ts b/src/database/clickhouse/clickhouse.service.ts index 13bb04c..30f5f1e 100644 --- a/src/database/clickhouse/clickhouse.service.ts +++ b/src/database/clickhouse/clickhouse.service.ts @@ -159,5 +159,6 @@ export class ClickhouseService { // } break; } + return 1; } } diff --git a/src/zvksmetrics/conf/ranges.json b/src/zvksmetrics/conf/ranges.json index 3390400..c988a80 100644 --- a/src/zvksmetrics/conf/ranges.json +++ b/src/zvksmetrics/conf/ranges.json @@ -1 +1 @@ -[{"name":"cpu_utilization","ranges":[{"min":0,"max":50,"status":1},{"min":51,"max":80,"status":2},{"min":81,"max":90,"status":3},{"min":91,"max":100,"status":4}]},{"name":"cpu_load_average_1","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_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":60,"status":1},{"min":61,"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":61,"max":80,"status":2},{"min":81,"max":90,"status":3},{"min":91,"max":100,"status":4}]},{"name":"cpu_load_average_1","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_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":60,"status":1},{"min":61,"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/zvksmetrics.controller.ts b/src/zvksmetrics/zvksmetrics.controller.ts index 9c83a4d..5c44483 100644 --- a/src/zvksmetrics/zvksmetrics.controller.ts +++ b/src/zvksmetrics/zvksmetrics.controller.ts @@ -12,7 +12,7 @@ export class ZvksmetricsController { let sum: any = { value: (a + b) / 4 * b + a }; await this.metricsService.useStatusModel(inputMetrics); // let a = await this.metricsService.showStatus(); - console.log(inputMetrics); + // console.log(inputMetrics); return sum.value; } diff --git a/src/zvksmetrics/zvksmetrics.service.ts b/src/zvksmetrics/zvksmetrics.service.ts index 8d7d47f..dbef4de 100644 --- a/src/zvksmetrics/zvksmetrics.service.ts +++ b/src/zvksmetrics/zvksmetrics.service.ts @@ -78,12 +78,12 @@ export class ZvksmetricsService { let intermediate = await this.getComplexMetricsValues(inp, prev, complex, model, scope); - console.log(intermediate); + // console.log(intermediate); let ctp: any = classToPlain(intermediate); let copmplexParameterBody: string = JSON.stringify(ctp); - let rtp: any = classToPlain(inputData); + let rtp: any = classToPlain(inp); let rawParameterBody: string = JSON.stringify(rtp); - // console.log(parameterBody); + // console.log(rawParameterBody); let abc = new ClickhouseService(); await abc.ClickHouseAddRecords('raw', rawParameterBody); await abc.ClickHouseAddRecords('complex', copmplexParameterBody); @@ -260,7 +260,7 @@ export class ZvksmetricsService { async saveRanges(inputRanges: string): Promise { let ret: any; let filePath = './src/zvksmetrics/conf/ranges.json'; - console.log(inputRanges); + // console.log(inputRanges); let inp: string = JSON.stringify(inputRanges); try { await writeFile(filePath, inp);