From 4e06b0414a01454efce39fefbba321b2db3a3182 Mon Sep 17 00:00:00 2001
From: Rui Zhu <ruizhu@pinterest.com>
Date: Fri, 1 Mar 2024 17:42:36 -0500
Subject: [PATCH 1/2] highlight sidecars with matching host environment

---
 .../deploy_board/templates/hosts/host_details.html     | 10 ++++++++++
 .../deploy_board/templates/hosts/host_details.tmpl     | 10 ++++++++++
 deploy-board/deploy_board/webapp/host_views.py         |  9 +++++++++
 3 files changed, 29 insertions(+)

diff --git a/deploy-board/deploy_board/templates/hosts/host_details.html b/deploy-board/deploy_board/templates/hosts/host_details.html
index 18e3263ab8..4c254168da 100644
--- a/deploy-board/deploy_board/templates/hosts/host_details.html
+++ b/deploy-board/deploy_board/templates/hosts/host_details.html
@@ -42,11 +42,21 @@
 
 {% if agent_wrappers %}
 <div class="panel panel-default">
+    {% if has_host_env_sidecar_agents %}
+    {% include "panel_heading.tmpl" with panel_title="Sidecar Agent Details" panel_body_id="sidecarAgentDetailsId" direction="down" copy_host_name_button=True %}
+    <div id="sidecarAgentDetailsId" class="collapse in panel-body">
+        <span>This host has relevant sidecars in it's environment. These have been marked with <span class="bg-success">green backgrounds</span> for visibility.</span>
+    {% else %}
     {% include "panel_heading.tmpl" with panel_title="Sidecar Agent Details" panel_body_id="sidecarAgentDetailsId" direction="right" copy_host_name_button=True %}
     <div id="sidecarAgentDetailsId" class="collapse panel-body">
+    {% endif %}
         {% for agent_wrapper in agent_wrappers.sidecars %}
         {% with env=agent_wrapper.env agent=agent_wrapper.agent hostdetailsvalue=host_details|getValue:"Phobos Link" %}
+        {% if env and env_name == env.envName and stage_name == env.stageName %}
+        {% include "hosts/host_details.tmpl" with agent=agent env=env hostdetailsvalue=hostdetailsvalue host_related_sidecar=1%}
+        {% else %}
         {% include "hosts/host_details.tmpl" with agent=agent env=env hostdetailsvalue=hostdetailsvalue%}
+        {% endif %}
         {% endwith %}
         {% endfor %}
     </div>
diff --git a/deploy-board/deploy_board/templates/hosts/host_details.tmpl b/deploy-board/deploy_board/templates/hosts/host_details.tmpl
index 28058f96eb..3d722d0422 100644
--- a/deploy-board/deploy_board/templates/hosts/host_details.tmpl
+++ b/deploy-board/deploy_board/templates/hosts/host_details.tmpl
@@ -1,6 +1,10 @@
 {% load utils %}
 <div id="hostInfo" class="panel panel-default">
+    {% if host_related_sidecar %}
+    <div class="panel-heading host-related-sidecar">
+    {% else %}
     <div class="panel-heading">
+    {% endif %}
         <strong>Environment:</strong><a href="/env/{{ env.envName }}/{{ env.stageName }}"> {{ env.envName }}/{{ env.stageName }}</a>
         <strong>Deploy:</strong><a href="/deploy/{{ agent.deployId }}"> {{ agent.deployId }}</a>
     </div>
@@ -83,6 +87,12 @@
         </div>
     </div>
 </div>
