Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 18 additions & 0 deletions internal/collector/otel_collector_plugin.go
Original file line number Diff line number Diff line change
Expand Up @@ -554,6 +554,24 @@ func (oc *Collector) updateNginxAppProtectTcplogReceivers(nginxConfigContext *mo
oc.config.Collector.Receivers.TcplogReceivers["nginx_app_protect"] = &config.TcplogReceiver{
ListenAddress: nginxConfigContext.NAPSysLogServer,
Operators: []config.Operator{
// regex captures the priority number from the log line
{
Type: "regex_parser",
Fields: map[string]string{
"regex": "^<(?P<priority>\\d+)>",
"parse_from": "body",
"parse_to": "attributes",
},
},
// filter drops all logs that have a severity above 4
// https://docs.secureauth.com/0902/en/how-to-read-a-syslog-message.html#severity-code-table
{
Type: "filter",
Fields: map[string]string{
"expr": "'int(attributes.priority) % 8 > 4'",
"drop_ratio": "1.0",
},
},
{
Type: "add",
Fields: map[string]string{
Expand Down
16 changes: 9 additions & 7 deletions internal/collector/otel_collector_plugin_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,9 @@ func TestCollector_ProcessNginxConfigUpdateTopic(t *testing.T) {
},
},
receivers: config.Receivers{
HostMetrics: nil,
OtlpReceivers: nil,
HostMetrics: nil,
OtlpReceivers: nil,
TcplogReceivers: make(map[string]*config.TcplogReceiver),
NginxPlusReceivers: []config.NginxPlusReceiver{
{
InstanceID: "123",
Expand Down Expand Up @@ -213,8 +214,9 @@ func TestCollector_ProcessNginxConfigUpdateTopic(t *testing.T) {
},
},
receivers: config.Receivers{
HostMetrics: nil,
OtlpReceivers: nil,
HostMetrics: nil,
OtlpReceivers: nil,
TcplogReceivers: make(map[string]*config.TcplogReceiver),
NginxReceivers: []config.NginxReceiver{
{
InstanceID: "123",
Expand Down Expand Up @@ -747,7 +749,7 @@ func TestCollector_updateNginxAppProtectTcplogReceivers(t *testing.T) {
assert.True(tt, tcplogReceiverAdded)
assert.Len(tt, conf.Collector.Receivers.TcplogReceivers, 1)
assert.Equal(tt, "localhost:151", conf.Collector.Receivers.TcplogReceivers["nginx_app_protect"].ListenAddress)
assert.Len(tt, conf.Collector.Receivers.TcplogReceivers["nginx_app_protect"].Operators, 4)
assert.Len(tt, conf.Collector.Receivers.TcplogReceivers["nginx_app_protect"].Operators, 6)
})

// Calling updateNginxAppProtectTcplogReceivers shouldn't update the TcplogReceivers slice
Expand All @@ -757,7 +759,7 @@ func TestCollector_updateNginxAppProtectTcplogReceivers(t *testing.T) {
assert.False(t, tcplogReceiverAdded)
assert.Len(t, conf.Collector.Receivers.TcplogReceivers, 1)
assert.Equal(t, "localhost:151", conf.Collector.Receivers.TcplogReceivers["nginx_app_protect"].ListenAddress)
assert.Len(t, conf.Collector.Receivers.TcplogReceivers["nginx_app_protect"].Operators, 4)
assert.Len(t, conf.Collector.Receivers.TcplogReceivers["nginx_app_protect"].Operators, 6)
})

t.Run("Test 3: TcplogReceiver deleted", func(tt *testing.T) {
Expand All @@ -776,7 +778,7 @@ func TestCollector_updateNginxAppProtectTcplogReceivers(t *testing.T) {
assert.True(t, tcplogReceiverDeleted)
assert.Len(t, conf.Collector.Receivers.TcplogReceivers, 1)
assert.Equal(t, "localhost:152", conf.Collector.Receivers.TcplogReceivers["nginx_app_protect"].ListenAddress)
assert.Len(t, conf.Collector.Receivers.TcplogReceivers["nginx_app_protect"].Operators, 4)
assert.Len(t, conf.Collector.Receivers.TcplogReceivers["nginx_app_protect"].Operators, 6)
})
}

Expand Down
2 changes: 1 addition & 1 deletion internal/collector/otelcol.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ service:
receivers:
{{- range $receiver := $pipeline.Receivers }}
{{- if eq $receiver "tcplog/nginx_app_protect" }}
- tcplog/nginx_app_protect:
- tcplog/nginx_app_protect
{{- else }}
- {{ $receiver }}
{{- end }}
Expand Down