karafka-web 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c3bf9c5a445bd6a5d291412eea7fba31d1de171f0262543cf149c49946af788
-  data.tar.gz: d4febb4b2b6bf5405213abaa114892b06f6207623c100cbfc4a3037809a0e94e
+  metadata.gz: 741082cd49e03399e910d2119b2bbd5bffd397c0b548005db6dedc3d6e283557
+  data.tar.gz: b5b24528a2e489fa509c70deea9e79011d0945e6a6f1b8e44686acc0ec2ab96b
 SHA512:
-  metadata.gz: 4ba13c91f46ef01927464720f9b0919f7a6bb5d7cc081a30e926a14b40331d375fdbab53b4de6fe3849101b15c3b9eeb70538a5821486ed15e4677a5e6995a3d
-  data.tar.gz: 6402543fa36aac339bd2d0795a45802d4c3f3f085d4075fed994ea51d889a872cc2f8fe17c04206bf8811c2395a7381d01698e29adba497fec4e5b35c97892c4
+  metadata.gz: aba7fd6a0b9e3729219bd477319b6e06b0662e41f7734e0e43940df940f20451a63a7c4ab734475b29a1c615109329f04a4f6e9767c3cf36005b365ca2174b8f
+  data.tar.gz: '02160184e59088650bb6a00c831ef58a880b02a70dc2b2a4ccfceb4e140a0ee4e0b30e27a5e6df1b35e9516db47823464e6b125ed34ee29a742db4506460983c'

data/.ruby-version

@@ -1 +1 @@
-3.2.1
+3.2.2

data/CHANGELOG.md

@@ -1,5 +1,31 @@
 # Karafka Web changelog
 
+## 0.4.0 (2023-04-07)
+- [Improvement] Include active jobs and active partitions subscriptions count in the per-process tab navigation.
+- [Improvement] Include subscription groups names in the per-process subscriptions view.
+- [Fix] Add missing support for using multiple subscription groups within a single consumer group.
+- [Fix] Mask SASL credentials in topic routing view (#46)
+
+### Upgrade notes
+
+Because of the reporting schema change, it is recommended to:
+
+- First, deploy **all** the Karafka consumer processes (`karafka server`)
+- Deploy the Web update to your web server.
+
+Please note that if you decide to use the updated Web UI with not updated consumers, you may hit a 500 error.
+
+## 0.3.1 (2023-03-27)
+- [Fix] Add missing retention policy for states topic.
+- [Fix] Fix display of compacted messages placeholders for offsets lower than low watermark.
+- [Fix] Fix invalid pagination per page count.
+
+### Upgrade notes
+
+If upgrading from `0.3.0`, nothing.
+
+If upgrading from lower, please follow `0.3.0` upgrade procedure.
+
 ## 0.3.0 (2023-03-27)
 - **[Feature]** Support paginating over compacted topics partitions.
 - [Improvement] Display watermark offsets in the errors view.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    karafka-web (0.3.0)
+    karafka-web (0.4.0)
       erubi (~> 1.4)
       karafka (>= 2.0.38, < 3.0.0)
       karafka-core (>= 2.0.12, < 3.0.0)
@@ -11,7 +11,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4.2)
+    activesupport (7.0.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -39,13 +39,13 @@ GEM
       mini_portile2 (~> 2.6)
       rake (> 12)
     mini_portile2 (2.8.1)
-    minitest (5.17.0)
-    rack (3.0.4.1)
+    minitest (5.18.0)
+    rack (3.0.7)
     rackup (0.2.3)
       rack (>= 3.0.0.beta1)
       webrick
     rake (13.0.6)
-    roda (3.65.0)
+    roda (3.66.0)
       rack
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -56,7 +56,7 @@ GEM
     rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.3)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
