Skip to content

Ver2.4.1 #32

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
mimuret merged 3 commits into from
Jul 20, 2025
Merged

Ver2.4.1 #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a38da87
fix: schema make file
mimuret Jul 20, 2025
10097f7
fix: json schema
mimuret Jul 20, 2025
e02fc3f
fix: update dependencies in go.mod
mimuret Jul 20, 2025
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
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ generate: pkg/types/dtap_frame.go
pkg/types/dtap_frame.go: proto/dtap_frame.proto
protoc --proto_path=./proto --go_opt=Mdnstap.proto=github.com/dnstap/golang-dnstap --go_opt=paths=source_relative --go_out=./pkg/types proto/dtap_frame.proto

schema/input_plugins.json: $(input_plugin_schemas)
schemas/input_plugins.json: $(input_plugin_schemas)
go run misc/merge-schema/main.go pkg/plugin/input /schemas/input_plugins.json > schemas/input_plugins.json.tmp && mv schemas/input_plugins.json.tmp schemas/input_plugins.json
schema/output_plugins.json: $(output_plugin_schemas)
schemas/output_plugins.json: $(output_plugin_schemas)
go run misc/merge-schema/main.go pkg/plugin/output /schemas/output_plugins.json > schemas/output_plugins.json.tmp && mv schemas/output_plugins.json.tmp schemas/output_plugins.json
schema/filter_plugins.json: $(filter_plugin_schemas)
schemas/filter_plugins.json: $(filter_plugin_schemas)
go run misc/merge-schema/main.go pkg/plugin/filter /schemas/filter_plugins.json > schemas/filter_plugins.json.tmp && mv schemas/filter_plugins.json.tmp schemas/filter_plugins.json
schema: $(schemas) schema/input_plugins.json schema/output_plugins.json schema/filter_plugins.json
schema: $(schemas)
ajv compile -s schemas/schema.json --allow-union-types --inline-refs=true --spec=draft2019 $(addprefix -r ,$(plugin_schemas)) $(addprefix -r ,$(schemas))
28 changes: 14 additions & 14 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ toolchain go1.23.1

require go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect

require github.com/nats-io/nats-server/v2 v2.9.23
require github.com/nats-io/nats-server/v2 v2.11.6

require (
github.com/Shopify/sarama v1.30.0
Expand All @@ -22,7 +22,7 @@ require (
github.com/linkedin/goavro v2.1.0+incompatible
github.com/miekg/dns v1.1.62
github.com/mimuret/dnsutils v1.11.0
github.com/nats-io/nats.go v1.28.0
github.com/nats-io/nats.go v1.43.0
github.com/onsi/ginkgo/v2 v2.22.1
github.com/onsi/gomega v1.36.2
github.com/packetcap/go-pcap v0.0.0-20250417081904-081143ce5ce4
Expand All @@ -42,8 +42,8 @@ require (
go.opentelemetry.io/otel/sdk/log v0.11.0
go.uber.org/zap v1.27.0
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0
golang.org/x/net v0.39.0
golang.org/x/sync v0.13.0
golang.org/x/net v0.40.0
golang.org/x/sync v0.15.0
google.golang.org/protobuf v1.36.5
gopkg.in/natefinch/lumberjack.v2 v2.2.1
sigs.k8s.io/yaml v1.4.0
Expand Down Expand Up @@ -109,6 +109,7 @@ require (
github.com/golang/snappy v0.0.4 // indirect
github.com/google/btree v1.1.3 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/go-tpm v0.9.5 // indirect
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
github.com/google/s2a-go v0.1.9 // indirect
github.com/google/uuid v1.6.0 // indirect
Expand Down Expand Up @@ -145,7 +146,6 @@ require (
github.com/josharian/intern v1.0.0 // indirect
github.com/jpillora/backoff v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/juju/zaputil v0.0.0-20190326175239-ef53049637ac // indirect
github.com/julienschmidt/httprouter v1.3.0 // indirect
github.com/klauspost/compress v1.18.0 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
Expand All @@ -156,7 +156,7 @@ require (
github.com/mdlayher/socket v0.5.1 // indirect
github.com/mdlayher/vsock v1.2.1 // indirect
github.com/mimuret/intcast v0.2.0 // indirect
github.com/minio/highwayhash v1.0.2 // indirect
github.com/minio/highwayhash v1.0.3 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect
Expand All @@ -165,8 +165,8 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
github.com/nats-io/jwt/v2 v2.5.0 // indirect
github.com/nats-io/nkeys v0.4.4 // indirect
github.com/nats-io/jwt/v2 v2.7.4 // indirect
github.com/nats-io/nkeys v0.4.11 // indirect
github.com/nats-io/nuid v1.0.1 // indirect
github.com/oklog/ulid v1.3.1 // indirect
github.com/opentracing-contrib/go-grpc v0.1.1 // indirect
Expand Down Expand Up @@ -210,13 +210,13 @@ require (
go.uber.org/goleak v1.3.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go4.org/netipx v0.0.0-20230125063823-8449b0a6169f // indirect
golang.org/x/crypto v0.37.0 // indirect
golang.org/x/mod v0.22.0 // indirect
golang.org/x/crypto v0.39.0 // indirect
golang.org/x/mod v0.25.0 // indirect
golang.org/x/oauth2 v0.28.0 // indirect
golang.org/x/sys v0.32.0 // indirect
golang.org/x/text v0.24.0 // indirect
golang.org/x/time v0.9.0 // indirect
golang.org/x/tools v0.28.0 // indirect
golang.org/x/sys v0.33.0 // indirect
golang.org/x/text v0.26.0 // indirect
golang.org/x/time v0.12.0 // indirect
golang.org/x/tools v0.33.0 // indirect
google.golang.org/api v0.218.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
Expand Down
Loading