Merge pull request 'Some improvements' (#6 ) from dev into main

Improved Metric Classes Reviewed-on: #6
Merge pull request 'Refactored Temperature - created single metric with labels' (#5 ) from dev into main
2025-04-19 16:05:37 +03:00 · 2025-04-06 11:54:48 +03:00 · 2025-04-06 09:58:34 +03:00 · 2025-02-23 10:44:25 +02:00 · 2025-02-18 10:25:39 +02:00 · 2025-02-16 15:16:23 +02:00
5 changed files with 15 additions and 113 deletions
--- a/README.md
+++ b/README.md
@@ -181,10 +181,6 @@ From version 2.0 the Application supports internal metrics to collect time. See
 - `result_path` - path to result value in response JSON separated by `app_config.RESPONSE_PATH_SEPARATOR` character. Could be configured in [Application config](#AppConfig).
 - `timeout` - timeout to wait for response

-#### REST value Binary Metrics
-**_Gets the responses value from http request to REST service_**
-THe same as [REST value Metrics] but works with 'ON/OFF' and 'TRUE/FALSE' values
-
 #### Shell value Metrics
 **_Gets the shell command executed result value_**
 ```json
--- a/app_config.py
+++ b/app_config.py
@@ -1,6 +1,6 @@
 import os

-APP_VERSION="2.4"
+APP_VERSION="2.2"
 SCRIPT_PATH = os.path.dirname(__file__)
 CONFIGS_DIR = SCRIPT_PATH + "/configs"
 CONFIG_FILE_NAME = CONFIGS_DIR + "/config.json"
--- a/main.py
+++ b/main.py
@@ -49,7 +49,6 @@ def init_metric_entities(data):
        M.IcmpMetric(data),
        M.InterfaceMetric(data),
        M.RestValueMetric(data),
-        M.RestValueBMetric(data),
        M.ShellValueMetric(data),
        M.UptimeMetric(app_config.UPTIME_UPDATE_SECONDS),
        M.SystemMetric(app_config.SYSTEM_UPDATE_SECONDS)
--- a/metrics/DataStructures.py
+++ b/metrics/DataStructures.py
@@ -122,16 +122,13 @@ class HealthData(AbstractData):
        self.e_state.labels(name=name, url=url, method=method, server=self.instance_prefix)
        self.set_data(is_up)

-    def set_data(self, is_up, working_time = None):
+    def set_data(self, is_up):
        time_ms = get_time_millis()
        self.is_up = is_up
        self.e_state.labels(name=self.name, url=self.url, method=self.method, server=self.instance_prefix).state(ENUM_UP_DN_STATES[0] if is_up else ENUM_UP_DN_STATES[1])
+        self.set_collect_time(get_time_millis() - time_ms)
        self.set_update_time()
        self.print_trigger_info()
-        if working_time:
-            self.set_collect_time(working_time)
-        else:
-            self.set_collect_time(get_time_millis() - time_ms)


 class RestValueData(AbstractData):
@@ -156,7 +153,7 @@ class RestValueData(AbstractData):
        self.g_value.labels(name=name, url=url, method=method, server=self.instance_prefix)
        self.set_data(value)

-    def set_data(self, value, working_time = None):
+    def set_data(self, value):
        time_ms = get_time_millis()
        self.value = value
        try:
@@ -164,50 +161,9 @@ class RestValueData(AbstractData):
        except:
            self.g_value.labels(name=self.name, url=self.url, method=self.method, server=self.instance_prefix).set(0)

+        self.set_collect_time(get_time_millis() - time_ms)
        self.set_update_time()
        self.print_trigger_info()
-        if working_time:
-            self.set_collect_time(working_time)
-        else:
-            self.set_collect_time(get_time_millis() - time_ms)
-
-
-class RestValueBData(AbstractData):
-    g_value: Gauge
-    def __init__(self, name, url, interval, timeout, value=None, method='GET', user=None, password=None, headers=None, prefix='',
-                 result_type='single', result_path=''):
-        super().__init__(name, interval, prefix)
-        if headers is None:
-            headers = {}
-        self.url = url
-        self.timeout = timeout
-        self.method = method.upper()
-        self.user = user
-        self.password = password
-        self.headers = headers
-        self.value = value
-        self.type = result_type
-        self.path = result_path
-        self.g_value = get_gauge_metric('das_rest_value_b',
-                                        'Remote REST API [name, url, method, server] Binary Value',
-                                        ['name', 'url', 'method', 'server'])
-        self.g_value.labels(name=name, url=url, method=method, server=self.instance_prefix)
-        self.set_data(value)
-
-    def set_data(self, value, working_time = None):
-        time_ms = get_time_millis()
-        self.value = value
-        try:
-            self.g_value.labels(name=self.name, url=self.url, method=self.method, server=self.instance_prefix).set(1 if str(value).upper() in ['ON', 'TRUE'] else 0)
-        except:
-            self.g_value.labels(name=self.name, url=self.url, method=self.method, server=self.instance_prefix).set(-1)
-
-        self.set_update_time()
-        self.print_trigger_info()
-        if working_time:
-            self.set_collect_time(working_time)
-        else:
-            self.set_collect_time(get_time_millis() - time_ms)


 class ShellValueData(AbstractData):
@@ -225,7 +181,7 @@ class ShellValueData(AbstractData):
        self.g_value.labels(name=name, command=command, server=self.instance_prefix)
        self.set_data(value)

-    def set_data(self, value, working_time = None):
+    def set_data(self, value):
        time_ms = get_time_millis()
        self.value = value
        try:
@@ -233,12 +189,9 @@ class ShellValueData(AbstractData):
        except:
            self.g_value.labels(name=self.name, command=self.command, server=self.instance_prefix).set(0)

+        self.set_collect_time(get_time_millis() - time_ms)
        self.set_update_time()
        self.print_trigger_info()
-        if working_time:
-            self.set_collect_time(working_time)
-        else:
-            self.set_collect_time(get_time_millis() - time_ms)


 class IcmpData(AbstractData):
@@ -254,16 +207,13 @@ class IcmpData(AbstractData):
        self.e_state.labels(name=name, ip=ip, server=self.instance_prefix)
        self.set_data(is_up)

-    def set_data(self, is_up, working_time = None):
+    def set_data(self, is_up):
        time_ms = get_time_millis()
        self.is_up = is_up
        self.e_state.labels(name=self.name, ip=self.ip, server=self.instance_prefix).state(ENUM_UP_DN_STATES[0] if is_up else ENUM_UP_DN_STATES[1])
+        self.set_collect_time(get_time_millis() - time_ms)
        self.set_update_time()
        self.print_trigger_info()
-        if working_time:
-            self.set_collect_time(working_time)
-        else:
-            self.set_collect_time(get_time_millis() - time_ms)


 class InterfaceData(AbstractData):
--- a/metrics/MetricClasses.py
+++ b/metrics/MetricClasses.py
@@ -12,7 +12,7 @@ import app_config

 from threading import Thread
 from metrics.DataStructures import DiskData, HealthData, IcmpData, ENUM_UP_DN_STATES, InterfaceData, UptimeData, \
-    SystemData, RestValueData, ShellValueData, RestValueBData
+    SystemData, RestValueData, ShellValueData


 class AbstractMetric:
@@ -36,7 +36,6 @@ class AbstractMetric:


 def is_health_check(url, timeout, method, user, pwd, headers, callback=None):
-    time_ms = get_time_millis()
    session = requests.Session()
    if user and pwd:
        session.auth = (user, pwd)
@@ -49,15 +48,13 @@ def is_health_check(url, timeout, method, user, pwd, headers, callback=None):
        )
        result = response.status_code == 200
        if callback is not None:
-            working_time = get_time_millis() - time_ms
-            callback(result, working_time)
+            callback(result)
        else:
            return result
    except (requests.ConnectTimeout, requests.exceptions.ConnectionError) as e:
        return False

 def get_rest_value(url, timeout, method, user, pwd, headers, callback=None, result_type='single', path=''):
-    time_ms = get_time_millis()
    session = requests.Session()
    if user and pwd:
        session.auth = (user, pwd)
@@ -70,11 +67,10 @@ def get_rest_value(url, timeout, method, user, pwd, headers, callback=None, resu
        )
        resp = json.loads(response.content.decode().replace("'", '"'))
        result = parse_response(resp, path)
-        if not str(result).isalnum():
+        if not result.isalnum():
            result = 0
        if callback is not None:
-            working_time = get_time_millis() - time_ms
-            callback(result, working_time)
+            callback(result)
        else:
            return result
    except (requests.ConnectTimeout, requests.exceptions.ConnectionError) as e:
@@ -102,7 +98,6 @@ def parse_response(resp, path):
            return ''

 def get_shell_value(command, args, callback=None):
-    time_ms = get_time_millis()
    cmd = [command, ' '.join(str(s) for s in args)]
    try:
        output = subprocess.check_output(cmd)
@@ -114,13 +109,11 @@ def get_shell_value(command, args, callback=None):
        result = 0

    if callback is not None:
-        working_time = get_time_millis() - time_ms
-        callback(result, working_time)
+        callback(result)
    else:
        return result

 def is_ping(ip, count, callback=None):
-    time_ms = get_time_millis()
    param = '-n' if platform.system().lower() == 'windows' else '-c'
    command = ['ping', param, str(count), ip]
    try:
@@ -130,10 +123,8 @@ def is_ping(ip, count, callback=None):
                  'time out'.upper() not in str(output).upper())
    except:
        result = False
-
    if callback is not None:
-        working_time = get_time_millis() - time_ms
-        callback(result, working_time)
+        callback(result)
    else:
        return result

@@ -143,8 +134,6 @@ def get_net_iface_stat(name):
 def get_next_update_time(d):
    return time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(d.updated_at + d.interval))

-def get_time_millis():
-    return round(time.time() * 1000)

 class DiskMetric(AbstractMetric):
    def __init__(self, config):
@@ -265,38 +254,6 @@ class RestValueMetric(AbstractMetric):
            print(f'[DEBUG] (next update at {get_next_update_time(d)}) on {d.url}: by {d.method} in {d.path} got value="{d.value}"')


-class RestValueBMetric(AbstractMetric):
-    def __init__(self, config):
-        super().__init__('rest_value_b', config)
-        for d in self.config:
-            name, url, interval, timeout, method = d['name'], d['url'], d['interval'], d['timeout'], d['method']
-            if 'auth' in self.config:
-                user = d['auth']['user']
-                pwd = d['auth']['pass']
-            else:
-                user = ''
-                pwd = ''
-            if 'headers' in self.config:
-                headers = d['headers']
-            else:
-                headers = ''
-            result_type, result_path = d['result_type'], d['result_path']
-            result = get_rest_value(url=url, timeout=timeout, method=method, user=user, pwd=pwd, headers=headers,
-                                    result_type=result_type, path=result_path)
-            self.data_array.append(RestValueBData(name, url, interval, timeout, result, method, user, pwd, headers, self.prefix, result_type, result_path))
-
-    def proceed_metric(self):
-        for d in self.data_array:
-            if d.is_need_to_update():
-                thread = Thread(target=get_rest_value, args=(d.url, d.timeout, d.method, d.user, d.password, d.headers,
-                                                             d.set_data, d.type, d.path))
-                thread.start()
-
-    def print_debug_info(self):
-        for d in self.data_array:
-            print(f'[DEBUG] (next update at {get_next_update_time(d)}) on {d.url}: by {d.method} in {d.path} got value="{d.value}"')
-
-
 class ShellValueMetric(AbstractMetric):
    def __init__(self, config):
        super().__init__('shell_value', config)
Author	SHA1	Message	Date
Anry Das	5fdca2c30d	Merge pull request 'Some improvements' (#6 ) from dev into main Improved Metric Classes Reviewed-on: #6	2025-04-19 16:05:37 +03:00
Anry Das	902d60bbea	Merge pull request 'Refactored Temperature - created single metric with labels' (#5 ) from dev into main Reviewed-on: #5	2025-04-06 11:54:48 +03:00
Anry Das	0e24bc09a0	Merge pull request 'Version 2.0' (#4 ) from dev into main Reviewed-on: #4 v.2.0: Refactored all metrics Added labels Added self measured metrics Updated README.md	2025-04-06 09:58:34 +03:00
das	7d8afee839	Merge pull request 'dev to main' (#3 ) from dev into main Reviewed-on: #3	2025-02-23 10:44:25 +02:00
das	78b7ea7146	Merge pull request 'Dev to Main: corrections' (#2 ) from dev into main Reviewed-on: #2 Removed unnecessary folder Corrected ICMP function Tested YAML files processing Updated .gitignore file	2025-02-18 10:25:39 +02:00
das	f24181ff79	Merge pull request 'Dev to Main' (#1 ) from dev into main Reviewed-on: #1	2025-02-16 15:16:23 +02:00