prometheus config function updated

Author: codeperfectplus

src/routes/helper/prometheus_helper.py

@@ -43,7 +43,9 @@ def update_prometheus_config():
 
     # Get the machine's IP address
     try:
-        ipv4_address = subprocess.run(['hostname', '-I'], capture_output=True, text=True, check=True).stdout.split()[0]
+        ipv4_address = subprocess.run(
+            ['hostname', '-I'], capture_output=True, text=True, check=True
+        ).stdout.split()[0]
     except subprocess.CalledProcessError as e:
         print(f"Error getting IP address: {e}")
         return False
@@ -54,29 +56,28 @@ def update_prometheus_config():
     except Exception as e:
         print(f"Error loading YAML config: {e}")
         return False
-
-    # Fetch the 'localhost' job
-    localhost_job = next((job for job in config.get('scrape_configs', []) if job.get('job_name') == 'localhost'), None)
 
-    if localhost_job:
-        # Update the IP address for the 'localhost' job target
-        localhost_job['static_configs'][0]['targets'][0] = f'{ipv4_address}:5050'
-        
-        # Create a new OrderedDict to maintain the correct order
-        updated_job = OrderedDict()
-        updated_job['job_name'] = localhost_job['job_name']
-        updated_job['scrape_interval'] = localhost_job.get('scrape_interval', '10s')
-        updated_job['static_configs'] = localhost_job['static_configs']
-        
-        # Add basic_auth last to maintain order
-        if 'basic_auth' in localhost_job:
-            updated_job['basic_auth'] = localhost_job['basic_auth']
+    for job in config.get('scrape_configs', []):
+        if job['job_name'] == 'localhost':
+            # Update the target for 'localhost' job
+            job['static_configs'][0]['targets'][0] = f'{ipv4_address}:5050'
+
+            # Create a new OrderedDict to ensure the correct order
+            updated_job = OrderedDict()
+            updated_job['job_name'] = job['job_name']
+            updated_job['scrape_interval'] = job.get('scrape_interval', '10s')
+            updated_job['static_configs'] = job['static_configs']
+
+            # Add basic_auth at the end if it exists
+            if 'basic_auth' in job:
+                updated_job['basic_auth'] = job['basic_auth']
 
         # Replace the old job with the updated one
-        for index, job in enumerate(config['scrape_configs']):
-            if job['job_name'] == 'localhost':
+        for index, j in enumerate(config['scrape_configs']):
+            if j['job_name'] == 'localhost':
                 config['scrape_configs'][index] = updated_job
-                break
+            else:
+                config['scrape_configs'][index] = OrderedDict(j)
 
         # Save the updated config
         try:

src/routes/prometheus.py

@@ -124,21 +124,24 @@ def add_target():
 
             break
 
-    # if not job_found:
-    #     # Create new job entry
-    #     new_job = OrderedDict()
-    #     new_job['job_name'] = job_name
-    #     new_job['static_configs'] = [{'targets': [new_target]}]
-    #     new_job['scrape_interval'] = scrape_interval
+    if not job_found:
+        # Create new job entry
+        new_job = OrderedDict()
+        new_job['job_name'] = job_name
+        new_job['static_configs'] = [{'targets': [new_target]}]
+        new_job['scrape_interval'] = scrape_interval
 
-    #     # Add basic_auth if provided
-    #     if username and password:
-    #         new_job['basic_auth'] = {
-    #             'username': username,
-    #             'password': password
-    #         }
-    #     # Append the new job to scrape_configs
-    #     config['scrape_configs'].append(new_job)
+        # Add basic_auth if provided
+        if username and password:
+            new_job['basic_auth'] = {
+                'username': username,
+                'password': password
+            }
+        # Append the new job to scrape_configs
+        config['scrape_configs'].append(new_job)
+
+    for index, j in enumerate(config['scrape_configs']):
+        config['scrape_configs'][index] = OrderedDict(j)
 
     # Save the updated config
     save_yaml(config, prometheus_yml_path)
@@ -167,6 +170,10 @@ def remove_target():
             else:
                 flash(f'Target {target_to_remove} not found in job {job_name}.', 'warning')
             break
+    
+    for index, j in enumerate(config['scrape_configs']):
+        config['scrape_configs'][index] = OrderedDict(j)
+
     else:
         flash(f'Job {job_name} not found.', 'warning')
 

src/templates/other/targets.html

@@ -68,7 +68,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" value="localhost" class="input-field" required>
+            <input type="text" name="job_name" placeholder="localhost" class="input-field" required>
             <input type="text" name="new_target" placeholder="New Target" class="input-field" required>
             <input type="text" name="scrape_interval" placeholder="Scrape Interval" class="input-field" required>
             <input type="text" name="username" placeholder="Username" class="input-field">
@@ -79,10 +79,23 @@ <h2>Add New Target</h2>
             </button>
         </form>
     </div>
-
 </div>
-{% endblock %}
+<script>
+    // if user enter localhost in job_name, then hide the username and password fields
+    document.querySelector('.add-target-form input[name="job_name"]').addEventListener('input', function () {
+        const usernameField = document.querySelector('.add-target-form input[name="username"]');
+        const passwordField = document.querySelector('.add-target-form input[name="password"]');
+        if (this.value === 'localhost') {
+            usernameField.style.display = 'none';
+            passwordField.style.display = 'none';
+        } else {
+            usernameField.style.display = 'block';
+            passwordField.style.display = 'block';
+        }
+    });
 
+</script>
+{% endblock %}
 {% block extra_scripts %}
 <script src="{{ url_for('static', filename='js/targets.js') }}"></script>
 {% endblock %}