Merge pull request #78 from NETWAYS/chore/bump-go-check

Bump go-check to v0.5.0

Author: martialblog

README.md

@@ -39,13 +39,13 @@ Usage:
 Examples:
 
 	$ check_logstash health --hostname 'localhost' --port 8888 --insecure
-	OK - Logstash is healthy | status=green process.cpu.percent=0;0.5;3;0;100
+	[OK] - Logstash is healthy | status=green process.cpu.percent=0;0.5;3;0;100
 	 \_[OK] Heap usage at 12.00%
 	 \_[OK] Open file descriptors at 12.00%
 	 \_[OK] CPU usage at 5.00%
 
 	$ check_logstash -p 9600 health --cpu-usage-threshold-warn 50 --cpu-usage-threshold-crit 75
-	WARNING - CPU usage at 55.00%
+	[WARNING] - CPU usage at 55.00%
 	 \_[OK] Heap usage at 12.00%
 	 \_[OK] Open file descriptors at 12.00%
 	 \_[WARNING] CPU usage at 55.00%
@@ -73,12 +73,12 @@ Usage:
 Examples:
 
 	$ check_logstash pipeline --inflight-events-warn 5 --inflight-events-crit 10
-	WARNING - Inflight events
+	[WARNING] - Inflight events
 	 \_[WARNING] inflight_events_example-input:9;
 	 \_[OK] inflight_events_example-default-connector:4
 
 	$ check_logstash pipeline --inflight-events-warn 5 --inflight-events-crit 10 --pipeline example
-	CRITICAL - Inflight events
+	[CRITICAL] - Inflight events
 	 \_[CRITICAL] inflight_events_example:15
 
 Flags:
@@ -102,11 +102,11 @@ Usage:
 Examples:
 
 	$ check_logstash pipeline flow --warning 5 --critical 10
-	OK - Flow metrics alright
+	[OK] - Flow metrics alright
 	 \_[OK] queue_backpressure_example:0.34;
 
 	$ check_logstash pipeline flow --pipeline example --warning 5 --critical 10
-	CRITICAL - Flow metrics alright
+	[CRITICAL] - Flow metrics alright
 	 \_[CRITICAL] queue_backpressure_example:11.23;
 
 Flags:
@@ -127,11 +127,11 @@ Usage:
 Examples:
 
 	$ check_logstash pipeline reload
-	OK - Configuration successfully reloaded
+	[OK] - Configuration successfully reloaded
 	 \_[OK] Configuration successfully reloaded for pipeline Foobar for on 2021-01-01T02:07:14Z
 
 	$ check_logstash pipeline reload --pipeline Example
-	CRITICAL - Configuration reload failed
+	[CRITICAL] - Configuration reload failed
 	 \_[CRITICAL] Configuration reload for pipeline Example failed on 2021-01-01T02:07:14Z
 
 Flags:

cmd/health_test.go

@@ -15,7 +15,7 @@ func TestHealth_ConnectionRefused(t *testing.T) {
 	out, _ := cmd.CombinedOutput()
 
 	actual := string(out)
-	expected := "UNKNOWN - Get \"http://localhost:9999/"
+	expected := "[UNKNOWN] - Get \"http://localhost:9999/"
 
 	if !strings.Contains(actual, expected) {
 		t.Error("\nActual: ", actual, "\nExpected: ", expected)
@@ -38,7 +38,7 @@ func TestHealthCmd_Logstash6(t *testing.T) {
 				w.Write([]byte(`{"host":"logstash","version":"foo"}`))
 			})),
 			args:     []string{"run", "../main.go", "health"},
-			expected: "UNKNOWN - Could not determine version",
+			expected: "[UNKNOWN] - Could not determine version",
 		},
 		{
 			name: "health-ok",
@@ -47,7 +47,7 @@ func TestHealthCmd_Logstash6(t *testing.T) {
 				w.Write([]byte(`{"host":"logstash","version":"6.8.23","http_address":"0.0.0.0:9600","id":"123","name":"logstash","jvm":{"threads":{"count":1,"peak_count":2},"mem":{},"gc":{},"uptime_in_millis":123},"process":{},"events":{},"pipelines":{"main":{}},"reloads":{"failures":0,"successes":0},"os":{}}`))
 			})),
 			args:     []string{"run", "../main.go", "health"},
