From 70a8ac8e0ce18d2546742aab7b68e49c769e38b4 Mon Sep 17 00:00:00 2001
From: zhongwencool <zhongwencool@gmail.com>
Date: Tue, 22 Oct 2024 09:36:07 +0800
Subject: [PATCH 1/2] Bump observer_cli to 1.8.0

(cherry picked from commit 8f7232b74212a422ca4978969d2b0623abacdf98)

# Conflicts:
#	rabbitmq-components.mk
---
 MODULE.bazel           | 4 ++--
 rabbitmq-components.mk | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/MODULE.bazel b/MODULE.bazel
index aceaa9f33a6a..4e64c019ea9c 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -231,8 +231,8 @@ erlang_package.hex_package(
 erlang_package.hex_package(
     name = "observer_cli",
     build_file = "@rabbitmq-server//bazel:BUILD.observer_cli",
-    sha256 = "872cf8e833a3a71ebd05420692678ec8aaede8fd96c805a4687398f6b23a3014",
-    version = "1.7.5",
+    sha256 = "9842759b11360819dd0e6e60173c39c1e6aaef4b20fa6fe9b4700e3e02911b83",
+    version = "1.8.0",
 )
 
 erlang_package.hex_package(
diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk
index 50bdc0db987f..8cf1f5b757c9 100644
--- a/rabbitmq-components.mk
+++ b/rabbitmq-components.mk
@@ -126,9 +126,16 @@ dep_prometheus = hex 4.11.0
 dep_ra = hex 2.14.0
 dep_ranch = hex 2.1.0
 dep_recon = hex 2.5.6
+<<<<<<< HEAD
 dep_redbug = hex 2.1.0
 dep_thoas = hex 1.2.1
 dep_observer_cli = hex 1.7.5
+=======
+dep_redbug = hex 2.0.7
+dep_systemd = hex 0.6.1
+dep_thoas = hex 1.0.0
+dep_observer_cli = hex 1.8.0
+>>>>>>> 8f7232b742 (Bump observer_cli to 1.8.0)
 dep_seshat = git https://github.com/rabbitmq/seshat v0.6.1
 dep_stdout_formatter = hex 0.2.4
 dep_sysmon_handler = hex 1.3.0

From 62521835c02d8b77d899cf6a7c44e77a5a878baa Mon Sep 17 00:00:00 2001
From: Michael Klishin <mikhail.klishin@broadcom.com>
Date: Mon, 21 Oct 2024 22:20:29 -0400
Subject: [PATCH 2/2] Resolve a conflict #12566

---
 rabbitmq-components.mk | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk
index 8cf1f5b757c9..340f2186956e 100644
--- a/rabbitmq-components.mk
+++ b/rabbitmq-components.mk
@@ -126,16 +126,9 @@ dep_prometheus = hex 4.11.0
 dep_ra = hex 2.14.0
 dep_ranch = hex 2.1.0
 dep_recon = hex 2.5.6
-<<<<<<< HEAD
 dep_redbug = hex 2.1.0
 dep_thoas = hex 1.2.1
-dep_observer_cli = hex 1.7.5
-=======
-dep_redbug = hex 2.0.7
-dep_systemd = hex 0.6.1
-dep_thoas = hex 1.0.0
 dep_observer_cli = hex 1.8.0
->>>>>>> 8f7232b742 (Bump observer_cli to 1.8.0)
 dep_seshat = git https://github.com/rabbitmq/seshat v0.6.1
 dep_stdout_formatter = hex 0.2.4
 dep_sysmon_handler = hex 1.3.0