diff --git a/go.mod b/go.mod index e8eae96f8..4153c1c7f 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/jpillora/sizestr v1.0.0 github.com/mattn/go-sqlite3 v1.14.48 github.com/navidys/tvxwidgets v0.14.0 - github.com/netobserv/flowlogs-pipeline v1.11.5-community + github.com/netobserv/flowlogs-pipeline v1.12.0-community github.com/netobserv/netobserv-ebpf-agent v1.12.0-community github.com/onsi/ginkgo/v2 v2.32.0 github.com/onsi/gomega v1.43.0 diff --git a/go.sum b/go.sum index 30cbe604c..904dcd7ae 100644 --- a/go.sum +++ b/go.sum @@ -156,8 +156,8 @@ github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/navidys/tvxwidgets v0.14.0 h1:8UDKTDbbQeWwmOBcsTzKTrUYv7BpGYphpib7zWt6i6s= github.com/navidys/tvxwidgets v0.14.0/go.mod h1:yILrJRJqf399gw7JyUM7UdT+e9PMMDXpk+CuIoqvEj8= -github.com/netobserv/flowlogs-pipeline v1.11.5-community h1:g056UVio6qFNzOzxD98k3YxBHZWUEr+tn3MxTog/f0A= -github.com/netobserv/flowlogs-pipeline v1.11.5-community/go.mod h1:RNGkTvF3w+epkBmtbKqj+M4h6f9VNwVkTB2Smy2OvCc= +github.com/netobserv/flowlogs-pipeline v1.12.0-community h1:+RDxtVHY//wOqHh3Q+Xq/q3rQpuOQ0y+zPS4awnZOLE= +github.com/netobserv/flowlogs-pipeline v1.12.0-community/go.mod h1:rLbF9BWm9s7EXpUXF7fztfrikvrIu1mzEOy/UPqZlLM= github.com/netobserv/netobserv-ebpf-agent v1.12.0-community h1:3e18pZzZPjRSm9TPECquVFf/4ntSjpVrb32pmJ8sAT8= github.com/netobserv/netobserv-ebpf-agent v1.12.0-community/go.mod h1:ML3ApiUVk+ROiB/oJ6v48PxIVhE9hAt955+oE+q20JM= github.com/onsi/ginkgo/v2 v2.32.0 h1:Hw7s2pVrQo/8Yz5N77qdnpHaoc+c6cC9WIV1Jce+J6E= diff --git a/vendor/github.com/netobserv/flowlogs-pipeline/pkg/api/encode_s3.go b/vendor/github.com/netobserv/flowlogs-pipeline/pkg/api/encode_s3.go index 71cc6d6fb..36ec4ab16 100644 --- a/vendor/github.com/netobserv/flowlogs-pipeline/pkg/api/encode_s3.go +++ b/vendor/github.com/netobserv/flowlogs-pipeline/pkg/api/encode_s3.go @@ -21,7 +21,7 @@ type EncodeS3 struct { Account string `yaml:"account" json:"account" doc:"tenant id for this flow collector"` Endpoint string `yaml:"endpoint" json:"endpoint" doc:"address of s3 server"` AccessKeyID string `yaml:"accessKeyId" json:"accessKeyId" doc:"username to connect to server"` - SecretAccessKey string `yaml:"secretAccessKey" json:"secretAccessKey" doc:"password to connect to server"` + SecretAccessKey RedactedText `yaml:"secretAccessKey" json:"secretAccessKey" doc:"password to connect to server"` Bucket string `yaml:"bucket" json:"bucket" doc:"bucket into which to store objects"` WriteTimeout Duration `yaml:"writeTimeout,omitempty" json:"writeTimeout,omitempty" doc:"timeout (in seconds) for write operation"` BatchSize int `yaml:"batchSize,omitempty" json:"batchSize,omitempty" doc:"limit on how many flows will be buffered before being sent to an object"` diff --git a/vendor/github.com/netobserv/flowlogs-pipeline/pkg/api/redacted.go b/vendor/github.com/netobserv/flowlogs-pipeline/pkg/api/redacted.go new file mode 100644 index 000000000..45f580830 --- /dev/null +++ b/vendor/github.com/netobserv/flowlogs-pipeline/pkg/api/redacted.go @@ -0,0 +1,16 @@ +package api + +import ( + "fmt" + "log/slog" +) + +type RedactedText string + +func (RedactedText) Format(f fmt.State, _ rune) { + _, _ = f.Write([]byte("[REDACTED]")) +} + +func (RedactedText) LogValue() slog.Value { + return slog.StringValue("[REDACTED]") +} diff --git a/vendor/github.com/netobserv/flowlogs-pipeline/pkg/api/tls.go b/vendor/github.com/netobserv/flowlogs-pipeline/pkg/api/tls.go index 5d8abfbf9..9ae087ae1 100644 --- a/vendor/github.com/netobserv/flowlogs-pipeline/pkg/api/tls.go +++ b/vendor/github.com/netobserv/flowlogs-pipeline/pkg/api/tls.go @@ -34,6 +34,7 @@ type ClientTLS struct { func (c *ClientTLS) Build() (*tls.Config, error) { tlsConfig := &tls.Config{ InsecureSkipVerify: c.InsecureSkipVerify, + MinVersion: tls.VersionTLS13, } if c.CACertPath != "" { caCert, err := os.ReadFile(c.CACertPath) diff --git a/vendor/github.com/netobserv/flowlogs-pipeline/pkg/config/config.go b/vendor/github.com/netobserv/flowlogs-pipeline/pkg/config/config.go index 444f278f5..c0f22da60 100644 --- a/vendor/github.com/netobserv/flowlogs-pipeline/pkg/config/config.go +++ b/vendor/github.com/netobserv/flowlogs-pipeline/pkg/config/config.go @@ -31,8 +31,9 @@ type Options struct { Parameters string DynamicParameters string MetricsSettings string - Health Health - Profile Profile + HealthAddr string + PprofAddr string + K8sCacheServer K8sCacheServer } type Root struct { @@ -55,13 +56,14 @@ type HotReloadStruct struct { Parameters []StageParam `yaml:"parameters,omitempty" json:"parameters,omitempty"` } -type Health struct { +type K8sCacheServer struct { Address string Port int -} - -type Profile struct { - Port int + // TLS configuration + TLSEnabled bool + TLSCertPath string + TLSKeyPath string + TLSCAPath string } // MetricsSettings is similar to api.PromEncode, but is global to the application, ie. it also works with operational metrics. diff --git a/vendor/modules.txt b/vendor/modules.txt index 4d05a857c..5cfde8736 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -192,7 +192,7 @@ github.com/mxk/go-flowrate/flowrate # github.com/navidys/tvxwidgets v0.14.0 ## explicit; go 1.25.6 github.com/navidys/tvxwidgets -# github.com/netobserv/flowlogs-pipeline v1.11.5-community +# github.com/netobserv/flowlogs-pipeline v1.12.0-community ## explicit; go 1.25.7 github.com/netobserv/flowlogs-pipeline/pkg/api github.com/netobserv/flowlogs-pipeline/pkg/config