From a5aec2f661acb734bed083575d52caa3d72ea36f Mon Sep 17 00:00:00 2001
From: ubyte <swarmer@ydb.tech>
Date: Tue, 16 Sep 2025 15:01:33 +0000
Subject: [PATCH 1/3] Pass read offset in the PartitionStatus response (#24748)

---
 .github/last_commit.txt                     | 2 +-
 src/api/protos/ydb_topic.proto              | 3 +++
 src/client/topic/impl/read_session_impl.ipp | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/last_commit.txt b/.github/last_commit.txt
index 9e9b2a1c928..79c5fd741f2 100644
--- a/.github/last_commit.txt
+++ b/.github/last_commit.txt
@@ -1 +1 @@
-110937321b45fb3be9ca39ff3bb83bcdfcf52c97
+2e6b589fa47b74662114ecad23c188f935c4b556
diff --git a/src/api/protos/ydb_topic.proto b/src/api/protos/ydb_topic.proto
index 5e0f65838f2..6ae3aa6f6e4 100644
--- a/src/api/protos/ydb_topic.proto
+++ b/src/api/protos/ydb_topic.proto
@@ -475,6 +475,9 @@ message StreamReadMessage {
 
         // Write timestamp of next message written to this partition will be no less than write_time_high_watermark.
         google.protobuf.Timestamp write_time_high_watermark = 4;
+
+        // Messages with offsets up to and including (read_offset - 1) was read.
+        int64 read_offset = 5;
     }
 
     // Command from server to create and start a partition session.
diff --git a/src/client/topic/impl/read_session_impl.ipp b/src/client/topic/impl/read_session_impl.ipp
index 4eeb0b3ba3d..83ccb111be3 100644
--- a/src/client/topic/impl/read_session_impl.ipp
+++ b/src/client/topic/impl/read_session_impl.ipp
@@ -1701,7 +1701,7 @@ inline void TSingleClusterReadSessionImpl<false>::OnReadDoneImpl(
     bool pushRes = EventsQueue->PushEvent(partitionStreamIt->second,
                             TReadSessionEvent::TPartitionSessionStatusEvent(
                                 partitionStreamIt->second, msg.committed_offset(),
-                                0, // TODO: support read offset in status
+                                msg.read_offset(),
                                 msg.partition_offsets().end(),
                                 TInstant::MilliSeconds(::google::protobuf::util::TimeUtil::TimestampToMilliseconds(
                                     msg.write_time_high_watermark()))),

From 3801926250117274649c5853f1c08feb791afb20 Mon Sep 17 00:00:00 2001
From: Evgeniy Ivanov <eivanov89@ydb.tech>
Date: Tue, 16 Sep 2025 15:01:39 +0000
Subject: [PATCH 2/3] Add CLI options to health check specified tenant (#23455)
 (#24973)

---
 .github/last_commit.txt                            | 2 +-
 include/ydb-cpp-sdk/client/monitoring/monitoring.h | 2 ++
 src/client/monitoring/monitoring.cpp               | 8 ++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/last_commit.txt b/.github/last_commit.txt
index 79c5fd741f2..4a5d128d765 100644
--- a/.github/last_commit.txt
+++ b/.github/last_commit.txt
@@ -1 +1 @@
-2e6b589fa47b74662114ecad23c188f935c4b556
+b39a359f04c57875ea162524646ae879f06c7a33
diff --git a/include/ydb-cpp-sdk/client/monitoring/monitoring.h b/include/ydb-cpp-sdk/client/monitoring/monitoring.h
index 72866e87622..54ce3211844 100644
--- a/include/ydb-cpp-sdk/client/monitoring/monitoring.h
+++ b/include/ydb-cpp-sdk/client/monitoring/monitoring.h
@@ -28,6 +28,8 @@ enum class EStatusFlag {
 
 struct TSelfCheckSettings : public TOperationRequestSettings<TSelfCheckSettings>{
     FLUENT_SETTING_OPTIONAL(bool, ReturnVerboseStatus);
+    FLUENT_SETTING_OPTIONAL(bool, NoMerge);
+    FLUENT_SETTING_OPTIONAL(bool, NoCache);
     FLUENT_SETTING_OPTIONAL(EStatusFlag, MinimumStatus);
     FLUENT_SETTING_OPTIONAL(uint32_t, MaximumLevel);
 };
diff --git a/src/client/monitoring/monitoring.cpp b/src/client/monitoring/monitoring.cpp
index 7f86d9a2006..16a4945ebd1 100644
--- a/src/client/monitoring/monitoring.cpp
+++ b/src/client/monitoring/monitoring.cpp
@@ -40,6 +40,14 @@ class TMonitoringClient::TImpl : public TClientImplCommon<TMonitoringClient::TIm
             request.set_return_verbose_status(settings.ReturnVerboseStatus_.value());
         }
 
+        if (settings.NoMerge_) {
+            request.set_merge_records(!settings.NoMerge_.value());
+        }
+
+        if (settings.NoCache_) {
+            request.set_do_not_cache(settings.NoCache_.value());
+        }
+
         if (settings.MinimumStatus_) {
             request.set_minimum_status((::Ydb::Monitoring::StatusFlag_Status)settings.MinimumStatus_.value());
         }

From e76dc5a09d4ad302d06d8912a1207a3b652f66b6 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 16 Sep 2025 15:01:39 +0000
Subject: [PATCH 3/3] Update import generation: 24

---
 .github/import_generation.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/import_generation.txt b/.github/import_generation.txt
index a45fd52cc58..7273c0fa8c5 100644
--- a/.github/import_generation.txt
+++ b/.github/import_generation.txt
@@ -1 +1 @@
-24
+25