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

add net.perf.conntrackAllowanceAvailable metric #121

Merged
merged 1 commit into from
Feb 2, 2024
Merged

add net.perf.conntrackAllowanceAvailable metric #121

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
13 changes: 13 additions & 0 deletions lib/ethtool.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,19 @@ class Ethtool {
continue;
}

found = stat_line.find("conntrack_allowance_available:");
if (found != std::string::npos) {
auto metric = registry_->GetGauge(id_for("net.perf.conntrackAllowanceAvailable", iface, nullptr, net_tags_));
std::vector<std::string> stat_fields = absl::StrSplit(stat_line, ':');
try {
auto number = std::stoll(stat_fields[1]);
metric->Set(number);
} catch (const std::invalid_argument& e) {
atlasagent::Logger()->error("Unable to parse {} as a number: {}", stat_fields[1], e.what());
}
continue;
}

found = stat_line.find("linklocal_allowance_exceeded:");
if (found != std::string::npos) {
auto metric = registry_->GetMonotonicCounter(id_for("net.perf.linklocalAllowanceExceeded", iface, nullptr, net_tags_));
Expand Down
8 changes: 6 additions & 2 deletions lib/ethtool_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,15 @@ TEST(Ethtool, Stats) {
" bw_out_allowance_exceeded: 0\n",
" pps_allowance_exceeded: 0\n",
" conntrack_allowance_exceeded: 0\n",
" conntrack_allowance_available: 100\n",
" linklocal_allowance_exceeded: 0\n",
" queue_0_tx_cnt: 368940\n",
" queue_0_tx_bytes: 126196057\n"};

ethtool.stats(first_sample, "eth0");
auto ms = registry.Measurements();
EXPECT_EQ(ms.size(), 0);
// one gauge, the rest mono counters
EXPECT_EQ(ms.size(), 1);

std::vector<std::string> second_sample = {
"NIC statistics:\n",
Expand All @@ -50,6 +52,7 @@ TEST(Ethtool, Stats) {
" bw_in_allowance_exceeded: 5\n",
" bw_out_allowance_exceeded: 10\n",
" conntrack_allowance_exceeded: 15\n",
" conntrack_allowance_available: 110\n",
" linklocal_allowance_exceeded: 20\n",
" pps_allowance_exceeded: 25\n",
" queue_0_tx_cnt: 368940\n",
Expand All @@ -58,13 +61,14 @@ TEST(Ethtool, Stats) {
// we need two samples, because these are all monotonic counters
ethtool.stats(second_sample, "eth0");
ms = registry.Measurements();
EXPECT_EQ(ms.size(), 5);
EXPECT_EQ(ms.size(), 6);

auto map = measurements_to_map(ms, "");
std::unordered_map<std::string, double> expected = {
{"net.perf.bwAllowanceExceeded|count|in", 5},
{"net.perf.bwAllowanceExceeded|count|out", 10},
{"net.perf.conntrackAllowanceExceeded|count", 15},
{"net.perf.conntrackAllowanceAvailable|gauge", 110},
{"net.perf.linklocalAllowanceExceeded|count", 20},
{"net.perf.ppsAllowanceExceeded|count", 25}};
EXPECT_EQ(map, expected);
Expand Down
Loading