From 28278d977d4f96d611d0d4e6e74acaaac74f6b87 Mon Sep 17 00:00:00 2001
From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com>
Date: Tue, 13 Jan 2026 13:13:52 +0100
Subject: [PATCH 1/9] Update elasticsearch workflow to trigger on all PRs
 except main

- Remove explicit branch list from pull_request trigger
- Add condition to skip workflow when PR targets main branch
- This avoids needing to maintain branch list for each new/deprecated version
---
 .github/workflows/elasticsearch.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/elasticsearch.yml b/.github/workflows/elasticsearch.yml
index f80371e..c8b725f 100644
--- a/.github/workflows/elasticsearch.yml
+++ b/.github/workflows/elasticsearch.yml
@@ -4,11 +4,11 @@ on:
   push:
     branches: [ "7.17", "8.17", "8.18", "8.19", "9.0", "9.1"]
   pull_request:
-    branches: [ "7.17", "8.17", "8.18", "8.19", "9.0", "9.1"]
 
 jobs:
 
   build:
+    if: github.event.pull_request.base.ref != 'main'
 
     runs-on: ubuntu-latest
 

From 0d9ad746801fddfb201380b2b33f8a4a2c0ef7f9 Mon Sep 17 00:00:00 2001
From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com>
Date: Tue, 13 Jan 2026 13:15:27 +0100
Subject: [PATCH 2/9] Update elasticsearch workflow push trigger to exclude
 main branch

- Remove explicit branch list from push trigger
- Use branches-ignore to exclude main branch
- Workflow now triggers on pushes to all branches except main
---
 .github/workflows/elasticsearch.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/elasticsearch.yml b/.github/workflows/elasticsearch.yml
index c8b725f..8fd9a30 100644
--- a/.github/workflows/elasticsearch.yml
+++ b/.github/workflows/elasticsearch.yml
@@ -2,13 +2,13 @@ name: Elasticsearch Docker Image CI
 
 on:
   push:
-    branches: [ "7.17", "8.17", "8.18", "8.19", "9.0", "9.1"]
+    branches-ignore: ['main']
   pull_request:
 
 jobs:
 
   build:
-    if: github.event.pull_request.base.ref != 'main'
+    if: github.event_name == 'push' || github.event.pull_request.base.ref != 'main'
 
     runs-on: ubuntu-latest
 

From c114fb9cb7fe0c1fb180eda5c2cd61372475698c Mon Sep 17 00:00:00 2001
From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com>
Date: Tue, 13 Jan 2026 13:16:11 +0100
Subject: [PATCH 3/9] Add branches-ignore to pull_request trigger for
 consistency

- Add branches-ignore: ['main'] to pull_request trigger
- Remove unnecessary condition from build job
- Both push and pull_request now consistently exclude main at the trigger level
---
 .github/workflows/elasticsearch.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/elasticsearch.yml b/.github/workflows/elasticsearch.yml
index 8fd9a30..74fb884 100644
--- a/.github/workflows/elasticsearch.yml
+++ b/.github/workflows/elasticsearch.yml
@@ -4,11 +4,11 @@ on:
   push:
     branches-ignore: ['main']
   pull_request:
+    branches-ignore: ['main']
 
 jobs:
 
   build:
-    if: github.event_name == 'push' || github.event.pull_request.base.ref != 'main'
 
     runs-on: ubuntu-latest
 

From cf3b96e33e7522856a2292f83551dbc29984b74c Mon Sep 17 00:00:00 2001
From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com>
Date: Tue, 13 Jan 2026 13:16:52 +0100
Subject: [PATCH 4/9] Update kibana and logstash workflows to trigger on all
 branches except main

- Remove explicit branch lists from push and pull_request triggers
- Add branches-ignore: ['main'] to both triggers for consistency
- Workflows now automatically work for all version branches without manual updates
---
 .github/workflows/kibana.yml   | 4 ++--
 .github/workflows/logstash.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/kibana.yml b/.github/workflows/kibana.yml
index 2888409..f3e916e 100644
--- a/.github/workflows/kibana.yml
+++ b/.github/workflows/kibana.yml
@@ -2,9 +2,9 @@ name: Kibana Docker Image CI
 
 on:
   push:
-    branches: [ "7.17", "8.17", "8.18", "8.19", "9.0", "9.1"]
+    branches-ignore: ['main']
   pull_request:
-    branches: [ "7.17", "8.17", "8.18", "8.19", "9.0", "9.1"]
+    branches-ignore: ['main']
 
 jobs:
 
diff --git a/.github/workflows/logstash.yml b/.github/workflows/logstash.yml
index 849302f..8f39de9 100644
--- a/.github/workflows/logstash.yml
+++ b/.github/workflows/logstash.yml
@@ -2,9 +2,9 @@ name: Logstash Docker Image CI
 
 on:
   push:
-    branches: ["8.17", "8.18", "8.19", "9.0", "9.1"]
+    branches-ignore: ['main']
   pull_request:
-    branches: ["8.17", "8.18", "8.19", "9.0", "9.1"]
+    branches-ignore: ['main']
 
 jobs:
 

From d5b401ebf33cb3389c6c252be64bb040e62cd611 Mon Sep 17 00:00:00 2001
From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com>
Date: Tue, 13 Jan 2026 13:20:03 +0100
Subject: [PATCH 5/9] Fix workflows to properly skip PRs targeting main branch

- Remove branches-ignore from pull_request (not reliable for PR events)
- Add job-level condition to skip when PR targets main
- Condition handles both push and pull_request events correctly
---
 .github/workflows/elasticsearch.yml | 2 +-
 .github/workflows/kibana.yml        | 2 +-
 .github/workflows/logstash.yml      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/elasticsearch.yml b/.github/workflows/elasticsearch.yml
index 74fb884..8fd9a30 100644
--- a/.github/workflows/elasticsearch.yml
+++ b/.github/workflows/elasticsearch.yml
@@ -4,11 +4,11 @@ on:
   push:
     branches-ignore: ['main']
   pull_request:
-    branches-ignore: ['main']
 
 jobs:
 
   build:
+    if: github.event_name == 'push' || github.event.pull_request.base.ref != 'main'
 
     runs-on: ubuntu-latest
 
diff --git a/.github/workflows/kibana.yml b/.github/workflows/kibana.yml
index f3e916e..2956467 100644
--- a/.github/workflows/kibana.yml
+++ b/.github/workflows/kibana.yml
@@ -4,11 +4,11 @@ on:
   push:
     branches-ignore: ['main']
   pull_request:
-    branches-ignore: ['main']
 
 jobs:
 
   build:
+    if: github.event_name == 'push' || github.event.pull_request.base.ref != 'main'
 
     runs-on: ubuntu-latest
 
diff --git a/.github/workflows/logstash.yml b/.github/workflows/logstash.yml
index 8f39de9..838dd56 100644
--- a/.github/workflows/logstash.yml
+++ b/.github/workflows/logstash.yml
@@ -4,11 +4,11 @@ on:
   push:
     branches-ignore: ['main']
   pull_request:
-    branches-ignore: ['main']
 
 jobs:
 
   build:
+    if: github.event_name == 'push' || github.event.pull_request.base.ref != 'main'
 
     runs-on: ubuntu-latest
 

From d752b03d2f16e7ca68117dc65e44ac77bdc93d6d Mon Sep 17 00:00:00 2001
From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com>
Date: Tue, 13 Jan 2026 13:22:20 +0100
Subject: [PATCH 6/9] Add directory existence check to prevent build failures

- Add check step to verify dockerfile directory exists before building
- Skip build step if directory doesn't exist (e.g., on main branch or PRs based on main)
- Prevents workflow failures when directories are not present
---
 .github/workflows/elasticsearch.yml | 11 +++++++++++
 .github/workflows/kibana.yml        | 11 +++++++++++
 .github/workflows/logstash.yml      | 11 +++++++++++
 3 files changed, 33 insertions(+)

diff --git a/.github/workflows/elasticsearch.yml b/.github/workflows/elasticsearch.yml
index 8fd9a30..78ef422 100644
--- a/.github/workflows/elasticsearch.yml
+++ b/.github/workflows/elasticsearch.yml
@@ -15,5 +15,16 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     
+    - name: Check if elasticsearch directory exists
+      id: check_dir
+      run: |
+        if [ ! -d "elasticsearch" ]; then
+          echo "exists=false" >> $GITHUB_OUTPUT
+          echo "Directory elasticsearch does not exist, skipping build"
+        else
+          echo "exists=true" >> $GITHUB_OUTPUT
+        fi
+    
     - name: Build the Elasticsearch Docker image
+      if: steps.check_dir.outputs.exists == 'true'
       run: docker build elasticsearch
diff --git a/.github/workflows/kibana.yml b/.github/workflows/kibana.yml
index 2956467..ee5c14a 100644
--- a/.github/workflows/kibana.yml
+++ b/.github/workflows/kibana.yml
@@ -15,5 +15,16 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     
+    - name: Check if kibana directory exists
+      id: check_dir
+      run: |
+        if [ ! -d "kibana" ]; then
+          echo "exists=false" >> $GITHUB_OUTPUT
+          echo "Directory kibana does not exist, skipping build"
+        else
+          echo "exists=true" >> $GITHUB_OUTPUT
+        fi
+    
     - name: Build the Kibana Docker image
+      if: steps.check_dir.outputs.exists == 'true'
       run: docker build kibana
diff --git a/.github/workflows/logstash.yml b/.github/workflows/logstash.yml
index 838dd56..00fc5d5 100644
--- a/.github/workflows/logstash.yml
+++ b/.github/workflows/logstash.yml
@@ -15,5 +15,16 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     
+    - name: Check if logstash directory exists
+      id: check_dir
+      run: |
+        if [ ! -d "logstash" ]; then
+          echo "exists=false" >> $GITHUB_OUTPUT
+          echo "Directory logstash does not exist, skipping build"
+        else
+          echo "exists=true" >> $GITHUB_OUTPUT
+        fi
+    
     - name: Build the Logstash Docker image
+      if: steps.check_dir.outputs.exists == 'true'
       run: docker build logstash

From 8d70765f1ce19c2b54fc87ed27c80c366b0b7a4e Mon Sep 17 00:00:00 2001
From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com>
Date: Tue, 13 Jan 2026 13:24:32 +0100
Subject: [PATCH 7/9] Simplify workflows by removing redundant job condition

- Remove job-level condition since directory check handles all cases
- Keep branches-ignore for push to prevent unnecessary workflow runs on main
- Directory existence check is now the single source of truth for builds
---
 .github/workflows/elasticsearch.yml | 1 -
 .github/workflows/kibana.yml        | 1 -
 .github/workflows/logstash.yml      | 1 -
 3 files changed, 3 deletions(-)

diff --git a/.github/workflows/elasticsearch.yml b/.github/workflows/elasticsearch.yml
index 78ef422..7036deb 100644
--- a/.github/workflows/elasticsearch.yml
+++ b/.github/workflows/elasticsearch.yml
@@ -8,7 +8,6 @@ on:
 jobs:
 
   build:
-    if: github.event_name == 'push' || github.event.pull_request.base.ref != 'main'
 
     runs-on: ubuntu-latest
 
diff --git a/.github/workflows/kibana.yml b/.github/workflows/kibana.yml
index ee5c14a..38f3a14 100644
--- a/.github/workflows/kibana.yml
+++ b/.github/workflows/kibana.yml
@@ -8,7 +8,6 @@ on:
 jobs:
 
   build:
-    if: github.event_name == 'push' || github.event.pull_request.base.ref != 'main'
 
     runs-on: ubuntu-latest
 
diff --git a/.github/workflows/logstash.yml b/.github/workflows/logstash.yml
index 00fc5d5..26cc67f 100644
--- a/.github/workflows/logstash.yml
+++ b/.github/workflows/logstash.yml
@@ -8,7 +8,6 @@ on:
 jobs:
 
   build:
-    if: github.event_name == 'push' || github.event.pull_request.base.ref != 'main'
 
     runs-on: ubuntu-latest
 

From 295c231ca235e685170bbf3872506cb07c664bbc Mon Sep 17 00:00:00 2001
From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com>
Date: Tue, 13 Jan 2026 13:25:48 +0100
Subject: [PATCH 8/9] Remove branches-ignore, rely solely on directory check

- Remove branches-ignore from push trigger
- Directory existence check is now the single source of truth
- Simpler and more maintainable - no need to maintain branch exclusion logic
---
 .github/workflows/elasticsearch.yml | 1 -
 .github/workflows/kibana.yml        | 1 -
 .github/workflows/logstash.yml      | 1 -
 3 files changed, 3 deletions(-)

diff --git a/.github/workflows/elasticsearch.yml b/.github/workflows/elasticsearch.yml
index 7036deb..a4a608d 100644
--- a/.github/workflows/elasticsearch.yml
+++ b/.github/workflows/elasticsearch.yml
@@ -2,7 +2,6 @@ name: Elasticsearch Docker Image CI
 
 on:
   push:
-    branches-ignore: ['main']
   pull_request:
 
 jobs:
diff --git a/.github/workflows/kibana.yml b/.github/workflows/kibana.yml
index 38f3a14..723f1a5 100644
--- a/.github/workflows/kibana.yml
+++ b/.github/workflows/kibana.yml
@@ -2,7 +2,6 @@ name: Kibana Docker Image CI
 
 on:
   push:
-    branches-ignore: ['main']
   pull_request:
 
 jobs:
diff --git a/.github/workflows/logstash.yml b/.github/workflows/logstash.yml
index 26cc67f..f12e168 100644
--- a/.github/workflows/logstash.yml
+++ b/.github/workflows/logstash.yml
@@ -2,7 +2,6 @@ name: Logstash Docker Image CI
 
 on:
   push:
-    branches-ignore: ['main']
   pull_request:
 
 jobs:

From 846e8b6499f83c36db6b24279ff8f65021ee315a Mon Sep 17 00:00:00 2001
From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com>
Date: Tue, 13 Jan 2026 13:27:07 +0100
Subject: [PATCH 9/9] Add comments explaining directory check for main branch

- Add comment explaining directory check is needed because main branch doesn't contain Dockerfiles
- Reference README.md for branch model documentation
- Improves code maintainability and understanding
---
 .github/workflows/elasticsearch.yml | 2 ++
 .github/workflows/kibana.yml        | 2 ++
 .github/workflows/logstash.yml      | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/.github/workflows/elasticsearch.yml b/.github/workflows/elasticsearch.yml
index a4a608d..e3f8910 100644
--- a/.github/workflows/elasticsearch.yml
+++ b/.github/workflows/elasticsearch.yml
@@ -13,6 +13,8 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     
+    # Check if directory exists - needed because main branch doesn't contain Dockerfiles
+    # (see README.md for branch model documentation)
     - name: Check if elasticsearch directory exists
       id: check_dir
       run: |
diff --git a/.github/workflows/kibana.yml b/.github/workflows/kibana.yml
index 723f1a5..3a69115 100644
--- a/.github/workflows/kibana.yml
+++ b/.github/workflows/kibana.yml
@@ -13,6 +13,8 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     
+    # Check if directory exists - needed because main branch doesn't contain Dockerfiles
+    # (see README.md for branch model documentation)
     - name: Check if kibana directory exists
       id: check_dir
       run: |
diff --git a/.github/workflows/logstash.yml b/.github/workflows/logstash.yml
index f12e168..5d14aa0 100644
--- a/.github/workflows/logstash.yml
+++ b/.github/workflows/logstash.yml
@@ -13,6 +13,8 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     
+    # Check if directory exists - needed because main branch doesn't contain Dockerfiles
+    # (see README.md for branch model documentation)
     - name: Check if logstash directory exists
       id: check_dir
       run: |