@@ -70,7 +70,7 @@ GEM
     tilt (2.1.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    waterdrop (2.4.11)
+    waterdrop (2.5.1)
       karafka-core (>= 2.0.12, < 3.0.0)
       zeitwerk (~> 2.3)
     webrick (1.8.1)
@@ -89,4 +89,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.4.7
+   2.4.10

data/lib/karafka/web/installer.rb

@@ -102,8 +102,13 @@ module Karafka
             consumers_states_topic,
             1,
             replication_factor,
-            # We care only about the most recent state, previous are irrelevant
-            { 'cleanup.policy': 'compact' }
+            # We care only about the most recent state, previous are irrelevant. So we can easily
+            # compact after one minute. We do not use this beyond the most recent collective
+            # state, hence it all can easily go away.
+            {
+              'cleanup.policy': 'compact',
+              'retention.ms': 60 * 60 * 1_000
+            }
           )
         end
 

data/lib/karafka/web/tracking/consumers/contracts/consumer_group.rb

@@ -7,20 +7,20 @@ module Karafka
         # Consumer tracking related contracts
         module Contracts
           # Expected data for each consumer group
-          # It's mostly about topics details
+          # It's mostly about subscription groups details
           class ConsumerGroup < BaseContract
             configure
 
             required(:id) { |val| val.is_a?(String) && !val.empty? }
-            required(:topics) { |val| val.is_a?(Hash) }
+            required(:subscription_groups) { |val| val.is_a?(Hash) }
 
             virtual do |data, errors|
               next unless errors.empty?
 
-              topic_contract = Topic.new
+              subscription_group_contract = SubscriptionGroup.new
 
-              data.fetch(:topics).each do |_topic_name, details|
-                topic_contract.validate!(details)
+              data.fetch(:subscription_groups).each do |_subscription_group_name, details|
+                subscription_group_contract.validate!(details)
               end
 
               nil

data/lib/karafka/web/tracking/consumers/contracts/subscription_group.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Karafka
+  module Web
+    module Tracking
+      module Consumers
+        module Contracts
+          # Expected data for each subscription group
+          # It's mostly about topics details
+          class SubscriptionGroup < BaseContract
+            configure
+
+            required(:id) { |val| val.is_a?(String) && !val.empty? }
+            required(:topics) { |val| val.is_a?(Hash) }
+            required(:state) { |val| val.is_a?(Hash) }
+
+            virtual do |data, errors|
+              next unless errors.empty?
+
+              topic_contract = Topic.new
+
+              data.fetch(:topics).each do |_topic_name, details|
+                topic_contract.validate!(details)
+              end
+
+              nil
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/karafka/web/tracking/consumers/listeners/statistics.rb

@@ -14,50 +14,61 @@ module Karafka
               statistics = event[:statistics]
               topics = statistics.fetch('topics')
               cgrp = statistics.fetch('cgrp')
-              consumer_group_id = event[:consumer_group_id]
+              cg_id = event[:consumer_group_id]
+              sg_id = event[:subscription_group_id]
+              sg_details = extract_sg_details(sg_id, cgrp)
 
+              # More than one subscription group from the same consumer group may be reporting
+              # almost the same time. To prevent corruption of partial data, we put everything here
+              # in track as we merge data from multiple subscription groups
               track do |sampler|
-                cg_details = extract_consumer_group_details(consumer_group_id, cgrp)
-                sampler.consumer_groups[consumer_group_id] = cg_details
-
                 topics.each do |topic_name, topic_values|
                   partitions = topic_values.fetch('partitions')
 
-                  partitions.each do |partition_name, partition_statistics|
-                    partition_id = partition_name.to_i
+                  partitions.each do |pt_name, pt_stats|
+                    pt_id = pt_name.to_i
 
-                    next unless partition_reportable?(partition_id, partition_statistics)
+                    next unless partition_reportable?(pt_id, pt_stats)
 
-                    metrics = extract_partition_metrics(partition_statistics)
+                    metrics = extract_partition_metrics(pt_stats)
 
                     next if metrics.empty?
 
-                    topics_details = cg_details[:topics]
+                    topics_details = sg_details[:topics]
 
                     topic_details = topics_details[topic_name] ||= {
                       name: topic_name,
                       partitions: {}
                     }
 
