chore: new feature added to add and remove targets

Author: codeperfectplus

requirements.txt

@@ -29,4 +29,7 @@ speedtest-cli==2.1.3
 prometheus_client==0.20.0
 
 # influxdb-client, optional for writing metrics to InfluxDB
-# influxdb-client==1.46.0
+# influxdb-client==1.46.0
+
+# pyyaml for parsing YAML configuration files
+pyyaml==6.0.2

src/background_task/__init__.py

@@ -1,7 +1,7 @@
 import os
 from src.background_task.monitor_website import start_website_monitoring
 from src.background_task.log_system_info import monitor_settings
-from src.background_task.prometheus_helper import fetch_file_metrics_task
+from src.background_task.external_monitoring import fetch_file_metrics_task
 from src.logger import logger
 
 

src/background_task/prometheus_helper.py …c/background_task/external_monitoring.pysrc/background_task/prometheus_helper.py renamed to src/background_task/external_monitoring.py src/background_task/prometheus_helper.py renamed to src/background_task/external_monitoring.py

@@ -20,3 +20,103 @@
 # except Exception as e:
 #     logger.error(f"Failed to connect to InfluxDB: {e}")
 #     raiseclient = InfluxDBClient(url=url, token=INFLUXDB_TOKEN, org=org)
+
+
+
+# @app.route('/api/v2/influxdb/graphs_data', methods=['GET'])
+# @login_required
+# def graph_data_api_v2():
+#     try:
+#         current_time = datetime.now()
+#         # Get the time filter from query parameters
+#         time_filter = request.args.get('filter', default='1 day')
+
+#         # Determine the start time based on the filter
+#         time_deltas = {
+#             '5 minutes': '-5m',
+#             '15 minutes': '-15m',
+#             '30 minutes': '-30m',
+#             '1 hour': '-1h',
+#             '3 hours': '-3h',
+#             '6 hours': '-6h',
+#             '12 hours': '-12h',
+#             '1 day': '-1d',
+#             '2 days': '-2d',
+#             '3 days': '-3d',
+#             '1 week': '-1w',
+#             '1 month': '-30d',
+#             '3 months': '-90d',
+#         }
+
+#         # Get the start time for the query
+#         time_range = time_deltas.get(time_filter, '-1d')
+
+#         # Build the InfluxDB query
+#         flux_query = f"""
+#         from(bucket: "{bucket}")
+#         |> range(start: {time_range})
+#         |> filter(fn: (r) => r._measurement == "system_info")
+#         |> pivot(rowKey:["_time"], columnKey: ["_field"], valueColumn: "_value")
+#         """
+
+#         # Execute the query
+#         tables = query_api.query(flux_query)
+
+#         # Initialize lists for the data
+#         time_data = []
+#         cpu_data = []
+#         memory_data = []
+#         battery_data = []
+#         network_sent_data = []
+#         network_received_data = []
+#         dashboard_memory_usage = []
+#         cpu_frequency = []
+#         current_temp = []
+
+#         # Parse the results
+#         for table in tables:
+#             for record in table.records:
+#                 time_data.append(record.values.get("_time", None))
+#                 # Extract each field by key (handle missing fields gracefully)
+#                 cpu_data.append(record.values.get("cpu_percent", None))
+#                 memory_data.append(record.values.get("memory_percent", None))
+#                 battery_data.append(record.values.get("battery_percent", None))
+#                 network_sent_data.append(record.values.get("network_sent", None))
+#                 network_received_data.append(record.values.get("network_received", None))
+#                 dashboard_memory_usage.append(record.values.get("dashboard_memory_usage", None))
+#                 cpu_frequency.append(record.values.get("cpu_frequency", None))
+#                 current_temp.append(record.values.get("current_temp", None))
+
+#         # Return the data as JSON
+#         response = jsonify({
+#             "time": time_data,
+#             "cpu": cpu_data,
+#             "memory": memory_data,
+#             "battery": battery_data,
+#             "network_sent": network_sent_data,
+#             "network_received": network_received_data,
+#             "dashboard_memory_usage": dashboard_memory_usage,
+#             "cpu_frequency": cpu_frequency,
+#             "current_temp": current_temp,
+#             "current_time": current_time
+#         })
+
+#         # Clean up large data structures
+#         del tables
+#         del time_data
+#         del cpu_data
+#         del memory_data
+#         del battery_data
+#         del network_sent_data
+#         del network_received_data
+#         del dashboard_memory_usage
+#         del cpu_frequency
+#         del current_temp
+
+#         gc.collect()
+
+#         return response, 200
+
+#     except Exception as e:
+#         # Handle and log the error for debugging purposes
+#         return jsonify({'error': 'An error occurred while fetching the graph data', 'details': str(e)}), 500

src/influxdb_config.py

@@ -1,4 +1,3 @@
-import datetime
 from src.config import db
 
 class PageToggleSettings(db.Model):
@@ -26,4 +25,4 @@ class PageToggleSettings(db.Model):
     is_disk_info_enabled = db.Column(db.Boolean, default=True)
     is_network_info_enabled = db.Column(db.Boolean, default=True)
     is_process_info_enabled = db.Column(db.Boolean, default=True)
-    is_dashboard_network_enabled = db.Column(db.Boolean, default=False)
+    is_dashboard_network_enabled = db.Column(db.Boolean, default=True)

src/models/page_toggle_settings.py

@@ -14,7 +14,7 @@
 api_bp = blueprints.Blueprint("api", __name__)
 
 PROMETHEUS_URL = 'http://localhost:9090'  # Change if using a different URL or port
