From d9af53abac853ed19857f90af446ebd576b9c663 Mon Sep 17 00:00:00 2001
From: Ben Hardill <ben@flowforge.com>
Date: Tue, 27 Jun 2023 10:09:17 +0100
Subject: [PATCH 01/20] First test

---
 frontend/src/pages/instance/components/InstanceLogs.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/pages/instance/components/InstanceLogs.vue b/frontend/src/pages/instance/components/InstanceLogs.vue
index 518174fd1b..979d11568e 100644
--- a/frontend/src/pages/instance/components/InstanceLogs.vue
+++ b/frontend/src/pages/instance/components/InstanceLogs.vue
@@ -13,6 +13,7 @@
             <a class=" text-center w-full hover:text-blue-400 cursor-pointer pb-1" @click="loadPrevious">Load earlier...</a>
         </div>
         <div v-for="(item, itemIdx) in logEntries" :key="itemIdx" class="flex" :class="'forge-log-entry-level-' + item.level">
+            <div v-if="this.instance.settings.ha" class="w-10 flex-shrink-0">{{ item.src }}</div>
             <div class="w-40 flex-shrink-0">{{ item.date }}</div>
             <div class="w-20 flex-shrink-0 align-right">[{{ item.level }}]</div>
             <div class="flex-grow break-all whitespace-pre-wrap">{{ item.msg }}</div>

From 3eb0140f44e07708ce9aaaac0d1b42b81c030642 Mon Sep 17 00:00:00 2001
From: Ben Hardill <ben@flowforge.com>
Date: Tue, 27 Jun 2023 10:36:39 +0100
Subject: [PATCH 02/20] Testing for HA instance

---
 frontend/src/pages/instance/components/InstanceLogs.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/pages/instance/components/InstanceLogs.vue b/frontend/src/pages/instance/components/InstanceLogs.vue
