From 6cae690c05f7278bfe068ad797e1e2e6e4375fce Mon Sep 17 00:00:00 2001 From: DenisN Date: Tue, 26 Aug 2025 03:22:40 -0400 Subject: [PATCH] Russian names --- src/zvksmetrics/conf/complex.json | 410 ++++++++++++++++++++++--- src/zvksmetrics/conf/integration.json | 2 + src/zvksmetrics/zvksmetrics.service.ts | 9 +- 3 files changed, 374 insertions(+), 47 deletions(-) diff --git a/src/zvksmetrics/conf/complex.json b/src/zvksmetrics/conf/complex.json index 52fb24a..c048c1b 100644 --- a/src/zvksmetrics/conf/complex.json +++ b/src/zvksmetrics/conf/complex.json @@ -2,259 +2,583 @@ { "id": "10001", "name": "cpu_utilization", - "values": {"arr":["cpurawidle", "cpurawuser", "cpurawnice", "cpurawsystem", "cpurawwait", "cpurawinterrupt"],"prevarr":["cpurawidle", "cpurawuser", "cpurawnice", "cpurawsystem", "cpurawwait", "cpurawinterrupt"]}, + "desription": "Загруженность центрального процессора", + "values": { + "arr": [ + "cpurawidle", + "cpurawuser", + "cpurawnice", + "cpurawsystem", + "cpurawwait", + "cpurawinterrupt" + ], + "prevarr": [ + "cpurawidle", + "cpurawuser", + "cpurawnice", + "cpurawsystem", + "cpurawwait", + "cpurawinterrupt" + ] + }, "formula": "((arr[2]-prevarr[2])+(arr[3]-prevarr[3])+(arr[4]-prevarr[4])+(arr[6]-prevarr[6]))/((arr[1]-prevarr[1])+(arr[2]-prevarr[2])+(arr[3]-prevarr[3])+(arr[4]-prevarr[4])+(arr[5]-prevarr[5])+(arr[6]-prevarr[6]))*100" }, { "id": "10002", "name": "cpu_load_average_1", - "values": {"arr":["cpu1min"]}, + "desription": "Средняя загруженность центрального процессора в периоде 1-ой минуты", + "values": { + "arr": [ + "cpu1min" + ] + }, "formula": "arr[1]" }, { "id": "10003", "name": "cpu_load_average_5", - "values": {"arr":["cpu5min"]}, + "desription": "Средняя загруженность центрального процессора в периоде 5-и минут", + "values": { + "arr": [ + "cpu5min" + ] + }, "formula": "arr[1]" }, { "id": "10004", "name": "cpu_load_average_15", - "values": {"arr":["cpu15min"]}, + "desription": "Средняя загруженность центрального процессора в периоде 15-и минут", + "values": { + "arr": [ + "cpu15min" + ] + }, "formula": "arr[1]" }, { "id": "10005", "name": "ram_usage", - "values": {"arr":["totalMemory", "totalMemoryAvail"]}, + "desription": "Объем использования оперативной памяти", + "values": { + "arr": [ + "totalMemory", + "totalMemoryAvail" + ] + }, "formula": "(arr[1]-arr[2])/arr[1]*100" }, { "id": "10006", "name": "disk_usage", - "values": {"arr":["totalDiskSize", "useDiskSize"]}, + "desription": "Объем использования ресурсов области хранения данных", + "values": { + "arr": [ + "totalDiskSize", + "useDiskSize" + ] + }, "formula": "(arr[1]-arr[2])/arr[1]*100" }, { "id": "10007", "name": "disk_read_rate", - "values": {"arr":["diskReadAccess"], "prevarr":["diskReadAccess"]}, + "desription": "Скорость чтения из области хранения данных", + "values": { + "arr": [ + "diskReadAccess" + ], + "prevarr": [ + "diskReadAccess" + ] + }, "formula": "(arr[1]-prevarr[1])" }, { "id": "10008", "name": "disk_write_rate", - "values": {"arr":["diskWriteAccess"], "prevarr":["diskWriteAccess"]}, + "desription": "Скорость записи в область хранения данных", + "values": { + "arr": [ + "diskWriteAccess" + ], + "prevarr": [ + "diskWriteAccess" + ] + }, "formula": "(arr[1]-prevarr[1])" }, { "id": "10009", "name": "network_interface_rx_Eth_1", - "values": {"arr":["speed1", "ifInOctets1"], "prevarr":["speed1", "ifInOctets1"]}, + "desription": "Скорость приема данных интерфейса Eth1", + "values": { + "arr": [ + "speed1", + "ifInOctets1" + ], + "prevarr": [ + "speed1", + "ifInOctets1" + ] + }, "formula": "(arr[2]-prevarr[2])/arr[1]*100" }, { "id": "10010", "name": "network_interface_tx_Eth_1", - "values": {"arr":["speed1", "ifOutOctets1"], "prevarr":["speed1", "ifOutOctets1"]}, + "desription": "Скорость передачи данных интерфейса Eth1", + "values": { + "arr": [ + "speed1", + "ifOutOctets1" + ], + "prevarr": [ + "speed1", + "ifOutOctets1" + ] + }, "formula": "(arr[2]-prevarr[2])/arr[1]*100" }, { "id": "10011", "name": "network_interface_rx_Eth_2", - "values": {"arr":["speed2", "ifInOctets2"], "prevarr":["speed2", "ifInOctets2"]}, + "desription": "Скорость приема данных интерфейса Eth2", + "values": { + "arr": [ + "speed2", + "ifInOctets2" + ], + "prevarr": [ + "speed2", + "ifInOctets2" + ] + }, "formula": "(arr[2]-prevarr[2])/arr[1]*100" }, { "id": "10012", "name": "network_interface_tx_Eth_2", - "values": {"arr":["speed2", "ifOutOctets2"], "prevarr":["speed2", "ifOutOctets2"]}, + "desription": "Скорость передачи данных интерфейса Eth2", + "values": { + "arr": [ + "speed2", + "ifOutOctets2" + ], + "prevarr": [ + "speed2", + "ifOutOctets2" + ] + }, "formula": "(arr[2]-prevarr[2])/arr[1]*100" }, { "id": "10013", "name": "network_interface_rx_Eth_3", - "values": {"arr":["speed3", "ifInOctets3"], "prevarr":["speed3", "ifInOctets3"]}, + "desription": "Скорость приема данных интерфейса Eth3", + "values": { + "arr": [ + "speed3", + "ifInOctets3" + ], + "prevarr": [ + "speed3", + "ifInOctets3" + ] + }, "formula": "(arr[2]-prevarr[2])/arr[1]*100" }, { "id": "10014", "name": "network_interface_tx_Eth_3", - "values": {"arr":["speed3", "ifOutOctets3"], "prevarr":["speed3", "ifOutOctets3"]}, + "desription": "Скорость передачи данных интерфейса Eth3", + "values": { + "arr": [ + "speed3", + "ifOutOctets3" + ], + "prevarr": [ + "speed3", + "ifOutOctets3" + ] + }, "formula": "(arr[2]-prevarr[2])/arr[1]*100" }, { "id": "10015", "name": "network_interface_rx_Eth_4", - "values": {"arr":["speed4", "ifInOctets4"], "prevarr":["speed4", "ifInOctets4"]}, + "desription": "Скорость приема данных интерфейса Eth4", + "values": { + "arr": [ + "speed4", + "ifInOctets4" + ], + "prevarr": [ + "speed4", + "ifInOctets4" + ] + }, "formula": "(arr[2]-prevarr[2])/arr[1]*100" }, { "id": "10016", "name": "network_interface_tx_Eth_4", - "values": {"arr":["speed4", "ifOutOctets4"], "prevarr":["speed4", "ifOutOctets4"]}, + "desription": "Скорость передачи данных интерфейса Eth4", + "values": { + "arr": [ + "speed4", + "ifOutOctets4" + ], + "prevarr": [ + "speed4", + "ifOutOctets4" + ] + }, "formula": "(arr[2]-prevarr[2])/arr[1]*100" }, { "id": "10017", "name": "network_interfaces_read_packets_errors_Eth_1", - "values": {"arr":["ifInErrors1"], "prevarr":["ifInErrors1"]}, + "desription": "Количество ошибок при чтении пакетов на интерфейсе Eth1", + "values": { + "arr": [ + "ifInErrors1" + ], + "prevarr": [ + "ifInErrors1" + ] + }, "formula": "(arr[1]-prevarr[1])" }, { "id": "10018", "name": "network_interfaces_write_packets_errors_Eth_1", - "values": {"arr":["ifOutErrors1"], "prevarr":["ifOutErrors1"]}, + "desription": "Количество ошибок при отправки пакетов на интерфейсе Eth1", + "values": { + "arr": [ + "ifOutErrors1" + ], + "prevarr": [ + "ifOutErrors1" + ] + }, "formula": "(arr[1]-prevarr[1])" }, { "id": "10019", "name": "network_interfaces_read_packets_errors_Eth_2", - "values": {"arr":["ifInErrors2"], "prevarr":["ifInErrors2"]}, + "desription": "Количество ошибок при чтении пакетов на интерфейсе Eth2", + "values": { + "arr": [ + "ifInErrors2" + ], + "prevarr": [ + "ifInErrors2" + ] + }, "formula": "(arr[1]-prevarr[1])" }, { "id": "10020", "name": "network_interfaces_write_packets_errors_Eth_2", - "values": {"arr":["ifOutErrors2"], "prevarr":["ifOutErrors2"]}, + "desription": "Количество ошибок при отправки пакетов на интерфейсе Eth2", + "values": { + "arr": [ + "ifOutErrors2" + ], + "prevarr": [ + "ifOutErrors2" + ] + }, "formula": "(arr[1]-prevarr[1])" }, { "id": "10021", "name": "network_interfaces_read_packets_errors_Eth_3", - "values": {"arr":["ifInErrors3"], "prevarr":["ifInErrors3"]}, + "desription": "Количество ошибок при чтении пакетов на интерфейсе Eth3", + "values": { + "arr": [ + "ifInErrors3" + ], + "prevarr": [ + "ifInErrors3" + ] + }, "formula": "(arr[1]-prevarr[1])" }, { "id": "10022", "name": "network_interfaces_write_packets_errors_Eth_3", - "values": {"arr":["ifOutErrors3"], "prevarr":["ifOutErrors3"]}, + "desription": "Количество ошибок при отправки пакетов на интерфейсе Eth3", + "values": { + "arr": [ + "ifOutErrors3" + ], + "prevarr": [ + "ifOutErrors3" + ] + }, "formula": "(arr[1]-prevarr[1])" }, { "id": "10023", "name": "network_interfaces_read_packets_errors_Eth_4", - "values": {"arr":["ifInErrors4"], "prevarr":["ifInErrors4"]}, + "desription": "Количество ошибок при чтении пакетов на интерфейсе Eth4", + "values": { + "arr": [ + "ifInErrors4" + ], + "prevarr": [ + "ifInErrors4" + ] + }, "formula": "(arr[1]-prevarr[1])" }, { "id": "10024", "name": "network_interfaces_write_packets_errors_Eth_4", - "values": {"arr":["ifOutErrors4"], "prevarr":["ifOutErrors4"]}, + "desription": "Количество ошибок при отправки пакетов на интерфейсе Eth4", + "values": { + "arr": [ + "ifOutErrors4" + ], + "prevarr": [ + "ifOutErrors4" + ] + }, "formula": "(arr[1]-prevarr[1])" }, { "id": "10025", "name": "network_interfaces_read_packets_discarded_Eth_1", - "values": {"arr":["ifInDiscard1"], "prevarr":["ifInDiscard1"]}, + "desription": "Количество не обработанных пакетов на интерфейсе Eth1 при отправки данных", + "values": { + "arr": [ + "ifInDiscard1" + ], + "prevarr": [ + "ifInDiscard1" + ] + }, "formula": "(arr[1]-prevarr[1])" }, { "id": "10026", "name": "network_interfaces_write_packets_discarded_Eth_1", - "values": {"arr":["ifOutDiscard1"], "prevarr":["ifOutDiscard1"]}, + "desription": "Количество не обработанных пакетов на интерфейсе Eth1 при получении данных", + "values": { + "arr": [ + "ifOutDiscard1" + ], + "prevarr": [ + "ifOutDiscard1" + ] + }, "formula": "(arr[1]-prevarr[1])" }, { "id": "10027", "name": "network_interfaces_read_packets_discarded_Eth_2", - "values": {"arr":["ifInDiscard2"], "prevarr":["ifInDiscard2"]}, + "desription": "Количество не обработанных пакетов на интерфейсе Eth2 при отправки данных", + "values": { + "arr": [ + "ifInDiscard2" + ], + "prevarr": [ + "ifInDiscard2" + ] + }, "formula": "(arr[1]-prevarr[1])" }, { "id": "10028", "name": "network_interfaces_write_packets_discarded_Eth_2", - "values": {"arr":["ifOutDiscard2"], "prevarr":["ifOutDiscard2"]}, + "desription": "Количество не обработанных пакетов на интерфейсе Eth1 при получении данных", + "values": { + "arr": [ + "ifOutDiscard2" + ], + "prevarr": [ + "ifOutDiscard2" + ] + }, "formula": "(arr[1]-prevarr[1])" }, { "id": "10029", "name": "network_interfaces_read_packets_discarded_Eth_3", - "values": {"arr":["ifInDiscard3"], "prevarr":["ifInDiscard3"]}, + "desription": "Количество не обработанных пакетов на интерфейсе Eth3 при отправки данных", + "values": { + "arr": [ + "ifInDiscard3" + ], + "prevarr": [ + "ifInDiscard3" + ] + }, "formula": "(arr[1]-prevarr[1])" }, { "id": "10030", "name": "network_interfaces_write_packets_discarded_Eth_3", - "values": {"arr":["ifOutDiscard3"], "prevarr":["ifOutDiscard3"]}, + "desription": "Количество не обработанных пакетов на интерфейсе Eth3 при получении данных", + "values": { + "arr": [ + "ifOutDiscard3" + ], + "prevarr": [ + "ifOutDiscard3" + ] + }, "formula": "(arr[1]-prevarr[1])" }, { "id": "10031", "name": "network_interfaces_read_packets_discarded_Eth_4", - "values": {"arr":["ifInDiscard4"], "prevarr":["ifInDiscard4"]}, + "desription": "Количество не обработанных пакетов на интерфейсе Eth4 при отправки данных", + "values": { + "arr": [ + "ifInDiscard4" + ], + "prevarr": [ + "ifInDiscard4" + ] + }, "formula": "(arr[1]-prevarr[1])" }, { "id": "10032", "name": "network_interfaces_write_packets_discarded_Eth_4", - "values": {"arr":["ifOutDiscard4"], "prevarr":["ifOutDiscard4"]}, + "desription": "Количество не обработанных пакетов на интерфейсе Eth4 при получении данных", + "values": { + "arr": [ + "ifOutDiscard4" + ], + "prevarr": [ + "ifOutDiscard4" + ] + }, "formula": "(arr[1]-prevarr[1])" }, { "id": "10033", "name": "response_icmp", - "values": {"arr":["ping_check"]}, + "desription": "Количество полученных ответов по протоколу ICMP", + "values": { + "arr": [ + "ping_check" + ] + }, "formula": "arr[1]" }, { "id": "10034", "name": "server_uptime", - "values": {"arr":["upTime"]}, + "desription": "Текущее время безотказной работы сервера", + "values": { + "arr": [ + "upTime" + ] + }, "formula": "arr[1]" }, { "id": "10035", "name": "total_participants", - "values": {"arr":["TotalParticipants"]}, + "desription": "Текущее количество участников конференции", + "values": { + "arr": [ + "TotalParticipants" + ] + }, "formula": "arr[1]" }, { "id": "10036", "name": "registered_abonents", - "values": {"arr":["RegisteredAbonents"]}, + "desription": "Текущее количество зарегистрированных пользователей", + "values": { + "arr": [ + "RegisteredAbonents" + ] + }, "formula": "arr[1]" }, { "id": "10037", "name": "webcasts_HLS_clients", - "values": {"arr":["WebcastsHLSclients"]}, + "desription": "Текущее количество клиентов, участвувающих в HLS WEB-трансляции ", + "values": { + "arr": [ + "WebcastsHLSclients" + ] + }, "formula": "arr[1]" }, { "id": "10038", "name": "total_P2P_rooms", - "values": {"arr":["TotalP2Prooms"]}, + "desription": "Общее количество P2P зон общения", + "values": { + "arr": [ + "TotalP2Prooms" + ] + }, "formula": "arr[1]" }, { "id": "10039", "name": "conferences_total", - "values": {"arr":["Conferencestotal"]}, + "desription": "Общее количество зарегистрированных конференций", + "values": { + "arr": [ + "Conferencestotal" + ] + }, "formula": "arr[1]" }, { "id": "10040", "name": "conferences_active", - "values": {"arr":["ConferencesActive"]}, + "desription": "Общее количество текущих активных конференций", + "values": { + "arr": [ + "ConferencesActive" + ] + }, "formula": "arr[1]" }, { "id": "10041", "name": "records_active", - "values": {"arr":["RecordsActive"]}, + "desription": "Текущее количество ведущихся записей", + "values": { + "arr": [ + "RecordsActive" + ] + }, "formula": "arr[1]" }, { "id": "10042", "name": "number_of_records_saved", - "values": {"arr":["NumberRecordsSaved"]}, + "desription": "Общее количество записанных записей", + "values": { + "arr": [ + "NumberRecordsSaved" + ] + }, "formula": "arr[1]" }, { "id": "10043", "name": "replication_status", - "values": {"arr":["replicationStatus"]}, + "desription": "Статус репликации данных", + "values": { + "arr": [ + "replicationStatus" + ] + }, "formula": "arr[1]" } ] \ No newline at end of file diff --git a/src/zvksmetrics/conf/integration.json b/src/zvksmetrics/conf/integration.json index a70f6c0..795216a 100644 --- a/src/zvksmetrics/conf/integration.json +++ b/src/zvksmetrics/conf/integration.json @@ -2,6 +2,7 @@ { "id": "90001", "name": "server_li", + "desription": "Индекс загрузки сервера - Server Load Index", "values": { "statusarr": [ "cpu_load_average_1", @@ -30,6 +31,7 @@ { "id": "90002", "name": "application_li", + "desription": "Индекс нагрузки приложения - Application Load Index", "values": { "statusarr": [ "total_participants", diff --git a/src/zvksmetrics/zvksmetrics.service.ts b/src/zvksmetrics/zvksmetrics.service.ts index 9c8d0eb..34010c9 100644 --- a/src/zvksmetrics/zvksmetrics.service.ts +++ b/src/zvksmetrics/zvksmetrics.service.ts @@ -50,6 +50,7 @@ export class MetricsRanges { export class MetricsCalculation { id: string; name: string; + desription: string; values: string; formula: string; }; @@ -108,8 +109,8 @@ export class ZvksmetricsService { // let editedMetrics : K2Metrics = await this.getMetrics (inp, comlexCalc, scope); let responseFromExporter: any = await this.sendMetrics(intermediate); let responseFromExporter1: any = await this.sendMetrics(inp); - let responseFromExporter2: any = await this.sendMetrics(integrate); - + // let responseFromExporter2: any = await this.sendMetrics(integrate); + console.log(responseFromExporter1); prev = inp; return responseFromExporter; @@ -169,7 +170,7 @@ export class ZvksmetricsService { complexMetric.type = inputData.metrics[0].type; complexMetric.addr = inputData.metrics[0].addr; complexMetric.value = val; - complexMetric.description = complexCalc[i].name; + complexMetric.description = complexCalc[i].desription; complexMetric.status = await this.showStatus(scope, complexMetric.name, val); complexMetric.device = devices[d]; complexMetric.source = metr.source + ', complex'; @@ -206,7 +207,7 @@ export class ZvksmetricsService { integrationMetric.type = complexData.metrics[0].type; integrationMetric.addr = complexData.metrics[0].addr; integrationMetric.value = val; - integrationMetric.description = intgrationCalc[i].name; + integrationMetric.description = intgrationCalc[i].desription; integrationMetric.status = await this.showStatus(scope, integrationMetric.name, val); integrationMetric.device = devices[d]; integrationMetric.source = metr.source.replace(', complex', ', integration');