diff --git a/Gemfile.lock b/Gemfile.lock index 88a270e3..dd32bc97 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,7 +3,7 @@ PATH specs: karafka-web (0.7.0) erubi (~> 1.4) - karafka (>= 2.2.0, < 3.0.0) + karafka (>= 2.2.3, < 3.0.0) karafka-core (>= 2.2.2, < 3.0.0) roda (~> 3.68, >= 3.69) tilt (~> 2.0) @@ -26,8 +26,8 @@ GEM ffi (1.15.5) i18n (1.14.1) concurrent-ruby (~> 1.0) - karafka (2.2.1) - karafka-core (>= 2.2.0, < 2.3.0) + karafka (2.2.3) + karafka-core (>= 2.2.2, < 2.3.0) thor (>= 0.20) waterdrop (>= 2.6.6, < 3.0.0) zeitwerk (~> 2.3) diff --git a/karafka-web.gemspec b/karafka-web.gemspec index f595275f..ed2a9e30 100644 --- a/karafka-web.gemspec +++ b/karafka-web.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |spec| spec.licenses = %w[LGPL-3.0 Commercial] spec.add_dependency 'erubi', '~> 1.4' - spec.add_dependency 'karafka', '>= 2.2.0', '< 3.0.0' + spec.add_dependency 'karafka', '>= 2.2.3', '< 3.0.0' spec.add_dependency 'karafka-core', '>= 2.2.2', '< 3.0.0' spec.add_dependency 'roda', '~> 3.68', '>= 3.69' spec.add_dependency 'tilt', '~> 2.0' diff --git a/lib/karafka/web/ui/pro/views/consumers/consumer/_partition.erb b/lib/karafka/web/ui/pro/views/consumers/consumer/_partition.erb index 64bf75a2..21f303ae 100644 --- a/lib/karafka/web/ui/pro/views/consumers/consumer/_partition.erb +++ b/lib/karafka/web/ui/pro/views/consumers/consumer/_partition.erb @@ -1,4 +1,4 @@ - + <%= topic.name %> @@ -33,4 +33,9 @@ <%= partition.poll_state %> + + + <%= partition.lso_risk_state %> + + diff --git a/lib/karafka/web/ui/pro/views/consumers/consumer/_subscription_group.erb b/lib/karafka/web/ui/pro/views/consumers/consumer/_subscription_group.erb index 9e66beac..4d98b02d 100644 --- a/lib/karafka/web/ui/pro/views/consumers/consumer/_subscription_group.erb +++ b/lib/karafka/web/ui/pro/views/consumers/consumer/_subscription_group.erb @@ -86,6 +86,7 @@ Stored offset Fetch state Poll state + LSO state diff --git a/lib/karafka/web/ui/pro/views/shared/_navigation.erb b/lib/karafka/web/ui/pro/views/shared/_navigation.erb index 4140648b..3826331c 100644 --- a/lib/karafka/web/ui/pro/views/shared/_navigation.erb +++ b/lib/karafka/web/ui/pro/views/shared/_navigation.erb @@ -21,7 +21,7 @@ diff --git a/spec/lib/karafka/web/ui/pro/controllers/explorer_spec.rb b/spec/lib/karafka/web/ui/pro/controllers/explorer_spec.rb index d13cf4eb..33cf218a 100644 --- a/spec/lib/karafka/web/ui/pro/controllers/explorer_spec.rb +++ b/spec/lib/karafka/web/ui/pro/controllers/explorer_spec.rb @@ -603,6 +603,20 @@ end end + context 'when we have many messages and we request earlier time on a higher partition' do + let(:partitions) { 2 } + + before do + produce_many(topic, Array.new(100, '1'), partition: 1) + get "explorer/#{topic}/1/2000-01-01/12:00:12" + end + + it do + expect(response.status).to eq(302) + expect(response.location).to eq("/explorer/#{topic}/1?offset=0") + end + end + context 'when we have many messages and we request later time' do before do produce_many(topic, Array.new(100, '1'))