Skip to content

Commit 6bb8141

Browse files
author
molegit9
committed
Fix(#7546): Include nftables information in Agent supportbundle
Signed-off-by: molegit9 <jangfish0925>
1 parent 3c81b27 commit 6bb8141

File tree

5 files changed

+79
-0
lines changed

5 files changed

+79
-0
lines changed

pkg/flowaggregator/test_2551044057.config

Whitespace-only changes.
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
flowCollector:
2+
enable: true
3+
address: 10.10.10.10:155
4+
clickHouse:
5+
enable: true
6+
s3Uploader:
7+
enable: true
8+
bucketName: test-bucket-name
9+
flowLogger:
10+
enable: true
11+
path: /tmp/antrea-flows.log
12+
flowCollector:
13+
enable: true
14+
address: 10.10.10.10:155
15+
clickHouse:
16+
enable: true
17+
s3Uploader:
18+
enable: true
19+
bucketName: test-bucket-name
20+
flowLogger:
21+
enable: true
22+
path: /tmp/antrea-flows.log
23+
clusterID: custom-cluster-id

pkg/flowaggregator/test_3823393030.config

Whitespace-only changes.
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
flowCollector:
2+
enable: true
3+
address: 10.10.10.10:155
4+
clickHouse:
5+
enable: true
6+
s3Uploader:
7+
enable: true
8+
bucketName: test-bucket-name
9+
flowLogger:
10+
enable: true
11+
path: /tmp/antrea-flows.log
12+
flowCollector:
13+
enable: true
14+
address: 10.10.10.10:155
15+
clickHouse:
16+
enable: true
17+
s3Uploader:
18+
enable: true
19+
bucketName: test-bucket-name
20+
flowLogger:
21+
enable: true
22+
path: /tmp/antrea-flows.log
23+
clusterID: custom-cluster-id

pkg/support/dump_others.go

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525

2626
"antrea.io/antrea/pkg/agent/util/iptables"
2727
"antrea.io/antrea/pkg/util/logdir"
28+
"antrea/pkg/agent/util/nftables"
2829
)
2930

3031
func (d *agentDumper) DumpLog(basedir string) error {
@@ -41,6 +42,9 @@ func (d *agentDumper) DumpHostNetworkInfo(basedir string) error {
4142
if err := d.dumpIPTables(basedir); err != nil {
4243
return err
4344
}
45+
if err := d.dumpNFTables(basedir); err != nil {
46+
return err
47+
}
4448
if err := d.dumpIPToolInfo(basedir); err != nil {
4549
return err
4650
}
@@ -59,6 +63,35 @@ func (d *agentDumper) dumpIPTables(basedir string) error {
5963
return writeFile(d.fs, filepath.Join(basedir, "iptables"), "iptables", data)
6064
}
6165

66+
func (d *agentDumper) dumpNFTables(basedir string) error {
67+
c, err := nftables.New(d.v4Enabled, d.v6Enabled)
68+
if err != nil {
69+
return err
70+
}
71+
72+
dumpTable := func(family knftables.Family, name string) error {
73+
output, err := c.GetInterface(family).DumpTable(context.TODO(), name)
74+
if err != nil {
75+
return fmt.Errorf("error when dumping %s nftables table %s: %w", family, name, err)
76+
}
77+
fileName := fmt.Sprintf("nftables-%s", family)
78+
return writeFile(d.fs, filepath.Join(basedir, fileName), fileName, output)
79+
}
80+
81+
if d.v4Enabled {
82+
if err := dumpTable(knftables.IPv4Family, "antrea"); err != nil {
83+
return err
84+
}
85+
}
86+
if d.v6Enabled {
87+
if err := dumpTable(knftables.IPv6Family, "antrea"); err != nil {
88+
return err
89+
}
90+
}
91+
92+
return nil
93+
}
94+
6295
func (d *agentDumper) dumpIPToolInfo(basedir string) error {
6396
dump := func(name string) error {
6497
output, err := d.executor.Command("ip", name).CombinedOutput()

0 commit comments

Comments
 (0)