-			expected: "OK - Logstash is healthy",
+			expected: "[OK] - Logstash is healthy",
 		},
 	}
 
@@ -79,7 +79,7 @@ func TestHealthCmd_Logstash7(t *testing.T) {
 				w.Write([]byte(`{"foo": "bar"}`))
 			})),
 			args:     []string{"run", "../main.go", "health"},
-			expected: "UNKNOWN - Could not determine status",
+			expected: "[UNKNOWN] - Could not determine status",
 		},
 		{
 			name: "health-bearer-ok",
@@ -95,7 +95,7 @@ func TestHealthCmd_Logstash7(t *testing.T) {
 				w.Write([]byte(`The Authorization header wasn't set`))
 			})),
 			args:     []string{"run", "../main.go", "--bearer", "secret", "health"},
-			expected: "OK - Logstash is healthy",
+			expected: "[OK] - Logstash is healthy",
 		},
 		{
 			name: "health-bearer-unauthorized",
@@ -111,7 +111,7 @@ func TestHealthCmd_Logstash7(t *testing.T) {
 				w.Write([]byte(`Access Denied!`))
 			})),
 			args:     []string{"run", "../main.go", "--bearer", "wrong-token", "health"},
-			expected: "UNKNOWN - Could not get ",
+			expected: "[UNKNOWN] - Could not get ",
 		},
 		{
 			name: "health-ok",
@@ -120,7 +120,7 @@ func TestHealthCmd_Logstash7(t *testing.T) {
 				w.Write([]byte(`{"host":"test","version":"7.17.8","status":"green","jvm":{"threads":{"count":50,"peak_count":51},"mem":{"heap_used_percent":20}},"process":{"open_file_descriptors": 120,"peak_open_file_descriptors": 120,"max_file_descriptors":16384,"cpu":{"percent": 1}}}`))
 			})),
 			args:     []string{"run", "../main.go", "health"},
-			expected: "OK - Logstash is healthy",
+			expected: "[OK] - Logstash is healthy",
 		},
 		{
 			name: "health-perfdata",
@@ -138,7 +138,7 @@ func TestHealthCmd_Logstash7(t *testing.T) {
 				w.Write([]byte(`{"host":"test","version":"7.17.8","status":"red","jvm":{"threads":{"count":50,"peak_count":51},"mem":{"heap_used_percent":20}},"process":{"open_file_descriptors": 120,"peak_open_file_descriptors": 120,"max_file_descriptors":16384,"cpu":{"percent": 1}}}`))
 			})),
 			args:     []string{"run", "../main.go", "health"},
-			expected: "CRITICAL - Logstash is unhealthy",
+			expected: "[CRITICAL] - Logstash is unhealthy",
 		},
 		{
 			name: "health-filedesc-ok",
@@ -147,7 +147,7 @@ func TestHealthCmd_Logstash7(t *testing.T) {
 				w.Write([]byte(`{"host":"test","version":"7.17.8","status":"green","jvm":{"threads":{"count":50,"peak_count":51},"mem":{"heap_used_percent":20}},"process":{"open_file_descriptors": 1,"peak_open_file_descriptors": 50,"max_file_descriptors":100,"cpu":{"percent": 1}}}`))
 			})),
 			args:     []string{"run", "../main.go", "health", "--file-descriptor-threshold-crit", "50"},
-			expected: "OK - Logstash is healthy",
+			expected: "[OK] - Logstash is healthy",
 		},
 		{
 			name: "health-filedesc-warn",
@@ -174,7 +174,7 @@ func TestHealthCmd_Logstash7(t *testing.T) {
 				w.Write([]byte(`{"host":"test","version":"7.17.8","status":"green","jvm":{"threads":{"count":50,"peak_count":51},"mem":{"heap_used_percent":50}},"process":{"open_file_descriptors": 51,"peak_open_file_descriptors": 50,"max_file_descriptors":100,"cpu":{"percent": 1}}}`))
 			})),
 			args:     []string{"run", "../main.go", "health", "--heap-usage-threshold-warn", "50"},
