From cdee274fc60b638d09acf7b0f4d58858f6e8b1d6 Mon Sep 17 00:00:00 2001 From: Tim Middleton Date: Wed, 28 Aug 2024 15:15:16 +0800 Subject: [PATCH] Minor panel updates (#227) * Minor panel updates * Fix failing unit test --- pkg/cmd/monitor_cluster.go | 11 ++++++----- pkg/cmd/monitor_cluster_test.go | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkg/cmd/monitor_cluster.go b/pkg/cmd/monitor_cluster.go index ffe596da..1ccd78eb 100644 --- a/pkg/cmd/monitor_cluster.go +++ b/pkg/cmd/monitor_cluster.go @@ -36,12 +36,13 @@ const ( var ( defaultMap = map[string]string{ - "default": "members,healthSummary:services,caches:proxies,http-servers:machines,network-stats", + "default": "members:services,caches:proxies,http-servers:machines,network-stats", "default-service": "services:service-members:service-distributions", "default-cache": "caches,cache-indexes:cache-access:cache-storage:cache-stores:cache-partitions", "default-topic": "topics:topic-members:subscribers:subscriber-groups", "default-subscriber": "topics:subscribers:subscriber-channels", "default-federation": "federation-all:federation-dest,federation-origins:caches:elastic-data", + "default-members": "members:machines,departed-members:network-stats", } errSelectService = errors.New("you must provide a service name via -S option") errSelectCache = errors.New("you must provide a cache using the -C option") @@ -80,19 +81,19 @@ var validPanels = []panelImpl{ createContentPanel(8, "cache-storage", "Cache Storage (%SERVICE/%CACHE)", "show cache storage", cacheStorageContent, cachesPanelData, servicesPanelData), createContentPanel(8, "cache-stores", "Cache Stores (%SERVICE/%CACHE)", "show cache stores", cacheStoresContent), createContentPanel(8, "cache-partitions", "Cache Partitions (%SERVICE/%CACHE)", "show cache partitions", cachePartitionContent, cachesPanelData, servicesPanelData), - createContentPanel(8, "departedMembers", "Departed Members", "show departed members", departedMembersContent, memberPanelData, storagePanelData), + createContentPanel(8, "departed-members", "Departed Members", "show departed members", departedMembersContent, memberPanelData, storagePanelData), createContentPanel(5, "elastic-data", "Elastic Data", "show elastic data", elasticDataContent, elasticDataPanelData), createContentPanel(8, "executors", "Executors", "show Executors", executorsContent, executorsPanelData), - createContentPanel(10, "healthSummary", "Health Summary", "show health summary", healthSummaryContent, healthPanelData), + createContentPanel(10, "health-summary", "Health Summary", "show health summary", healthSummaryContent, healthPanelData), createContentPanel(5, "federation-all", "Federation All", "show all federation details", federationAllContent, federationPanelData), createContentPanel(5, "federation-dest", "Federation Destinations", "show federation destinations", federationDestinationsContent, federationPanelData), createContentPanel(5, "federation-origins", "Federation Origins", "show federation origins", federationOriginsContent, federationPanelData), createContentPanel(8, "http-servers", "HTTP Servers", "show HTTP servers", httpServersContent, proxiesPanelData), createContentPanel(8, "http-sessions", "HTTP Sessions", "show HTTP sessions", httpSessionsContent, httpSessionsPanelData), createContentPanel(8, "machines", "Machines", "show machines", machinesContent, memberPanelData, storagePanelData), - createContentPanel(7, "membersSummary", "Members Summary", "show members summary", membersSummaryContent, memberPanelData, storagePanelData), + createContentPanel(7, "members-summary", "Members Summary", "show members summary", membersSummaryContent, memberPanelData, storagePanelData), createContentPanel(10, "members", "Members", "show members", membersContent, memberPanelData, storagePanelData), - createContentPanel(7, "membersShort", "Members (Short)", "show members (short)", membersOnlyContent, memberPanelData, storagePanelData), + createContentPanel(7, "members-short", "Members (Short)", "show members (short)", membersOnlyContent, memberPanelData, storagePanelData), createContentPanel(8, "network-stats", "Network Stats", "show network stats", networkStatsContent, memberPanelData, storagePanelData), createContentPanel(8, "persistence", "Persistence", "show persistence", persistenceContent, servicesPanelData), createContentPanel(8, "proxies", "Proxy Servers", "show proxy servers", proxiesContent, proxiesPanelData), diff --git a/pkg/cmd/monitor_cluster_test.go b/pkg/cmd/monitor_cluster_test.go index a09c31ae..345eac18 100644 --- a/pkg/cmd/monitor_cluster_test.go +++ b/pkg/cmd/monitor_cluster_test.go @@ -44,7 +44,7 @@ func TestValidatePanels(t *testing.T) { err := validatePanels([]string{"members"}) g.Expect(err).To(gomega.Not(gomega.HaveOccurred())) - err = validatePanels([]string{"membersSummary"}) + err = validatePanels([]string{"members-summary"}) g.Expect(err).To(gomega.Not(gomega.HaveOccurred())) err = validatePanels([]string{"caches"})