Skip to content

Fix monitor cluster to protect against empty data #250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 29, 2024
Merged

Fix monitor cluster to protect against empty data #250

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c51a83a
Fix monitor cluster to protect against empty data
Nov 28, 2024
ca131c7
Update build to test with multipel go versions
Nov 29, 2024
b20fc72
Revert last change
Nov 29, 2024
f70ec3d
Revert change to 1.23 in release ci/cd
Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions pkg/cmd/monitor_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,6 +745,10 @@ var elasticDataContent = func(_ fetcher.Fetcher, clusterSummary clusterSummaryIn
var persistenceContent = func(dataFetcher fetcher.Fetcher, clusterSummary clusterSummaryInfo) ([]string, error) {
var services = config.ServicesSummaries{}

if contentIsEmpty(clusterSummary.servicesResult) {
return noContentArray, nil
}

err := json.Unmarshal(clusterSummary.servicesResult, &services)
if err != nil {
return emptyStringArray, err
Expand All @@ -761,7 +765,7 @@ var persistenceContent = func(dataFetcher fetcher.Fetcher, clusterSummary cluste

var reportersContent = func(_ fetcher.Fetcher, clusterSummary clusterSummaryInfo) ([]string, error) {
var reporters = config.Reporters{}
if len(clusterSummary.reportersResult) > 0 {
if !contentIsEmpty(clusterSummary.reportersResult) {
err := json.Unmarshal(clusterSummary.reportersResult, &reporters)
if err != nil {
return emptyStringArray, err
Expand Down Expand Up @@ -834,6 +838,10 @@ var federationOriginsContent = func(_ fetcher.Fetcher, clusterSummary clusterSum
var healthSummaryContent = func(_ fetcher.Fetcher, clusterSummary clusterSummaryInfo) ([]string, error) {
var healthSummaries = config.HealthSummaries{}

if contentIsEmpty(clusterSummary.healthResult) {
return noContentArray, nil
}

err := json.Unmarshal(clusterSummary.healthResult, &healthSummaries)
if err != nil {
return emptyStringArray, err
Expand All @@ -854,6 +862,10 @@ var httpServersContent = func(_ fetcher.Fetcher, clusterSummary clusterSummaryIn
var proxiesContentInternal = func(protocol string, clusterSummary clusterSummaryInfo) ([]string, error) {
var proxiesSummary = config.ProxiesSummary{}

if contentIsEmpty(clusterSummary.proxyResults) {
return noContentArray, nil
}

err := json.Unmarshal(clusterSummary.proxyResults, &proxiesSummary)
if err != nil {
return emptyStringArray, err
Expand Down Expand Up @@ -911,6 +923,10 @@ var cacheStoresContent = func(dataFetcher fetcher.Fetcher, _ clusterSummaryInfo)
return emptyStringArray, err
}

if contentIsEmpty(cacheStoreResult) {
return noContentArray, nil
}

if err = json.Unmarshal(cacheStoreResult, &cacheStoreDetails); err != nil {
return emptyStringArray, err
}
Expand Down Expand Up @@ -950,7 +966,7 @@ func getCacheContent(dataFetcher fetcher.Fetcher, displayType string) ([]string,
return emptyStringArray, err
}

if string(cacheResult) == "{}" || len(cacheResult) == 0 {
if contentIsEmpty(cacheResult) {
return emptyStringArray, fmt.Errorf(cannotFindCache, selectedCache, serviceName)
}

Expand Down Expand Up @@ -1434,6 +1450,10 @@ func getLengths(width, count int) []int {
return lens
}

func contentIsEmpty(data []byte) bool {
return len(data) == 0 || string(data) == "{}"
}

func init() {
monitorClusterCmd.Flags().StringVarP(&layoutParam, "layout", "l", defaultLayoutName, "layout to use")
monitorClusterCmd.Flags().BoolVarP(&showAllPanels, "show-panels", "", false, "show all available panels")
Expand Down
Loading