From 2f9268d24b905e42a5ec02bd0d7bbad8cc89c3fd Mon Sep 17 00:00:00 2001 From: "R.I.Pienaar" Date: Mon, 6 Jan 2025 16:31:52 +0100 Subject: [PATCH] Improve audit error handling Signed-off-by: R.I.Pienaar --- audit/gather/gather.go | 25 +++++++++++++++++++++++++ audit/jetstream_checks.go | 4 ++-- go.mod | 16 ++++++++-------- go.sum | 28 ++++++++++++++-------------- 4 files changed, 49 insertions(+), 24 deletions(-) diff --git a/audit/gather/gather.go b/audit/gather/gather.go index 974b59e4..a7364c72 100644 --- a/audit/gather/gather.go +++ b/audit/gather/gather.go @@ -290,6 +290,11 @@ func (g *gather) captureAccountStreams(serverInfoMap map[string]*server.ServerIn return } + if apiResponse.Error != nil { + g.log.Errorf("Received an error from server %s: (%d) %s", apiResponse.Server.Name, apiResponse.Error.ErrCode, apiResponse.Error.Description) + return + } + serverId, serverName := apiResponse.Server.ID, apiResponse.Server.Name // Ignore responses from servers not discovered earlier. @@ -393,6 +398,11 @@ func (g *gather) captureAccountEndpoints(serverInfoMap map[string]*server.Server return } + if apiResponse.Error != nil { + g.log.Errorf("Received an error from server %s: (%d) %s", apiResponse.Server.Name, apiResponse.Error.ErrCode, apiResponse.Error.Description) + return + } + serverId := apiResponse.Server.ID // Ignore responses from servers not discovered earlier. @@ -564,6 +574,11 @@ func (g *gather) captureServerEndpoints(serverInfoMap map[string]*server.ServerI continue } + if apiResponse.Error != nil { + g.log.Errorf("Received an error from server %s: (%d) %s", apiResponse.Server.Name, apiResponse.Error.ErrCode, apiResponse.Error.Description) + continue + } + buff := bytes.NewBuffer([]byte{}) err = json.Indent(buff, apiResponse.Data, "", " ") if err != nil { @@ -628,6 +643,11 @@ func (g *gather) discoverAccounts(serverInfoMap map[string]*server.ServerInfo) ( return } + if apiResponse.Error != nil { + g.log.Errorf("Received an error from server %s: (%d) %s", apiResponse.Server.Name, apiResponse.Error.ErrCode, apiResponse.Error.Description) + return + } + g.log.Infof("Discovered %d accounts on server %s", len(accountsResponse.Accounts), serverName) // Track how many servers known any given account @@ -670,6 +690,11 @@ func (g *gather) discoverServers() (map[string]*server.ServerInfo, error) { return } + if apiResponse.Error != nil { + g.log.Errorf("Received an error from server %s: (%d) %s", apiResponse.Server.Name, apiResponse.Error.ErrCode, apiResponse.Error.Description) + return + } + serverId, serverName := apiResponse.Server.ID, apiResponse.Server.Name _, exists := serverInfoMap[apiResponse.Server.ID] diff --git a/audit/jetstream_checks.go b/audit/jetstream_checks.go index 7e94c106..9767232b 100644 --- a/audit/jetstream_checks.go +++ b/audit/jetstream_checks.go @@ -85,14 +85,14 @@ func RegisterJetStreamChecks(collection *CheckCollection) error { Code: "JETSTREAM_004", Suite: "jetstream", Name: "Stream Metadata based monitoring", - Description: "Perform stream monitoring using the 'nats server check stream' metadata", + Description: "Stream health using the 'nats server check stream' metadata", Handler: checkStreamMetadataMonitoring, }, Check{ Code: "JETSTREAM_005", Suite: "jetstream", Name: "Consumer Metadata based monitoring", - Description: "Perform consumer monitoring using the 'nats server check consumer' metadata", + Description: "Consumer health using the 'nats server check consumer' metadata", Handler: checkConsumerMetadataMonitoring, }, ) diff --git a/go.mod b/go.mod index bdb5e260..3bd1bc38 100644 --- a/go.mod +++ b/go.mod @@ -3,19 +3,20 @@ module github.com/nats-io/jsm.go go 1.22.0 require ( + github.com/choria-io/fisk v0.6.4 github.com/dustin/go-humanize v1.0.1 github.com/expr-lang/expr v1.16.9 github.com/google/go-cmp v0.6.0 github.com/jedib0t/go-pretty/v6 v6.6.5 github.com/klauspost/compress v1.17.11 github.com/nats-io/jwt/v2 v2.7.3 - github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20241219180704-470a7acda496 + github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20250106135224-4f0878aca3c6 github.com/nats-io/nats.go v1.38.0 github.com/nats-io/nkeys v0.4.9 github.com/nats-io/nuid v1.0.1 github.com/prometheus/client_golang v1.20.5 github.com/prometheus/common v0.61.0 - golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 + golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329 golang.org/x/net v0.33.0 golang.org/x/text v0.21.0 gopkg.in/yaml.v3 v3.0.1 @@ -24,8 +25,7 @@ require ( require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect - github.com/choria-io/fisk v0.6.4 // indirect - github.com/google/go-tpm v0.9.2 // indirect + github.com/google/go-tpm v0.9.3 // indirect github.com/kr/text v0.2.0 // indirect github.com/mattn/go-runewidth v0.0.16 // indirect github.com/minio/highwayhash v1.0.3 // indirect @@ -34,8 +34,8 @@ require ( github.com/prometheus/procfs v0.15.1 // indirect github.com/rivo/uniseg v0.4.7 // indirect github.com/rogpeppe/go-internal v1.12.0 // indirect - golang.org/x/crypto v0.31.0 // indirect - golang.org/x/sys v0.28.0 // indirect - golang.org/x/time v0.8.0 // indirect - google.golang.org/protobuf v1.36.0 // indirect + golang.org/x/crypto v0.32.0 // indirect + golang.org/x/sys v0.29.0 // indirect + golang.org/x/time v0.9.0 // indirect + google.golang.org/protobuf v1.36.1 // indirect ) diff --git a/go.sum b/go.sum index 22586be3..66d0755f 100644 --- a/go.sum +++ b/go.sum @@ -13,8 +13,8 @@ github.com/expr-lang/expr v1.16.9 h1:WUAzmR0JNI9JCiF0/ewwHB1gmcGw5wW7nWt8gc6PpCI github.com/expr-lang/expr v1.16.9/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-tpm v0.9.2 h1:Gh8CMnMm06b09DmcsuY9fI3oF69188lGXCpiT/a05T4= -github.com/google/go-tpm v0.9.2/go.mod h1:h9jEsEECg7gtLis0upRBQU+GhYVH6jMjrFxI8u6bVUY= +github.com/google/go-tpm v0.9.3 h1:+yx0/anQuGzi+ssRqeD6WpXjW2L/V0dItUayO0i9sRc= +github.com/google/go-tpm v0.9.3/go.mod h1:h9jEsEECg7gtLis0upRBQU+GhYVH6jMjrFxI8u6bVUY= github.com/jedib0t/go-pretty/v6 v6.6.5 h1:9PgMJOVBedpgYLI56jQRJYqngxYAAzfEUua+3NgSqAo= github.com/jedib0t/go-pretty/v6 v6.6.5/go.mod h1:Uq/HrbhuFty5WSVNfjpQQe47x16RwVGXIveNGEyGtHs= github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= @@ -31,8 +31,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/nats-io/jwt/v2 v2.7.3 h1:6bNPK+FXgBeAqdj4cYQ0F8ViHRbi7woQLq4W29nUAzE= github.com/nats-io/jwt/v2 v2.7.3/go.mod h1:GvkcbHhKquj3pkioy5put1wvPxs78UlZ7D/pY+BgZk4= -github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20241219180704-470a7acda496 h1:NT7IPFPqkHccMqQWFoCOATlBLR+POK1sqFx4oOX3bAY= -github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20241219180704-470a7acda496/go.mod h1:Ky5GDRMam5300yCf1N+pD0apW7TqfVvTNgYEvbXtnE8= +github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20250106135224-4f0878aca3c6 h1:OJKl7INH3S9SczUJHYTeDmkXuy2tQmsVaH8gPQZiIdI= +github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20250106135224-4f0878aca3c6/go.mod h1:skFpICXskKQmrPs+EqjiIdeBTq7FBYWfYAxyCdPdP+4= github.com/nats-io/nats.go v1.38.0 h1:A7P+g7Wjp4/NWqDOOP/K6hfhr54DvdDQUznt5JFg9XA= github.com/nats-io/nats.go v1.38.0/go.mod h1:IGUM++TwokGnXPs82/wCuiHS02/aKrdYUQkU8If6yjw= github.com/nats-io/nkeys v0.4.9 h1:qe9Faq2Gxwi6RZnZMXfmGMZkg3afLLOtrU+gDZJ35b0= @@ -56,21 +56,21 @@ github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= -golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= -golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 h1:1UoZQm6f0P/ZO0w1Ri+f+ifG/gXhegadRdwBIXEFWDo= -golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c= +golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc= +golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= +golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329 h1:9kj3STMvgqy3YA4VQXBrN7925ICMxD5wzMRcgA30588= +golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c= golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= -golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= +golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= -golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg= -golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= -google.golang.org/protobuf v1.36.0 h1:mjIs9gYtt56AzC4ZaffQuh88TZurBGhIJMBZGSxNerQ= -google.golang.org/protobuf v1.36.0/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY= +golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk= +google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=