index 979d11568e..98cfd4b258 100644
--- a/frontend/src/pages/instance/components/InstanceLogs.vue
+++ b/frontend/src/pages/instance/components/InstanceLogs.vue
@@ -85,6 +85,7 @@ export default {
             this.loadItems(this.instance.id, this.nextCursor)
         },
         loadItems: async function (instanceId, cursor) {
+            console.log('isHA', this.instance.settings)
             try {
                 const entries = await InstanceApi.getInstanceLogs(instanceId, cursor, null, { showAlert: false })
                 this.showOfflineBanner = false

From 0e678653cd166546f60dbb9bbdf60b585ab5a849 Mon Sep 17 00:00:00 2001
From: Ben Hardill <ben@flowforge.com>
Date: Tue, 27 Jun 2023 12:27:03 +0100
Subject: [PATCH 03/20] right tests for ha now?

---
 frontend/src/pages/instance/components/InstanceLogs.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frontend/src/pages/instance/components/InstanceLogs.vue b/frontend/src/pages/instance/components/InstanceLogs.vue
index 98cfd4b258..eb7897b9e0 100644
--- a/frontend/src/pages/instance/components/InstanceLogs.vue
+++ b/frontend/src/pages/instance/components/InstanceLogs.vue
@@ -13,7 +13,7 @@
             <a class=" text-center w-full hover:text-blue-400 cursor-pointer pb-1" @click="loadPrevious">Load earlier...</a>
         </div>
         <div v-for="(item, itemIdx) in logEntries" :key="itemIdx" class="flex" :class="'forge-log-entry-level-' + item.level">
-            <div v-if="this.instance.settings.ha" class="w-10 flex-shrink-0">{{ item.src }}</div>
+            <div v-if="this.instance.ha?.replicas !== undefined"  class="w-10 flex-shrink-0">{{ item.src }}</div>
             <div class="w-40 flex-shrink-0">{{ item.date }}</div>
             <div class="w-20 flex-shrink-0 align-right">[{{ item.level }}]</div>
             <div class="flex-grow break-all whitespace-pre-wrap">{{ item.msg }}</div>
@@ -85,7 +85,6 @@ export default {
             this.loadItems(this.instance.id, this.nextCursor)
         },
         loadItems: async function (instanceId, cursor) {
-            console.log('isHA', this.instance.settings)
             try {
                 const entries = await InstanceApi.getInstanceLogs(instanceId, cursor, null, { showAlert: false })
                 this.showOfflineBanner = false

From cd1a1908c2c6ce93155f19492cd13d697db39715 Mon Sep 17 00:00:00 2001
From: Ben Hardill <ben@flowforge.com>
Date: Wed, 28 Jun 2023 13:01:09 +0100
Subject: [PATCH 04/20] Close to filtering

---
 frontend/src/pages/instance/Logs.vue          | 26 +++++++++++++++++--
 .../instance/components/InstanceLogs.vue      |  7 +++++
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/frontend/src/pages/instance/Logs.vue b/frontend/src/pages/instance/Logs.vue
index 34caed1fdc..f24037298b 100644
--- a/frontend/src/pages/instance/Logs.vue
+++ b/frontend/src/pages/instance/Logs.vue
@@ -1,8 +1,17 @@
 <template>
     <div class="mb-3">
-        <SectionTopMenu hero="Node-RED Logs" info=""></SectionTopMenu>
+        <SectionTopMenu hero="Node-RED Logs" info="">
+            <template #tools v-if="this.instance.ha?.replicas == undefined">
+                <ff-dropdown ref="dropdown" v-model="selectedHAId">
+                    <ff-dropdown-option label="All" value="all" />
+                    <ff-dropdown-option v-for="id in haIds" :key="id"
+                        :label="id" :value="id"
+                    />
+                </ff-dropdown>
+            </template>
+        </SectionTopMenu>
     </div>
-    <LogsShared :instance="instance" />
+    <LogsShared :instance="instance" @ha-instance-detected="newHAId" />
 </template>
 
 <script>
@@ -22,6 +31,19 @@ export default {
             type: Object,
             required: true
         }
+    },
+    data() {
+        return {
+            haIds: [],
+            selectedHAId: 'all'
+        }
+    },
+    methods: {
+        newHAId(id) {
+            if (!this.haIds.includes(id)) {
+                this.haIds.push(id)
+            }
+        }
     }
 }
 </script>
diff --git a/frontend/src/pages/instance/components/InstanceLogs.vue b/frontend/src/pages/instance/components/InstanceLogs.vue
index eb7897b9e0..739b7e1ec7 100644
--- a/frontend/src/pages/instance/components/InstanceLogs.vue
+++ b/frontend/src/pages/instance/components/InstanceLogs.vue
@@ -31,12 +31,18 @@ export default {
     name: 'LogsShared',
     mixins: [VueTimersMixin],
     inheritAttrs: false,
+    emits: [ 'ha-instance-detected' ],
     props: {
         instance: {
             type: Object,
             required: true
         }
     },
+    computed: {
+        filteredLogEntries: () => {
+            
+        }    
+    },
     data () {
         return {
             doneInitialLoad: false,
@@ -85,6 +91,7 @@ export default {
             this.loadItems(this.instance.id, this.nextCursor)
         },
         loadItems: async function (instanceId, cursor) {
+            this.$emit('ha-instance-detected', 'foo')
             try {
                 const entries = await InstanceApi.getInstanceLogs(instanceId, cursor, null, { showAlert: false })
                 this.showOfflineBanner = false

From 70e0a8365205de805a1f673e9003c329ed1053e1 Mon Sep 17 00:00:00 2001
From: Ben Hardill <ben@flowforge.com>
Date: Wed, 28 Jun 2023 13:28:49 +0100
Subject: [PATCH 05/20] Set test right way round

---
 frontend/src/pages/instance/Logs.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/pages/instance/Logs.vue b/frontend/src/pages/instance/Logs.vue
index f24037298b..7b525a8d5e 100644
--- a/frontend/src/pages/instance/Logs.vue
+++ b/frontend/src/pages/instance/Logs.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="mb-3">
         <SectionTopMenu hero="Node-RED Logs" info="">
-            <template #tools v-if="this.instance.ha?.replicas == undefined">
+            <template #tools v-if="this.instance.ha?.replicas != undefined">
                 <ff-dropdown ref="dropdown" v-model="selectedHAId">
                     <ff-dropdown-option label="All" value="all" />
                     <ff-dropdown-option v-for="id in haIds" :key="id"

From 420706543216d9141ef63e31a3f9e4ab3f8d8bd1 Mon Sep 17 00:00:00 2001
From: Ben Hardill <ben@flowforge.com>
Date: Wed, 28 Jun 2023 14:03:01 +0100
Subject: [PATCH 06/20] Push replica ids

---
 frontend/src/pages/instance/components/InstanceLogs.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend/src/pages/instance/components/InstanceLogs.vue b/frontend/src/pages/instance/components/InstanceLogs.vue
index 739b7e1ec7..5fa38cd011 100644
--- a/frontend/src/pages/instance/components/InstanceLogs.vue
+++ b/frontend/src/pages/instance/components/InstanceLogs.vue
@@ -40,7 +40,7 @@ export default {
     },
     computed: {
         filteredLogEntries: () => {
-            
+
         }    
     },
     data () {
@@ -91,7 +91,6 @@ export default {
             this.loadItems(this.instance.id, this.nextCursor)
         },
         loadItems: async function (instanceId, cursor) {
-            this.$emit('ha-instance-detected', 'foo')
             try {
                 const entries = await InstanceApi.getInstanceLogs(instanceId, cursor, null, { showAlert: false })
                 this.showOfflineBanner = false
@@ -113,6 +112,9 @@ export default {
                         } else {
                             toPrepend.push(l)
                         }
+                        if (l.msg.src) {
+                            this.$emit('ha-instance-detected', l.msg.src)
+                        }
                     })
                     if (toPrepend.length > 0) {
                         this.logEntries = toPrepend.concat(this.logEntries)

From 6da6455ad8c68fb9a408da8ea7a298fda62ce51a Mon Sep 17 00:00:00 2001
From: Ben Hardill <ben@flowforge.com>
Date: Wed, 28 Jun 2023 14:24:32 +0100
Subject: [PATCH 07/20] Fix right src

---
 frontend/src/pages/instance/components/InstanceLogs.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/pages/instance/components/InstanceLogs.vue b/frontend/src/pages/instance/components/InstanceLogs.vue
index 5fa38cd011..4b617e0d70 100644
--- a/frontend/src/pages/instance/components/InstanceLogs.vue
+++ b/frontend/src/pages/instance/components/InstanceLogs.vue
@@ -112,8 +112,8 @@ export default {
                         } else {
                             toPrepend.push(l)
                         }
-                        if (l.msg.src) {
-                            this.$emit('ha-instance-detected', l.msg.src)
+                        if (l.src) {
+                            this.$emit('ha-instance-detected', l.src)
                         }
                     })
                     if (toPrepend.length > 0) {

From 632834d5301ac8189ffe70734bdac9cf469f7671 Mon Sep 17 00:00:00 2001
From: Ben Hardill <ben@flowforge.com>
Date: Wed, 28 Jun 2023 15:22:06 +0100
Subject: [PATCH 08/20] Apply filter

---
 frontend/src/pages/instance/Logs.vue                   |  2 +-
 .../src/pages/instance/components/InstanceLogs.vue     | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/frontend/src/pages/instance/Logs.vue b/frontend/src/pages/instance/Logs.vue
index 7b525a8d5e..12f727e5b5 100644
--- a/frontend/src/pages/instance/Logs.vue
+++ b/frontend/src/pages/instance/Logs.vue
@@ -11,7 +11,7 @@
             </template>
         </SectionTopMenu>
     </div>
-    <LogsShared :instance="instance" @ha-instance-detected="newHAId" />
+    <LogsShared :instance="instance" @ha-instance-detected="newHAId" :filter="selectedHAId"/>
 </template>
 
 <script>
diff --git a/frontend/src/pages/instance/components/InstanceLogs.vue b/frontend/src/pages/instance/components/InstanceLogs.vue
index 4b617e0d70..27dbc8e879 100644
--- a/frontend/src/pages/instance/components/InstanceLogs.vue
+++ b/frontend/src/pages/instance/components/InstanceLogs.vue
@@ -36,11 +36,19 @@ export default {
         instance: {
             type: Object,
             required: true
+        },
+        filter: {
+            type: String,
+            required: false
         }
     },
     computed: {
         filteredLogEntries: () => {
-
+            if (this.filter && this.filter !== 'all') {
+                return logEntries.filter( l => l.src === this.filter)
+            } else {
+                return this.logEntries
+            }
         }    
     },
     data () {

From 915e2f7eb662121191b82dd45c2be100f441a6c6 Mon Sep 17 00:00:00 2001
From: Ben Hardill <ben@flowforge.com>
Date: Wed, 28 Jun 2023 16:05:09 +0100
Subject: [PATCH 09/20] User the filtered list

---
 frontend/src/pages/instance/components/InstanceLogs.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/pages/instance/components/InstanceLogs.vue b/frontend/src/pages/instance/components/InstanceLogs.vue
index 27dbc8e879..3d18ef6a28 100644
--- a/frontend/src/pages/instance/components/InstanceLogs.vue
+++ b/frontend/src/pages/instance/components/InstanceLogs.vue
@@ -12,7 +12,7 @@
         <div v-if="prevCursor" class="flex">
             <a class=" text-center w-full hover:text-blue-400 cursor-pointer pb-1" @click="loadPrevious">Load earlier...</a>
         </div>
-        <div v-for="(item, itemIdx) in logEntries" :key="itemIdx" class="flex" :class="'forge-log-entry-level-' + item.level">
+        <div v-for="(item, itemIdx) in filteredLogEntries" :key="itemIdx" class="flex" :class="'forge-log-entry-level-' + item.level">
             <div v-if="this.instance.ha?.replicas !== undefined"  class="w-10 flex-shrink-0">{{ item.src }}</div>
             <div class="w-40 flex-shrink-0">{{ item.date }}</div>
             <div class="w-20 flex-shrink-0 align-right">[{{ item.level }}]</div>

From e7131a81e8a129ff843915bf13517ee6004302ea Mon Sep 17 00:00:00 2001
From: Ben Hardill <ben@flowforge.com>
Date: Wed, 28 Jun 2023 17:05:05 +0100
Subject: [PATCH 10/20] Add debug

---
 frontend/src/pages/instance/components/InstanceLogs.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend/src/pages/instance/components/InstanceLogs.vue b/frontend/src/pages/instance/components/InstanceLogs.vue
index 3d18ef6a28..db43caf311 100644
--- a/frontend/src/pages/instance/components/InstanceLogs.vue
+++ b/frontend/src/pages/instance/components/InstanceLogs.vue
@@ -43,9 +43,11 @@ export default {
         }
     },
     computed: {
-        filteredLogEntries: () => {
+        filteredLogEntries: function () {
+            console.log(this.filter)
             if (this.filter && this.filter !== 'all') {
-                return logEntries.filter( l => l.src === this.filter)
+                const filteredList = logEntries.filter( l => l.src === this.filter)
+                return filteredList
             } else {
                 return this.logEntries
             }

From b6ca2d1890bc091519b888989eaae7d25195da9a Mon Sep 17 00:00:00 2001
From: Ben Hardill <ben@flowforge.com>
Date: Wed, 28 Jun 2023 17:21:30 +0100
Subject: [PATCH 11/20] more debug

---
 .../pages/instance/components/InstanceLogs.vue    | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/frontend/src/pages/instance/components/InstanceLogs.vue b/frontend/src/pages/instance/components/InstanceLogs.vue
index db43caf311..ccf99c0c7e 100644
--- a/frontend/src/pages/instance/components/InstanceLogs.vue
+++ b/frontend/src/pages/instance/components/InstanceLogs.vue
@@ -45,11 +45,16 @@ export default {
     computed: {
         filteredLogEntries: function () {
             console.log(this.filter)
-            if (this.filter && this.filter !== 'all') {
-                const filteredList = logEntries.filter( l => l.src === this.filter)
-                return filteredList
-            } else {
-                return this.logEntries
+            try {
+                if (this.filter && this.filter !== 'all') {
+                    const filteredList = this.logEntries.filter( l => l.src === this.filter)
+                    console.log(filteredList)
+                    return filteredList
+                } else {
+                    return this.logEntries
+                }
+            } catch (err) {
+                console.log(err)
             }
         }    
     },

From 9d2079a2fd5d651cd2353b92e187eafec938be5b Mon Sep 17 00:00:00 2001
From: Ben Hardill <ben@flowforge.com>
Date: Thu, 29 Jun 2023 09:43:33 +0100
Subject: [PATCH 12/20] verbose debug

---
 frontend/src/pages/instance/components/InstanceLogs.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/pages/instance/components/InstanceLogs.vue b/frontend/src/pages/instance/components/InstanceLogs.vue
index ccf99c0c7e..1aa843604c 100644
--- a/frontend/src/pages/instance/components/InstanceLogs.vue
+++ b/frontend/src/pages/instance/components/InstanceLogs.vue
@@ -47,8 +47,9 @@ export default {
             console.log(this.filter)
             try {
                 if (this.filter && this.filter !== 'all') {
+                    console.log('filtering to', this.filter)
                     const filteredList = this.logEntries.filter( l => l.src === this.filter)
-                    console.log(filteredList)
+                    console.log('filtered list',filteredList)
                     return filteredList
                 } else {
                     return this.logEntries

From 2b0a75108d0f13e01e75edeeabf195f60d935161 Mon Sep 17 00:00:00 2001
From: Ben Hardill <ben@flowforge.com>
Date: Thu, 29 Jun 2023 10:06:51 +0100
Subject: [PATCH 13/20] Clean version

---
 frontend/src/pages/instance/Logs.vue            |  1 +
 .../pages/instance/components/InstanceLogs.vue  | 17 +++++------------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/frontend/src/pages/instance/Logs.vue b/frontend/src/pages/instance/Logs.vue
index 12f727e5b5..7001592260 100644
--- a/frontend/src/pages/instance/Logs.vue
+++ b/frontend/src/pages/instance/Logs.vue
@@ -2,6 +2,7 @@
     <div class="mb-3">
         <SectionTopMenu hero="Node-RED Logs" info="">
             <template #tools v-if="this.instance.ha?.replicas != undefined">
+                <div class="mr-2"><strong>Replica:</strong></div>
                 <ff-dropdown ref="dropdown" v-model="selectedHAId">
                     <ff-dropdown-option label="All" value="all" />
                     <ff-dropdown-option v-for="id in haIds" :key="id"
diff --git a/frontend/src/pages/instance/components/InstanceLogs.vue b/frontend/src/pages/instance/components/InstanceLogs.vue
index 1aa843604c..a94f47320a 100644
--- a/frontend/src/pages/instance/components/InstanceLogs.vue
+++ b/frontend/src/pages/instance/components/InstanceLogs.vue
@@ -44,18 +44,11 @@ export default {
     },
     computed: {
         filteredLogEntries: function () {
-            console.log(this.filter)
-            try {
-                if (this.filter && this.filter !== 'all') {
-                    console.log('filtering to', this.filter)
-                    const filteredList = this.logEntries.filter( l => l.src === this.filter)
-                    console.log('filtered list',filteredList)
-                    return filteredList
-                } else {
-                    return this.logEntries
-                }
-            } catch (err) {
-                console.log(err)
+            if (this.filter && this.filter !== 'all') {
+                const filteredList = this.logEntries.filter( l => l.src === this.filter)
+                return filteredList
+            } else {
+                return this.logEntries
             }
         }    
     },

From 04adfc46e4939eb7bbd2c294bf03d73098c9585c Mon Sep 17 00:00:00 2001
From: Ben Hardill <ben@flowforge.com>
Date: Thu, 29 Jun 2023 10:21:31 +0100
Subject: [PATCH 14/20] Wrap replica id

---
 frontend/src/pages/instance/components/InstanceLogs.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/pages/instance/components/InstanceLogs.vue b/frontend/src/pages/instance/components/InstanceLogs.vue
index a94f47320a..56f835b24d 100644
--- a/frontend/src/pages/instance/components/InstanceLogs.vue
+++ b/frontend/src/pages/instance/components/InstanceLogs.vue
@@ -13,7 +13,7 @@
             <a class=" text-center w-full hover:text-blue-400 cursor-pointer pb-1" @click="loadPrevious">Load earlier...</a>
         </div>
         <div v-for="(item, itemIdx) in filteredLogEntries" :key="itemIdx" class="flex" :class="'forge-log-entry-level-' + item.level">
-            <div v-if="this.instance.ha?.replicas !== undefined"  class="w-10 flex-shrink-0">{{ item.src }}</div>
+            <div v-if="this.instance.ha?.replicas !== undefined"  class="w-10 flex-shrink-0">[{{ item.src }}]</div>
             <div class="w-40 flex-shrink-0">{{ item.date }}</div>
             <div class="w-20 flex-shrink-0 align-right">[{{ item.level }}]</div>
             <div class="flex-grow break-all whitespace-pre-wrap">{{ item.msg }}</div>

From 7a6fd5e95c755ca921cce8e2bc3cc41d97d5b230 Mon Sep 17 00:00:00 2001
From: Ben Hardill <ben@flowforge.com>
Date: Thu, 29 Jun 2023 10:37:55 +0100
Subject: [PATCH 15/20] Layout

---
 frontend/src/pages/instance/Logs.vue | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/frontend/src/pages/instance/Logs.vue b/frontend/src/pages/instance/Logs.vue
index 7001592260..c1237c5600 100644
--- a/frontend/src/pages/instance/Logs.vue
+++ b/frontend/src/pages/instance/Logs.vue
@@ -2,13 +2,15 @@
     <div class="mb-3">
         <SectionTopMenu hero="Node-RED Logs" info="">
             <template #tools v-if="this.instance.ha?.replicas != undefined">
-                <div class="mr-2"><strong>Replica:</strong></div>
-                <ff-dropdown ref="dropdown" v-model="selectedHAId">
-                    <ff-dropdown-option label="All" value="all" />
-                    <ff-dropdown-option v-for="id in haIds" :key="id"
-                        :label="id" :value="id"
-                    />
-                </ff-dropdown>
+                <div style="display: flex;align-items: center;">
+                    <div class="mr-2"><strong>Replica:</strong></div>
+                    <ff-dropdown ref="dropdown" v-model="selectedHAId">
+                        <ff-dropdown-option label="All" value="all" />
+                        <ff-dropdown-option v-for="id in haIds" :key="id"
+                            :label="id" :value="id"
+                        />
+                    </ff-dropdown>
+                </div>
             </template>
         </SectionTopMenu>
     </div>

From faa6d835fcbc4d40818d09d4922c78c64d695837 Mon Sep 17 00:00:00 2001
From: Ben Hardill <ben@flowforge.com>
Date: Thu, 29 Jun 2023 11:04:39 +0100
Subject: [PATCH 16/20] Fix replica id width

---
 frontend/src/pages/instance/components/InstanceLogs.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/pages/instance/components/InstanceLogs.vue b/frontend/src/pages/instance/components/InstanceLogs.vue
index 56f835b24d..99dfd6fdb7 100644
--- a/frontend/src/pages/instance/components/InstanceLogs.vue
+++ b/frontend/src/pages/instance/components/InstanceLogs.vue
@@ -13,7 +13,7 @@
             <a class=" text-center w-full hover:text-blue-400 cursor-pointer pb-1" @click="loadPrevious">Load earlier...</a>
         </div>
         <div v-for="(item, itemIdx) in filteredLogEntries" :key="itemIdx" class="flex" :class="'forge-log-entry-level-' + item.level">
-            <div v-if="this.instance.ha?.replicas !== undefined"  class="w-10 flex-shrink-0">[{{ item.src }}]</div>
+            <div v-if="this.instance.ha?.replicas !== undefined"  class="w-14 flex-shrink-0">[{{ item.src }}]</div>
             <div class="w-40 flex-shrink-0">{{ item.date }}</div>
             <div class="w-20 flex-shrink-0 align-right">[{{ item.level }}]</div>
             <div class="flex-grow break-all whitespace-pre-wrap">{{ item.msg }}</div>

From e61ccc538c24b304a6bdeb1a28bc1e4f69d78576 Mon Sep 17 00:00:00 2001
From: Ben Hardill <ben@flowforge.com>
Date: Thu, 29 Jun 2023 11:39:58 +0100
Subject: [PATCH 17/20] fix lint

---
 frontend/src/pages/instance/Logs.vue          | 11 +++++----
 .../instance/components/InstanceLogs.vue      | 24 +++++++++----------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/frontend/src/pages/instance/Logs.vue b/frontend/src/pages/instance/Logs.vue
index c1237c5600..4915f617c5 100644
--- a/frontend/src/pages/instance/Logs.vue
+++ b/frontend/src/pages/instance/Logs.vue
@@ -1,12 +1,13 @@
 <template>
     <div class="mb-3">
         <SectionTopMenu hero="Node-RED Logs" info="">
-            <template #tools v-if="this.instance.ha?.replicas != undefined">
+            <template v-if="instance.ha?.replicas != undefined" #tools>
                 <div style="display: flex;align-items: center;">
                     <div class="mr-2"><strong>Replica:</strong></div>
                     <ff-dropdown ref="dropdown" v-model="selectedHAId">
                         <ff-dropdown-option label="All" value="all" />
-                        <ff-dropdown-option v-for="id in haIds" :key="id"
+                        <ff-dropdown-option
+                            v-for="id in haIds" :key="id"
                             :label="id" :value="id"
                         />
                     </ff-dropdown>
@@ -14,7 +15,7 @@
             </template>
         </SectionTopMenu>
     </div>
-    <LogsShared :instance="instance" @ha-instance-detected="newHAId" :filter="selectedHAId"/>
+    <LogsShared :instance="instance" :filter="selectedHAId" @ha-instance-detected="newHAId" />
 </template>
 
 <script>
@@ -35,14 +36,14 @@ export default {
             required: true
         }
     },
-    data() {
+    data () {
         return {
             haIds: [],
             selectedHAId: 'all'
         }
     },
     methods: {
-        newHAId(id) {
+        newHAId (id) {
             if (!this.haIds.includes(id)) {
                 this.haIds.push(id)
             }
diff --git a/frontend/src/pages/instance/components/InstanceLogs.vue b/frontend/src/pages/instance/components/InstanceLogs.vue
index 99dfd6fdb7..95e2cc4ffe 100644
--- a/frontend/src/pages/instance/components/InstanceLogs.vue
+++ b/frontend/src/pages/instance/components/InstanceLogs.vue
@@ -13,7 +13,7 @@
             <a class=" text-center w-full hover:text-blue-400 cursor-pointer pb-1" @click="loadPrevious">Load earlier...</a>
         </div>
         <div v-for="(item, itemIdx) in filteredLogEntries" :key="itemIdx" class="flex" :class="'forge-log-entry-level-' + item.level">
-            <div v-if="this.instance.ha?.replicas !== undefined"  class="w-14 flex-shrink-0">[{{ item.src }}]</div>
+            <div v-if="instance.ha?.replicas !== undefined" class="w-14 flex-shrink-0">[{{ item.src }}]</div>
             <div class="w-40 flex-shrink-0">{{ item.date }}</div>
             <div class="w-20 flex-shrink-0 align-right">[{{ item.level }}]</div>
             <div class="flex-grow break-all whitespace-pre-wrap">{{ item.msg }}</div>
@@ -31,7 +31,6 @@ export default {
     name: 'LogsShared',
     mixins: [VueTimersMixin],
     inheritAttrs: false,
-    emits: [ 'ha-instance-detected' ],
     props: {
         instance: {
             type: Object,
@@ -42,16 +41,7 @@ export default {
             required: false
         }
     },
-    computed: {
-        filteredLogEntries: function () {
-            if (this.filter && this.filter !== 'all') {
-                const filteredList = this.logEntries.filter( l => l.src === this.filter)
-                return filteredList
-            } else {
-                return this.logEntries
-            }
-        }    
-    },
+    emits: ['ha-instance-detected'],
     data () {
         return {
             doneInitialLoad: false,
@@ -63,6 +53,16 @@ export default {
             showOfflineBanner: false
         }
     },
+    computed: {
+        filteredLogEntries: function () {
+            if (this.filter && this.filter !== 'all') {
+                const filteredList = this.logEntries.filter(l => l.src === this.filter)
+                return filteredList
+            } else {
+                return this.logEntries
+            }
+        }
+    },
     timers: {
         pollTimer: { time: POLL_TIME, repeat: true, autostart: false }
     },

From 0fdfd69b54bed27e54fabb3df9046031b95c95b3 Mon Sep 17 00:00:00 2001
From: Ben Hardill <ben@flowforge.com>
Date: Fri, 30 Jun 2023 14:30:13 +0100
Subject: [PATCH 18/20] Add src markers to stub logs

---
 forge/containers/stub/index.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/forge/containers/stub/index.js b/forge/containers/stub/index.js
index fe08621cd2..02cc3fc383 100644
--- a/forge/containers/stub/index.js
+++ b/forge/containers/stub/index.js
@@ -228,27 +228,32 @@ module.exports = {
             {
                 level: 'system',
                 msg: 'Fake Log Entry',
-                ts: `${Date.now() - oneHour}`
+                ts: `${Date.now() - oneHour}`,
+                src: 'one'
             },
             {
                 level: 'system',
                 msg: 'Starting Node-RED',
-                ts: `${Date.now() - oneHour / 2}`
+                ts: `${Date.now() - oneHour / 2}`,
+                src: 'one'
             },
             {
                 level: 'info',
                 msg: '\n\nMulti Line Message\n===================\n',
-                ts: `${Date.now() - oneHour / 4}`
+                ts: `${Date.now() - oneHour / 4}`,
+                src: 'one'
             },
             {
                 level: 'warn',
                 msg: 'This is the voice of the Mysterons. We know that you can hear us Earthmen.',
-                ts: `${Date.now() - oneHour / 5}`
+                ts: `${Date.now() - oneHour / 5}`,
+                src: 'one'
             },
             {
                 level: 'error',
                 msg: 'Captain Scarlet is indestructible',
-                ts: `${Date.now()}`
+                ts: `${Date.now()}`,
+                src: 'two'
             }
         ]
     },

From f894e5b6b8863a043b22a3abd8eb6a02c0e74e6c Mon Sep 17 00:00:00 2001
From: Joe Pavitt <joepavitt@flowforge.com>
Date: Fri, 30 Jun 2023 15:17:09 +0100
Subject: [PATCH 19/20] Add E2E tests for HA log filtering

---
 frontend/src/pages/instance/Logs.vue          |  2 +-
 .../instance/components/InstanceLogs.vue      |  8 +-
 .../cypress/tests-ee/instances/logs.spec.js   | 99 +++++++++++++++++++
 3 files changed, 107 insertions(+), 2 deletions(-)
 create mode 100644 test/e2e/frontend/cypress/tests-ee/instances/logs.spec.js

diff --git a/frontend/src/pages/instance/Logs.vue b/frontend/src/pages/instance/Logs.vue
index 4915f617c5..3c3862f46a 100644
--- a/frontend/src/pages/instance/Logs.vue
+++ b/frontend/src/pages/instance/Logs.vue
@@ -4,7 +4,7 @@
             <template v-if="instance.ha?.replicas != undefined" #tools>
                 <div style="display: flex;align-items: center;">
                     <div class="mr-2"><strong>Replica:</strong></div>
-                    <ff-dropdown ref="dropdown" v-model="selectedHAId">
+                    <ff-dropdown ref="dropdown" v-model="selectedHAId" data-el="select-ha-replica">
                         <ff-dropdown-option label="All" value="all" />
                         <ff-dropdown-option
                             v-for="id in haIds" :key="id"
diff --git a/frontend/src/pages/instance/components/InstanceLogs.vue b/frontend/src/pages/instance/components/InstanceLogs.vue
index 95e2cc4ffe..578a4fed22 100644
--- a/frontend/src/pages/instance/components/InstanceLogs.vue
+++ b/frontend/src/pages/instance/components/InstanceLogs.vue
@@ -12,7 +12,11 @@
         <div v-if="prevCursor" class="flex">
             <a class=" text-center w-full hover:text-blue-400 cursor-pointer pb-1" @click="loadPrevious">Load earlier...</a>
         </div>
-        <div v-for="(item, itemIdx) in filteredLogEntries" :key="itemIdx" class="flex" :class="'forge-log-entry-level-' + item.level">
+        <div
+            v-for="(item, itemIdx) in filteredLogEntries" :key="itemIdx"
+            data-el="instance-log-row"
+            class="flex" :class="'forge-log-entry-level-' + item.level"
+        >
             <div v-if="instance.ha?.replicas !== undefined" class="w-14 flex-shrink-0">[{{ item.src }}]</div>
             <div class="w-40 flex-shrink-0">{{ item.date }}</div>
             <div class="w-20 flex-shrink-0 align-right">[{{ item.level }}]</div>
@@ -37,6 +41,7 @@ export default {
             required: true
         },
         filter: {
+            default: null,
             type: String,
             required: false
         }
@@ -110,6 +115,7 @@ export default {
                 const toPrepend = []
                 if (entries.log.length > 0) {
                     entries.log.forEach(l => {
+                        console.log(l)
                         const d = new Date(parseInt(l.ts.substring(0, l.ts.length - 4)))
                         l.date = `${d.toLocaleDateString()} ${d.toLocaleTimeString()}`
                         if (typeof l.msg !== 'string') {
diff --git a/test/e2e/frontend/cypress/tests-ee/instances/logs.spec.js b/test/e2e/frontend/cypress/tests-ee/instances/logs.spec.js
new file mode 100644
index 0000000000..7e48357e5f
--- /dev/null
+++ b/test/e2e/frontend/cypress/tests-ee/instances/logs.spec.js
@@ -0,0 +1,99 @@
+describe('FlowForge - Instance - Logs', () => {
+    let instance
+    function navigateToInstanceLogs (teamName, instanceName) {
+        cy.request('GET', '/api/v1/user/teams')
+            .then((response) => {
+                const team = response.body.teams.find(
+                    (team) => team.name === teamName
+                )
+                return cy.request('GET', `/api/v1/teams/${team.id}/projects`)
+            })
+            .then((response) => {
+                instance = response.body.projects.find(
+                    (app) => app.name === instanceName
+                )
+                cy.visit(`/instance/${instance.id}/logs`)
+                cy.wait('@getInstance')
+            })
+    }
+
+    beforeEach(() => {
+        cy.intercept('GET', '/api/*/projects/*/logs?*', {
+            body: {
+                meta: {},
+                log: []
+            }
+        }).as('getLogsUpdates')
+
+        cy.intercept('GET', '/api/*/projects/*').as('getInstance')
+
+        cy.login('bob', 'bbPassword')
+        cy.home()
+    })
+
+    it('load all logs by default', () => {
+        // mock the API response with well-defined logs
+        cy.intercept('GET', '/api/*/projects/*/logs', {
+            body: {
+                meta: {},
+                log: [
+                    { level: 'info', msg: 'Updated flows', ts: '16874362594840001' }
+                ]
+            }
+        }).as('getLogs')
+
+        navigateToInstanceLogs('BTeam', 'instance-2-1')
+        cy.wait('@getLogs')
+
+        cy.get('[data-el="instance-log-row"]').should('have.length', 1)
+        cy.get('[data-el="select-ha-replica"]').should('not.exist')
+    })
+
+    it('display a marker to indicuate with HA replica the logs are from, if present', () => {
+        // Modify our Instance so that HA is enabled
+        cy.intercept('GET', '/api/*/projects/*', (req) => {
+            req.continue((res) => {
+                // intercept the response and update the HA settings
+                res.body.ha = {
+                    replicas: ['123', '456']
+                }
+            })
+        }).as('getInstance')
+
+        // mock the API response with well-defined logs
+        cy.intercept('GET', '/api/*/projects/*/logs', {
+            body: {
+                meta: {},
+                log: [
+                    { src: '123', level: 'info', msg: 'Created flows', ts: '16874362594840000' },
+                    { src: '123', level: 'info', msg: 'Updated flows', ts: '16874362594840001' },
+                    { src: '456', level: 'info', msg: 'Updated flows', ts: '16874362594840001' }
+                ]
+            }
+        }).as('getLogs')
+
+        navigateToInstanceLogs('BTeam', 'instance-2-1')
+        cy.wait('@getLogs')
+
+        // should load our stubbed logs
+        cy.get('[data-el="instance-log-row"]').should('have.length', 3)
+
+        cy.get('[data-el="select-ha-replica"]').should('exist')
+        // open dropdown
+        cy.get('[data-el="select-ha-replica"]').click()
+        // check we have 3 options
+        cy.get('[data-el="select-ha-replica"] .ff-dropdown-option').should('have.length', 3)
+        // select the first HA Replica
+        cy.get('[data-el="select-ha-replica"] .ff-dropdown-option').eq(1).click()
+
+        // logs should now be filtered to the 3 we've defined for first replica
+        cy.get('[data-el="instance-log-row"]').should('have.length', 2)
+
+        // open dropdown and select "All"
+        cy.get('[data-el="select-ha-replica"]').click()
+        cy.get('[data-el="select-ha-replica"] .ff-dropdown-option').eq(0).click()
+
+        // logs should be restored
+        cy.get('[data-el="instance-log-row"]').should('have.length', 3)
+    })
+})

From 419239dad9a3d601abd8512a2017593e4d56437e Mon Sep 17 00:00:00 2001
From: Joe Pavitt <joepavitt@flowforge.com>
Date: Fri, 30 Jun 2023 15:20:07 +0100
Subject: [PATCH 20/20] Remove console.log

---
 frontend/src/pages/instance/components/InstanceLogs.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/pages/instance/components/InstanceLogs.vue b/frontend/src/pages/instance/components/InstanceLogs.vue
index 578a4fed22..2daf07a1d5 100644
--- a/frontend/src/pages/instance/components/InstanceLogs.vue
+++ b/frontend/src/pages/instance/components/InstanceLogs.vue
@@ -115,7 +115,6 @@ export default {
                 const toPrepend = []
                 if (entries.log.length > 0) {
                     entries.log.forEach(l => {
-                        console.log(l)
                         const d = new Date(parseInt(l.ts.substring(0, l.ts.length - 4)))
                         l.date = `${d.toLocaleDateString()} ${d.toLocaleTimeString()}`
                         if (typeof l.msg !== 'string') {