-			expected: "OK - Logstash is healthy",
+			expected: "[OK] - Logstash is healthy",
 		},
 		{
 			name: "health-heapuse-warn",
@@ -201,7 +201,7 @@ func TestHealthCmd_Logstash7(t *testing.T) {
 				w.Write([]byte(`{"host":"test","version":"7.17.8","status":"green","jvm":{"threads":{"count":50,"peak_count":51},"mem":{"heap_used_percent":50}},"process":{"open_file_descriptors": 51,"peak_open_file_descriptors": 50,"max_file_descriptors":100,"cpu":{"percent": 50}}}`))
 			})),
 			args:     []string{"run", "../main.go", "health", "--cpu-usage-threshold-warn", "50"},
-			expected: "OK - Logstash is healthy",
+			expected: "[OK] - Logstash is healthy",
 		},
 		{
 			name: "health-cpuuse-warn",
@@ -228,7 +228,7 @@ func TestHealthCmd_Logstash7(t *testing.T) {
 				w.Write([]byte(`{"host":"test","version":"7.17.8","status":"green","jvm":{"threads":{"count":50,"peak_count":51},"mem":{"heap_used_percent":55}},"process":{"open_file_descriptors": 51,"peak_open_file_descriptors": 50,"max_file_descriptors":100,"cpu":{"percent": 45}}}`))
 			})),
 			args:     []string{"run", "../main.go", "health", "--cpu-usage-threshold-warn", "40", "--heap-usage-threshold-crit", "50"},
-			expected: "CRITICAL - Logstash is unhealthy",
+			expected: "[CRITICAL] - Logstash is unhealthy",
 		},
 	}
 
@@ -260,7 +260,7 @@ func TestHealthCmd_Logstash8(t *testing.T) {
 				w.Write([]byte(`{"host":"test","version":"8.6","status":"green","jvm":{"threads":{"count":50,"peak_count":51},"mem":{"heap_used_percent":20}},"process":{"open_file_descriptors": 120,"peak_open_file_descriptors": 120,"max_file_descriptors":16384,"cpu":{"percent": 1}}}`))
 			})),
 			args:     []string{"run", "../main.go", "health"},
-			expected: "OK - Logstash is healthy",
+			expected: "[OK] - Logstash is healthy",
 		},
 		{
 			name: "health-perfdata",
@@ -278,7 +278,7 @@ func TestHealthCmd_Logstash8(t *testing.T) {
 				w.Write([]byte(`{"host":"test","version":"8.6","status":"green","jvm":{"threads":{"count":50,"peak_count":51},"mem":{"heap_used_percent":55}},"process":{"open_file_descriptors": 51,"peak_open_file_descriptors": 50,"max_file_descriptors":100,"cpu":{"percent": 45}}}`))
 			})),
 			args:     []string{"run", "../main.go", "health", "--cpu-usage-threshold-warn", "40", "--heap-usage-threshold-crit", "50"},
-			expected: "CRITICAL - Logstash is unhealthy",
+			expected: "[CRITICAL] - Logstash is unhealthy",
 		},
 	}
 

cmd/pipeline_test.go

@@ -15,7 +15,7 @@ func TestPipeline_ConnectionRefused(t *testing.T) {
 	out, _ := cmd.CombinedOutput()
 
 	actual := string(out)
-	expected := "UNKNOWN - Get \"http://localhost:9999/"
+	expected := "[UNKNOWN] - Get \"http://localhost:9999/"
 
 	if !strings.Contains(actual, expected) {
 		t.Error("\nActual: ", actual, "\nExpected: ", expected)
@@ -38,7 +38,7 @@ func TestPipelineCmd_Logstash7(t *testing.T) {
 				w.Write([]byte(`{}`))
 			})),
 			args:     []string{"run", "../main.go", "pipeline"},
