chore: updated the web page

Author: codeperfectplus

src/scripts/update_prometheus.sh

@@ -1,12 +1,29 @@
 #!/bin/bash
 
+# function to get the user name
+get_user_name() {
+    if [ "$(whoami)" = "root" ]; then
+        LOGNAME_USER=$(logname 2>/dev/null) # Redirect any error output to /dev/null
+        if [ $? -ne 0 ]; then               # Check if the exit status of the last command is not 0
+            USER_NAME=$(cat /etc/passwd | grep '/home' | cut -d: -f1 | tail -n 1)
+        else
+            USER_NAME=$LOGNAME_USER
+        fi
+    else
+        USER_NAME=$(whoami)
+    fi
+    echo "$USER_NAME"
+}
+
+USER_NAME=$(get_user_name)
 # Configuration
 CURRENT_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 CURRENT_DIR="$CURRENT_SCRIPT_DIR"
 ROOT_DIR="$(dirname "$(dirname "$CURRENT_DIR")")"
 PROMETHEUS_CONFIG_DIR="$ROOT_DIR/prometheus_config"
 CONTAINER_NAME="prometheus"
 PROMETHEUS_CONFIG="$PROMETHEUS_CONFIG_DIR/prometheus.yml"
+PROMETHEUS_DATA_DIR="/home/$USER_NAME/.database/prometheus"
 PROMETHEUS_IMAGE="prom/prometheus"  # Add your image name if needed
 NETWORK_NAME="flask-prometheus-net"  # Specify your network name
 PROMETHEUS_PORT="9090"  # Specify your port
@@ -34,6 +51,7 @@ else
       -p "$PROMETHEUS_PORT:$PROMETHEUS_PORT" \
       --restart always \
       -v "$PROMETHEUS_CONFIG:/etc/prometheus/prometheus.yml" \
+      -v "PROMETHEUS_DATA_DIR:/prometheus" \
       "$PROMETHEUS_IMAGE" &> /dev/null
 
     log "Prometheus container started successfully."

src/templates/network/dashboard_network.html

@@ -11,7 +11,7 @@ <h1>SystemGuard Active Targets</h1>
     <table>
         <thead>
             <tr>
-                <th>Job</th>
+                <th>Group</th>
                 <th>Instance</th>
                 <th>Health</th>
                 <th>Last Scrape</th>

src/templates/other/targets.html

@@ -14,10 +14,10 @@ <h1>SystemGuard Targets</h1>
             <table class="modern-table">
                 <thead>
                     <tr>
-                        <th>Job Name</th>
-                        <th>Targets</th>
-                        <th>Scrape Interval</th>
-                        <th>Actions</th>
+                        <th>Group Name <i class="fas fa-info-circle" title="Job Name is the name of the service that is being monitored."></i></th>
+                        <th>Targets <i class="fas fa-info-circle" title="Targets are the IP addresses of the services that are being monitored."></i></th>
+                        <th>Scrape Interval <i class="fas fa-info-circle" title="Scrape Interval is the time interval between each scrape of the target."></i></th>
+                        <th>New Interval<i class="fas fa-info-circle" title="Change the scrape interval of the target."></i></th>
                     </tr>
                 </thead>
                 <tbody>
@@ -32,7 +32,9 @@ <h1>SystemGuard Targets</h1>
                                     <form action="{{ url_for('remove_target') }}" method="post" class="inline-form">
                                         <input type="hidden" name="job_name" value="{{ info.job_name }}">
                                         <input type="hidden" name="target_to_remove" value="{{ target }}">
-                                        <input type="submit" value="Remove" class="btn-danger">
+                                        <button type="submit" class="btn-danger">
+                                            <i class="fas fa-times"></i> Remove
+                                        </button>
                                     </form>
                                 </li>
                                 {% endfor %}
@@ -62,7 +64,7 @@ <h2>Restart Prometheus Docker Service</h2>
         <div class="section">
             <h2>Add New Target</h2>
             <form action="{{ url_for('add_target') }}" method="post" class="add-target-form">
-                <input type="text" name="job_name" placeholder="Job Name" required class="input-field">
+                <input type="text" name="job_name" placeholder="Group Name" required class="input-field">
                 <input type="text" name="new_target" placeholder="New Target" required class="input-field">
                 <input type="text" name="scrape_interval" placeholder="Scrape Interval" required class="input-field">
                 <br>