flexmetric 0.5.1__tar.gz → 0.5.2__tar.gz

{flexmetric-0.5.1 → flexmetric-0.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flexmetric
-Version: 0.5.1
+Version: 0.5.2
 Summary: A secure flexible Prometheus exporter for commands, databases, functions.
 Home-page: https://github.com/nikhillingadhal1999/flexmetric
 Author: Nikhil Lingadhal
@@ -21,6 +21,7 @@ Requires-Dist: wheel
 Requires-Dist: twine
 Requires-Dist: flask
 Requires-Dist: clickhouse-connect
+Requires-Dist: psycopg2-binary
 Dynamic: author
 Dynamic: classifier
 Dynamic: description

{flexmetric-0.5.1 → flexmetric-0.5.2}/flexmetric/metric_process/database_connections.py

@@ -2,11 +2,55 @@ import clickhouse_connect
 import sqlite3
 from flexmetric.logging_module.logger import get_logger
 import os
+import psycopg2
 
-logger = get_logger(__name__)
 
+logger = get_logger(__name__)
 logger.info("database logs")
 
+def create_postgres_client(db_conf: dict):
+    host = db_conf.get('host', 'localhost')
+    port = db_conf.get('port', 5432)
+    database = db_conf.get('database')
+    username = db_conf.get('username', 'postgres')
+    password = db_conf.get('password', '')
+
+    sslmode = db_conf.get('sslmode', 'prefer')
+    sslcert = db_conf.get('client_cert')
+    sslkey = db_conf.get('client_key')
+    sslrootcert = db_conf.get('ca_cert')
+
+    if not database:
+        raise ValueError("Missing 'database' name in PostgreSQL configuration")
+
+    conn_params = {
+        'host': host,
+        'port': port,
+        'dbname': database,
+        'user': username,
+        'password': password,
+        'sslmode': sslmode
+    }
+
+    if sslcert and sslkey and sslrootcert:
+        if not (os.path.isfile(sslcert) and os.path.isfile(sslkey) and os.path.isfile(sslrootcert)):
+            raise FileNotFoundError("One or more SSL certificate files not found.")
+        conn_params.update({
+            'sslcert': sslcert,
+            'sslkey': sslkey,
+            'sslrootcert': sslrootcert,
+            'sslmode': 'verify-full'
+        })
+
+    try:
+        conn = psycopg2.connect(**conn_params)
+        logger.info(f"PostgreSQL connection to '{database}' established successfully (SSL: {'Yes' if 'sslcert' in conn_params else 'No'})")
+        return conn
+
+    except Exception as e:
+        logger.error(f"Failed to create PostgreSQL client: {e}")
+        raise
+
 def create_clickhouse_client(db_conf):
     id = db_conf.get('id')
     host = db_conf.get('host', 'localhost')

{flexmetric-0.5.1 → flexmetric-0.5.2}/flexmetric/metric_process/database_processing.py

@@ -1,7 +1,7 @@
 import yaml
 import re
-from flexmetric.metric_process.database_connections import create_clickhouse_client,create_sqlite_client
-from flexmetric.metric_process.queries_execution import execute_clickhouse_command,execute_sqlite_query
+from flexmetric.metric_process.database_connections import create_clickhouse_client,create_sqlite_client,create_postgres_client
+from flexmetric.metric_process.queries_execution import execute_clickhouse_command,execute_sqlite_query,execute_postgres_query
 from flexmetric.logging_module.logger import get_logger
 logger = get_logger(__name__)
 
@@ -59,7 +59,10 @@ def create_clients_from_config(config_file: str):
                 client = create_sqlite_client(db_conf)
                 clients[db_id] = client
                 logger.info(clients)
-
+            elif db_type == 'postgres':
+                client = create_postgres_client(db_conf)
+                clients[db_id] = client
+                logger.info(clients)
             else:
                 logger.info(f"Unsupported database type: {db_type}")
 
@@ -123,10 +126,13 @@ def execute_commands(clients: dict, commands_file: str):
                 response ,column_names = execute_sqlite_query(client,query)
                 result = process_and_get_value(cmd,response,column_names)
                 results.append(result)
+            elif db_type == 'postgres':
+                response ,column_names = execute_postgres_query(client,query)
+                result = process_and_get_value(cmd,response,column_names)
+                results.append(result)
             else:
                 logger.info(f"Unknown type '{db_type}' in command '{cmd_id}'")
                 continue
-                
         except Exception as e:
             logger.error(f"Command '{cmd_id}' failed: {e}")
     return results

{flexmetric-0.5.1 → flexmetric-0.5.2}/flexmetric/metric_process/queries_execution.py

@@ -21,4 +21,20 @@ def execute_sqlite_query(conn, query):
         return rows, column_names
     except Exception as ex:
         logger.error(f"Exception during SQLite query: {ex}")
+        return [], []
+
+def execute_postgres_query(conn, query):
+    try:
+        cursor = conn.cursor()
+        cursor.execute(query)
+
+        rows = cursor.fetchall()
+        column_names = [desc[0] for desc in cursor.description]
+
+        logger.info(f"Query executed successfully. Rows fetched: {len(rows)}")
+
+        return rows, column_names
+
+    except Exception as ex:
+        logger.error(f"Exception during Postgres query: {ex}")
         return [], []

{flexmetric-0.5.1 → flexmetric-0.5.2}/flexmetric.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flexmetric
-Version: 0.5.1
+Version: 0.5.2
 Summary: A secure flexible Prometheus exporter for commands, databases, functions.
 Home-page: https://github.com/nikhillingadhal1999/flexmetric
 Author: Nikhil Lingadhal
@@ -21,6 +21,7 @@ Requires-Dist: wheel
 Requires-Dist: twine
 Requires-Dist: flask
 Requires-Dist: clickhouse-connect
+Requires-Dist: psycopg2-binary
 Dynamic: author
 Dynamic: classifier
 Dynamic: description

{flexmetric-0.5.1 → flexmetric-0.5.2}/flexmetric.egg-info/requires.txt

@@ -6,3 +6,4 @@ wheel
 twine
 flask
 clickhouse-connect
+psycopg2-binary

{flexmetric-0.5.1 → flexmetric-0.5.2}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="flexmetric",
-    version="0.5.1",
+    version="0.5.2",
     author="Nikhil Lingadhal",
     description="A secure flexible Prometheus exporter for commands, databases, functions.",
     long_description=open("README.md").read(),
@@ -23,7 +23,8 @@ setup(
         "wheel",
         "twine",
         "flask",
-        "clickhouse-connect"
+        "clickhouse-connect",
+        "psycopg2-binary"
     ],
     entry_points={
         "console_scripts": [