-			expected: "UNKNOWN - required flag",
+			expected: "[UNKNOWN] - required flag",
 		},
 		{
 			name: "pipeline-ok",
@@ -47,7 +47,7 @@ func TestPipelineCmd_Logstash7(t *testing.T) {
 				w.Write([]byte(`{"host":"localhost","version":"7.17.8","http_address":"127.0.0.1:9600","id":"4","name":"test","ephemeral_id":"5","status":"green","snapshot":false,"pipeline":{"workers":2,"batch_size":125,"batch_delay":50},"pipelines":{"localhost-input":{"events":{"filtered":0,"duration_in_millis":0,"queue_push_duration_in_millis":0,"out":50,"in":100},"plugins":{"inputs":[{"id":"b","name":"beats","events":{"queue_push_duration_in_millis":0,"out":0}}],"codecs":[{"id":"plain","name":"plain","decode":{"writes_in":0,"duration_in_millis":0,"out":0},"encode":{"writes_in":0,"duration_in_millis":0}},{"id":"json","name":"json","decode":{"writes_in":0,"duration_in_millis":0,"out":0},"encode":{"writes_in":0,"duration_in_millis":0}}],"filters":[],"outputs":[{"id":"f","name":"redis","events":{"duration_in_millis":18,"out":50,"in":100}}]},"reloads":{"successes":0,"last_success_timestamp":null,"last_error":null,"last_failure_timestamp":null,"failures":0},"queue":{"type":"memory","events_count":0,"queue_size_in_bytes":0,"max_queue_size_in_bytes":0},"hash":"f","ephemeral_id":"f"}}}`))
 			})),
 			args:     []string{"run", "../main.go", "pipeline", "--inflight-events-warn", "200", "--inflight-events-crit", "500"},
-			expected: "OK - Inflight events",
+			expected: "[OK] - Inflight events",
 		},
 		{
 			name: "pipeline-perfdata",
@@ -65,7 +65,7 @@ func TestPipelineCmd_Logstash7(t *testing.T) {
 				w.Write([]byte(`{"path": "/_node/stats/pipelines/foo","status": 404,"error": {"message": "Not Found"}}`))
 			})),
 			args:     []string{"run", "../main.go", "pipeline", "--inflight-events-warn", "10", "--inflight-events-crit", "20", "--pipeline", "foo"},
-			expected: "UNKNOWN - Could not get",
+			expected: "[UNKNOWN] - Could not get",
 		},
 		{
 			name: "pipeline-inflight-warn",
@@ -74,7 +74,7 @@ func TestPipelineCmd_Logstash7(t *testing.T) {
 				w.Write([]byte(`{"host":"localhost","version":"7.17.8","http_address":"127.0.0.1:9600","id":"4","name":"test","ephemeral_id":"5","status":"green","snapshot":false,"pipeline":{"workers":2,"batch_size":125,"batch_delay":50},"pipelines":{"localhost-input":{"events":{"filtered":0,"duration_in_millis":0,"queue_push_duration_in_millis":0,"out":50,"in":100},"plugins":{"inputs":[{"id":"b","name":"beats","events":{"queue_push_duration_in_millis":0,"out":0}}],"codecs":[{"id":"plain","name":"plain","decode":{"writes_in":0,"duration_in_millis":0,"out":0},"encode":{"writes_in":0,"duration_in_millis":0}},{"id":"json","name":"json","decode":{"writes_in":0,"duration_in_millis":0,"out":0},"encode":{"writes_in":0,"duration_in_millis":0}}],"filters":[],"outputs":[{"id":"f","name":"redis","events":{"duration_in_millis":18,"out":50,"in":100}}]},"reloads":{"successes":0,"last_success_timestamp":null,"last_error":null,"last_failure_timestamp":null,"failures":0},"queue":{"type":"memory","events_count":0,"queue_size_in_bytes":0,"max_queue_size_in_bytes":0},"hash":"f","ephemeral_id":"f"}}}`))
 			})),
 			args:     []string{"run", "../main.go", "pipeline", "--inflight-events-warn", "25", "--inflight-events-crit", "60"},
