flexmetric 0.5.1__py3-none-any.whl → 0.5.3__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.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flexmetric
-Version: 0.5.1
+Version: 0.5.3
 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
@@ -32,25 +33,38 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
-# FlexMetric
+FlexMetric is a lightweight, pluggable, and extensible Prometheus exporter that helps you collect, expose, and visualize custom metrics with minimal setup and maximum flexibility.
 
-FlexMetric is a lightweight, flexible, and extensible Prometheus exporter that allows you to securely expose system metrics, database query results, Python function outputs, and externally submitted metrics—via an optional Flask API with HTTPS support—as Prometheus-compatible metrics, all with minimal setup and maximum customization.
+With FlexMetric, you can:
 
----
+Run system commands and expose their output as metrics
+
+Execute SQL queries against databases like SQLite, PostgreSQL, and ClickHouse
+
+Call custom Python functions and export their results
 
-## Features
+Receive externally submitted metrics via a secure Flask-based API with optional HTTPS (TLS)
 
-- Run shell commands and expose the results as Prometheus metrics.  
-  ➔ **Harmful commands (e.g., file deletion, system shutdown) are blocked for safety.**
-- Execute SQL queries (e.g., SQLite) and monitor database statistics.  
-  ➔ **Potentially dangerous queries (e.g., `DROP`, `DELETE`, `TRUNCATE`) are not allowed.**
-- Automatically discover and expose Python function outputs as metrics.
-- Expose an optional **Flask API** (`/update_metric`) to receive external metrics dynamically.
-- Modular and easy to extend—add your own custom integrations.
-- Built-in Prometheus HTTP server (`/metrics`) with configurable port.
-- **Supports HTTPS** to securely expose both metrics and API endpoints.
-- **Input sanitization** is performed to ensure only safe commands and queries are executed.
+All metrics are exposed in Prometheus-compatible format, making them ready for visualization in Grafana or any Prometheus-based monitoring stack.
+---
 
+Paste your rich text content here. You can paste directly from Word or other rich text sources.
+
+*   Run **shell commands** and expose the results as **Prometheus metrics**.  
+    ➔ _Harmful commands (e.g., file deletion, system shutdown) are blocked for safety._
+    
+*   Execute **SQL queries** and monitor database statistics:
+    
+    * **SQLite** (lightweight, file-based databases)
+    * **PostgreSQL** (robust, production-grade relational databases)
+    * **ClickHouse** (high-performance, analytical databases)  
+* Potentially dangerous queries (e.g., `DROP`, `DELETE`, `TRUNCATE`) are blocked by default.
+*   Automatically discover and expose **Python function outputs** as metrics.
+*   Expose an optional **Flask API** (`/update_metric`) to receive and update external metrics **dynamically**.
+*   Modular and **easy to extend**—add your own **custom integrations** with minimal effort.
+*   Built-in **Prometheus-compatible HTTP server** (`/metrics`) with configurable port.
+*   Supports **HTTPS** to securely expose both the metrics endpoint and API. 
+*   Input **sanitization and validation** ensure only safe commands and queries are executed.
 
 ---
 
@@ -189,52 +203,99 @@ Filesystem      Size  Used Avail Use% Mounted on
 | `timeout_seconds` | Maximum time (in seconds) to wait for the command to complete. If it exceeds this time, the command is aborted.             |
 
 ## Database mode
+## 🔗 Supported Database Connections
+
+FlexMetric supports fetching and exposing metrics from multiple databases using a simple YAML-based configuration. This allows you to monitor data directly from your existing data sources without writing custom code.
+
+### ✅ Currently Supported Databases:
+
+| Database      | Type Name     | Description                                      |
+|--------------|---------------|--------------------------------------------------|
+| **SQLite**    | `sqlite`      | Lightweight, file-based relational database       |
+| **PostgreSQL** | `postgres`    | Robust, production-grade relational database      |
+| **ClickHouse** | `clickhouse`  | High-performance, analytical columnar database    |
+
+---
+
+### 📄 Example `database.yaml` Configuration:
 file - database.yaml
 ```yaml
 databases:
-  - id: "active_user_count"
+  - id: "local_sqlite"
+    type: "sqlite"
+    db_connection: "/path/to/example.db"
+
+  - id: "analytics_pg"
+    type: "postgres"
+    host: "localhost"
+    port: 5432
+    database: "metricsdb"
+    username: "postgres"
+    password: "postgres_password"
+    sslmode: "disable"
+    client_cert: "/path/to/cert.pem"
+    client_key: "/path/to/key.pem"
+    ca_cert: "/path/to/ca.pem"
+
+  - id: "clickhouse_cluster"
     type: "clickhouse"
     host: "localhost"
-    port: 8123
+    port: 8443
     username: "default"
-    password: ""
-    client_cert: ""
-    client_key: ""
-    ca_cert: ""
-
-  - id: "userdb"
-    type: "sqlite"
-    db_connection: "/path/to/my.db"
+    password: "clickhouse_password"
+    secure: true
+    client_cert: "/path/to/cert.pem"
+    client_key: "/path/to/key.pem"
+    ca_cert: "/path/to/ca.pem"
 ```
-file - queries.yaml
+
+## Supported Query Configuration
+
+FlexMetric allows you to define custom queries in a simple YAML format. Each query is linked to a database using the `database_id` and can expose the results as Prometheus metrics with flexible labeling and value extraction.
+
+### Example `queries.yaml` Configuration:
+
 ```yaml
 commands:
-  - id: "active_user_count"
-    type: "clickhouse"
-    database_id: "active_user_count"
+  - id: "active_user_count_pg"
+    type: "postgres"
+    database_id: "analytics_pg"
     query: |
       SELECT
         country AS country_name,
-        COUNT() AS active_user_count
+        COUNT(*) AS active_user_count
       FROM users
-      WHERE is_active = 1
-      GROUP BY country
+      WHERE is_active = true
+      GROUP BY country;
     main_label: "active_user_count"
     labels: ["country_name"]
     value_column: "active_user_count"
 
-  - id: "list_all_users_sqlite"
+  - id: "total_user_count_sqlite"
     type: "sqlite"
-    database_id: "userdb"
+    database_id: "local_sqlite"
+    query: |
+      SELECT
+        'all' AS user_group,
+        COUNT(*) AS total_user_count
+      FROM users;
+    main_label: "total_user_count"
+    labels: ["user_group"]
+    value_column: "total_user_count"
+
+  - id: "clickhouse_user_summary"
+    type: "clickhouse"
+    database_id: "clickhouse_cluster"
     query: |
       SELECT
-        id,
-        name
+        region AS region_name,
+        COUNT() AS user_count
       FROM users
-    main_label: "user_list"
-    labels: ["id", "name"]
-    value_column: "id"
-
+      WHERE status = 'active'
+      GROUP BY region;
+    main_label: "clickhouse_user_count"
+    labels: ["region_name"]
+    value_column: "user_count"
 ```
 ## Functions mode
 

{flexmetric-0.5.1.dist-info → flexmetric-0.5.3.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.3.dist-info/METADATA,sha256=CVkAz_6fG6cJgoKN7e_GB-RxTBQJM1ehGz_s5p23Q8I,13820
+flexmetric-0.5.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+flexmetric-0.5.3.dist-info/entry_points.txt,sha256=urVePn5EWr3JqNvkYP7OsB_h2_Bqvv-Wq1MJRBexm8A,79
+flexmetric-0.5.3.dist-info/top_level.txt,sha256=zBlrNwKhXUNhgu9RRZnXxYwYnmE-eocRe6wKSmQROA4,11
+flexmetric-0.5.3.dist-info/RECORD,,