+<style>
+    #hostInfo>.panel-heading.host-related-sidecar {
+        background-image: none;
+        background-color: #dff0d8;
+    }
+</style>
 <script>
     $(function () {
         $('.deployToolTip').tooltip();
diff --git a/deploy-board/deploy_board/webapp/host_views.py b/deploy-board/deploy_board/webapp/host_views.py
index da03ac17b0..3fdc284674 100644
--- a/deploy-board/deploy_board/webapp/host_views.py
+++ b/deploy-board/deploy_board/webapp/host_views.py
@@ -188,6 +188,14 @@ def get(self, request, name, stage, hostname):
             is_protected = autoscaling_groups_helper.is_hosts_protected(request, asg, [host_id])
 
         agent_wrappers, is_unreachable = get_agent_wrapper(request, hostname)
+        has_host_env_sidecar_agents = any(
+            x for x in agent_wrappers['sidecars']
+            if x['env'] and x['env']['envName'] and
+            x['env']['stageName'] and
+            x['env']['envName'] == name and
+            x['env']['stageName'] == stage
+        )
+        
         host_details = get_host_details(host_id)
 
         termination_limit = environs_helper.get_env_by_stage(request, name, stage).get('terminationLimit')
@@ -212,6 +220,7 @@ def get(self, request, name, stage, hostname):
             'host_details': host_details,
             'duplicate_stage': duplicate_stage,
             'termination_limit': termination_limit,
+            'has_host_env_sidecar_agents': has_host_env_sidecar_agents,
         })
 
 

From 80ccaac4223bd635cadb614bc6c8c2a350f72727 Mon Sep 17 00:00:00 2001
From: Rui Zhu <ruizhu@pinterest.com>
Date: Mon, 4 Mar 2024 21:38:54 -0500
Subject: [PATCH 2/2] change color and msg

---
 .../deploy_board/templates/hosts/host_details.html     |  2 +-
 .../deploy_board/templates/hosts/host_details.tmpl     |  3 ++-
 deploy-board/deploy_board/webapp/host_views.py         | 10 +++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/deploy-board/deploy_board/templates/hosts/host_details.html b/deploy-board/deploy_board/templates/hosts/host_details.html
index 4c254168da..c07ef40dc6 100644
--- a/deploy-board/deploy_board/templates/hosts/host_details.html
+++ b/deploy-board/deploy_board/templates/hosts/host_details.html
@@ -45,7 +45,7 @@
     {% if has_host_env_sidecar_agents %}
     {% include "panel_heading.tmpl" with panel_title="Sidecar Agent Details" panel_body_id="sidecarAgentDetailsId" direction="down" copy_host_name_button=True %}
     <div id="sidecarAgentDetailsId" class="collapse in panel-body">
-        <span>This host has relevant sidecars in it's environment. These have been marked with <span class="bg-success">green backgrounds</span> for visibility.</span>
+        <span>This is a sidecar deployment on the host. The relevant sidecar has been marked with a <span class="bg-info">blue background</span> for visibility.</span>
     {% else %}
     {% include "panel_heading.tmpl" with panel_title="Sidecar Agent Details" panel_body_id="sidecarAgentDetailsId" direction="right" copy_host_name_button=True %}
     <div id="sidecarAgentDetailsId" class="collapse panel-body">
diff --git a/deploy-board/deploy_board/templates/hosts/host_details.tmpl b/deploy-board/deploy_board/templates/hosts/host_details.tmpl
index 3d722d0422..e383dfe41a 100644
--- a/deploy-board/deploy_board/templates/hosts/host_details.tmpl
+++ b/deploy-board/deploy_board/templates/hosts/host_details.tmpl
@@ -90,7 +90,8 @@
 <style>
     #hostInfo>.panel-heading.host-related-sidecar {
         background-image: none;
-        background-color: #dff0d8;
+        background-color: #d9edf7;
+        font-weight: bold;
     }
 </style>
 <script>
diff --git a/deploy-board/deploy_board/webapp/host_views.py b/deploy-board/deploy_board/webapp/host_views.py
index 3fdc284674..72963c3a03 100644
--- a/deploy-board/deploy_board/webapp/host_views.py
+++ b/deploy-board/deploy_board/webapp/host_views.py
@@ -189,11 +189,11 @@ def get(self, request, name, stage, hostname):
 
         agent_wrappers, is_unreachable = get_agent_wrapper(request, hostname)
         has_host_env_sidecar_agents = any(
-            x for x in agent_wrappers['sidecars']
-            if x['env'] and x['env']['envName'] and
-            x['env']['stageName'] and
-            x['env']['envName'] == name and
-            x['env']['stageName'] == stage
+            agent for agent in agent_wrappers['sidecars']
+            if agent['env'] and agent['env']['envName'] and
+            agent['env']['stageName'] and
+            agent['env']['envName'] == name and
+            agent['env']['stageName'] == stage
         )
         
         host_details = get_host_details(host_id)