8000 Add labels to NAP security logs (#1280) · nginx/agent@aa15b39 · GitHub
[go: up one dir, main page]
Skip to content

Commit aa15b39

Browse files
spencerugbospencerugbo
authored
Add labels to NAP security logs (#1280)
* add instance type to nap logs * update unit test
1 parent aadf861 commit aa15b39

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

‎internal/collector/otel_collector_plugin.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -623,6 +623,13 @@ func (oc *Collector) updateNginxAppProtectTcplogReceivers(
623623
"value": nginxConfigContext.InstanceID,
624624
},
625625
},
626+ 8000
{
627+
Type: "add",
628+
Fields: map[string]string{
629+
"field": "resource[\"instance.type\"]",
630+
"value": "nginx-app-protect",
631+
},
632+
},
626633
},
627634
}
628635

‎internal/collector/otel_collector_plugin_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,7 @@ func TestCollector_updateNginxAppProtectTcplogReceivers(t *testing.T) {
755755
assert.True(tt, tcplogReceiverAdded)
756756
assert.Len(tt, conf.Collector.Receivers.TcplogReceivers, 1)
757757
assert.Equal(tt, "localhost:15632", conf.Collector.Receivers.TcplogReceivers["nginx_app_protect"].ListenAddress)
758-
assert.Len(tt, conf.Collector.Receivers.TcplogReceivers["nginx_app_protect"].Operators, 6)
758+
assert.Len(tt, conf.Collector.Receivers.TcplogReceivers["nginx_app_protect"].Operators, 7)
759759
})
760760

761761
// Calling updateNginxAppProtectTcplogReceivers shouldn't update the TcplogReceivers slice
@@ -765,7 +765,7 @@ func TestCollector_updateNginxAppProtectTcplogReceivers(t *testing.T) {
765765
assert.False(t, tcplogReceiverAdded)
766766
assert.Len(t, conf.Collector.Receivers.TcplogReceivers, 1)
767767
assert.Equal(t, "localhost:15632", conf.Collector.Receivers.TcplogReceivers["nginx_app_protect"].ListenAddress)
768-
assert.Len(t, conf.Collector.Receivers.TcplogReceivers["nginx_app_protect"].Operators, 6)
768+
assert.Len(t, conf.Collector.Receivers.TcplogReceivers["nginx_app_protect"].Operators, 7)
769769
})
770770

771771
t.Run("Test 3: TcplogReceiver deleted", func(tt *testing.T) {
@@ -784,7 +784,7 @@ func TestCollector_updateNginxAppProtectTcplogReceivers(t *testing.T) {
784784
assert.True(t, tcplogReceiverDeleted)
785785
assert.Len(t, conf.Collector.Receivers.TcplogReceivers, 1)
786786
assert.Equal(t, "localhost:1555", conf.Collector.Receivers.TcplogReceivers["nginx_app_protect"].ListenAddress)
787-
assert.Len(t, conf.Collector.Receivers.TcplogReceivers["nginx_app_protect"].Operators, 6)
787+
assert.Len(t, conf.Collector.Receivers.TcplogReceivers["nginx_app_protect"].Operators, 7)
788788
})
789789
}
790790

‎test/docker/nginx-plus-and-nap/deb/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ RUN --mount=type=secret,id=nginx-crt,dst=nginx-repo.crt \
5454
&& echo "Acquire::https::pkgs.nginx.com::Verify-Host \"true\";" >> /etc/apt/apt.conf.d/90nginx \
5555
&& echo "Acquire::https::pkgs.nginx.com::SslCert \"/etc/ssl/nginx/nginx-repo.crt\";" >> /etc/apt/apt.conf.d/90nginx \
5656
&& echo "Acquire::https::pkgs.nginx.com::SslKey \"/etc/ssl/nginx/nginx-repo.key\";" >> /etc/apt/apt.conf.d/90nginx \
57-
&& printf "deb https://pkgs.nginx.com/plus/${PLUS_VERSION}/ubuntu/ `lsb_release -cs` nginx-plus\n" > /etc/apt/sources.list.d/nginx-plus.list \
57+
&& printf "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] https://pkgs.nginx.com/plus/${PLUS_VERSION}/ubuntu/ `lsb_release -cs` nginx-plus\n" > /etc/apt/sources.list.d/nginx-plus.list \
5858
&& printf "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] https://pkgs.nginx.com/app-protect/${PLUS_VERSION}/ubuntu `lsb_release -cs` nginx-plus\n" | tee /etc/apt/sources.list.d/nginx-app-protect.list \
5959
&& printf "deb [signed-by=/usr/share/keyrings/app-protect-security-updates.gpg] https://pkgs.nginx.com/app-protect-security-updates/ubuntu `lsb_release -cs` nginx-plus\n" | tee -a /etc/apt/sources.list.d/nginx-app-protect.list \
6060
&& mkdir -p /etc/ssl/nginx \

0 commit comments

Comments
 (0)
0