Skip to content
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

feat: add csphere_http port detection [sc-118080] #119

Merged
merged 1 commit into from
Nov 27, 2024
Merged

feat: add csphere_http port detection [sc-118080] #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions service_port.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@ var inputServicePorts = map[string]ServicePortGetter{
DefaultPort: 25826,
DefaultProtocol: networking.ProtocolUDP,
},
"csphere_http": {
PortFunc: fromPort,
DefaultPort: 443,
DefaultProtocol: networking.ProtocolTCP,
},
"elasticsearch": {
PortFunc: fromPort,
DefaultPort: 9200,
Expand Down
81 changes: 44 additions & 37 deletions service_port_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ func TestConfig_ServicePorts(t *testing.T) {
name cloudflare
[INPUT]
name collectd
[INPUT]
name csphere_http
[INPUT]
name elasticsearch
[INPUT]
Expand Down Expand Up @@ -67,17 +69,18 @@ func TestConfig_ServicePorts(t *testing.T) {
{Port: 2020, Protocol: networking.ProtocolTCP, Kind: SectionKindService},
expected(9880, networking.ProtocolTCP, SectionKindInput, "cloudflare", 0),
expected(25826, networking.ProtocolUDP, SectionKindInput, "collectd", 1),
expected(9200, networking.ProtocolTCP, SectionKindInput, "elasticsearch", 2),
expected(24224, networking.ProtocolTCP, SectionKindInput, "forward", 3),
expected(9880, networking.ProtocolTCP, SectionKindInput, "http", 4),
expected(1883, networking.ProtocolTCP, SectionKindInput, "mqtt", 5),
expected(4318, networking.ProtocolTCP, SectionKindInput, "opentelemetry", 6),
expected(8080, networking.ProtocolTCP, SectionKindInput, "prometheus_remote_write", 7),
expected(8088, networking.ProtocolTCP, SectionKindInput, "splunk", 8),
expected(8125, networking.ProtocolUDP, SectionKindInput, "statsd", 9),
// expected(5140, networking.ProtocolTCP, SectionKindInput, "syslog", 10), // default syslog without explicit mode tcp or udp is skipped
expected(5170, networking.ProtocolTCP, SectionKindInput, "tcp", 11),
expected(5170, networking.ProtocolUDP, SectionKindInput, "udp", 12),
expected(443, networking.ProtocolTCP, SectionKindInput, "csphere_http", 2),
expected(9200, networking.ProtocolTCP, SectionKindInput, "elasticsearch", 3),
expected(24224, networking.ProtocolTCP, SectionKindInput, "forward", 4),
expected(9880, networking.ProtocolTCP, SectionKindInput, "http", 5),
expected(1883, networking.ProtocolTCP, SectionKindInput, "mqtt", 6),
expected(4318, networking.ProtocolTCP, SectionKindInput, "opentelemetry", 7),
expected(8080, networking.ProtocolTCP, SectionKindInput, "prometheus_remote_write", 8),
expected(8088, networking.ProtocolTCP, SectionKindInput, "splunk", 9),
expected(8125, networking.ProtocolUDP, SectionKindInput, "statsd", 10),
// expected(5140, networking.ProtocolTCP, SectionKindInput, "syslog", 11), // default syslog without explicit mode tcp or udp is skipped
expected(5170, networking.ProtocolTCP, SectionKindInput, "tcp", 12),
expected(5170, networking.ProtocolUDP, SectionKindInput, "udp", 13),
expected(2021, networking.ProtocolTCP, SectionKindOutput, "prometheus_exporter", 0),
}, config.ServicePorts())
})
Expand All @@ -94,65 +97,69 @@ func TestConfig_ServicePorts(t *testing.T) {
name collectd
port 3
[INPUT]
name elasticsearch
name csphere_http
port 4
[INPUT]
name forward
name elasticsearch
port 5
[INPUT]
name http
name forward
port 6
[INPUT]
name mqtt
name http
port 7
[INPUT]
name opentelemetry
name mqtt
port 8
[INPUT]
name prometheus_remote_write
name opentelemetry
port 9
[INPUT]
name splunk
name prometheus_remote_write
port 10
[INPUT]
name statsd
name splunk
port 11
[INPUT]
name statsd
port 12
[INPUT]
name syslog
mode tcp
port 12
port 13
[INPUT]
name syslog
mode udp
port 13
port 14
[INPUT]
name tcp
port 14
port 15
[INPUT]
name udp
port 15
port 16
[OUTPUT]
name prometheus_exporter
port 16
port 17
`, FormatClassic)
assert.NoError(t, err)
assert.Equal(t, ServicePorts{
{Port: 1, Protocol: networking.ProtocolTCP, Kind: SectionKindService},
expected(2, networking.ProtocolTCP, SectionKindInput, "cloudflare", 0, property.Property{Key: "addr", Value: ":2"}),
expected(3, networking.ProtocolUDP, SectionKindInput, "collectd", 1, property.Property{Key: "port", Value: int64(3)}),
expected(4, networking.ProtocolTCP, SectionKindInput, "elasticsearch", 2, property.Property{Key: "port", Value: int64(4)}),
expected(5, networking.ProtocolTCP, SectionKindInput, "forward", 3, property.Property{Key: "port", Value: int64(5)}),
expected(6, networking.ProtocolTCP, SectionKindInput, "http", 4, property.Property{Key: "port", Value: int64(6)}),
expected(7, networking.ProtocolTCP, SectionKindInput, "mqtt", 5, property.Property{Key: "port", Value: int64(7)}),
expected(8, networking.ProtocolTCP, SectionKindInput, "opentelemetry", 6, property.Property{Key: "port", Value: int64(8)}),
expected(9, networking.ProtocolTCP, SectionKindInput, "prometheus_remote_write", 7, property.Property{Key: "port", Value: int64(9)}),
expected(10, networking.ProtocolTCP, SectionKindInput, "splunk", 8, property.Property{Key: "port", Value: int64(10)}),
expected(11, networking.ProtocolUDP, SectionKindInput, "statsd", 9, property.Property{Key: "port", Value: int64(11)}),
expected(12, networking.ProtocolTCP, SectionKindInput, "syslog", 10, property.Property{Key: "mode", Value: "tcp"}, property.Property{Key: "port", Value: int64(12)}),
expected(13, networking.ProtocolUDP, SectionKindInput, "syslog", 11, property.Property{Key: "mode", Value: "udp"}, property.Property{Key: "port", Value: int64(13)}),
expected(14, networking.ProtocolTCP, SectionKindInput, "tcp", 12, property.Property{Key: "port", Value: int64(14)}),
expected(15, networking.ProtocolUDP, SectionKindInput, "udp", 13, property.Property{Key: "port", Value: int64(15)}),
expected(16, networking.ProtocolTCP, SectionKindOutput, "prometheus_exporter", 0, property.Property{Key: "port", Value: int64(16)}),
expected(4, networking.ProtocolTCP, SectionKindInput, "csphere_http", 2, property.Property{Key: "port", Value: int64(4)}),
expected(5, networking.ProtocolTCP, SectionKindInput, "elasticsearch", 3, property.Property{Key: "port", Value: int64(5)}),
expected(6, networking.ProtocolTCP, SectionKindInput, "forward", 4, property.Property{Key: "port", Value: int64(6)}),
expected(7, networking.ProtocolTCP, SectionKindInput, "http", 5, property.Property{Key: "port", Value: int64(7)}),
expected(8, networking.ProtocolTCP, SectionKindInput, "mqtt", 6, property.Property{Key: "port", Value: int64(8)}),
expected(9, networking.ProtocolTCP, SectionKindInput, "opentelemetry", 7, property.Property{Key: "port", Value: int64(9)}),
expected(10, networking.ProtocolTCP, SectionKindInput, "prometheus_remote_write", 8, property.Property{Key: "port", Value: int64(10)}),
expected(11, networking.ProtocolTCP, SectionKindInput, "splunk", 9, property.Property{Key: "port", Value: int64(11)}),
expected(12, networking.ProtocolUDP, SectionKindInput, "statsd", 10, property.Property{Key: "port", Value: int64(12)}),
expected(13, networking.ProtocolTCP, SectionKindInput, "syslog", 11, property.Property{Key: "mode", Value: "tcp"}, property.Property{Key: "port", Value: int64(13)}),
expected(14, networking.ProtocolUDP, SectionKindInput, "syslog", 12, property.Property{Key: "mode", Value: "udp"}, property.Property{Key: "port", Value: int64(14)}),
expected(15, networking.ProtocolTCP, SectionKindInput, "tcp", 13, property.Property{Key: "port", Value: int64(15)}),
expected(16, networking.ProtocolUDP, SectionKindInput, "udp", 14, property.Property{Key: "port", Value: int64(16)}),
expected(17, networking.ProtocolTCP, SectionKindOutput, "prometheus_exporter", 0, property.Property{Key: "port", Value: int64(17)}),
}, config.ServicePorts())
})

Expand Down