@cryptotaxi247 / netdata-1 / commits / 61bf2b17a

fix proc netstat metrics (#16122)

Ilya Mashchenko committed Oct 5, 2023 at 16:36 UTC 61bf2b17a84b8fcce7e0a864fcce772a49a246fe
7 files changed +327 -350
collectors/all.h
+64 -53
@@ -266,65 +266,76 @@
266
267 // IP STACK
268
269 -#define NETDATA_CHART_PRIO_IP_ERRORS 4100
270 -#define NETDATA_CHART_PRIO_IP_TCP_CONNABORTS 4210
271 -#define NETDATA_CHART_PRIO_IP_TCP_SYN_QUEUE 4215
272 -#define NETDATA_CHART_PRIO_IP_TCP_ACCEPT_QUEUE 4216
273 -#define NETDATA_CHART_PRIO_IP_TCP_REORDERS 4220
274 -#define NETDATA_CHART_PRIO_IP_TCP_OFO 4250
275 -#define NETDATA_CHART_PRIO_IP_TCP_SYNCOOKIES 4260
276 -#define NETDATA_CHART_PRIO_IP_TCP_MEM 4290
277 -#define NETDATA_CHART_PRIO_IP_BCAST 4500
278 -#define NETDATA_CHART_PRIO_IP_BCAST_PACKETS 4510
279 -#define NETDATA_CHART_PRIO_IP_MCAST 4600
280 -#define NETDATA_CHART_PRIO_IP_MCAST_PACKETS 4610
281 -#define NETDATA_CHART_PRIO_IP_ECN 4700
269 +#define NETDATA_CHART_PRIO_IP_TCP_PACKETS 4200
270 +#define NETDATA_CHART_PRIO_IP_TCP_ERRORS 4210
271 +#define NETDATA_CHART_PRIO_IP_TCP_ESTABLISHED_CONNS 4220
272 +#define NETDATA_CHART_PRIO_IP_TCP_OPENS 4220
273 +#define NETDATA_CHART_PRIO_IP_TCP_HANDSHAKE 4230
274 +#define NETDATA_CHART_PRIO_IP_TCP_CONNABORTS 4240
275 +#define NETDATA_CHART_PRIO_IP_TCP_SYN_QUEUE 4250
276 +#define NETDATA_CHART_PRIO_IP_TCP_ACCEPT_QUEUE 4260
277 +#define NETDATA_CHART_PRIO_IP_TCP_REORDERS 4270
278 +#define NETDATA_CHART_PRIO_IP_TCP_OFO 4280
279 +#define NETDATA_CHART_PRIO_IP_TCP_SYNCOOKIES 4290
280 +#define NETDATA_CHART_PRIO_IP_TCP_MEM_PRESSURE 4300
281 +#define NETDATA_CHART_PRIO_IP_SOCKETS 4310
282
283 // IPv4
284
285 -#define NETDATA_CHART_PRIO_IPV4_SOCKETS 5100
286 -#define NETDATA_CHART_PRIO_IPV4_PACKETS 5130
287 -#define NETDATA_CHART_PRIO_IPV4_ERRORS 5150
288 -#define NETDATA_CHART_PRIO_IPV4_ICMP 5170
289 -#define NETDATA_CHART_PRIO_IPV4_TCP 5200
290 -#define NETDATA_CHART_PRIO_IPV4_TCP_SOCKETS 5201
291 -#define NETDATA_CHART_PRIO_IPV4_TCP_MEM 5290
292 -#define NETDATA_CHART_PRIO_IPV4_UDP 5300
293 -#define NETDATA_CHART_PRIO_IPV4_UDP_MEM 5390
294 -#define NETDATA_CHART_PRIO_IPV4_UDPLITE 5400
285 +#define NETDATA_CHART_PRIO_IPV4_PACKETS 5000
286 +#define NETDATA_CHART_PRIO_IPV4_ERRORS 5050
287 +#define NETDATA_CHART_PRIO_IPV4_BCAST 5100
288 +#define NETDATA_CHART_PRIO_IPV4_BCAST_PACKETS 5105
289 +#define NETDATA_CHART_PRIO_IPV4_MCAST 5150
290 +#define NETDATA_CHART_PRIO_IPV4_MCAST_PACKETS 5155
291 +#define NETDATA_CHART_PRIO_IPV4_TCP_SOCKETS 5180
292 +#define NETDATA_CHART_PRIO_IPV4_TCP_SOCKETS_MEM 5185
293 +#define NETDATA_CHART_PRIO_IPV4_ICMP_PACKETS 5200
294 +#define NETDATA_CHART_PRIO_IPV4_ICMP_MESSAGES 5205
295 +#define NETDATA_CHART_PRIO_IPV4_ICMP_ERRORS 5210
296 +#define NETDATA_CHART_PRIO_IPV4_UDP_PACKETS 5250
297 +#define NETDATA_CHART_PRIO_IPV4_UDP_ERRORS 5255
298 +#define NETDATA_CHART_PRIO_IPV4_UDP_SOCKETS 5260
299 +#define NETDATA_CHART_PRIO_IPV4_UDP_SOCKETS_MEM 5265
300 +#define NETDATA_CHART_PRIO_IPV4_UDPLITE_PACKETS 5300
301 +#define NETDATA_CHART_PRIO_IPV4_UDPLITE_ERRORS 5305
302 +#define NETDATA_CHART_PRIO_IPV4_UDPLITE_SOCKETS 5310
303 +#define NETDATA_CHART_PRIO_IPV4_ECN 5350
304 +#define NETDATA_CHART_PRIO_IPV4_FRAGMENTS_IN 5400
305 +#define NETDATA_CHART_PRIO_IPV4_FRAGMENTS_OUT 5405
306 +#define NETDATA_CHART_PRIO_IPV4_FRAGMENTS_SOCKETS 5410
307 +#define NETDATA_CHART_PRIO_IPV4_FRAGMENTS_SOCKETS_MEM 5415
308 #define NETDATA_CHART_PRIO_IPV4_RAW 5450
296 -#define NETDATA_CHART_PRIO_IPV4_FRAGMENTS 5460
297 -#define NETDATA_CHART_PRIO_IPV4_FRAGMENTS_MEM 5470
309
310 // IPv6
300 -
301 -#define NETDATA_CHART_PRIO_IPV6_PACKETS 6200
302 -#define NETDATA_CHART_PRIO_IPV6_ECT 6210
303 -#define NETDATA_CHART_PRIO_IPV6_ERRORS 6300
304 -#define NETDATA_CHART_PRIO_IPV6_FRAGMENTS 6400
305 -#define NETDATA_CHART_PRIO_IPV6_FRAGSOUT 6401
306 -#define NETDATA_CHART_PRIO_IPV6_FRAGSIN 6402
307 -#define NETDATA_CHART_PRIO_IPV6_TCP 6500
308 -#define NETDATA_CHART_PRIO_IPV6_UDP 6600
309 -#define NETDATA_CHART_PRIO_IPV6_UDP_PACKETS 6601
310 -#define NETDATA_CHART_PRIO_IPV6_UDP_ERRORS 6610
311 -#define NETDATA_CHART_PRIO_IPV6_UDPLITE 6700
312 -#define NETDATA_CHART_PRIO_IPV6_UDPLITE_PACKETS 6701
313 -#define NETDATA_CHART_PRIO_IPV6_UDPLITE_ERRORS 6710
314 -#define NETDATA_CHART_PRIO_IPV6_RAW 6800
315 -#define NETDATA_CHART_PRIO_IPV6_BCAST 6840
316 -#define NETDATA_CHART_PRIO_IPV6_MCAST 6850
317 -#define NETDATA_CHART_PRIO_IPV6_MCAST_PACKETS 6851
318 -#define NETDATA_CHART_PRIO_IPV6_ICMP 6900
319 -#define NETDATA_CHART_PRIO_IPV6_ICMP_REDIR 6910
320 -#define NETDATA_CHART_PRIO_IPV6_ICMP_ERRORS 6920
321 -#define NETDATA_CHART_PRIO_IPV6_ICMP_ECHOS 6930
322 -#define NETDATA_CHART_PRIO_IPV6_ICMP_GROUPMEMB 6940
323 -#define NETDATA_CHART_PRIO_IPV6_ICMP_ROUTER 6950
324 -#define NETDATA_CHART_PRIO_IPV6_ICMP_NEIGHBOR 6960
325 -#define NETDATA_CHART_PRIO_IPV6_ICMP_LDV2 6970
326 -#define NETDATA_CHART_PRIO_IPV6_ICMP_TYPES 6980
327 -
311 +#define NETDATA_CHART_PRIO_IPV6_PACKETS 6000
312 +#define NETDATA_CHART_PRIO_IPV6_ERRORS 6005
313 +#define NETDATA_CHART_PRIO_IPV6_BCAST 6050
314 +#define NETDATA_CHART_PRIO_IPV6_MCAST 6100
315 +#define NETDATA_CHART_PRIO_IPV6_MCAST_PACKETS 6105
316 +#define NETDATA_CHART_PRIO_IPV6_TCP_SOCKETS 6140
317 +#define NETDATA_CHART_PRIO_IPV6_ICMP 6150
318 +#define NETDATA_CHART_PRIO_IPV6_ICMP_REDIR 6155
319 +#define NETDATA_CHART_PRIO_IPV6_ICMP_ERRORS 6160
320 +#define NETDATA_CHART_PRIO_IPV6_ICMP_ECHOS 6165
321 +#define NETDATA_CHART_PRIO_IPV6_ICMP_GROUPMEMB 6170
322 +#define NETDATA_CHART_PRIO_IPV6_ICMP_ROUTER 6180
323 +#define NETDATA_CHART_PRIO_IPV6_ICMP_NEIGHBOR 6185
324 +#define NETDATA_CHART_PRIO_IPV6_ICMP_LDV2 6190
325 +#define NETDATA_CHART_PRIO_IPV6_ICMP_TYPES 6195
326 +#define NETDATA_CHART_PRIO_IPV6_UDP 6200
327 +#define NETDATA_CHART_PRIO_IPV6_UDP_PACKETS 6205
328 +#define NETDATA_CHART_PRIO_IPV6_UDP_ERRORS 6210
329 +#define NETDATA_CHART_PRIO_IPV6_UDP_SOCKETS 6215
330 +#define NETDATA_CHART_PRIO_IPV6_UDPLITE 6250
331 +#define NETDATA_CHART_PRIO_IPV6_UDPLITE_PACKETS 6255
332 +#define NETDATA_CHART_PRIO_IPV6_UDPLITE_ERRORS 6260
333 +#define NETDATA_CHART_PRIO_IPV6_UDPLITE_SOCKETS 6265
334 +#define NETDATA_CHART_PRIO_IPV6_ECT 6300
335 +#define NETDATA_CHART_PRIO_IPV6_FRAGSIN 6350
336 +#define NETDATA_CHART_PRIO_IPV6_FRAGSOUT 6355
337 +#define NETDATA_CHART_PRIO_IPV6_FRAGMENTS_SOCKETS 6360
338 +#define NETDATA_CHART_PRIO_IPV6_RAW_SOCKETS 6400
339
340 // Network interfaces
341
collectors/proc.plugin/metadata.yaml
+147 -153
@@ -3140,29 +3140,29 @@ modules:
3140 os: "linux"
3141 - name: tcp_connections
3142 link: https://github.com/netdata/netdata/blob/master/health/health.d/tcp_conn.conf
3143 - metric: ipv4.tcpsock
3144 - info: IPv4 TCP connections utilization
3143 + metric: ip.tcpsock
3144 + info: TCP connections utilization
3145 os: "linux"
3146 - - name: 1m_ipv4_tcp_resets_sent
3146 + - name: 1m_ip_tcp_resets_sent
3147 link: https://github.com/netdata/netdata/blob/master/health/health.d/tcp_resets.conf
3148 - metric: ipv4.tcphandshake
3148 + metric: ip.tcphandshake
3149 info: average number of sent TCP RESETS over the last minute
3150 os: "linux"
3151 - - name: 10s_ipv4_tcp_resets_sent
3151 + - name: 10s_ip_tcp_resets_sent
3152 link: https://github.com/netdata/netdata/blob/master/health/health.d/tcp_resets.conf
3153 - metric: ipv4.tcphandshake
3153 + metric: ip.tcphandshake
3154 info:
3155 average number of sent TCP RESETS over the last 10 seconds. This can indicate a port scan, or that a service running on this host has
3156 crashed. Netdata will not send a clear notification for this alarm.
3157 os: "linux"
3158 - - name: 1m_ipv4_tcp_resets_received
3158 + - name: 1m_ip_tcp_resets_received
3159 link: https://github.com/netdata/netdata/blob/master/health/health.d/tcp_resets.conf
3160 - metric: ipv4.tcphandshake
3160 + metric: ip.tcphandshake
3161 info: average number of received TCP RESETS over the last minute
3162 os: "linux freebsd"
3163 - - name: 10s_ipv4_tcp_resets_received
3163 + - name: 10s_ip_tcp_resets_received
3164 link: https://github.com/netdata/netdata/blob/master/health/health.d/tcp_resets.conf
3165 - metric: ipv4.tcphandshake
3165 + metric: ip.tcphandshake
3166 info:
3167 average number of received TCP RESETS over the last 10 seconds. This can be an indication that a service this host needs has crashed.
3168 Netdata will not send a clear notification for this alarm.
@@ -3189,57 +3189,12 @@ modules:
3189 labels: []
3190 metrics:
3191 - name: system.ip
3192 - description: IP Bandwidth
3192 + description: IPv4 Bandwidth
3193 unit: "kilobits/s"
3194 chart_type: area
3195 dimensions:
3196 - name: received
3197 - name: sent
3198 - - name: ip.inerrors
3199 - description: IP Input Errors
3200 - unit: "packets/s"
3201 - chart_type: line
3202 - dimensions:
3203 - - name: noroutes
3204 - - name: truncated
3205 - - name: checksum
3206 - - name: ip.mcast
3207 - description: IP Multicast Bandwidth
3208 - unit: "kilobits/s"
3209 - chart_type: area
3210 - dimensions:
3211 - - name: received
3212 - - name: sent
3213 - - name: ip.bcast
3214 - description: IP Broadcast Bandwidth
3215 - unit: "kilobits/s"
3216 - chart_type: area
3217 - dimensions:
3218 - - name: received
3219 - - name: sent
3220 - - name: ip.mcastpkts
3221 - description: IP Multicast Packets
3222 - unit: "packets/s"
3223 - chart_type: line
3224 - dimensions:
3225 - - name: received
3226 - - name: sent
3227 - - name: ip.bcastpkts
3228 - description: IP Broadcast Packets
3229 - unit: "packets/s"
3230 - chart_type: line
3231 - dimensions:
3232 - - name: received
3233 - - name: sent
3234 - - name: ip.ecnpkts
3235 - description: IP ECN Statistics
3236 - unit: "packets/s"
3237 - chart_type: line
3238 - dimensions:
3239 - - name: CEP
3240 - - name: NoECTP
3241 - - name: ECTP0
3242 - - name: ECTP1
3198 - name: ip.tcpmemorypressures
3199 description: TCP Memory Pressures
3200 unit: "events/s"
@@ -3297,31 +3252,52 @@ modules:
3252 dimensions:
3253 - name: overflows
3254 - name: drops
3300 - - name: ipv4.packets
3301 - description: IPv4 Packets
3255 + - name: ip.tcpsock
3256 + description: IPv4 TCP Connections
3257 + unit: "active connections"
3258 + chart_type: line
3259 + dimensions:
3260 + - name: connections
3261 + - name: ip.tcppackets
3262 + description: IPv4 TCP Packets
3263 unit: "packets/s"
3264 chart_type: line
3265 dimensions:
3266 - name: received
3267 - name: sent
3307 - - name: forwarded
3308 - - name: delivered
3309 - - name: ipv4.fragsout
3310 - description: IPv4 Fragments Sent
3268 + - name: ip.tcperrors
3269 + description: IPv4 TCP Errors
3270 unit: "packets/s"
3271 chart_type: line
3272 dimensions:
3314 - - name: ok
3315 - - name: failed
3316 - - name: created
3317 - - name: ipv4.fragsin
3318 - description: IPv4 Fragments Reassembly
3273 + - name: InErrs
3274 + - name: InCsumErrors
3275 + - name: RetransSegs
3276 + - name: ip.tcpopens
3277 + description: IPv4 TCP Opens
3278 + unit: "connections/s"
3279 + chart_type: line
3280 + dimensions:
3281 + - name: active
3282 + - name: passive
3283 + - name: ip.tcphandshake
3284 + description: IPv4 TCP Handshake Issues
3285 + unit: "events/s"
3286 + chart_type: line
3287 + dimensions:
3288 + - name: EstabResets
3289 + - name: OutRsts
3290 + - name: AttemptFails
3291 + - name: SynRetrans
3292 + - name: ipv4.packets
3293 + description: IPv4 Packets
3294 unit: "packets/s"
3295 chart_type: line
3296 dimensions:
3322 - - name: ok
3323 - - name: failed
3324 - - name: all
3297 + - name: received
3298 + - name: sent
3299 + - name: forwarded
3300 + - name: delivered
3301 - name: ipv4.errors
3302 description: IPv4 Errors
3303 unit: "packets/s"
@@ -3329,25 +3305,47 @@ modules:
3305 dimensions:
3306 - name: InDiscards
3307 - name: OutDiscards
3332 - - name: InHdrErrors
3308 + - name: InNoRoutes
3309 - name: OutNoRoutes
3310 + - name: InHdrErrors
3311 - name: InAddrErrors
3335 - - name: InUnknownProtos
3336 - - name: ipv4.icmp
3337 - description: IPv4 ICMP Packets
3312 + - name: InTruncatedPkts
3313 + - name: InCsumErrors
3314 + - name: ipc4.bcast
3315 + description: IP Broadcast Bandwidth
3316 + unit: "kilobits/s"
3317 + chart_type: area
3318 + dimensions:
3319 + - name: received
3320 + - name: sent
3321 + - name: ipv4.bcastpkts
3322 + description: IP Broadcast Packets
3323 unit: "packets/s"
3324 chart_type: line
3325 dimensions:
3326 - name: received
3327 - name: sent
3343 - - name: ipv4.icmp_errors
3344 - description: IPv4 ICMP Errors
3328 + - name: ipv4.mcast
3329 + description: IPv4 Multicast Bandwidth
3330 + unit: "kilobits/s"
3331 + chart_type: area
3332 + dimensions:
3333 + - name: received
3334 + - name: sent
3335 + - name: ipv4.mcastpkts
3336 + description: IP Multicast Packets
3337 unit: "packets/s"
3338 chart_type: line
3339 dimensions:
3348 - - name: InErrors
3349 - - name: OutErrors
3350 - - name: InCsumErrors
3340 + - name: received
3341 + - name: sent
3342 + - name: ipv4.icmp
3343 + description: IPv4 ICMP Packets
3344 + unit: "packets/s"
3345 + chart_type: line
3346 + dimensions:
3347 + - name: received
3348 + - name: sent
3349 - name: ipv4.icmpmsg
3350 description: IPv4 ICMP Messages
3351 unit: "packets/s"
@@ -3373,43 +3371,14 @@ modules:
3371 - name: OutTimestamps
3372 - name: InTimestampReps
3373 - name: OutTimestampReps
3376 - - name: ipv4.tcpsock
3377 - description: IPv4 TCP Connections
3378 - unit: "active connections"
3379 - chart_type: line
3380 - dimensions:
3381 - - name: connections
3382 - - name: ipv4.tcppackets
3383 - description: IPv4 TCP Packets
3384 - unit: "packets/s"
3385 - chart_type: line
3386 - dimensions:
3387 - - name: received
3388 - - name: sent
3389 - - name: ipv4.tcperrors
3390 - description: IPv4 TCP Errors
3374 + - name: ipv4.icmp_errors
3375 + description: IPv4 ICMP Errors
3376 unit: "packets/s"
3377 chart_type: line
3378 dimensions:
3394 - - name: InErrs
3379 + - name: InErrors
3380 + - name: OutErrors
3381 - name: InCsumErrors
3396 - - name: RetransSegs
3397 - - name: ipv4.tcpopens
3398 - description: IPv4 TCP Opens
3399 - unit: "connections/s"
3400 - chart_type: line
3401 - dimensions:
3402 - - name: active
3403 - - name: passive
3404 - - name: ipv4.tcphandshake
3405 - description: IPv4 TCP Handshake Issues
3406 - unit: "events/s"
3407 - chart_type: line
3408 - dimensions:
3409 - - name: EstabResets
3410 - - name: OutRsts
3411 - - name: AttemptFails
3412 - - name: SynRetrans
3382 - name: ipv4.udppackets
3383 description: IPv4 UDP Packets
3384 unit: "packets/s"
@@ -3446,6 +3415,31 @@ modules:
3415 - name: NoPorts
3416 - name: InCsumErrors
3417 - name: IgnoredMulti
3418 + - name: ipv4.ecnpkts
3419 + description: IP ECN Statistics
3420 + unit: "packets/s"
3421 + chart_type: line
3422 + dimensions:
3423 + - name: CEP
3424 + - name: NoECTP
3425 + - name: ECTP0
3426 + - name: ECTP1
3427 + - name: ipv4.fragsin
3428 + description: IPv4 Fragments Reassembly
3429 + unit: "packets/s"
3430 + chart_type: line
3431 + dimensions:
3432 + - name: ok
3433 + - name: failed
3434 + - name: all
3435 + - name: ipv4.fragsout
3436 + description: IPv4 Fragments Sent
3437 + unit: "packets/s"
3438 + chart_type: line
3439 + dimensions:
3440 + - name: ok
3441 + - name: failed
3442 + - name: created
3443 - name: system.ipv6
3444 description: IPv6 Bandwidth
3445 unit: "kilobits/s"
@@ -3453,7 +3447,7 @@ modules:
3447 dimensions:
3448 - name: received
3449 - name: sent
3456 - - name: system.ipv6
3450 + - name: ipv6.packets
3451 description: IPv6 Packets
3452 unit: "packets/s"
3453 chart_type: line
@@ -3462,23 +3456,6 @@ modules:
3456 - name: sent
3457 - name: forwarded
3458 - name: delivers
3465 - - name: ipv6.fragsout
3466 - description: IPv6 Fragments Sent
3467 - unit: "packets/s"
3468 - chart_type: line
3469 - dimensions:
3470 - - name: ok
3471 - - name: failed
3472 - - name: all
3473 - - name: ipv6.fragsin
3474 - description: IPv6 Fragments Reassembly
3475 - unit: "packets/s"
3476 - chart_type: line
3477 - dimensions:
3478 - - name: ok
3479 - - name: failed
3480 - - name: timeout
3481 - - name: all
3459 - name: ipv6.errors
3460 description: IPv6 Errors
3461 unit: "packets/s"
@@ -3493,6 +3470,27 @@ modules:
3470 - name: InTruncatedPkts
3471 - name: InNoRoutes
3472 - name: OutNoRoutes
3473 + - name: ipv6.bcast
3474 + description: IPv6 Broadcast Bandwidth
3475 + unit: "kilobits/s"
3476 + chart_type: area
3477 + dimensions:
3478 + - name: received
3479 + - name: sent
3480 + - name: ipv6.mcast
3481 + description: IPv6 Multicast Bandwidth
3482 + unit: "kilobits/s"
3483 + chart_type: area
3484 + dimensions:
3485 + - name: received
3486 + - name: sent
3487 + - name: ipv6.mcastpkts
3488 + description: IPv6 Multicast Packets
3489 + unit: "packets/s"
3490 + chart_type: line
3491 + dimensions:
3492 + - name: received
3493 + - name: sent
3494 - name: ipv6.udppackets
3495 description: IPv6 UDP Packets
3496 unit: "packets/s"
@@ -3528,27 +3526,6 @@ modules:
3526 - name: InErrors
3527 - name: NoPorts
3528 - name: InCsumErrors
3531 - - name: ipv6.mcast
3532 - description: IPv6 Multicast Bandwidth
3533 - unit: "kilobits/s"
3534 - chart_type: area
3535 - dimensions:
3536 - - name: received
3537 - - name: sent
3538 - - name: ipv6.bcast
3539 - description: IPv6 Broadcast Bandwidth
3540 - unit: "kilobits/s"
3541 - chart_type: area
3542 - dimensions:
3543 - - name: received
3544 - - name: sent
3545 - - name: ipv6.mcastpkts
3546 - description: IPv6 Multicast Packets
3547 - unit: "packets/s"
3548 - chart_type: line
3549 - dimensions:
3550 - - name: received
3551 - - name: sent
3529 - name: ipv6.icmp
3530 description: IPv6 ICMP Messages
3531 unit: "messages/s"
@@ -3657,6 +3634,23 @@ modules:
3634 - name: InECT1Pkts
3635 - name: InECT0Pkts
3636 - name: InCEPkts
3637 + - name: ipv6.fragsin
3638 + description: IPv6 Fragments Reassembly
3639 + unit: "packets/s"
3640 + chart_type: line
3641 + dimensions:
3642 + - name: ok
3643 + - name: failed
3644 + - name: timeout
3645 + - name: all
3646 + - name: ipv6.fragsout
3647 + description: IPv6 Fragments Sent
3648 + unit: "packets/s"
3649 + chart_type: line
3650 + dimensions:
3651 + - name: ok
3652 + - name: failed
3653 + - name: all
3654 - meta:
3655 plugin_name: proc.plugin
3656 module_name: /proc/net/sockstat
@@ -3734,8 +3728,8 @@ modules:
3728 description: ""
3729 labels: []
3730 metrics:
3737 - - name: ipv4.sockstat_sockets
3738 - description: IPv4 Sockets Used
3731 + - name: ip.sockstat_sockets
3732 + description: Sockets used for all address families
3733 unit: "sockets"
3734 chart_type: line
3735 dimensions:
collectors/proc.plugin/proc_net_netstat.c
+89 -117
@@ -2,9 +2,9 @@
2
3 #include "plugin_proc.h"
4
5 -#define RRD_TYPE_NET_NETSTAT "ip"
6 -#define RRD_TYPE_NET_SNMP "ipv4"
7 -#define RRD_TYPE_NET_SNMP6 "ipv6"
5 +#define RRD_TYPE_NET_IP "ip"
6 +#define RRD_TYPE_NET_IP4 "ipv4"
7 +#define RRD_TYPE_NET_IP6 "ipv6"
8 #define PLUGIN_PROC_MODULE_NETSTAT_NAME "/proc/net/netstat"
9 #define CONFIG_SECTION_PLUGIN_PROC_NETSTAT "plugin:" PLUGIN_PROC_CONFIG_NAME ":" PLUGIN_PROC_MODULE_NETSTAT_NAME
10
@@ -424,7 +424,7 @@ static void do_proc_net_snmp6(int update_every) {
424
425 if(unlikely(!st)) {
426 st = rrdset_create_localhost(
427 - RRD_TYPE_NET_SNMP6
427 + RRD_TYPE_NET_IP6
428 , "packets"
429 , NULL
430 , "packets"
@@ -464,7 +464,7 @@ static void do_proc_net_snmp6(int update_every) {
464
465 if(unlikely(!st)) {
466 st = rrdset_create_localhost(
467 - RRD_TYPE_NET_SNMP6
467 + RRD_TYPE_NET_IP6
468 , "fragsout"
469 , NULL
470 , "fragments6"
@@ -506,7 +506,7 @@ static void do_proc_net_snmp6(int update_every) {
506
507 if(unlikely(!st)) {
508 st = rrdset_create_localhost(
509 - RRD_TYPE_NET_SNMP6
509 + RRD_TYPE_NET_IP6
510 , "fragsin"
511 , NULL
512 , "fragments6"
@@ -557,7 +557,7 @@ static void do_proc_net_snmp6(int update_every) {
557
558 if(unlikely(!st)) {
559 st = rrdset_create_localhost(
560 - RRD_TYPE_NET_SNMP6
560 + RRD_TYPE_NET_IP6
561 , "errors"
562 , NULL
563 , "errors"
@@ -605,7 +605,7 @@ static void do_proc_net_snmp6(int update_every) {
605
606 if(unlikely(!st)) {
607 st = rrdset_create_localhost(
608 - RRD_TYPE_NET_SNMP6
608 + RRD_TYPE_NET_IP6
609 , "udppackets"
610 , NULL
611 , "udp6"
@@ -647,7 +647,7 @@ static void do_proc_net_snmp6(int update_every) {
647
648 if(unlikely(!st)) {
649 st = rrdset_create_localhost(
650 - RRD_TYPE_NET_SNMP6
650 + RRD_TYPE_NET_IP6
651 , "udperrors"
652 , NULL
653 , "udp6"
@@ -689,7 +689,7 @@ static void do_proc_net_snmp6(int update_every) {
689
690 if(unlikely(!st)) {
691 st = rrdset_create_localhost(
692 - RRD_TYPE_NET_SNMP6
692 + RRD_TYPE_NET_IP6
693 , "udplitepackets"
694 , NULL
695 , "udplite6"
@@ -730,7 +730,7 @@ static void do_proc_net_snmp6(int update_every) {
730
731 if(unlikely(!st)) {
732 st = rrdset_create_localhost(
733 - RRD_TYPE_NET_SNMP6
733 + RRD_TYPE_NET_IP6
734 , "udpliteerrors"
735 , NULL
736 , "udplite6"
@@ -771,7 +771,7 @@ static void do_proc_net_snmp6(int update_every) {
771
772 if(unlikely(!st)) {
773 st = rrdset_create_localhost(
774 - RRD_TYPE_NET_SNMP6
774 + RRD_TYPE_NET_IP6
775 , "mcast"
776 , NULL
777 , "multicast6"
@@ -806,7 +806,7 @@ static void do_proc_net_snmp6(int update_every) {
806
807 if(unlikely(!st)) {
808 st = rrdset_create_localhost(
809 - RRD_TYPE_NET_SNMP6
809 + RRD_TYPE_NET_IP6
810 , "bcast"
811 , NULL
812 , "broadcast6"
@@ -841,7 +841,7 @@ static void do_proc_net_snmp6(int update_every) {
841
842 if(unlikely(!st)) {
843 st = rrdset_create_localhost(
844 - RRD_TYPE_NET_SNMP6
844 + RRD_TYPE_NET_IP6
845 , "mcastpkts"
846 , NULL
847 , "multicast6"
@@ -876,7 +876,7 @@ static void do_proc_net_snmp6(int update_every) {
876
877 if(unlikely(!st)) {
878 st = rrdset_create_localhost(
879 - RRD_TYPE_NET_SNMP6
879 + RRD_TYPE_NET_IP6
880 , "icmp"
881 , NULL
882 , "icmp6"
@@ -910,7 +910,7 @@ static void do_proc_net_snmp6(int update_every) {
910
911 if(unlikely(!st)) {
912 st = rrdset_create_localhost(
913 - RRD_TYPE_NET_SNMP6
913 + RRD_TYPE_NET_IP6
914 , "icmpredir"
915 , NULL
916 , "icmp6"
@@ -962,7 +962,7 @@ static void do_proc_net_snmp6(int update_every) {
962
963 if(unlikely(!st)) {
964 st = rrdset_create_localhost(
965 - RRD_TYPE_NET_SNMP6
965 + RRD_TYPE_NET_IP6
966 , "icmperrors"
967 , NULL
968 , "icmp6"
@@ -1018,7 +1018,7 @@ static void do_proc_net_snmp6(int update_every) {
1018
1019 if(unlikely(!st)) {
1020 st = rrdset_create_localhost(
1021 - RRD_TYPE_NET_SNMP6
1021 + RRD_TYPE_NET_IP6
1022 , "icmpechos"
1023 , NULL
1024 , "icmp6"
@@ -1064,7 +1064,7 @@ static void do_proc_net_snmp6(int update_every) {
1064
1065 if(unlikely(!st)) {
1066 st = rrdset_create_localhost(
1067 - RRD_TYPE_NET_SNMP6
1067 + RRD_TYPE_NET_IP6
1068 , "groupmemb"
1069 , NULL
1070 , "icmp6"
@@ -1109,7 +1109,7 @@ static void do_proc_net_snmp6(int update_every) {
1109
1110 if(unlikely(!st)) {
1111 st = rrdset_create_localhost(
1112 - RRD_TYPE_NET_SNMP6
1112 + RRD_TYPE_NET_IP6
1113 , "icmprouter"
1114 , NULL
1115 , "icmp6"
@@ -1151,7 +1151,7 @@ static void do_proc_net_snmp6(int update_every) {
1151
1152 if(unlikely(!st)) {
1153 st = rrdset_create_localhost(
1154 - RRD_TYPE_NET_SNMP6
1154 + RRD_TYPE_NET_IP6
1155 , "icmpneighbor"
1156 , NULL
1157 , "icmp6"
@@ -1189,7 +1189,7 @@ static void do_proc_net_snmp6(int update_every) {
1189
1190 if(unlikely(!st)) {
1191 st = rrdset_create_localhost(
1192 - RRD_TYPE_NET_SNMP6
1192 + RRD_TYPE_NET_IP6
1193 , "icmpmldv2"
1194 , NULL
1195 , "icmp6"
@@ -1239,7 +1239,7 @@ static void do_proc_net_snmp6(int update_every) {
1239
1240 if(unlikely(!st)) {
1241 st = rrdset_create_localhost(
1242 - RRD_TYPE_NET_SNMP6
1242 + RRD_TYPE_NET_IP6
1243 , "icmptypes"
1244 , NULL
1245 , "icmp6"
@@ -1287,7 +1287,7 @@ static void do_proc_net_snmp6(int update_every) {
1287
1288 if (unlikely(!st)) {
1289 st = rrdset_create_localhost(
1290 - RRD_TYPE_NET_SNMP6,
1290 + RRD_TYPE_NET_IP6,
1291 "ect",
1292 NULL,
1293 "packets",
@@ -1852,11 +1852,11 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1852 if(unlikely(!st_system_ip)) {
1853 st_system_ip = rrdset_create_localhost(
1854 "system"
1855 - , RRD_TYPE_NET_NETSTAT
1855 + , "ip" // FIXME: this is ipv4. Not changing it because it will require to do changes in cloud-frontend too
1856 , NULL
1857 , "network"
1858 , NULL
1859 - , "IP Bandwidth"
1859 + , "IPv4 Bandwidth"
1860 , "kilobits/s"
1861 , PLUGIN_PROC_NAME
1862 , PLUGIN_PROC_MODULE_NETSTAT_NAME
@@ -1874,43 +1874,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1874 rrdset_done(st_system_ip);
1875 }
1876
1877 - if(do_inerrors == CONFIG_BOOLEAN_YES || (do_inerrors == CONFIG_BOOLEAN_AUTO &&
1878 - (ipext_InNoRoutes ||
1879 - ipext_InTruncatedPkts ||
1880 - netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
1881 - do_inerrors = CONFIG_BOOLEAN_YES;
1882 - static RRDSET *st_ip_inerrors = NULL;
1883 - static RRDDIM *rd_noroutes = NULL, *rd_truncated = NULL, *rd_checksum = NULL;
1884 -
1885 - if(unlikely(!st_ip_inerrors)) {
1886 - st_ip_inerrors = rrdset_create_localhost(
1887 - RRD_TYPE_NET_NETSTAT
1888 - , "inerrors"
1889 - , NULL
1890 - , "errors"
1891 - , NULL
1892 - , "IP Input Errors"
1893 - , "packets/s"
1894 - , PLUGIN_PROC_NAME
1895 - , PLUGIN_PROC_MODULE_NETSTAT_NAME
1896 - , NETDATA_CHART_PRIO_IP_ERRORS
1897 - , update_every
1898 - , RRDSET_TYPE_LINE
1899 - );
1900 -
1901 - rrdset_flag_set(st_ip_inerrors, RRDSET_FLAG_DETAIL);
1902 -
1903 - rd_noroutes = rrddim_add(st_ip_inerrors, "InNoRoutes", "noroutes", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1904 - rd_truncated = rrddim_add(st_ip_inerrors, "InTruncatedPkts", "truncated", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1905 - rd_checksum = rrddim_add(st_ip_inerrors, "InCsumErrors", "checksum", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1906 - }
1907 -
1908 - rrddim_set_by_pointer(st_ip_inerrors, rd_noroutes, ipext_InNoRoutes);
1909 - rrddim_set_by_pointer(st_ip_inerrors, rd_truncated, ipext_InTruncatedPkts);
1910 - rrddim_set_by_pointer(st_ip_inerrors, rd_checksum, ipext_InCsumErrors);
1911 - rrdset_done(st_ip_inerrors);
1912 - }
1913 -
1877 if(do_mcast == CONFIG_BOOLEAN_YES || (do_mcast == CONFIG_BOOLEAN_AUTO &&
1878 (ipext_InMcastOctets ||
1879 ipext_OutMcastOctets ||
@@ -1921,7 +1884,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1884
1885 if(unlikely(!st_ip_mcast)) {
1886 st_ip_mcast = rrdset_create_localhost(
1924 - RRD_TYPE_NET_NETSTAT
1887 + RRD_TYPE_NET_IP4
1888 , "mcast"
1889 , NULL
1890 , "multicast"
@@ -1930,7 +1893,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1893 , "kilobits/s"
1894 , PLUGIN_PROC_NAME
1895 , PLUGIN_PROC_MODULE_NETSTAT_NAME
1933 - , NETDATA_CHART_PRIO_IP_MCAST
1896 + , NETDATA_CHART_PRIO_IPV4_MCAST
1897 , update_every
1898 , RRDSET_TYPE_AREA
1899 );
@@ -1960,16 +1923,16 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1923
1924 if(unlikely(!st_ip_bcast)) {
1925 st_ip_bcast = rrdset_create_localhost(
1963 - RRD_TYPE_NET_NETSTAT
1926 + RRD_TYPE_NET_IP4
1927 , "bcast"
1928 , NULL
1929 , "broadcast"
1930 , NULL
1968 - , "IP Broadcast Bandwidth"
1931 + , "IPv4 Broadcast Bandwidth"
1932 , "kilobits/s"
1933 , PLUGIN_PROC_NAME
1934 , PLUGIN_PROC_MODULE_NETSTAT_NAME
1972 - , NETDATA_CHART_PRIO_IP_BCAST
1935 + , NETDATA_CHART_PRIO_IPV4_BCAST
1936 , update_every
1937 , RRDSET_TYPE_AREA
1938 );
@@ -1999,16 +1962,16 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1962
1963 if(unlikely(!st_ip_mcastpkts)) {
1964 st_ip_mcastpkts = rrdset_create_localhost(
2002 - RRD_TYPE_NET_NETSTAT
1965 + RRD_TYPE_NET_IP4
1966 , "mcastpkts"
1967 , NULL
1968 , "multicast"
1969 , NULL
2007 - , "IP Multicast Packets"
1970 + , "IPv4 Multicast Packets"
1971 , "packets/s"
1972 , PLUGIN_PROC_NAME
1973 , PLUGIN_PROC_MODULE_NETSTAT_NAME
2011 - , NETDATA_CHART_PRIO_IP_MCAST_PACKETS
1974 + , NETDATA_CHART_PRIO_IPV4_MCAST_PACKETS
1975 , update_every
1976 , RRDSET_TYPE_LINE
1977 );
@@ -2035,16 +1998,16 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
1998
1999 if(unlikely(!st_ip_bcastpkts)) {
2000 st_ip_bcastpkts = rrdset_create_localhost(
2038 - RRD_TYPE_NET_NETSTAT
2001 + RRD_TYPE_NET_IP4
2002 , "bcastpkts"
2003 , NULL
2004 , "broadcast"
2005 , NULL
2043 - , "IP Broadcast Packets"
2006 + , "IPv4 Broadcast Packets"
2007 , "packets/s"
2008 , PLUGIN_PROC_NAME
2009 , PLUGIN_PROC_MODULE_NETSTAT_NAME
2047 - , NETDATA_CHART_PRIO_IP_BCAST_PACKETS
2010 + , NETDATA_CHART_PRIO_IPV4_BCAST_PACKETS
2011 , update_every
2012 , RRDSET_TYPE_LINE
2013 );
@@ -2073,16 +2036,16 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2036
2037 if(unlikely(!st_ecnpkts)) {
2038 st_ecnpkts = rrdset_create_localhost(
2076 - RRD_TYPE_NET_NETSTAT
2039 + RRD_TYPE_NET_IP4
2040 , "ecnpkts"
2041 , NULL
2042 , "ecn"
2043 , NULL
2081 - , "IP ECN Statistics"
2044 + , "IPv4 ECN Statistics"
2045 , "packets/s"
2046 , PLUGIN_PROC_NAME
2047 , PLUGIN_PROC_MODULE_NETSTAT_NAME
2085 - , NETDATA_CHART_PRIO_IP_ECN
2048 + , NETDATA_CHART_PRIO_IPV4_ECN
2049 , update_every
2050 , RRDSET_TYPE_LINE
2051 );
@@ -2114,7 +2077,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2077
2078 if(unlikely(!st_tcpmemorypressures)) {
2079 st_tcpmemorypressures = rrdset_create_localhost(
2117 - RRD_TYPE_NET_NETSTAT
2080 + RRD_TYPE_NET_IP
2081 , "tcpmemorypressures"
2082 , NULL
2083 , "tcp"
@@ -2123,7 +2086,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2086 , "events/s"
2087 , PLUGIN_PROC_NAME
2088 , PLUGIN_PROC_MODULE_NETSTAT_NAME
2126 - , NETDATA_CHART_PRIO_IP_TCP_MEM
2089 + , NETDATA_CHART_PRIO_IP_TCP_MEM_PRESSURE
2090 , update_every
2091 , RRDSET_TYPE_LINE
2092 );
@@ -2150,7 +2113,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2113
2114 if(unlikely(!st_tcpconnaborts)) {
2115 st_tcpconnaborts = rrdset_create_localhost(
2153 - RRD_TYPE_NET_NETSTAT
2116 + RRD_TYPE_NET_IP
2117 , "tcpconnaborts"
2118 , NULL
2119 , "tcp"
@@ -2194,7 +2157,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2157
2158 if(unlikely(!st_tcpreorders)) {
2159 st_tcpreorders = rrdset_create_localhost(
2197 - RRD_TYPE_NET_NETSTAT
2160 + RRD_TYPE_NET_IP
2161 , "tcpreorders"
2162 , NULL
2163 , "tcp"
@@ -2236,7 +2199,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2199 if(unlikely(!st_ip_tcpofo)) {
2200
2201 st_ip_tcpofo = rrdset_create_localhost(
2239 - RRD_TYPE_NET_NETSTAT
2202 + RRD_TYPE_NET_IP
2203 , "tcpofo"
2204 , NULL
2205 , "tcp"
@@ -2276,7 +2239,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2239 if(unlikely(!st_syncookies)) {
2240
2241 st_syncookies = rrdset_create_localhost(
2279 - RRD_TYPE_NET_NETSTAT
2242 + RRD_TYPE_NET_IP
2243 , "tcpsyncookies"
2244 , NULL
2245 , "tcp"
@@ -2315,7 +2278,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2278 if(unlikely(!st_syn_queue)) {
2279
2280 st_syn_queue = rrdset_create_localhost(
2318 - RRD_TYPE_NET_NETSTAT
2281 + RRD_TYPE_NET_IP
2282 , "tcp_syn_queue"
2283 , NULL
2284 , "tcp"
@@ -2351,7 +2314,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2314 if(unlikely(!st_accept_queue)) {
2315
2316 st_accept_queue = rrdset_create_localhost(
2354 - RRD_TYPE_NET_NETSTAT
2317 + RRD_TYPE_NET_IP
2318 , "tcp_accept_queue"
2319 , NULL
2320 , "tcp"
@@ -2392,7 +2355,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2355
2356 if(unlikely(!st)) {
2357 st = rrdset_create_localhost(
2395 - RRD_TYPE_NET_SNMP
2358 + RRD_TYPE_NET_IP4
2359 , "packets"
2360 , NULL
2361 , "packets"
@@ -2433,7 +2396,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2396
2397 if(unlikely(!st)) {
2398 st = rrdset_create_localhost(
2436 - RRD_TYPE_NET_SNMP
2399 + RRD_TYPE_NET_IP4
2400 , "fragsout"
2401 , NULL
2402 , "fragments"
@@ -2442,7 +2405,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2405 , "packets/s"
2406 , PLUGIN_PROC_NAME
2407 , PLUGIN_PROC_MODULE_NETSTAT_NAME
2445 - , NETDATA_CHART_PRIO_IPV4_FRAGMENTS
2408 + , NETDATA_CHART_PRIO_IPV4_FRAGMENTS_OUT
2409 , update_every
2410 , RRDSET_TYPE_LINE
2411 );
@@ -2473,7 +2436,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2436
2437 if(unlikely(!st)) {
2438 st = rrdset_create_localhost(
2476 - RRD_TYPE_NET_SNMP
2439 + RRD_TYPE_NET_IP4
2440 , "fragsin"
2441 , NULL
2442 , "fragments"
@@ -2482,7 +2445,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2445 , "packets/s"
2446 , PLUGIN_PROC_NAME
2447 , PLUGIN_PROC_MODULE_NETSTAT_NAME
2485 - , NETDATA_CHART_PRIO_IPV4_FRAGMENTS + 1
2448 + , NETDATA_CHART_PRIO_IPV4_FRAGMENTS_IN
2449 , update_every
2450 , RRDSET_TYPE_LINE
2451 );
@@ -2513,13 +2476,16 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2476 static RRDDIM *rd_InDiscards = NULL,
2477 *rd_OutDiscards = NULL,
2478 *rd_InHdrErrors = NULL,
2479 + *rd_InNoRoutes = NULL,
2480 *rd_OutNoRoutes = NULL,
2481 *rd_InAddrErrors = NULL,
2482 + *rd_InTruncatedPkts = NULL,
2483 + *rd_InCsumErrors = NULL,
2484 *rd_InUnknownProtos = NULL;
2485
2486 if(unlikely(!st)) {
2487 st = rrdset_create_localhost(
2522 - RRD_TYPE_NET_SNMP
2488 + RRD_TYPE_NET_IP4
2489 , "errors"
2490 , NULL
2491 , "errors"
@@ -2537,11 +2503,14 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2503 rd_InDiscards = rrddim_add(st, "InDiscards", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2504 rd_OutDiscards = rrddim_add(st, "OutDiscards", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2505
2540 - rd_InHdrErrors = rrddim_add(st, "InHdrErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2506 + rd_InNoRoutes = rrddim_add(st, "InNoRoutes", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2507 rd_OutNoRoutes = rrddim_add(st, "OutNoRoutes", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2508
2509 + rd_InHdrErrors = rrddim_add(st, "InHdrErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2510 rd_InAddrErrors = rrddim_add(st, "InAddrErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2511 rd_InUnknownProtos = rrddim_add(st, "InUnknownProtos", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2512 + rd_InTruncatedPkts = rrddim_add(st, "InTruncatedPkts", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2513 + rd_InCsumErrors = rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2514 }
2515
2516 rrddim_set_by_pointer(st, rd_InDiscards, (collected_number)snmp_root.ip_InDiscards);
@@ -2549,7 +2518,10 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2518 rrddim_set_by_pointer(st, rd_InHdrErrors, (collected_number)snmp_root.ip_InHdrErrors);
2519 rrddim_set_by_pointer(st, rd_InAddrErrors, (collected_number)snmp_root.ip_InAddrErrors);
2520 rrddim_set_by_pointer(st, rd_InUnknownProtos, (collected_number)snmp_root.ip_InUnknownProtos);
2521 + rrddim_set_by_pointer(st, rd_InNoRoutes, (collected_number)ipext_InNoRoutes);
2522 rrddim_set_by_pointer(st, rd_OutNoRoutes, (collected_number)snmp_root.ip_OutNoRoutes);
2523 + rrddim_set_by_pointer(st, rd_InTruncatedPkts, (collected_number)ipext_InTruncatedPkts);
2524 + rrddim_set_by_pointer(st, rd_InCsumErrors, (collected_number)ipext_InCsumErrors);
2525 rrdset_done(st);
2526 }
2527
@@ -2571,7 +2543,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2543
2544 if(unlikely(!st_packets)) {
2545 st_packets = rrdset_create_localhost(
2574 - RRD_TYPE_NET_SNMP
2546 + RRD_TYPE_NET_IP4
2547 , "icmp"
2548 , NULL
2549 , "icmp"
@@ -2580,7 +2552,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2552 , "packets/s"
2553 , PLUGIN_PROC_NAME
2554 , PLUGIN_PROC_MODULE_NETSTAT_NAME
2583 - , NETDATA_CHART_PRIO_IPV4_ICMP
2555 + , NETDATA_CHART_PRIO_IPV4_ICMP_PACKETS
2556 , update_every
2557 , RRDSET_TYPE_LINE
2558 );
@@ -2602,7 +2574,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2574
2575 if(unlikely(!st_errors)) {
2576 st_errors = rrdset_create_localhost(
2605 - RRD_TYPE_NET_SNMP
2577 + RRD_TYPE_NET_IP4
2578 , "icmp_errors"
2579 , NULL
2580 , "icmp"
@@ -2611,7 +2583,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2583 , "packets/s"
2584 , PLUGIN_PROC_NAME
2585 , PLUGIN_PROC_MODULE_NETSTAT_NAME
2614 - , NETDATA_CHART_PRIO_IPV4_ICMP + 1
2586 + , NETDATA_CHART_PRIO_IPV4_ICMP_ERRORS
2587 , update_every
2588 , RRDSET_TYPE_LINE
2589 );
@@ -2678,7 +2650,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2650
2651 if(unlikely(!st)) {
2652 st = rrdset_create_localhost(
2681 - RRD_TYPE_NET_SNMP
2653 + RRD_TYPE_NET_IP4
2654 , "icmpmsg"
2655 , NULL
2656 , "icmp"
@@ -2687,7 +2659,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2659 , "packets/s"
2660 , PLUGIN_PROC_NAME
2661 , PLUGIN_PROC_MODULE_NETSTAT_NAME
2690 - , NETDATA_CHART_PRIO_IPV4_ICMP + 2
2662 + , NETDATA_CHART_PRIO_IPV4_ICMP_MESSAGES
2663 , update_every
2664 , RRDSET_TYPE_LINE
2665 );
@@ -2754,16 +2726,16 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2726
2727 if(unlikely(!st)) {
2728 st = rrdset_create_localhost(
2757 - RRD_TYPE_NET_SNMP
2729 + RRD_TYPE_NET_IP
2730 , "tcpsock"
2731 , NULL
2732 , "tcp"
2733 , NULL
2762 - , "IPv4 TCP Connections"
2734 + , "TCP Connections"
2735 , "active connections"
2736 , PLUGIN_PROC_NAME
2737 , PLUGIN_PROC_MODULE_NETSTAT_NAME
2766 - , NETDATA_CHART_PRIO_IPV4_TCP
2738 + , NETDATA_CHART_PRIO_IP_TCP_ESTABLISHED_CONNS
2739 , update_every
2740 , RRDSET_TYPE_LINE
2741 );
@@ -2787,7 +2759,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2759
2760 if(unlikely(!st)) {
2761 st = rrdset_create_localhost(
2790 - RRD_TYPE_NET_SNMP
2762 + RRD_TYPE_NET_IP
2763 , "tcppackets"
2764 , NULL
2765 , "tcp"
@@ -2796,7 +2768,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2768 , "packets/s"
2769 , PLUGIN_PROC_NAME
2770 , PLUGIN_PROC_MODULE_NETSTAT_NAME
2799 - , NETDATA_CHART_PRIO_IPV4_TCP + 4
2771 + , NETDATA_CHART_PRIO_IP_TCP_PACKETS
2772 , update_every
2773 , RRDSET_TYPE_LINE
2774 );
@@ -2826,7 +2798,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2798
2799 if(unlikely(!st)) {
2800 st = rrdset_create_localhost(
2829 - RRD_TYPE_NET_SNMP
2801 + RRD_TYPE_NET_IP
2802 , "tcperrors"
2803 , NULL
2804 , "tcp"
@@ -2835,7 +2807,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2807 , "packets/s"
2808 , PLUGIN_PROC_NAME
2809 , PLUGIN_PROC_MODULE_NETSTAT_NAME
2838 - , NETDATA_CHART_PRIO_IPV4_TCP + 20
2810 + , NETDATA_CHART_PRIO_IP_TCP_ERRORS
2811 , update_every
2812 , RRDSET_TYPE_LINE
2813 );
@@ -2864,7 +2836,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2836
2837 if(unlikely(!st)) {
2838 st = rrdset_create_localhost(
2867 - RRD_TYPE_NET_SNMP
2839 + RRD_TYPE_NET_IP
2840 , "tcpopens"
2841 , NULL
2842 , "tcp"
@@ -2873,7 +2845,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2845 , "connections/s"
2846 , PLUGIN_PROC_NAME
2847 , PLUGIN_PROC_MODULE_NETSTAT_NAME
2876 - , NETDATA_CHART_PRIO_IPV4_TCP + 5
2848 + , NETDATA_CHART_PRIO_IP_TCP_OPENS
2849 , update_every
2850 , RRDSET_TYPE_LINE
2851 );
@@ -2903,7 +2875,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2875
2876 if(unlikely(!st)) {
2877 st = rrdset_create_localhost(
2906 - RRD_TYPE_NET_SNMP
2878 + RRD_TYPE_NET_IP
2879 , "tcphandshake"
2880 , NULL
2881 , "tcp"
@@ -2912,7 +2884,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2884 , "events/s"
2885 , PLUGIN_PROC_NAME
2886 , PLUGIN_PROC_MODULE_NETSTAT_NAME
2915 - , NETDATA_CHART_PRIO_IPV4_TCP + 30
2887 + , NETDATA_CHART_PRIO_IP_TCP_HANDSHAKE
2888 , update_every
2889 , RRDSET_TYPE_LINE
2890 );
@@ -2946,7 +2918,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2918
2919 if(unlikely(!st)) {
2920 st = rrdset_create_localhost(
2949 - RRD_TYPE_NET_SNMP
2921 + RRD_TYPE_NET_IP4
2922 , "udppackets"
2923 , NULL
2924 , "udp"
@@ -2955,7 +2927,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2927 , "packets/s"
2928 , PLUGIN_PROC_NAME
2929 , PLUGIN_PROC_MODULE_NETSTAT_NAME
2958 - , NETDATA_CHART_PRIO_IPV4_UDP
2930 + , NETDATA_CHART_PRIO_IPV4_UDP_PACKETS
2931 , update_every
2932 , RRDSET_TYPE_LINE
2933 );
@@ -2991,7 +2963,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2963
2964 if(unlikely(!st)) {
2965 st = rrdset_create_localhost(
2994 - RRD_TYPE_NET_SNMP
2966 + RRD_TYPE_NET_IP4
2967 , "udperrors"
2968 , NULL
2969 , "udp"
@@ -3000,7 +2972,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
2972 , "events/s"
2973 , PLUGIN_PROC_NAME
2974 , PLUGIN_PROC_MODULE_NETSTAT_NAME
3003 - , NETDATA_CHART_PRIO_IPV4_UDP + 10
2975 + , NETDATA_CHART_PRIO_IPV4_UDP_ERRORS
2976 , update_every
2977 , RRDSET_TYPE_LINE
2978 );
@@ -3044,7 +3016,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
3016
3017 if(unlikely(!st)) {
3018 st = rrdset_create_localhost(
3047 - RRD_TYPE_NET_SNMP
3019 + RRD_TYPE_NET_IP4
3020 , "udplite"
3021 , NULL
3022 , "udplite"
@@ -3053,7 +3025,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
3025 , "packets/s"
3026 , PLUGIN_PROC_NAME
3027 , PLUGIN_PROC_MODULE_NETSTAT_NAME
3056 - , NETDATA_CHART_PRIO_IPV4_UDPLITE
3028 + , NETDATA_CHART_PRIO_IPV4_UDPLITE_PACKETS
3029 , update_every
3030 , RRDSET_TYPE_LINE
3031 );
@@ -3078,7 +3050,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
3050
3051 if(unlikely(!st)) {
3052 st = rrdset_create_localhost(
3081 - RRD_TYPE_NET_SNMP
3053 + RRD_TYPE_NET_IP4
3054 , "udplite_errors"
3055 , NULL
3056 , "udplite"
@@ -3087,7 +3059,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
3059 , "packets/s"
3060 , PLUGIN_PROC_NAME
3061 , PLUGIN_PROC_MODULE_NETSTAT_NAME
3090 - , NETDATA_CHART_PRIO_IPV4_UDPLITE + 10
3062 + , NETDATA_CHART_PRIO_IPV4_UDPLITE_ERRORS
3063 , update_every
3064 , RRDSET_TYPE_LINE);
3065
collectors/proc.plugin/proc_net_sockstat.c
+11 -11
@@ -228,16 +228,16 @@ int do_proc_net_sockstat(int update_every, usec_t dt) {
228
229 if(unlikely(!st)) {
230 st = rrdset_create_localhost(
231 - "ipv4"
231 + "ip"
232 , "sockstat_sockets"
233 , NULL
234 , "sockets"
235 , NULL
236 - , "IPv4 Sockets Used"
236 + , "Sockets used for all address families"
237 , "sockets"
238 , PLUGIN_PROC_NAME
239 , PLUGIN_PROC_MODULE_NET_SOCKSTAT_NAME
240 - , NETDATA_CHART_PRIO_IPV4_SOCKETS
240 + , NETDATA_CHART_PRIO_IP_SOCKETS
241 , update_every
242 , RRDSET_TYPE_LINE
243 );
@@ -272,7 +272,7 @@ int do_proc_net_sockstat(int update_every, usec_t dt) {
272 , NULL
273 , "tcp"
274 , NULL
275 - , "IPv4 TCP Sockets"
275 + , "TCP Sockets"
276 , "sockets"
277 , PLUGIN_PROC_NAME
278 , PLUGIN_PROC_MODULE_NET_SOCKSTAT_NAME
@@ -310,11 +310,11 @@ int do_proc_net_sockstat(int update_every, usec_t dt) {
310 , NULL
311 , "tcp"
312 , NULL
313 - , "IPv4 TCP Sockets Memory"
313 + , "TCP Sockets Memory"
314 , "KiB"
315 , PLUGIN_PROC_NAME
316 , PLUGIN_PROC_MODULE_NET_SOCKSTAT_NAME
317 - , NETDATA_CHART_PRIO_IPV4_TCP_MEM
317 + , NETDATA_CHART_PRIO_IPV4_TCP_SOCKETS_MEM
318 , update_every
319 , RRDSET_TYPE_AREA
320 );
@@ -347,7 +347,7 @@ int do_proc_net_sockstat(int update_every, usec_t dt) {
347 , "sockets"
348 , PLUGIN_PROC_NAME
349 , PLUGIN_PROC_MODULE_NET_SOCKSTAT_NAME
350 - , NETDATA_CHART_PRIO_IPV4_UDP
350 + , NETDATA_CHART_PRIO_IPV4_UDP_SOCKETS
351 , update_every
352 , RRDSET_TYPE_LINE
353 );
@@ -380,7 +380,7 @@ int do_proc_net_sockstat(int update_every, usec_t dt) {
380 , "KiB"
381 , PLUGIN_PROC_NAME
382 , PLUGIN_PROC_MODULE_NET_SOCKSTAT_NAME
383 - , NETDATA_CHART_PRIO_IPV4_UDP_MEM
383 + , NETDATA_CHART_PRIO_IPV4_UDP_SOCKETS_MEM
384 , update_every
385 , RRDSET_TYPE_AREA
386 );
@@ -413,7 +413,7 @@ int do_proc_net_sockstat(int update_every, usec_t dt) {
413 , "sockets"
414 , PLUGIN_PROC_NAME
415 , PLUGIN_PROC_MODULE_NET_SOCKSTAT_NAME
416 - , NETDATA_CHART_PRIO_IPV4_UDPLITE
416 + , NETDATA_CHART_PRIO_IPV4_UDPLITE_SOCKETS
417 , update_every
418 , RRDSET_TYPE_LINE
419 );
@@ -479,7 +479,7 @@ int do_proc_net_sockstat(int update_every, usec_t dt) {
479 , "fragments"
480 , PLUGIN_PROC_NAME
481 , PLUGIN_PROC_MODULE_NET_SOCKSTAT_NAME
482 - , NETDATA_CHART_PRIO_IPV4_FRAGMENTS
482 + , NETDATA_CHART_PRIO_IPV4_FRAGMENTS_SOCKETS
483 , update_every
484 , RRDSET_TYPE_LINE
485 );
@@ -512,7 +512,7 @@ int do_proc_net_sockstat(int update_every, usec_t dt) {
512 , "KiB"
513 , PLUGIN_PROC_NAME
514 , PLUGIN_PROC_MODULE_NET_SOCKSTAT_NAME
515 - , NETDATA_CHART_PRIO_IPV4_FRAGMENTS_MEM
515 + , NETDATA_CHART_PRIO_IPV4_FRAGMENTS_SOCKETS_MEM
516 , update_every
517 , RRDSET_TYPE_AREA
518 );
collectors/proc.plugin/proc_net_sockstat6.c
+5 -5
@@ -130,7 +130,7 @@ int do_proc_net_sockstat6(int update_every, usec_t dt) {
130 , "sockets"
131 , PLUGIN_PROC_NAME
132 , PLUGIN_PROC_MODULE_NET_SOCKSTAT6_NAME
133 - , NETDATA_CHART_PRIO_IPV6_TCP
133 + , NETDATA_CHART_PRIO_IPV6_TCP_SOCKETS
134 , update_every
135 , RRDSET_TYPE_LINE
136 );
@@ -163,7 +163,7 @@ int do_proc_net_sockstat6(int update_every, usec_t dt) {
163 , "sockets"
164 , PLUGIN_PROC_NAME
165 , PLUGIN_PROC_MODULE_NET_SOCKSTAT6_NAME
166 - , NETDATA_CHART_PRIO_IPV6_UDP
166 + , NETDATA_CHART_PRIO_IPV6_UDP_SOCKETS
167 , update_every
168 , RRDSET_TYPE_LINE
169 );
@@ -196,7 +196,7 @@ int do_proc_net_sockstat6(int update_every, usec_t dt) {
196 , "sockets"
197 , PLUGIN_PROC_NAME
198 , PLUGIN_PROC_MODULE_NET_SOCKSTAT6_NAME
199 - , NETDATA_CHART_PRIO_IPV6_UDPLITE
199 + , NETDATA_CHART_PRIO_IPV6_UDPLITE_SOCKETS
200 , update_every
201 , RRDSET_TYPE_LINE
202 );
@@ -229,7 +229,7 @@ int do_proc_net_sockstat6(int update_every, usec_t dt) {
229 , "sockets"
230 , PLUGIN_PROC_NAME
231 , PLUGIN_PROC_MODULE_NET_SOCKSTAT6_NAME
232 - , NETDATA_CHART_PRIO_IPV6_RAW
232 + , NETDATA_CHART_PRIO_IPV6_RAW_SOCKETS
233 , update_every
234 , RRDSET_TYPE_LINE
235 );
@@ -262,7 +262,7 @@ int do_proc_net_sockstat6(int update_every, usec_t dt) {
262 , "fragments"
263 , PLUGIN_PROC_NAME
264 , PLUGIN_PROC_MODULE_NET_SOCKSTAT6_NAME
265 - , NETDATA_CHART_PRIO_IPV6_FRAGMENTS
265 + , NETDATA_CHART_PRIO_IPV6_FRAGMENTS_SOCKETS
266 , update_every
267 , RRDSET_TYPE_LINE
268 );
health/health.d/tcp_conn.conf
+1 -1
@@ -6,7 +6,7 @@
6 #
7
8 alarm: tcp_connections
9 - on: ipv4.tcpsock
9 + on: ip.tcpsock
10 class: Workload
11 type: System
12 component: Network
health/health.d/tcp_resets.conf
+10 -10
@@ -4,8 +4,8 @@
4 # -----------------------------------------------------------------------------
5 # tcp resets this host sends
6
7 - alarm: 1m_ipv4_tcp_resets_sent
8 - on: ipv4.tcphandshake
7 + alarm: 1m_ip_tcp_resets_sent
8 + on: ip.tcphandshake
9 class: Errors
10 type: System
11 component: Network
@@ -16,8 +16,8 @@ component: Network
16 every: 10s
17 info: average number of sent TCP RESETS over the last minute
18
19 - alarm: 10s_ipv4_tcp_resets_sent
20 - on: ipv4.tcphandshake
19 + alarm: 10s_ip_tcp_resets_sent
20 + on: ip.tcphandshake
21 class: Errors
22 type: System
23 component: Network
@@ -26,7 +26,7 @@ component: Network
26 lookup: average -10s unaligned absolute of OutRsts
27 units: tcp resets/s
28 every: 10s
29 - warn: $netdata.uptime.uptime > (1 * 60) AND $this > ((($1m_ipv4_tcp_resets_sent < 5)?(5):($1m_ipv4_tcp_resets_sent)) * (($status >= $WARNING) ? (1) : (10)))
29 + warn: $netdata.uptime.uptime > (1 * 60) AND $this > ((($1m_ip_tcp_resets_sent < 5)?(5):($1m_ip_tcp_resets_sent)) * (($status >= $WARNING) ? (1) : (10)))
30 delay: up 20s down 60m multiplier 1.2 max 2h
31 options: no-clear-notification
32 info: average number of sent TCP RESETS over the last 10 seconds. \
@@ -38,8 +38,8 @@ component: Network
38 # -----------------------------------------------------------------------------
39 # tcp resets this host receives
40
41 - alarm: 1m_ipv4_tcp_resets_received
42 - on: ipv4.tcphandshake
41 + alarm: 1m_ip_tcp_resets_received
42 + on: ip.tcphandshake
43 class: Errors
44 type: System
45 component: Network
@@ -50,8 +50,8 @@ component: Network
50 every: 10s
51 info: average number of received TCP RESETS over the last minute
52
53 - alarm: 10s_ipv4_tcp_resets_received
54 - on: ipv4.tcphandshake
53 + alarm: 10s_ip_tcp_resets_received
54 + on: ip.tcphandshake
55 class: Errors
56 type: System
57 component: Network
@@ -60,7 +60,7 @@ component: Network
60 lookup: average -10s unaligned absolute of AttemptFails
61 units: tcp resets/s
62 every: 10s
63 - warn: $netdata.uptime.uptime > (1 * 60) AND $this > ((($1m_ipv4_tcp_resets_received < 5)?(5):($1m_ipv4_tcp_resets_received)) * (($status >= $WARNING) ? (1) : (10)))
63 + warn: $netdata.uptime.uptime > (1 * 60) AND $this > ((($1m_ip_tcp_resets_received < 5)?(5):($1m_ip_tcp_resets_received)) * (($status >= $WARNING) ? (1) : (10)))
64 delay: up 20s down 60m multiplier 1.2 max 2h
65 options: no-clear-notification
66 info: average number of received TCP RESETS over the last 10 seconds. \