-			expected: "WARNING - Inflight events",
+			expected: "[WARNING] - Inflight events",
 		},
 		{
 			name: "pipeline-inflight-crit",
@@ -83,7 +83,7 @@ func TestPipelineCmd_Logstash7(t *testing.T) {
 				w.Write([]byte(`{"host":"localhost","version":"7.17.8","http_address":"127.0.0.1:9600","id":"4","name":"test","ephemeral_id":"5","status":"green","snapshot":false,"pipeline":{"workers":2,"batch_size":125,"batch_delay":50},"pipelines":{"localhost-input":{"events":{"filtered":0,"duration_in_millis":0,"queue_push_duration_in_millis":0,"out":50,"in":100},"plugins":{"inputs":[{"id":"b","name":"beats","events":{"queue_push_duration_in_millis":0,"out":0}}],"codecs":[{"id":"plain","name":"plain","decode":{"writes_in":0,"duration_in_millis":0,"out":0},"encode":{"writes_in":0,"duration_in_millis":0}},{"id":"json","name":"json","decode":{"writes_in":0,"duration_in_millis":0,"out":0},"encode":{"writes_in":0,"duration_in_millis":0}}],"filters":[],"outputs":[{"id":"f","name":"redis","events":{"duration_in_millis":18,"out":50,"in":100}}]},"reloads":{"successes":0,"last_success_timestamp":null,"last_error":null,"last_failure_timestamp":null,"failures":0},"queue":{"type":"memory","events_count":0,"queue_size_in_bytes":0,"max_queue_size_in_bytes":0},"hash":"f","ephemeral_id":"f"}}}`))
 			})),
 			args:     []string{"run", "../main.go", "pipeline", "--inflight-events-warn", "25", "--inflight-events-crit", "49"},
-			expected: "CRITICAL - Inflight events",
+			expected: "[CRITICAL] - Inflight events",
 		},
 	}
 
@@ -115,7 +115,7 @@ func TestPipelineCmd_Logstash8(t *testing.T) {
 				w.Write([]byte(`{"host":"localhost","version":"8.6","http_address":"127.0.0.1:9600","id":"4","name":"test","ephemeral_id":"5","status":"green","snapshot":false,"pipeline":{"workers":2,"batch_size":125,"batch_delay":50},"pipelines":{"localhost-input":{"events":{"filtered":0,"duration_in_millis":0,"queue_push_duration_in_millis":0,"out":50,"in":100},"plugins":{"inputs":[{"id":"b","name":"beats","events":{"queue_push_duration_in_millis":0,"out":0}}],"codecs":[{"id":"plain","name":"plain","decode":{"writes_in":0,"duration_in_millis":0,"out":0},"encode":{"writes_in":0,"duration_in_millis":0}},{"id":"json","name":"json","decode":{"writes_in":0,"duration_in_millis":0,"out":0},"encode":{"writes_in":0,"duration_in_millis":0}}],"filters":[],"outputs":[{"id":"f","name":"redis","events":{"duration_in_millis":18,"out":50,"in":100}}]},"reloads":{"successes":0,"last_success_timestamp":null,"last_error":null,"last_failure_timestamp":null,"failures":0},"queue":{"type":"memory","events_count":0,"queue_size_in_bytes":0,"max_queue_size_in_bytes":0},"hash":"f","ephemeral_id":"f"}}}`))
 			})),
 			args:     []string{"run", "../main.go", "pipeline", "--inflight-events-warn", "200", "--inflight-events-crit", "500"},
