flexmetric 0.5.1__py3-none-any.whl → 0.5.2__py3-none-any.whl

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/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/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.dist-info → flexmetric-0.5.2.dist-info}/METADATA

@@ -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.dist-info → flexmetric-0.5.2.dist-info}/RECORD

@@ -6,15 +6,15 @@ flexmetric/file_recognition/exec_file.py,sha256=9wBbnqPConxtLhqWTgigEr8VQG-fa9K_
 flexmetric/logging_module/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 flexmetric/logging_module/logger.py,sha256=hXj9m2Q_KxJVI5YRHRoK6PXV5tO6NmvuVjq2Ipx_1tE,447
 flexmetric/metric_process/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-flexmetric/metric_process/database_connections.py,sha256=3yYQmFTBz9h_DKWlRxpKi-RFmaFDjz95oZh0Flvfpd8,1591
-flexmetric/metric_process/database_processing.py,sha256=_7C1DyC9jtgiTUti4_YYFpQlE0BlJwbaEx3OPpDCGSs,4633
+flexmetric/metric_process/database_connections.py,sha256=Pa_Lcs8Im6pZxmET2pQRR3-DCyu8goEvup5dpYZH1Xk,3050
+flexmetric/metric_process/database_processing.py,sha256=Sbbk-ktdUSx7zFpjaJdC_8L6r61d82t4VKGOr7oAlB0,5066
 flexmetric/metric_process/expiring_queue.py,sha256=1oC0MjloitPiRo7yDgVarz81ETEQavKI_W-GFUvp5_Y,1920
 flexmetric/metric_process/process_commands.py,sha256=clGMQhLNcuJUO1gElpAS9Dyk0KU5w41DIguczjo7ceA,4089
 flexmetric/metric_process/prometheus_agent.py,sha256=pDPqiPtHLv1cfF6dPRNg2LtAhVF1UKf8MNZ_S9xuRQY,7712
-flexmetric/metric_process/queries_execution.py,sha256=NdnQ9Flbc8_6VOSY3aHxSmhcCsZf2zIxKTnc0hCp1oU,790
+flexmetric/metric_process/queries_execution.py,sha256=ed8GnWbBdvCb7WfQOmeJdpR0DarF_EHbXBPc6tKaEyg,1229
 flexmetric/metric_process/views.py,sha256=BY695dCpTkJRc1KLC9RNpFTieFdHeHvyqyefmHhMauE,3297
-flexmetric-0.5.1.dist-info/METADATA,sha256=pTpT0fjs-5GcnO8-Mq1t3UDz5DvCpgw7QaM5S7gZWyY,11276
-flexmetric-0.5.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-flexmetric-0.5.1.dist-info/entry_points.txt,sha256=urVePn5EWr3JqNvkYP7OsB_h2_Bqvv-Wq1MJRBexm8A,79
-flexmetric-0.5.1.dist-info/top_level.txt,sha256=zBlrNwKhXUNhgu9RRZnXxYwYnmE-eocRe6wKSmQROA4,11
-flexmetric-0.5.1.dist-info/RECORD,,
+flexmetric-0.5.2.dist-info/METADATA,sha256=rDkws5sg0EbOrR9r_yoOp3ZhdM7av_7ddXMg9YIXFPw,11307
+flexmetric-0.5.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+flexmetric-0.5.2.dist-info/entry_points.txt,sha256=urVePn5EWr3JqNvkYP7OsB_h2_Bqvv-Wq1MJRBexm8A,79
+flexmetric-0.5.2.dist-info/top_level.txt,sha256=zBlrNwKhXUNhgu9RRZnXxYwYnmE-eocRe6wKSmQROA4,11
+flexmetric-0.5.2.dist-info/RECORD,,