-                    topic_details[:partitions][partition_id] = metrics.merge(
-                      id: partition_id,
-                      poll_state: poll_state(consumer_group_id, topic_name, partition_id)
+                    topic_details[:partitions][pt_id] = metrics.merge(
+                      id: pt_id,
+                      # Pauses are stored on a consumer group since we do not process same topic
+                      # twice in the multiple subscription groups
+                      poll_state: poll_state(cg_id, topic_name, pt_id)
                     )
                   end
                 end
+
+                sampler.consumer_groups[cg_id] ||= {
+                  id: cg_id,
+                  subscription_groups: {}
+                }
+
+                sampler.consumer_groups[cg_id][:subscription_groups][sg_id] = sg_details
               end
             end
 
             private
 
             # Extracts basic consumer group related details
-            # @param consumer_group_id [String]
-            # @param consumer_group_statistics [Hash]
+            # @param sg_id [String]
+            # @param sg_stats [Hash]
             # @return [Hash] consumer group relevant details
-            def extract_consumer_group_details(consumer_group_id, consumer_group_statistics)
+            def extract_sg_details(sg_id, sg_stats)
               {
-                id: consumer_group_id,
-                state: consumer_group_statistics.slice(
+                id: sg_id,
+                state: sg_stats.slice(
                   'state',
                   'join_state',
                   'stateage',
@@ -69,29 +80,29 @@ module Karafka
               }
             end
 
-            # @param partition_id [Integer]
-            # @param partition_statistics [Hash]
+            # @param pt_id [Integer]
+            # @param pt_stats [Hash]
             # @return [Boolean] is this partition relevant to the current process, hence should we
             #   report about it in the context of the process.
-            def partition_reportable?(partition_id, partition_statistics)
-              return false if partition_id == -1
+            def partition_reportable?(pt_id, pt_stats)
+              return false if pt_id == -1
 
               # Skip until lag info is available
-              return false if partition_statistics['consumer_lag'] == -1
+              return false if pt_stats['consumer_lag'] == -1
 
               # Collect information only about what we are subscribed to and what we fetch or
               # work in any way. Stopped means, we no longer work with it
-              return false if partition_statistics['fetch_state'] == 'stopped'
+              return false if pt_stats['fetch_state'] == 'stopped'
 
               true
             end
 
             # Extracts and formats partition relevant metrics
             #
-            # @param partition_statistics [Hash]
+            # @param pt_stats [Hash]
             # @return [Hash] extracted partition metrics
-            def extract_partition_metrics(partition_statistics)
-              metrics = partition_statistics.slice(
+            def extract_partition_metrics(pt_stats)
+              metrics = pt_stats.slice(
                 'consumer_lag_stored',
                 'consumer_lag_stored_d',
                 'committed_offset',
@@ -106,12 +117,12 @@ module Karafka
               metrics
             end
 
-            # @param consumer_group_id [String]
+            # @param cg_id [String]
             # @param topic_name [String]
-            # @param partition_id [Integer]
+            # @param pt_id [Integer]
             # @return [String] poll state / is partition paused or not
-            def poll_state(consumer_group_id, topic_name, partition_id)
-              pause_id = [consumer_group_id, topic_name, partition_id].join('-')
+            def poll_state(cg_id, topic_name, pt_id)
+              pause_id = [cg_id, topic_name, pt_id].join('-')
 
               sampler.pauses.include?(pause_id) ? 'paused' : 'active'
             end

data/lib/karafka/web/tracking/consumers/sampler.rb

@@ -14,7 +14,7 @@ module Karafka
           # Current schema version
           # This can be used in the future for detecting incompatible changes and writing
           # migrations
-          SCHEMA_VERSION = '1.0.2'
+          SCHEMA_VERSION = '1.1.0'
 
           # 60 seconds window for time tracked window-based metrics
           TIMES_TTL = 60

data/lib/karafka/web/ui/models/consumer_group.rb

@@ -7,11 +7,12 @@ module Karafka
       module Models
         # Representation of data of a Karafka consumer group
         class ConsumerGroup < Lib::HashProxy
-          # @return [Array<Topic>] Data of topics belonging to this consumer group
-          def topics
-            super.values.map do |topic_hash|
-              Topic.new(topic_hash)
-            end
+          # @return [Array<SubscriptionGroup>] Data of topics belonging to this consumer group
+          def subscription_groups
+            super
+              .values
+              .map { |sg_hash| SubscriptionGroup.new(sg_hash) }
+              .sort_by(&:id)
           end
         end
       end

data/lib/karafka/web/ui/models/health.rb

@@ -12,29 +12,39 @@ module Karafka
             def current(state)
               stats = {}
 
-              processes = Processes.active(state)
+              iterate_partitions(state) do |process, consumer_group, topic, partition|
+                cg_name = consumer_group.id
+                t_name = topic.name
+                pt_id = partition.id
 
-              processes.each do |process|
-                process.consumer_groups.each do |details|
-                  name = details.id
+                stats[cg_name] ||= {}
+                stats[cg_name][t_name] ||= {}
+                stats[cg_name][t_name][pt_id] = partition.to_h
+                stats[cg_name][t_name][pt_id][:process] = process
+              end
+
+              stats
+            end
 
-                  stats[name] ||= {}
+            private
 
-                  details.topics.each do |details2|
-                    t_name = details2.name
+            # Iterates over all partitions, yielding with extra expanded details
+            #
+            # @param state [State]
+            def iterate_partitions(state)
+              processes = Processes.active(state)
 
-                    stats[name][t_name] ||= {}
-                    details2.partitions.each do |partition|
-                      partition_id = partition.id
-                      stats[name][t_name] ||= {}
-                      stats[name][t_name][partition_id] = partition.to_h
-                      stats[name][t_name][partition_id][:process] = process
+              processes.each do |process|
+                process.consumer_groups.each do |consumer_group|
+                  consumer_group.subscription_groups.each do |subscription_group|
+                    subscription_group.topics.each do |topic|
+                      topic.partitions.each do |partition|
+                        yield(process, consumer_group, topic, partition)
+                      end
                     end
                   end
                 end
               end
-
-              stats
             end
           end
         end

data/lib/karafka/web/ui/models/message.rb

@@ -56,11 +56,11 @@ module Karafka
               # not previous page leading offset
               start_offset = high_offset - (per_page * page)
 
-              if start_offset < low_offset
-                count = per_page + start_offset
+              if start_offset <= low_offset
+                count = per_page - (low_offset - start_offset)
                 previous_page = page < 2 ? false : page - 1
                 next_page = false
-                start_offset = 0
+                start_offset = low_offset
               else
                 previous_page = page < 2 ? false : page - 1
                 next_page = page + 1

data/lib/karafka/web/ui/models/process.rb

@@ -43,12 +43,22 @@ module Karafka
           # @return [Integer] collective lag on this process
           def lag_stored
             consumer_groups
+              .flat_map(&:subscription_groups)
               .flat_map(&:topics)
               .flat_map(&:partitions)
               .map(&:lag_stored)
               .delete_if(&:negative?)
               .sum
           end
+
+          # @return [Integer] number of partitions to which we are currently subscribed
+          def subscribed_partitions_count
+            consumer_groups
+              .flat_map(&:subscription_groups)
+              .flat_map(&:topics)
+              .flat_map(&:partitions)
+              .count
+          end
         end
       end
     end

data/lib/karafka/web/ui/models/subscription_group.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Karafka
+  module Web
+    module Ui
+      # Namespace for models representing pieces of data about Karafka setup
+      module Models
+        # Representation of data of a Karafka subscription group
+        class SubscriptionGroup < Lib::HashProxy
+          # @return [Array<Topic>] Data of topics belonging to this subscription group
+          def topics
+            super.values.map do |topic_hash|
+              Topic.new(topic_hash)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/karafka/web/ui/pro/views/consumers/_consumer.erb

@@ -10,11 +10,13 @@
 
     <p class="mt-0 mb-1">
       <% process.consumer_groups.each do |consumer_group| %>
-        <% consumer_group.topics.each do |topic| %>
-          <span class="badge bg-secondary badge-topic" title="Consumer group: <%= consumer_group.id %>">
-            <%= topic.name %>:
-            <%= topic.partitions.map(&:id).join(',') %>
-          </span>
+        <% consumer_group.subscription_groups.each do |subscription_group| %>
+          <% subscription_group.topics.each do |topic| %>
+            <span class="badge bg-secondary badge-topic" title="Consumer group: <%= consumer_group.id %>">
+              <%= topic.name %>:
+              <%= topic.partitions.map(&:id).join(',') %>
+            </span>
+          <% end %>
         <% end %>
       <% end %>
     </p>

data/lib/karafka/web/ui/pro/views/consumers/consumer/_consumer_group.erb

@@ -1,109 +1,8 @@
-<div class="row mb-4">
-  <div class="col-sm-12">
-    <h5 class="mb-4">
-      <%= consumer_group.id %>
-    </h5>
-
-    <div class="card-group text-center">
-      <div class="card">
-        <div class="card-body d-flex flex-column align-items-center justify-content-center p-2">
-          State:&nbsp;
-          <span class="badge <%= kafka_state_bg(consumer_group[:state][:state]) %> mt-1 mb-1">
-            <%= consumer_group[:state][:state] %>
-          </span>
-        </div>
-      </div>
-      <div class="card">
-        <div class="card-body d-flex flex-column align-items-center justify-content-center p-2">
-          Join state:&nbsp;
-          <span class="badge <%= kafka_state_bg(consumer_group.join_state) %> mt-1 mb-1">
-            <%= consumer_group.join_state %>
-          </span>
-        </div>
-      </div>
-      <div class="card">
-        <div class="card-body d-flex flex-column align-items-center justify-content-center p-2">
-          State change:&nbsp;
-          <span class="badge bg-secondary mt-1 mb-1">
-            <%==
-              relative_time(
-                Time.at(@process.dispatched_at) - (consumer_group.stateage / 1_000)
-              )
-            %>
-          </span>
-        </div>
-      </div>
-      <div class="card">
-        <div class="card-body d-flex flex-column align-items-center justify-content-center p-2">
-          Last rebalance:&nbsp;
-          <span class="badge bg-secondary mt-1 mb-1">
-            <%==
-              relative_time(
-                Time.at(@process.dispatched_at) - (consumer_group.rebalance_age / 1_000)
-              )
-            %>
-          </span>
-        </div>
-      </div>
-      <div class="card">
-        <div class="card-body d-flex flex-column align-items-center justify-content-center p-2">
-          Rebalance count:&nbsp;
-          <span class="badge bg-secondary mt-1 mb-1">
-            <%= consumer_group.rebalance_cnt %>
-          </span>
-        </div>
-      </div>
-    </div>
-  </div>
-
-  <span class="text-end mt-3">
-    <small>
-      Last rebalance reason: <%= consumer_group.rebalance_reason %>
-    </small>
-  </span>
-</div>
-
-<% if consumer_group.topics.empty? %>
-  <div class="row">
-    <div class="col-lg-12">
-      <div class="alert alert-info" role="alert">
-        This process does not consume any messages from any topics of this consumer group.
-      </div>
-    </div>
-  </div>
-<% else %>
-  <div class="row mb-5">
-    <div class="col-sm-12">
-      <table class="processes bg-white table table-hover table-bordered table-striped mb-0 align-middle">
-        <thead>
-          <tr class="align-middle">
-            <th>Topic</th>
-            <th>Partition</th>
-            <th>Lag stored</th>
-            <th>Lag trend</th>
-            <th>Committed offset</th>
-            <th>Stored offset</th>
-            <th>Fetch state</th>
-            <th>Poll state</th>
-          </tr>
-        </thead>
-        <tbody>
-          <% consumer_group.topics.each do |topic| %>
-            <% topic.partitions.each do |partition| %>
-              <%==
-                partial(
-                  'consumers/consumer/partition',
-                  locals: {
-                    topic: topic,
-                    partition: partition,
-                    consumer_group: consumer_group
-                  }
-                )
-              %>
-            <% end %>
-          <% end %>
-        </tbody>
-      </table>
-    </div>
-  </div>
-<% end %>
+<%==
+  render_each(
+    consumer_group.subscription_groups,
+    'consumers/consumer/_subscription_group',
+    local: :subscription_group,
+    locals: { consumer_group: consumer_group }
+  )
+%>

data/lib/karafka/web/ui/pro/views/consumers/consumer/_subscription_group.erb

@@ -0,0 +1,110 @@
+<div class="row mb-4">
+  <div class="col-sm-12">
+    <h6 class="mb-4">
+      <%= consumer_group.id %> /
+      <%= subscription_group.id %>
+    </h6>
+
+    <div class="card-group text-center">
+      <div class="card">
+        <div class="card-body d-flex flex-column align-items-center justify-content-center p-2">
+          State:&nbsp;
+          <span class="badge <%= kafka_state_bg(subscription_group[:state][:state]) %> mt-1 mb-1">
+            <%= subscription_group[:state][:state] %>
+          </span>
+        </div>
+      </div>
+      <div class="card">
+        <div class="card-body d-flex flex-column align-items-center justify-content-center p-2">
+          Join state:&nbsp;
+          <span class="badge <%= kafka_state_bg(subscription_group.join_state) %> mt-1 mb-1">
+            <%= subscription_group.join_state %>
+          </span>
+        </div>
+      </div>
+      <div class="card">
+        <div class="card-body d-flex flex-column align-items-center justify-content-center p-2">
+          State change:&nbsp;
+          <span class="badge bg-secondary mt-1 mb-1">
+            <%==
+              relative_time(
+                Time.at(@process.dispatched_at) - (subscription_group.stateage / 1_000)
+              )
+            %>
+          </span>
+        </div>
+      </div>
+      <div class="card">
+        <div class="card-body d-flex flex-column align-items-center justify-content-center p-2">
+          Last rebalance:&nbsp;
+          <span class="badge bg-secondary mt-1 mb-1">
+            <%==
+              relative_time(
+                Time.at(@process.dispatched_at) - (subscription_group.rebalance_age / 1_000)
+              )
+            %>
+          </span>
+        </div>
+      </div>
+      <div class="card">
+        <div class="card-body d-flex flex-column align-items-center justify-content-center p-2">
+          Rebalance count:&nbsp;
+          <span class="badge bg-secondary mt-1 mb-1">
+            <%= subscription_group.rebalance_cnt %>
+          </span>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <span class="text-end mt-3">
+    <small>
+      Last rebalance reason: <%= subscription_group.rebalance_reason %>
+    </small>
+  </span>
+</div>
+
+<% if subscription_group.topics.empty? %>
+  <div class="row">
+    <div class="col-lg-12">
+      <div class="alert alert-info" role="alert">
+        This process does not consume any messages from any topics of this consumer group.
+      </div>
+    </div>
+  </div>
+<% else %>
+  <div class="row mb-5">
+    <div class="col-sm-12">
+      <table class="processes bg-white table table-hover table-bordered table-striped mb-0 align-middle">
+        <thead>
+          <tr class="align-middle">
+            <th>Topic</th>
+            <th>Partition</th>
+            <th>Lag stored</th>
+            <th>Lag trend</th>
+            <th>Committed offset</th>
+            <th>Stored offset</th>
+            <th>Fetch state</th>
+            <th>Poll state</th>
+          </tr>
+        </thead>
+        <tbody>
+          <% subscription_group.topics.each do |topic| %>
+            <% topic.partitions.each do |partition| %>
+              <%==
+                partial(
+                  'consumers/consumer/partition',
+                  locals: {
+                    topic: topic,
+                    partition: partition,
+                    subscription_group: subscription_group
+                  }
+                )
+              %>
+            <% end %>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  </div>
+<% end %>

data/lib/karafka/web/ui/pro/views/consumers/consumer/_tabs.erb

@@ -6,11 +6,13 @@
         <li class="nav-item">
           <a class="nav-link <%= nav_class(include: 'subscriptions') %>" href="<%= root_path('consumers', @process.id, 'subscriptions') %>">
             Active subscriptions
+            (<%= @process.subscribed_partitions_count %>)
           </a>
         </li>
         <li class="nav-item">
           <a class="nav-link <%= nav_class(include: 'jobs') %>" href="<%= root_path('consumers', @process.id, 'jobs') %>">
             Running jobs
+            (<%= @process.jobs.count %>)
           </a>
         </li>
       </ul>

data/lib/karafka/web/ui/pro/views/errors/_detail.erb

@@ -5,7 +5,7 @@
         <%= "#{k}.#{k2}" %>
       </td>
       <td>
-        <% if k2.to_s.include?('ssl') %>
+        <% if %w[sasl ssl].any? { |scope| k2.to_s.include?(scope) } %>
           ***
         <% elsif k2.to_s == 'tags' %>
           <%== tags(v2) %>

data/lib/karafka/web/ui/pro/views/health/index.erb

@@ -13,48 +13,48 @@
 <% end %>
 
 <% @stats.each do |cg_name, details| %>
-<div class="container mb-5">
-  <div class="row mb-3">
-    <div class="col-sm-12">
-      <h4 class="mb-4"><%= cg_name %></h4>
-      <hr/>
+  <div class="container mb-5">
+    <div class="row mb-3">
+      <div class="col-sm-12">
+        <h4 class="mb-4"><%= cg_name %></h4>
+        <hr/>
+      </div>
     </div>
-  </div>
 
-  <div class="row mb-5">
-    <div class="col-sm-12">
-      <table class="processes bg-white table table-hover table-bordered table-striped mb-0 align-middle">
-        <thead>
-          <tr class="align-middle">
-            <th class="align-middle">Topic</th>
-            <th>Partition</th>
-            <th>Lag stored</th>
-            <th>Lag trend</th>
-            <th>Committed offset</th>
-            <th>Stored offset</th>
-            <th>Fetch state</th>
-            <th>Poll state</th>
-            <th>Process name</th>
-          </tr>
-        </thead>
-        <tbody>
-          <% details.sort_by(&:first).each do |topic_name, partitions| %>
-            <% partitions.sort_by(&:first).each do |partition_id, details| %>
-              <%==
-                partial(
-                  'health/partition',
-                  locals: {
-                    topic_name: topic_name,
-                    partition_id: partition_id,
-                    details: details
-                  }
-                )
-              %>
+    <div class="row mb-5">
+      <div class="col-sm-12">
+        <table class="processes bg-white table table-hover table-bordered table-striped mb-0 align-middle">
+          <thead>
+            <tr class="align-middle">
+              <th class="align-middle">Topic</th>
+              <th>Partition</th>
+              <th>Lag stored</th>
+              <th>Lag trend</th>
+              <th>Committed offset</th>
+              <th>Stored offset</th>
+              <th>Fetch state</th>
+              <th>Poll state</th>
+              <th>Process name</th>
+            </tr>
+          </thead>
+          <tbody>
+            <% details.sort_by(&:first).each do |topic_name, partitions| %>
+              <% partitions.sort_by(&:first).each do |partition_id, details| %>
+                <%==
+                  partial(
+                    'health/partition',
+                    locals: {
+                      topic_name: topic_name,
+                      partition_id: partition_id,
+                      details: details
+                    }
+                  )
+                %>
+              <% end %>
             <% end %>
-          <% end %>
-        </tbody>
-      </table>
+          </tbody>
+        </table>
+      </div>
     </div>
   </div>
-</div>
 <% end %>

data/lib/karafka/web/ui/views/consumers/_consumer.erb

@@ -10,11 +10,13 @@
 
     <p class="mt-0 mb-1">
       <% process.consumer_groups.each do |consumer_group| %>
-        <% consumer_group.topics.each do |topic| %>
-          <span class="badge bg-secondary badge-topic" title="Consumer group: <%= consumer_group.id %>">
-            <%= topic.name %>:
-            <%= topic.partitions.map(&:id).join(',') %>
-          </span>
+        <% consumer_group.subscription_groups.each do |subscription_group| %>
+          <% subscription_group.topics.each do |topic| %>
+            <span class="badge bg-secondary badge-topic" title="Consumer group: <%= consumer_group.id %>">
+              <%= topic.name %>:
+              <%= topic.partitions.map(&:id).join(',') %>
+            </span>
+          <% end %>
         <% end %>
       <% end %>
     </p>

data/lib/karafka/web/ui/views/errors/_detail.erb

@@ -5,7 +5,7 @@
         <%= "#{k}.#{k2}" %>
       </td>
       <td>
-        <% if k2.to_s.include?('ssl') %>
+        <% if %w[sasl ssl].any? { |scope| k2.to_s.include?(scope) } %>
           ***
         <% elsif k2.to_s == 'tags' %>
           <%== tags(v2) %>

data/lib/karafka/web/ui/views/routing/_detail.erb

@@ -5,7 +5,7 @@
         <%= "#{k}.#{k2}" %>
       </td>
       <td>
-        <% if k2.to_s.include?('ssl') %>
+        <% if %w[sasl ssl].any? { |scope| k2.to_s.include?(scope) } %>
           ***
         <% else %>
           <%= v2 %>

data/lib/karafka/web/version.rb

@@ -3,6 +3,6 @@
 module Karafka
   module Web
     # Current gem version
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
   end
 end

data/renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base"
+  ]
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: karafka-web
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Maciej Mensfeld
@@ -35,7 +35,7 @@ cert_chain:
   Qf04B9ceLUaC4fPVEz10FyobjaFoY4i32xRto3XnrzeAgfEe4swLq8bQsR3w/EF3
   MGU0FeSV2Yj7Xc2x/7BzLK8xQn5l7Yy75iPF+KP3vVmDHnNl
   -----END CERTIFICATE-----
-date: 2023-03-27 00:00:00.000000000 Z
+date: 2023-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi
@@ -176,6 +176,7 @@ files:
 - lib/karafka/web/tracking/consumers/contracts/job.rb
 - lib/karafka/web/tracking/consumers/contracts/partition.rb
 - lib/karafka/web/tracking/consumers/contracts/report.rb
+- lib/karafka/web/tracking/consumers/contracts/subscription_group.rb
 - lib/karafka/web/tracking/consumers/contracts/topic.rb
 - lib/karafka/web/tracking/consumers/listeners/base.rb
 - lib/karafka/web/tracking/consumers/listeners/errors.rb
@@ -213,6 +214,7 @@ files:
 - lib/karafka/web/ui/models/processes.rb
 - lib/karafka/web/ui/models/state.rb
 - lib/karafka/web/ui/models/status.rb
+- lib/karafka/web/ui/models/subscription_group.rb
 - lib/karafka/web/ui/models/topic.rb
 - lib/karafka/web/ui/models/watermark_offsets.rb
 - lib/karafka/web/ui/pro/app.rb
@@ -236,6 +238,7 @@ files:
 - lib/karafka/web/ui/pro/views/consumers/consumer/_no_subscriptions.erb
 - lib/karafka/web/ui/pro/views/consumers/consumer/_partition.erb
 - lib/karafka/web/ui/pro/views/consumers/consumer/_stopped.erb
+- lib/karafka/web/ui/pro/views/consumers/consumer/_subscription_group.erb
 - lib/karafka/web/ui/pro/views/consumers/consumer/_tabs.erb
 - lib/karafka/web/ui/pro/views/consumers/index.erb
 - lib/karafka/web/ui/pro/views/consumers/jobs.erb
@@ -337,6 +340,7 @@ files:
 - lib/karafka/web/ui/views/status/show.erb
 - lib/karafka/web/ui/views/status/warnings/_pro_subscription.erb
 - lib/karafka/web/version.rb
+- renovate.json
 homepage: https://karafka.io
 licenses:
 - LGPL-3.0
@@ -364,7 +368,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Karafka ecosystem Web UI interface