-			expected: "OK - Inflight events",
+			expected: "[OK] - Inflight events",
 		},
 		{
 			name: "pipeline-reload-no-success",
@@ -124,7 +124,7 @@ func TestPipelineCmd_Logstash8(t *testing.T) {
 				w.Write([]byte(`{"host":"localhost","version":"8.6","http_address":"127.0.0.1:9600","id":"4","name":"test","ephemeral_id":"5","status":"green","snapshot":false,"pipeline":{"workers":2,"batch_size":125,"batch_delay":50},"pipelines":{"localhost-input":{"events":{"filtered":0,"duration_in_millis":0,"queue_push_duration_in_millis":0,"out":50,"in":100},"plugins":{"inputs":[{"id":"b","name":"beats","events":{"queue_push_duration_in_millis":0,"out":0}}],"codecs":[{"id":"plain","name":"plain","decode":{"writes_in":0,"duration_in_millis":0,"out":0},"encode":{"writes_in":0,"duration_in_millis":0}},{"id":"json","name":"json","decode":{"writes_in":0,"duration_in_millis":0,"out":0},"encode":{"writes_in":0,"duration_in_millis":0}}],"filters":[],"outputs":[{"id":"f","name":"redis","events":{"duration_in_millis":18,"out":50,"in":100}}]},"reloads":{"successes":0,"last_success_timestamp":"","last_error":null,"last_failure_timestamp":"2020-10-11T01:10:10.11Z","failures":0},"queue":{"type":"memory","events_count":0,"queue_size_in_bytes":0,"max_queue_size_in_bytes":0},"hash":"f","ephemeral_id":"f"}}}`))
 			})),
 			args:     []string{"run", "../main.go", "pipeline", "reload"},
-			expected: "UNKNOWN - Configuration reload status unknown",
+			expected: "[UNKNOWN] - Configuration reload status unknown",
 		},
 		{
 			name: "pipeline-reload-not-timestamp",
@@ -160,7 +160,7 @@ func TestPipelineCmd_Logstash8(t *testing.T) {
 				w.Write([]byte(`{"path": "/_node/stats/pipelines/foo","status": 404,"error": {"message": "Not Found"}}`))
 			})),
 			args:     []string{"run", "../main.go", "pipeline", "reload", "--pipeline", "foo"},
-			expected: "UNKNOWN - Could not get",
+			expected: "[UNKNOWN] - Could not get",
 		},
 		{
 			name: "pipeline-flow-ok",
@@ -178,7 +178,7 @@ func TestPipelineCmd_Logstash8(t *testing.T) {
 				w.Write([]byte(`{"host":"foobar","version":"8.7.1","http_address":"127.0.0.1:9600","id":"4","name":"test","ephemeral_id":"5","status":"green","snapshot":false,"pipeline":{"workers":2,"batch_size":125,"batch_delay":50},"pipelines":{"ansible-input":{"flow":{"queue_backpressure":{"current":10,"last_1_minute":0,"lifetime":2.503e-05},"output_throughput":{"current":0,"last_1_minute":0.344,"lifetime":0.7051},"input_throughput":{"current":10,"last_1_minute":0.5734,"lifetime":1.089},"worker_concurrency":{"current":0.0001815,"last_1_minute":0.0009501,"lifetime":0.003384},"filter_throughput":{"current":0,"last_1_minute":0.5734,"lifetime":1.089}},"events":{"filtered":0,"duration_in_millis":0,"queue_push_duration_in_millis":0,"out":50,"in":100},"queue":{"type":"memory","events_count":0,"queue_size_in_bytes":0,"max_queue_size_in_bytes":0},"hash":"f","ephemeral_id":"f"}}}`))
 			})),
 			args:     []string{"run", "../main.go", "pipeline", "flow", "--warning", "1", "--critical", "2"},
-			expected: "CRITICAL - Flow metrics not alright",
+			expected: "[CRITICAL] - Flow metrics not alright",
 		},
 	}
 

go.mod

@@ -3,7 +3,7 @@ module github.com/NETWAYS/check_logstash
 go 1.19
 
 require (
-	github.com/NETWAYS/go-check v0.4.2
+	github.com/NETWAYS/go-check v0.5.0
 	github.com/spf13/cobra v1.7.0
 	golang.org/x/oauth2 v0.10.0
 	gopkg.in/yaml.v2 v2.4.0
@@ -13,11 +13,8 @@ require (
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/kr/pretty v0.1.0 // indirect
-	github.com/mitchellh/go-ps v1.0.0 // indirect
-	github.com/sirupsen/logrus v1.9.2 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	golang.org/x/net v0.12.0 // indirect
-	golang.org/x/sys v0.10.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect