From a6a2aa07639092277948e659ae0065ce9a8526a4 Mon Sep 17 00:00:00 2001
From: manegron <manegron@redborder.com>
Date: Wed, 23 Oct 2024 20:44:21 +0100
Subject: [PATCH 1/4] Update redborder.rb

---
 resources/ohai/plugins/redborder.rb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/resources/ohai/plugins/redborder.rb b/resources/ohai/plugins/redborder.rb
index 52c9d48..a322a8c 100644
--- a/resources/ohai/plugins/redborder.rb
+++ b/resources/ohai/plugins/redborder.rb
@@ -27,6 +27,7 @@
         r = /(snort|barnyard2)-(.*)\.(x86_64)/
         m = r.match(line.chomp)
         next unless m
+
         if m[1] == "snort"
           redborder[:snort] = Mash.new
           redborder[:snort][:version] =  m[2].gsub(".el9", "")
@@ -37,6 +38,21 @@
       end
     end
 
+    # get webui version
+    if redborder[:is_manager]
+      rpms = shell_out('rpm -qa | grep -E "(redborder-webui-)"').stdout
+      rpms.each_line do |line|
+        r = /(redborder-webui)-(.*)\.(noarch)/
+        m = r.match(line.chomp)
+        next unless m
+
+        if m[1] == "redborder-webui"
+          redborder[:webui] = Mash.new
+          redborder[:webui][:version] =  m[2].gsub(".el9", "")
+        end
+      end
+    end
+
     redborder[:dmidecode] = Mash.new
     redborder[:dmidecode][:manufacturer] = shell_out('dmidecode -t 1 | grep "Manufacturer:" | sed "s/.*Manufacturer: //"').stdout.chomp
     redborder[:dmidecode][:product_name] = shell_out('dmidecode -t 1 | grep "Product Name:" | sed "s/.*Product Name: //"').stdout.chomp

From 2e0926ff0c1c87c5ed701b71c853153bcb3a753d Mon Sep 17 00:00:00 2001
From: manegron <manegron@redborder.com>
Date: Wed, 23 Oct 2024 21:03:07 +0100
Subject: [PATCH 2/4] Add repo version

---
 resources/ohai/plugins/redborder.rb | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/resources/ohai/plugins/redborder.rb b/resources/ohai/plugins/redborder.rb
index a322a8c..60d6c34 100644
--- a/resources/ohai/plugins/redborder.rb
+++ b/resources/ohai/plugins/redborder.rb
@@ -53,6 +53,19 @@
       end
     end
 
+    # get repo version
+    rpms = shell_out('rpm -qa | grep -E "(redborder-repo-)"').stdout
+    rpms.each_line do |line|
+      r = /(redborder-repo)-(.*)\.(noarch)/
+      m = r.match(line.chomp)
+      next unless m
+
+      if m[1] == "redborder-repo"
+        redborder[:repo] = Mash.new
+        redborder[:repo][:version] =  m[2].gsub(".el9", "")
+      end
+    end
+
     redborder[:dmidecode] = Mash.new
     redborder[:dmidecode][:manufacturer] = shell_out('dmidecode -t 1 | grep "Manufacturer:" | sed "s/.*Manufacturer: //"').stdout.chomp
     redborder[:dmidecode][:product_name] = shell_out('dmidecode -t 1 | grep "Product Name:" | sed "s/.*Product Name: //"').stdout.chomp

From db1671acf27b3db66d409305eedac740bb9a4d47 Mon Sep 17 00:00:00 2001
From: manegron <manegron@redborder.com>
Date: Wed, 23 Oct 2024 21:27:25 +0100
Subject: [PATCH 3/4] Update plugin

---
 resources/ohai/plugins/redborder.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/ohai/plugins/redborder.rb b/resources/ohai/plugins/redborder.rb
index 60d6c34..802df1e 100644
--- a/resources/ohai/plugins/redborder.rb
+++ b/resources/ohai/plugins/redborder.rb
@@ -48,7 +48,7 @@
 
         if m[1] == "redborder-webui"
           redborder[:webui] = Mash.new
-          redborder[:webui][:version] =  m[2].gsub(".el9", "")
+          redborder[:webui][:version] =  m[2].gsub(".el9.rb", "")
         end
       end
     end
@@ -62,7 +62,7 @@
 
       if m[1] == "redborder-repo"
         redborder[:repo] = Mash.new
-        redborder[:repo][:version] =  m[2].gsub(".el9", "")
+        redborder[:repo][:version] =  m[2].gsub(".el9.rb", "")
       end
     end
 

From eae4bf95ed79d5c5ee9abca7cc2ddb7e5d3b5164 Mon Sep 17 00:00:00 2001
From: Miguel Negron <manegron@redborder.com>
Date: Wed, 23 Oct 2024 21:40:05 +0100
Subject: [PATCH 4/4] Bump version

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 88c5fb8..bc80560 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.4.0
+1.5.0