Skip to content

Add parent-tunnel byte counters (NPU-offload-accurate) #405

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
bastischubert merged 1 commit into from
Jun 29, 2026
Merged

Add parent-tunnel byte counters (NPU-offload-accurate) #405

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
26 changes: 22 additions & 4 deletions pkg/probe/vpn_ipsec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,16 @@ func probeVPNIPSec(c fortigatehttpclient.FortiHTTP, _ *TargetMetadata) ([]promet
"Total number of bytes received over the IPsec tunnel",
[]string{"vdom", "name", "p2serial", "parent"}, nil,
)
parentTransmitted = prometheus.NewDesc(
"fortigate_ipsec_tunnel_parent_transmit_bytes_total",
"Total bytes transmitted over the IPsec tunnel (parent counter, accurate under NPU offload)",
[]string{"vdom", "name"}, nil,
)
parentReceived = prometheus.NewDesc(
"fortigate_ipsec_tunnel_parent_receive_bytes_total",
"Total bytes received over the IPsec tunnel (parent counter, accurate under NPU offload)",
[]string{"vdom", "name"}, nil,
)
)

type proxyid struct {
Expand All @@ -49,10 +59,12 @@ func probeVPNIPSec(c fortigatehttpclient.FortiHTTP, _ *TargetMetadata) ([]promet
Outgoing float64 `json:"outgoing_bytes"`
}
type tunnel struct {
Name string `json:"name"`
Type string `json:"type"`
ProxyID []proxyid `json:"proxyid"`
Connection int `json:"connection_count"`
Name string `json:"name"`
Type string `json:"type"`
ProxyID []proxyid `json:"proxyid"`
Connection int `json:"connection_count"`
IncomingBytes float64 `json:"incoming_bytes"`
OutgoingBytes float64 `json:"outgoing_bytes"`
}
type ipsecResult struct {
Results []tunnel `json:"results"`
Expand All @@ -74,6 +86,12 @@ func probeVPNIPSec(c fortigatehttpclient.FortiHTTP, _ *TargetMetadata) ([]promet
if i.Type == "dialup" {
continue
}
m = append(m, prometheus.MustNewConstMetric(
parentTransmitted, prometheus.CounterValue,
i.OutgoingBytes, v.VDOM, i.Name))
m = append(m, prometheus.MustNewConstMetric(
parentReceived, prometheus.CounterValue,
i.IncomingBytes, v.VDOM, i.Name))
for _, t := range i.ProxyID {
s := 0.0
if t.Status == "up" {
Expand Down
12 changes: 12 additions & 0 deletions pkg/probe/vpn_ipsec_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ func TestVPNIPSec(t *testing.T) {
}

em := `
# HELP fortigate_ipsec_tunnel_parent_receive_bytes_total Total bytes received over the IPsec tunnel (parent counter, accurate under NPU offload)
# TYPE fortigate_ipsec_tunnel_parent_receive_bytes_total counter
fortigate_ipsec_tunnel_parent_receive_bytes_total{name="tunnel_1",vdom="root"} 1.429824e+07
# HELP fortigate_ipsec_tunnel_parent_transmit_bytes_total Total bytes transmitted over the IPsec tunnel (parent counter, accurate under NPU offload)
# TYPE fortigate_ipsec_tunnel_parent_transmit_bytes_total counter
fortigate_ipsec_tunnel_parent_transmit_bytes_total{name="tunnel_1",vdom="root"} 1.424856e+07
# HELP fortigate_ipsec_tunnel_receive_bytes_total Total number of bytes received over the IPsec tunnel
# TYPE fortigate_ipsec_tunnel_receive_bytes_total counter
fortigate_ipsec_tunnel_receive_bytes_total{name="tunnel_1-sub",p2serial="1",parent="tunnel_1",vdom="root"} 1.429824e+07
Expand Down Expand Up @@ -59,6 +65,12 @@ func TestVPNIPSecWithCommonP2Names(t *testing.T) {
}

em := `
# HELP fortigate_ipsec_tunnel_parent_receive_bytes_total Total bytes received over the IPsec tunnel (parent counter, accurate under NPU offload)
# TYPE fortigate_ipsec_tunnel_parent_receive_bytes_total counter
fortigate_ipsec_tunnel_parent_receive_bytes_total{name="My VPN",vdom="root"} 3.1301813185e+11
# HELP fortigate_ipsec_tunnel_parent_transmit_bytes_total Total bytes transmitted over the IPsec tunnel (parent counter, accurate under NPU offload)
# TYPE fortigate_ipsec_tunnel_parent_transmit_bytes_total counter
fortigate_ipsec_tunnel_parent_transmit_bytes_total{name="My VPN",vdom="root"} 1.34036710453e+11
# HELP fortigate_ipsec_tunnel_receive_bytes_total Total number of bytes received over the IPsec tunnel
# TYPE fortigate_ipsec_tunnel_receive_bytes_total counter
fortigate_ipsec_tunnel_receive_bytes_total{name="CommonP2",p2serial="22",parent="My VPN",vdom="root"} 0
Expand Down