flexmetric 0.4.3__py3-none-any.whl → 0.5.0__py3-none-any.whl

flexmetric/metric_process/database_connections.py

@@ -15,7 +15,7 @@ def create_clickhouse_client(db_conf):
     password = db_conf.get('password', '')
 
     client_cert = db_conf.get('client_cert')
-    client_cert_key = db_conf.get('client_cert_key')
+    client_cert_key = db_conf.get('client_key')
     ca_cert = db_conf.get('ca_cert')
 
     secure = bool(client_cert and client_cert_key and ca_cert)
@@ -26,13 +26,14 @@ def create_clickhouse_client(db_conf):
         'username': username,
         'password': password,
         'secure': secure,
+        'verify': True
     }
 
     if secure:
         settings.update({
             'client_cert': client_cert,
             'client_cert_key': client_cert_key,
-            'secure_ca': ca_cert,
+            'ca_cert': ca_cert,
         })
 
     client = clickhouse_connect.get_client(**settings)

flexmetric/metric_process/queries_execution.py

@@ -12,17 +12,13 @@ def execute_clickhouse_command(client, command: str):
     except Exception as e:
         logger.error(f"Error executing command: {e}")
         return None
-def execute_sqlite_query(conn,query):
+def execute_sqlite_query(conn, query):
     try:
         cursor = conn.cursor()
         cursor.execute(query)
-        result = cursor.fetchone()
+        rows = cursor.fetchall()
         column_names = [desc[0] for desc in cursor.description]
-        conn.close()
-        return float(result[0]) if result and result[0] is not None else None , column_names
+        return rows, column_names
     except Exception as ex:
-        logger.error(f"Exception : {ex}")
-        return None
-    
-
-
+        logger.error(f"Exception during SQLite query: {ex}")
+        return [], []

{flexmetric-0.4.3.dist-info → flexmetric-0.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flexmetric
-Version: 0.4.3
+Version: 0.5.0
 Summary: A secure flexible Prometheus exporter for commands, databases, functions.
 Home-page: https://github.com/nikhillingadhal1999/flexmetric
 Author: Nikhil Lingadhal
@@ -189,21 +189,52 @@ 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
-
+file - database.yaml
 ```yaml
 databases:
-  - name: mydb
-    db_type: sqlite
-    db_connection: /path/to/my.db
-````
+  - id: "active_user_count"
+    type: "clickhouse"
+    host: "localhost"
+    port: 8123
+    username: "default"
+    password: ""
+    client_cert: ""
+    client_key: ""
+    ca_cert: ""
+
+  - id: "userdb"
+    type: "sqlite"
+    db_connection: "/path/to/my.db"
+```
+file - queries.yaml
 ```yaml
 commands:
-  - name: user_count
-    database: userdb
-    query: "SELECT COUNT(*) FROM users;"
-    main_label: database_user_count
-    labels: ["database_name", "table_name"]
-    label_values: ["userdb", "users"]
+  - id: "active_user_count"
+    type: "clickhouse"
+    database_id: "active_user_count"
+    query: |
+      SELECT
+        country AS country_name,
+        COUNT() AS active_user_count
+      FROM users
+      WHERE is_active = 1
+      GROUP BY country
+    main_label: "active_user_count"
+    labels: ["country_name"]
+    value_column: "active_user_count"
+
+  - id: "list_all_users_sqlite"
+    type: "sqlite"
+    database_id: "userdb"
+    query: |
+      SELECT
+        id,
+        name
+      FROM users
+    main_label: "user_list"
+    labels: ["id", "name"]
+    value_column: "id"
+
 ```
 ## Functions mode
 

{flexmetric-0.4.3.dist-info → flexmetric-0.5.0.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=CqYrzXkwoB7yq4SpIu7_jDDNHSemaPsfDJj5DLwHSXM,1574
+flexmetric/metric_process/database_connections.py,sha256=G76qZgKp61gEbejpWL956SM9okUzMavC6nSIrOPnD_k,1590
 flexmetric/metric_process/database_processing.py,sha256=_7C1DyC9jtgiTUti4_YYFpQlE0BlJwbaEx3OPpDCGSs,4633
 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=uTGcbB8hWVVYX_PsR-sBMrZIByP50bL4KOsdDq2XtKU,858
+flexmetric/metric_process/queries_execution.py,sha256=NdnQ9Flbc8_6VOSY3aHxSmhcCsZf2zIxKTnc0hCp1oU,790
 flexmetric/metric_process/views.py,sha256=BY695dCpTkJRc1KLC9RNpFTieFdHeHvyqyefmHhMauE,3297
-flexmetric-0.4.3.dist-info/METADATA,sha256=Uv0kdl7bM3lEkXwBjQcewIv9ph3APOqtyoCqk8sVFck,10672
-flexmetric-0.4.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-flexmetric-0.4.3.dist-info/entry_points.txt,sha256=urVePn5EWr3JqNvkYP7OsB_h2_Bqvv-Wq1MJRBexm8A,79
-flexmetric-0.4.3.dist-info/top_level.txt,sha256=zBlrNwKhXUNhgu9RRZnXxYwYnmE-eocRe6wKSmQROA4,11
-flexmetric-0.4.3.dist-info/RECORD,,
+flexmetric-0.5.0.dist-info/METADATA,sha256=oKYei2gWS8fHPBhlNhUCpdJLeWWb5QiKOwzf1p6PYfU,11276
+flexmetric-0.5.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+flexmetric-0.5.0.dist-info/entry_points.txt,sha256=urVePn5EWr3JqNvkYP7OsB_h2_Bqvv-Wq1MJRBexm8A,79
+flexmetric-0.5.0.dist-info/top_level.txt,sha256=zBlrNwKhXUNhgu9RRZnXxYwYnmE-eocRe6wKSmQROA4,11
+flexmetric-0.5.0.dist-info/RECORD,,