flexmetric 0.1.2__tar.gz → 0.1.4__tar.gz

{flexmetric-0.1.2 → flexmetric-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flexmetric
-Version: 0.1.2
+Version: 0.1.4
 Summary: A flexible Prometheus exporter for commands, databases, functions, and scripts.
 Home-page: https://github.com/nikhillingadhal1999/custom_prometheus_agent
 Author: Nikhil Lingadhal

{flexmetric-0.1.2 → flexmetric-0.1.4}/flexmetric/metric_process/prometheus_agent.py

@@ -96,7 +96,8 @@ def measure(init_flag,args):
         exec_result.extend(function_results)
     if args.commands:
         cmd_results = process_commands(args.commands_config)
-        exec_result.extend(cmd_results)
+        if cmd_results != None:
+            exec_result.extend(cmd_results)
     # exec_result = process_commands('commands.yaml')
     # print(exec_result)
     global gauges
@@ -123,7 +124,8 @@ def measure(init_flag,args):
                 label_dict = dict(zip(labels, result['label']))
                 gauge.labels(**label_dict).set(convert_to_data_type(result['value']))
 
-if __name__ == "__main__":
+
+def main():
     args = arguments()
     print("Validating configuration...")
     if not validate_all_modes(args):
@@ -138,3 +140,4 @@ if __name__ == "__main__":
         measure(flag,args)
         flag = False
         time.sleep(5)
+main()

{flexmetric-0.1.2 → flexmetric-0.1.4}/flexmetric.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flexmetric
-Version: 0.1.2
+Version: 0.1.4
 Summary: A flexible Prometheus exporter for commands, databases, functions, and scripts.
 Home-page: https://github.com/nikhillingadhal1999/custom_prometheus_agent
 Author: Nikhil Lingadhal

{flexmetric-0.1.2 → flexmetric-0.1.4}/flexmetric.egg-info/SOURCES.txt

@@ -15,5 +15,4 @@ flexmetric/logging_module/__init__.py
 flexmetric/logging_module/logger.py
 flexmetric/metric_process/__init__.py
 flexmetric/metric_process/database_processing.py
-flexmetric/metric_process/process_commands.py
 flexmetric/metric_process/prometheus_agent.py

{flexmetric-0.1.2 → flexmetric-0.1.4}/setup.py

@@ -2,14 +2,14 @@ from setuptools import setup, find_packages
 
 setup(
     name="flexmetric",
-    version="0.1.2",
+    version="0.1.4",
     author="Nikhil Lingadhal",
     description="A flexible Prometheus exporter for commands, databases, functions, and scripts.",
     long_description=open("README.md").read(),
     long_description_content_type="text/markdown",
     url="https://github.com/nikhillingadhal1999/custom_prometheus_agent",
     license="MIT",
-    packages=find_packages(),  # Auto-detects submodules in flexmetric/
+    packages=find_packages(),
     install_requires=[
         "prometheus_client",
         "PyYAML",

flexmetric-0.1.2/flexmetric/metric_process/process_commands.py

@@ -1,73 +0,0 @@
-import subprocess
-import yaml
-import re
-
-# 1. Read YAML commands
-def read_commands_from_yaml(file_path):
-    with open(file_path, 'r') as f:
-        config = yaml.safe_load(f)
-    return config.get('commands', [])
-
-# 2. Execute command with timeout
-def execute_command_with_timeout(command, timeout):
-    try:
-        result = subprocess.run(command, shell=True, capture_output=True, text=True, timeout=timeout)
-        if result.returncode != 0:
-            return ''
-        return result.stdout.strip()
-    except subprocess.TimeoutExpired:
-        return ''
-
-def process_commands(config_file):
-    commands = read_commands_from_yaml(config_file)
-    all_results = []
-
-    for cmd_info in commands:
-        command = cmd_info['command']
-        label_name = cmd_info['label']
-        timeout = cmd_info.get('timeout_seconds', 30)
-        label_column = cmd_info.get('label_column', -1)
-        value_column = cmd_info.get('value_column', 0)
-        fixed_label_value = cmd_info.get('label_value')
-
-        raw_output = execute_command_with_timeout(command, timeout)
-        lines = raw_output.strip().splitlines()
-
-        result_list = []
-
-        for line in lines:
-            parts = line.strip().split()
-            if not parts:
-                continue
-            if label_column == 'fixed':
-                label = fixed_label_value or 'label'
-            else:
-                try:
-                    label = parts[label_column]
-                except IndexError:
-                    label = 'unknown'
-            try:
-                raw_value = parts[value_column]
-                cleaned_value = re.sub(r'[^\d\.\-]', '', raw_value)
-                value = float(cleaned_value) if cleaned_value else 1
-            except (IndexError, ValueError):
-                value = 1
-
-            result_list.append({
-                'label': label,
-                'value': value
-            })
-
-        formatted = {
-            'result': result_list,
-            'labels': [label_name]
-        }
-        all_results.append(formatted)
-
-    return all_results
-
-
-# # Example usage:
-# if __name__ == "__main__":
-#     results = process_commands('/Users/nlingadh/code/custom_prometheus_agent/src/commands.yaml')
-#     print(results)