Skip to content

Refactor to use strings.Builder #56

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 2 commits into from
Feb 3, 2023
Merged

Refactor to use strings.Builder #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1cb71fe
Refactor to use strings.Builder
martialblog Feb 3, 2023
c51ecc3
Update golangci-lint config
martialblog Feb 3, 2023
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
3 changes: 1 addition & 2 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ linters:
- funlen
- dogsled
- dupl
# - lll
- whitespace
- wsl
- exportloopref
Expand All @@ -25,8 +24,8 @@ linters:
- sqlclosecheck
- structcheck
- unparam
- musttag
presets:
- bugs
- unused
# - style
fast: false
11 changes: 6 additions & 5 deletions cmd/health.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"github.com/spf13/cobra"
"net/http"
"net/url"
"strings"
)

// To store the CLI parameters
Expand Down Expand Up @@ -142,7 +143,6 @@ var healthCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) {
var (
output string
summary string
rc int
stat logstash.Stat
thresholds HealthThreshold
Expand Down Expand Up @@ -247,11 +247,12 @@ var healthCmd = &cobra.Command{
}

// Generate summary for subchecks
summary += fmt.Sprintf("\n \\_[%s] Heap usage at %.2f%%", heapstatus, stat.Jvm.Mem.HeapUsedPercent)
summary += fmt.Sprintf("\n \\_[%s] Open file descriptors at %.2f%%", fdstatus, fileDescriptorsPercent)
summary += fmt.Sprintf("\n \\_[%s] CPU usage at %.2f%%", cpustatus, stat.Process.CPU.Percent)
var summary strings.Builder
summary.WriteString(fmt.Sprintf("\n \\_[%s] Heap usage at %.2f%%", heapstatus, stat.Jvm.Mem.HeapUsedPercent))
summary.WriteString(fmt.Sprintf("\n \\_[%s] Open file descriptors at %.2f%%", fdstatus, fileDescriptorsPercent))
summary.WriteString(fmt.Sprintf("\n \\_[%s] CPU usage at %.2f%%", cpustatus, stat.Process.CPU.Percent))

check.ExitRaw(rc, output, summary, "|", perfList.String())
check.ExitRaw(rc, output, summary.String(), "|", perfList.String())
},
}

Expand Down
14 changes: 8 additions & 6 deletions cmd/pipeline.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"github.com/spf13/cobra"
"net/http"
"net/url"
"strings"
)

// To store the CLI parameters
Expand Down Expand Up @@ -64,7 +65,6 @@ var pipelineCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) {
var (
output string
summary string
rc int
pp logstash.Pipeline
thresholds PipelineThreshold
Expand Down Expand Up @@ -102,19 +102,21 @@ var pipelineCmd = &cobra.Command{
states := make([]int, 0, len(pp.Pipelines))

// Check status for each pipeline
var summary strings.Builder

for name, pipe := range pp.Pipelines {
inflightEvents := pipe.Events.In - pipe.Events.Out

summary += "\n \\_"
summary.WriteString("\n \\_")
if thresholds.inflightEventsCrit.DoesViolate(float64(inflightEvents)) {
states = append(states, check.Critical)
summary += fmt.Sprintf("[CRITICAL] inflight_events_%s:%d;", name, inflightEvents)
summary.WriteString(fmt.Sprintf("[CRITICAL] inflight_events_%s:%d;", name, inflightEvents))
} else if thresholds.inflightEventsWarn.DoesViolate(float64(inflightEvents)) {
states = append(states, check.Warning)
summary += fmt.Sprintf("[WARNING] inflight_events_%s:%d;", name, inflightEvents)
summary.WriteString(fmt.Sprintf("[WARNING] inflight_events_%s:%d;", name, inflightEvents))
} else {
states = append(states, check.OK)
summary += fmt.Sprintf("[OK] inflight_events_%s:%d;", name, inflightEvents)
summary.WriteString(fmt.Sprintf("[OK] inflight_events_%s:%d;", name, inflightEvents))
}

// Generate perfdata for each event
Expand Down Expand Up @@ -155,7 +157,7 @@ var pipelineCmd = &cobra.Command{
output = "Inflight events status unknown"
}

check.ExitRaw(rc, output, summary, "|", perfList.String())
check.ExitRaw(rc, output, summary.String(), "|", perfList.String())
},
}

Expand Down