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

Jump to bottom

Fix telemetry #237

Merged
merged 1 commit into from
Mar 24, 2021
Merged

Fix telemetry #237

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions conf/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,21 +68,21 @@ def parse(self, ifaces):

# Enable hardware checksum
try:
self.hwcksum = bool(self.conf["hwcksum"] == 'True' or self.conf["hwcksum"] == 'true')
self.hwcksum = bool(self.conf["hwcksum"])
except KeyError:
print('hwcksum not set, using default software fallback')

# Enable DDP
try:
self.ddp = bool(self.conf["ddp"] == 'True' or self.conf["ddp"] == 'true')
self.ddp = bool(self.conf["ddp"])
except KeyError:
print('ddp not set, using default software fallback')

# Telemtrics
# See this link for details:
# https://github.com/NetSys/bess/blob/master/bessctl/module_tests/timestamp.py
try:
self.measure = bool(self.conf["measure"] == 'True' or self.conf["measure"] == 'true')
self.measure = self.conf["measure"]
except KeyError:
print('measure value not set. Not installing Measure module.')

Expand Down Expand Up @@ -142,6 +142,6 @@ def parse(self, ifaces):

# Network Token Function
try:
self.enable_ntf = bool(self.conf['enable_ntf'] == 'True' or self.conf['enable_ntf'] == 'true')
self.enable_ntf = bool(self.conf['enable_ntf'])
except KeyError:
print('Network Token Function disabled')
6 changes: 3 additions & 3 deletions conf/upf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
"": "ip_frag_with_eth_mtu: 1518",

"": "Enable hardware offload of checksum. Might disable vector PMD",
"": "hwcksum: True",
"hwcksum": false,

"": "Enable Intel Dynamic Device Personalization (DDP)",
"": "ddp: True",
"ddp": true,

"": "Telemetrics-See this link for details: https://github.com/NetSys/bess/blob/master/bessctl/module_tests/timestamp.py",
"measure": true,
Expand Down Expand Up @@ -64,7 +64,7 @@
"nb_dst_ip": "172.17.0.1",
"" : "nb_dst_ip: CPHostname",
"hostname": "spgwc",
"prom_port": "8089"
"prom_port": "8080"
},

"": "p4rtc interface settings",
Expand Down
5 changes: 0 additions & 5 deletions pfcpiface/bess.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,11 +153,6 @@ func (b *bess) getPortStats(ifname string) *pb.GetPortStatsResponse {
}

func (b *bess) portStats(uc *upfCollector, ch chan<- prometheus.Metric) {
// When operating in sim mode there are no BESS ports
if uc.upf.simInfo != nil {
return
}

portstats := func(ifaceLabel, ifaceName string) {
packets := func(packets uint64, direction string) {
p := prometheus.MustNewConstMetric(
Expand Down