-QUERY_API_URL = f'{PROMETHEUS_URL}/api/v1/query'
+QUERY_API_URL = f'{PROMETHEUS_URL}/api/v1/query_range'
 TARGETS_API_URL = f'{PROMETHEUS_URL}/api/v1/targets'
 
 PROMETHEUS_METRICS = {
@@ -28,7 +28,7 @@
     'current_temp': 'cpu_temperature',
 }
 
-@app.route("/api/system-info", methods=["GET"])
+@app.route("/api/v1/system-info", methods=["GET"])
 @login_required
 def system_api():
     try:
@@ -142,104 +142,6 @@ def graph_data_api():
         # Handle and log the error for debugging purposes
         return jsonify({'error': 'An error occurred while fetching the graph data', 'details': str(e)}), 500
 
-# @app.route('/api/v2/influxdb/graphs_data', methods=['GET'])
-# @login_required
-# def graph_data_api_v2():
-#     try:
-#         current_time = datetime.now()
-#         # Get the time filter from query parameters
-#         time_filter = request.args.get('filter', default='1 day')
-
-#         # Determine the start time based on the filter
-#         time_deltas = {
-#             '5 minutes': '-5m',
-#             '15 minutes': '-15m',
-#             '30 minutes': '-30m',
-#             '1 hour': '-1h',
-#             '3 hours': '-3h',
-#             '6 hours': '-6h',
-#             '12 hours': '-12h',
-#             '1 day': '-1d',
-#             '2 days': '-2d',
-#             '3 days': '-3d',
-#             '1 week': '-1w',
-#             '1 month': '-30d',
-#             '3 months': '-90d',
-#         }
-
-#         # Get the start time for the query
-#         time_range = time_deltas.get(time_filter, '-1d')
-
-#         # Build the InfluxDB query
-#         flux_query = f"""
-#         from(bucket: "{bucket}")
-#         |> range(start: {time_range})
-#         |> filter(fn: (r) => r._measurement == "system_info")
-#         |> pivot(rowKey:["_time"], columnKey: ["_field"], valueColumn: "_value")
-#         """
-
-#         # Execute the query
-#         tables = query_api.query(flux_query)
-
-#         # Initialize lists for the data
-#         time_data = []
-#         cpu_data = []
-#         memory_data = []
-#         battery_data = []
-#         network_sent_data = []
-#         network_received_data = []
-#         dashboard_memory_usage = []
-#         cpu_frequency = []
-#         current_temp = []
-
-#         # Parse the results
-#         for table in tables:
-#             for record in table.records:
-#                 time_data.append(record.values.get("_time", None))
-#                 # Extract each field by key (handle missing fields gracefully)
-#                 cpu_data.append(record.values.get("cpu_percent", None))
-#                 memory_data.append(record.values.get("memory_percent", None))
-#                 battery_data.append(record.values.get("battery_percent", None))
-#                 network_sent_data.append(record.values.get("network_sent", None))
-#                 network_received_data.append(record.values.get("network_received", None))
-#                 dashboard_memory_usage.append(record.values.get("dashboard_memory_usage", None))
-#                 cpu_frequency.append(record.values.get("cpu_frequency", None))
-#                 current_temp.append(record.values.get("current_temp", None))
-
-#         # Return the data as JSON
-#         response = jsonify({
-#             "time": time_data,
-#             "cpu": cpu_data,
-#             "memory": memory_data,
-#             "battery": battery_data,
-#             "network_sent": network_sent_data,
-#             "network_received": network_received_data,
-#             "dashboard_memory_usage": dashboard_memory_usage,
-#             "cpu_frequency": cpu_frequency,
-#             "current_temp": current_temp,
-#             "current_time": current_time
-#         })
-
-#         # Clean up large data structures
-#         del tables
-#         del time_data
-#         del cpu_data
-#         del memory_data
-#         del battery_data
-#         del network_sent_data
-#         del network_received_data
-#         del dashboard_memory_usage
-#         del cpu_frequency
-#         del current_temp
-
-#         gc.collect()
-
-#         return response, 200
-
-#     except Exception as e:
-#         # Handle and log the error for debugging purposes
-#         return jsonify({'error': 'An error occurred while fetching the graph data', 'details': str(e)}), 500
-
 @app.route('/api/v1/prometheus/graphs_data', methods=['GET'])
 @login_required
 def graph_data_api_v3():
@@ -509,4 +411,3 @@ def get_os_info_api():
         return jsonify(os_info), 200
     except Exception as e:
         return jsonify({"error": "An error occurred while fetching the OS information", "details": str(e)}), 500
-    

src/routes/api.py

@@ -0,0 +1,40 @@
+import os
+import yaml
+from src.utils import ROOT_DIR
+
+prometheus_yml_path = os.path.join(ROOT_DIR, 'prometheus_config/prometheus.yml')
+
+def is_valid_file(file_path: str) -> bool:
+    """Checks if a file is valid and has key-value pairs separated by a colon."""
+    with open(file_path, 'r') as file:
+        for line in file:
+            if not line.strip():
+                continue
+            if ':' not in line:
+                return False
+    return True
+
+def load_yaml(file_path):
+    """Load the YAML file."""
+    with open(file_path, 'r') as file:
+        return yaml.safe_load(file)
+
+def save_yaml(data, file_path):
+    """Save the updated YAML data back to the file."""
+    with open(file_path, 'w') as file:
+        yaml.dump(data, file, default_flow_style=False)
+
+def show_targets():
+    """Show all targets for each job."""
+    config = load_yaml(prometheus_yml_path)
+    targets_info = []
+    for scrape_config in config.get('scrape_configs', []):
+        job_name = scrape_config['job_name']
+        targets = scrape_config['static_configs'][0]['targets']
+        scrape_interval = scrape_config.get('scrape_interval', '15s')
+        targets_info.append({
+            'job_name': job_name,
+            'targets': targets,
+            'scrape_interval': scrape_interval
+        })
+    return targets_info