updated dimensions according to recent kernel information
Costa Tsaousis (ktsaou) committed
Sep 16, 2016 at 01:08 UTC
f3f24ac2174dd48113edf92fd3ba9404e5f46d1e
2 files changed
+20
-33
conf.d/health.d/softnet.conf
-10
@@ -19,13 +19,3 @@
19
delay: down 30m multiplier 1.5 max 1h
20
info: number of times ksoftirq ran out of sysctl net.core.netdev_budget or time slice, with work remaining
21
to: sysadmin
22
-
23
- alarm: 1hour_cpu_lock_collisions
24
- on: system.softnet_stat
25
- lookup: sum -1h unaligned absolute of collisions
26
- units: collisions
27
- every: 1m
28
- warn: $this > 0
29
- delay: down 30m multiplier 1.5 max 1h
30
- info: number of times two cpus collided trying to get a network device queue lock
31
- to: sysadmin
src/proc_net_softnet_stat.c
+20
-23
@@ -1,24 +1,15 @@
1
#include "common.h"
2
3
static inline char *softnet_column_name(uint32_t column) {
4
- static char buf[4] = "c00";
5
- char *s;
6
-
4
switch(column) {
8
- case 0: s = "total"; break;
9
- case 1: s = "dropped"; break;
10
- case 2: s = "squeezed"; break;
11
- case 8: s = "collisions"; break;
12
- default: {
13
- uint32_t c = column + 1;
14
- buf[1] = '0' + ( c / 10); c = c % 10;
15
- buf[2] = '0' + c;
16
- s = buf;
17
- break;
18
- }
5
+ // https://github.com/torvalds/linux/blob/a7fd20d1c476af4563e66865213474a2f9f473a4/net/core/net-procfs.c#L161-L166
6
+ case 0: return "processed";
7
+ case 1: return "dropped";
8
+ case 2: return "squeezed";
9
+ case 9: return "received_rps";
10
+ case 10: return "flow_limit_count";
11
+ default: return NULL;
12
}
20
-
21
- return s;
13
}
14
15
int do_proc_net_softnet_stat(int update_every, unsigned long long dt) {
@@ -69,9 +60,11 @@ int do_proc_net_softnet_stat(int update_every, unsigned long long dt) {
60
if(words > allocated_columns) words = allocated_columns;
61
62
for(w = 0; w < words ; w++) {
72
- uint32_t t = strtoul(procfile_lineword(ff, l, w), NULL, 16);
73
- data[w] += t;
74
- data[((l + 1) * allocated_columns) + w] = t;
63
+ if(unlikely(softnet_column_name(w))) {
64
+ uint32_t t = strtoul(procfile_lineword(ff, l, w), NULL, 16);
65
+ data[w] += t;
66
+ data[((l + 1) * allocated_columns) + w] = t;
67
+ }
68
}
69
}
70
@@ -86,12 +79,14 @@ int do_proc_net_softnet_stat(int update_every, unsigned long long dt) {
79
if(!st) {
80
st = rrdset_create("system", "softnet_stat", NULL, "softnet_stat", NULL, "System softnet_stat", "events/s", 955, update_every, RRDSET_TYPE_LINE);
81
for(w = 0; w < allocated_columns ;w++)
89
- rrddim_add(st, softnet_column_name(w), NULL, 1, 1, RRDDIM_INCREMENTAL);
82
+ if(unlikely(softnet_column_name(w)))
83
+ rrddim_add(st, softnet_column_name(w), NULL, 1, 1, RRDDIM_INCREMENTAL);
84
}
85
else rrdset_next(st);
86
87
for(w = 0; w < allocated_columns ;w++)
94
- rrddim_set(st, softnet_column_name(w), data[w]);
88
+ if(unlikely(softnet_column_name(w)))
89
+ rrddim_set(st, softnet_column_name(w), data[w]);
90
91
rrdset_done(st);
92
@@ -107,12 +102,14 @@ int do_proc_net_softnet_stat(int update_every, unsigned long long dt) {
102
103
st = rrdset_create("cpu", id, NULL, "softnet_stat", NULL, title, "events/s", 4101 + l, update_every, RRDSET_TYPE_LINE);
104
for(w = 0; w < allocated_columns ;w++)
110
- rrddim_add(st, softnet_column_name(w), NULL, 1, 1, RRDDIM_INCREMENTAL);
105
+ if(unlikely(softnet_column_name(w)))
106
+ rrddim_add(st, softnet_column_name(w), NULL, 1, 1, RRDDIM_INCREMENTAL);
107
}
108
else rrdset_next(st);
109
110
for(w = 0; w < allocated_columns ;w++)
115
- rrddim_set(st, softnet_column_name(w), data[((l + 1) * allocated_columns) + w]);
111
+ if(unlikely(softnet_column_name(w)))
112
+ rrddim_set(st, softnet_column_name(w), data[((l + 1) * allocated_columns) + w]);
113
114
rrdset_done(st);
115
}