flexmetric 0.4.3__tar.gz → 0.5.0__tar.gz

{flexmetric-0.4.3 → flexmetric-0.5.0}/PKG-INFO

@@ -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 → flexmetric-0.5.0}/README.md

@@ -155,21 +155,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 → flexmetric-0.5.0}/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-0.4.3 → flexmetric-0.5.0}/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 → flexmetric-0.5.0}/flexmetric.egg-info/PKG-INFO

@@ -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 → flexmetric-0.5.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="flexmetric",
-    version="0.4.3",
+    version="0.5.0",
     author="Nikhil Lingadhal",
     description="A secure flexible Prometheus exporter for commands, databases, functions.",
     long_description=open("README.md").read(),