fix proc netstat metrics (#16122)

5 files changed, 316 insertions, 339 deletions

diff --git a/collectors/all.h b/collectors/all.h
index 8d4c297fcc..ec4ac00ebb 100644
--- a/collectors/all.h
+++ b/collectors/all.h
@@ -266,65 +266,76 @@
 
 // IP STACK
 
-#define NETDATA_CHART_PRIO_IP_ERRORS                  4100
-#define NETDATA_CHART_PRIO_IP_TCP_CONNABORTS          4210
-#define NETDATA_CHART_PRIO_IP_TCP_SYN_QUEUE           4215
-#define NETDATA_CHART_PRIO_IP_TCP_ACCEPT_QUEUE        4216
-#define NETDATA_CHART_PRIO_IP_TCP_REORDERS            4220
-#define NETDATA_CHART_PRIO_IP_TCP_OFO                 4250
-#define NETDATA_CHART_PRIO_IP_TCP_SYNCOOKIES          4260
-#define NETDATA_CHART_PRIO_IP_TCP_MEM                 4290
-#define NETDATA_CHART_PRIO_IP_BCAST                   4500
-#define NETDATA_CHART_PRIO_IP_BCAST_PACKETS           4510
-#define NETDATA_CHART_PRIO_IP_MCAST                   4600
-#define NETDATA_CHART_PRIO_IP_MCAST_PACKETS           4610
-#define NETDATA_CHART_PRIO_IP_ECN                     4700
+#define NETDATA_CHART_PRIO_IP_TCP_PACKETS             4200
+#define NETDATA_CHART_PRIO_IP_TCP_ERRORS              4210
+#define NETDATA_CHART_PRIO_IP_TCP_ESTABLISHED_CONNS   4220
+#define NETDATA_CHART_PRIO_IP_TCP_OPENS               4220
+#define NETDATA_CHART_PRIO_IP_TCP_HANDSHAKE           4230
+#define NETDATA_CHART_PRIO_IP_TCP_CONNABORTS          4240
+#define NETDATA_CHART_PRIO_IP_TCP_SYN_QUEUE           4250
+#define NETDATA_CHART_PRIO_IP_TCP_ACCEPT_QUEUE        4260
+#define NETDATA_CHART_PRIO_IP_TCP_REORDERS            4270
+#define NETDATA_CHART_PRIO_IP_TCP_OFO                 4280
+#define NETDATA_CHART_PRIO_IP_TCP_SYNCOOKIES          4290
+#define NETDATA_CHART_PRIO_IP_TCP_MEM_PRESSURE        4300
+#define NETDATA_CHART_PRIO_IP_SOCKETS                 4310
 
 // IPv4
 
-#define NETDATA_CHART_PRIO_IPV4_SOCKETS               5100
-#define NETDATA_CHART_PRIO_IPV4_PACKETS               5130
-#define NETDATA_CHART_PRIO_IPV4_ERRORS                5150
-#define NETDATA_CHART_PRIO_IPV4_ICMP                  5170
-#define NETDATA_CHART_PRIO_IPV4_TCP                   5200
-#define NETDATA_CHART_PRIO_IPV4_TCP_SOCKETS           5201
-#define NETDATA_CHART_PRIO_IPV4_TCP_MEM               5290
-#define NETDATA_CHART_PRIO_IPV4_UDP                   5300
-#define NETDATA_CHART_PRIO_IPV4_UDP_MEM               5390
-#define NETDATA_CHART_PRIO_IPV4_UDPLITE               5400
+#define NETDATA_CHART_PRIO_IPV4_PACKETS               5000
+#define NETDATA_CHART_PRIO_IPV4_ERRORS                5050
+#define NETDATA_CHART_PRIO_IPV4_BCAST                 5100
+#define NETDATA_CHART_PRIO_IPV4_BCAST_PACKETS         5105
+#define NETDATA_CHART_PRIO_IPV4_MCAST                 5150
+#define NETDATA_CHART_PRIO_IPV4_MCAST_PACKETS         5155
+#define NETDATA_CHART_PRIO_IPV4_TCP_SOCKETS           5180
+#define NETDATA_CHART_PRIO_IPV4_TCP_SOCKETS_MEM       5185
+#define NETDATA_CHART_PRIO_IPV4_ICMP_PACKETS          5200
+#define NETDATA_CHART_PRIO_IPV4_ICMP_MESSAGES         5205
+#define NETDATA_CHART_PRIO_IPV4_ICMP_ERRORS           5210
+#define NETDATA_CHART_PRIO_IPV4_UDP_PACKETS           5250
+#define NETDATA_CHART_PRIO_IPV4_UDP_ERRORS            5255
+#define NETDATA_CHART_PRIO_IPV4_UDP_SOCKETS           5260
+#define NETDATA_CHART_PRIO_IPV4_UDP_SOCKETS_MEM       5265
+#define NETDATA_CHART_PRIO_IPV4_UDPLITE_PACKETS       5300
+#define NETDATA_CHART_PRIO_IPV4_UDPLITE_ERRORS        5305
+#define NETDATA_CHART_PRIO_IPV4_UDPLITE_SOCKETS       5310
+#define NETDATA_CHART_PRIO_IPV4_ECN                   5350
+#define NETDATA_CHART_PRIO_IPV4_FRAGMENTS_IN          5400
+#define NETDATA_CHART_PRIO_IPV4_FRAGMENTS_OUT         5405
+#define NETDATA_CHART_PRIO_IPV4_FRAGMENTS_SOCKETS     5410
+#define NETDATA_CHART_PRIO_IPV4_FRAGMENTS_SOCKETS_MEM 5415
 #define NETDATA_CHART_PRIO_IPV4_RAW                   5450
-#define NETDATA_CHART_PRIO_IPV4_FRAGMENTS             5460
-#define NETDATA_CHART_PRIO_IPV4_FRAGMENTS_MEM         5470
 
 // IPv6
-
-#define NETDATA_CHART_PRIO_IPV6_PACKETS               6200
-#define NETDATA_CHART_PRIO_IPV6_ECT                   6210
-#define NETDATA_CHART_PRIO_IPV6_ERRORS                6300
-#define NETDATA_CHART_PRIO_IPV6_FRAGMENTS             6400
-#define NETDATA_CHART_PRIO_IPV6_FRAGSOUT              6401
-#define NETDATA_CHART_PRIO_IPV6_FRAGSIN               6402
-#define NETDATA_CHART_PRIO_IPV6_TCP                   6500
-#define NETDATA_CHART_PRIO_IPV6_UDP                   6600
-#define NETDATA_CHART_PRIO_IPV6_UDP_PACKETS           6601
-#define NETDATA_CHART_PRIO_IPV6_UDP_ERRORS            6610
-#define NETDATA_CHART_PRIO_IPV6_UDPLITE               6700
-#define NETDATA_CHART_PRIO_IPV6_UDPLITE_PACKETS       6701
-#define NETDATA_CHART_PRIO_IPV6_UDPLITE_ERRORS        6710
-#define NETDATA_CHART_PRIO_IPV6_RAW                   6800
-#define NETDATA_CHART_PRIO_IPV6_BCAST                 6840
-#define NETDATA_CHART_PRIO_IPV6_MCAST                 6850
-#define NETDATA_CHART_PRIO_IPV6_MCAST_PACKETS         6851
-#define NETDATA_CHART_PRIO_IPV6_ICMP                  6900
-#define NETDATA_CHART_PRIO_IPV6_ICMP_REDIR            6910
-#define NETDATA_CHART_PRIO_IPV6_ICMP_ERRORS           6920
-#define NETDATA_CHART_PRIO_IPV6_ICMP_ECHOS            6930
-#define NETDATA_CHART_PRIO_IPV6_ICMP_GROUPMEMB        6940
-#define NETDATA_CHART_PRIO_IPV6_ICMP_ROUTER           6950
-#define NETDATA_CHART_PRIO_IPV6_ICMP_NEIGHBOR         6960
-#define NETDATA_CHART_PRIO_IPV6_ICMP_LDV2             6970
-#define NETDATA_CHART_PRIO_IPV6_ICMP_TYPES            6980
-
+#define NETDATA_CHART_PRIO_IPV6_PACKETS               6000
+#define NETDATA_CHART_PRIO_IPV6_ERRORS                6005
+#define NETDATA_CHART_PRIO_IPV6_BCAST                 6050
+#define NETDATA_CHART_PRIO_IPV6_MCAST                 6100
+#define NETDATA_CHART_PRIO_IPV6_MCAST_PACKETS         6105
+#define NETDATA_CHART_PRIO_IPV6_TCP_SOCKETS           6140
+#define NETDATA_CHART_PRIO_IPV6_ICMP                  6150
+#define NETDATA_CHART_PRIO_IPV6_ICMP_REDIR            6155
+#define NETDATA_CHART_PRIO_IPV6_ICMP_ERRORS           6160
+#define NETDATA_CHART_PRIO_IPV6_ICMP_ECHOS            6165
+#define NETDATA_CHART_PRIO_IPV6_ICMP_GROUPMEMB        6170
+#define NETDATA_CHART_PRIO_IPV6_ICMP_ROUTER           6180
+#define NETDATA_CHART_PRIO_IPV6_ICMP_NEIGHBOR         6185
+#define NETDATA_CHART_PRIO_IPV6_ICMP_LDV2             6190
+#define NETDATA_CHART_PRIO_IPV6_ICMP_TYPES            6195
+#define NETDATA_CHART_PRIO_IPV6_UDP                   6200
+#define NETDATA_CHART_PRIO_IPV6_UDP_PACKETS           6205
+#define NETDATA_CHART_PRIO_IPV6_UDP_ERRORS            6210
+#define NETDATA_CHART_PRIO_IPV6_UDP_SOCKETS           6215
+#define NETDATA_CHART_PRIO_IPV6_UDPLITE               6250
+#define NETDATA_CHART_PRIO_IPV6_UDPLITE_PACKETS       6255
+#define NETDATA_CHART_PRIO_IPV6_UDPLITE_ERRORS        6260
+#define NETDATA_CHART_PRIO_IPV6_UDPLITE_SOCKETS       6265
+#define NETDATA_CHART_PRIO_IPV6_ECT                   6300
+#define NETDATA_CHART_PRIO_IPV6_FRAGSIN               6350
+#define NETDATA_CHART_PRIO_IPV6_FRAGSOUT              6355
+#define NETDATA_CHART_PRIO_IPV6_FRAGMENTS_SOCKETS     6360
+#define NETDATA_CHART_PRIO_IPV6_RAW_SOCKETS           6400
 
 // Network interfaces
 
diff --git a/collectors/proc.plugin/metadata.yaml b/collectors/proc.plugin/metadata.yaml
index 81d83f50e5..d0329420c5 100644
--- a/collectors/proc.plugin/metadata.yaml
+++ b/collectors/proc.plugin/metadata.yaml
@@ -3140,29 +3140,29 @@ modules:
         os: "linux"
       - name: tcp_connections
         link: https://github.com/netdata/netdata/blob/master/health/health.d/tcp_conn.conf
-        metric: ipv4.tcpsock
-        info: IPv4 TCP connections utilization
+        metric: ip.tcpsock
+        info: TCP connections utilization
         os: "linux"
-      - name: 1m_ipv4_tcp_resets_sent
+      - name: 1m_ip_tcp_resets_sent
         link: https://github.com/netdata/netdata/blob/master/health/health.d/tcp_resets.conf
-        metric: ipv4.tcphandshake
+        metric: ip.tcphandshake
         info: average number of sent TCP RESETS over the last minute
         os: "linux"
-      - name: 10s_ipv4_tcp_resets_sent
+      - name: 10s_ip_tcp_resets_sent
         link: https://github.com/netdata/netdata/blob/master/health/health.d/tcp_resets.conf
-        metric: ipv4.tcphandshake
+        metric: ip.tcphandshake
         info:
           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
           crashed. Netdata will not send a clear notification for this alarm.
         os: "linux"
-      - name: 1m_ipv4_tcp_resets_received
+      - name: 1m_ip_tcp_resets_received
         link: https://github.com/netdata/netdata/blob/master/health/health.d/tcp_resets.conf
-        metric: ipv4.tcphandshake
+        metric: ip.tcphandshake
         info: average number of received TCP RESETS over the last minute
         os: "linux freebsd"
-      - name: 10s_ipv4_tcp_resets_received
+      - name: 10s_ip_tcp_resets_received
         link: https://github.com/netdata/netdata/blob/master/health/health.d/tcp_resets.conf
-        metric: ipv4.tcphandshake
+        metric: ip.tcphandshake
         info:
           average number of received TCP RESETS over the last 10 seconds. This can be an indication that a service this host needs has crashed.
           Netdata will not send a clear notification for this alarm.
@@ -3189,57 +3189,12 @@ modules:
           labels: []
           metrics:
             - name: system.ip
-              description: IP Bandwidth
+              description: IPv4 Bandwidth
               unit: "kilobits/s"
               chart_type: area
               dimensions:
                 - name: received
                 - name: sent
-            - name: ip.inerrors
-              description: IP Input Errors
-              unit: "packets/s"
-              chart_type: line
-              dimensions:
-                - name: noroutes
-                - name: truncated
-                - name: checksum
-            - name: ip.mcast
-              description: IP Multicast Bandwidth
-              unit: "kilobits/s"
-              chart_type: area
-              dimensions:
-                - name: received
-                - name: sent
-            - name: ip.bcast
-              description: IP Broadcast Bandwidth
-              unit: "kilobits/s"
-              chart_type: area
-              dimensions:
-                - name: received
-                - name: sent
-            - name: ip.mcastpkts
-              description: IP Multicast Packets
-              unit: "packets/s"
-              chart_type: line
-              dimensions:
-                - name: received
-                - name: sent
-            - name: ip.bcastpkts
-              description: IP Broadcast Packets
-              unit: "packets/s"
-              chart_type: line
-              dimensions:
-                - name: received
-                - name: sent
-            - name: ip.ecnpkts
-              description: IP ECN Statistics
-              unit: "packets/s"
-              chart_type: line
-              dimensions:
-                - name: CEP
-                - name: NoECTP
-                - name: ECTP0
-                - name: ECTP1
             - name: ip.tcpmemorypressures
               description: TCP Memory Pressures
               unit: "events/s"
@@ -3297,31 +3252,52 @@ modules:
               dimensions:
                 - name: overflows
                 - name: drops
-            - name: ipv4.packets
-              description: IPv4 Packets
+            - name: ip.tcpsock
+              description: IPv4 TCP Connections
+              unit: "active connections"
+              chart_type: line
+              dimensions:
+                - name: connections
+            - name: ip.tcppackets
+              description: IPv4 TCP Packets
               unit: "packets/s"
               chart_type: line
               dimensions:
                 - name: received
                 - name: sent
-                - name: forwarded
-                - name: delivered
-            - name: ipv4.fragsout
-              description: IPv4 Fragments Sent
+            - name: ip.tcperrors
+              description: IPv4 TCP Errors
               unit: "packets/s"
               chart_type: line
               dimensions:
-                - name: ok
-                - name: failed
-                - name: created
-            - name: ipv4.fragsin
-              description: IPv4 Fragments Reassembly
+                - name: InErrs
+                - name: InCsumErrors
+                - name: RetransSegs
+            - name: ip.tcpopens
+              description: IPv4 TCP Opens
+              unit: "connections/s"
+              chart_type: line
+              dimensions:
+                - name: active
+                - name: passive
+            - name: ip.tcphandshake
+              description: IPv4 TCP Handshake Issues
+              unit: "events/s"
+              chart_type: line
+              dimensions:
+                - name: EstabResets
+                - name: OutRsts
+                - name: AttemptFails
+                - name: SynRetrans
+            - name: ipv4.packets
+              description: IPv4 Packets
               unit: "packets/s"
               chart_type: line
               dimensions:
-                - name: ok
-                - name: failed
-                - name: all
+                - name: received
+                - name: sent
+                - name: forwarded
+                - name: delivered
             - name: ipv4.errors
               description: IPv4 Errors
               unit: "packets/s"
@@ -3329,25 +3305,47 @@ modules:
               dimensions:
                 - name: InDiscards
                 - name: OutDiscards
-                - name: InHdrErrors
+                - name: InNoRoutes
                 - name: OutNoRoutes
+                - name: InHdrErrors
                 - name: InAddrErrors
-                - name: InUnknownProtos
-            - name: ipv4.icmp
-              description: IPv4 ICMP Packets
+                - name: InTruncatedPkts
+                - name: InCsumErrors
+            - name: ipc4.bcast
+              description: IP Broadcast Bandwidth
+              unit: "kilobits/s"
+              chart_type: area
+              dimensions:
+                - name: received
+                - name: sent
+            - name: ipv4.bcastpkts
+              description: IP Broadcast Packets
               unit: "packets/s"
               chart_type: line
               dimensions:
                 - name: received
                 - name: sent
-            - name: ipv4.icmp_errors
-              description: IPv4 ICMP Errors
+            - name: ipv4.mcast
+              description: IPv4 Multicast Bandwidth
+              unit: "kilobits/s"
+              chart_type: area
+              dimensions:
+                - name: received
+                - name: sent
+            - name: ipv4.mcastpkts
+              description: IP Multicast Packets
               unit: "packets/s"
               chart_type: line
               dimensions:
-                - name: InErrors
-                - name: OutErrors
-                - name: InCsumErrors
+                - name: received
+                - name: sent
+            - name: ipv4.icmp
+              description: IPv4 ICMP Packets
+              unit: "packets/s"
+              chart_type: line
+              dimensions:
+                - name: received
+                - name: sent
             - name: ipv4.icmpmsg
               description: IPv4 ICMP Messages
               unit: "packets/s"
@@ -3373,43 +3371,14 @@ modules:
                 - name: OutTimestamps
                 - name: InTimestampReps
                 - name: OutTimestampReps
-            - name: ipv4.tcpsock
-              description: IPv4 TCP Connections
-              unit: "active connections"
-              chart_type: line
-              dimensions:
-                - name: connections
-            - name: ipv4.tcppackets
-              description: IPv4 TCP Packets
-              unit: "packets/s"
-              chart_type: line
-              dimensions:
-                - name: received
-                - name: sent
-            - name: ipv4.tcperrors
-              description: IPv4 TCP Errors
+            - name: ipv4.icmp_errors
+              description: IPv4 ICMP Errors
               unit: "packets/s"
               chart_type: line
               dimensions:
-                - name: InErrs
+                - name: InErrors
+                - name: OutErrors
                 - name: InCsumErrors
-                - name: RetransSegs
-            - name: ipv4.tcpopens
-              description: IPv4 TCP Opens
-              unit: "connections/s"
-              chart_type: line
-              dimensions:
-                - name: active
-                - name: passive
-            - name: ipv4.tcphandshake
-              description: IPv4 TCP Handshake Issues
-              unit: "events/s"
-              chart_type: line
-              dimensions:
-                - name: EstabResets
-                - name: OutRsts
-                - name: AttemptFails
-                - name: SynRetrans
             - name: ipv4.udppackets
               description: IPv4 UDP Packets
               unit: "packets/s"
@@ -3446,6 +3415,31 @@ modules:
                 - name: NoPorts
                 - name: InCsumErrors
                 - name: IgnoredMulti
+            - name: ipv4.ecnpkts
+              description: IP ECN Statistics
+              unit: "packets/s"
+              chart_type: line
+              dimensions:
+                - name: CEP
+                - name: NoECTP
+                - name: ECTP0
+                - name: ECTP1
+            - name: ipv4.fragsin
+              description: IPv4 Fragments Reassembly
+              unit: "packets/s"
+              chart_type: line
+              dimensions:
+                - name: ok
+                - name: failed
+                - name: all
+            - name: ipv4.fragsout
+              description: IPv4 Fragments Sent
+              unit: "packets/s"
+              chart_type: line
+              dimensions:
+                - name: ok
+                - name: failed
+                - name: created
             - name: system.ipv6
               description: IPv6 Bandwidth
               unit: "kilobits/s"
@@ -3453,7 +3447,7 @@ modules:
               dimensions:
                 - name: received
                 - name: sent
-            - name: system.ipv6
+            - name: ipv6.packets
               description: IPv6 Packets
               unit: "packets/s"
               chart_type: line
@@ -3462,23 +3456,6 @@ modules:
                 - name: sent
                 - name: forwarded
                 - name: delivers
-            - name: ipv6.fragsout
-              description: IPv6 Fragments Sent
-              unit: "packets/s"
-              chart_type: line
-              dimensions:
-                - name: ok
-                - name: failed
-                - name: all
-            - name: ipv6.fragsin
-              description: IPv6 Fragments Reassembly
-              unit: "packets/s"
-              chart_type: line
-              dimensions:
-                - name: ok
-                - name: failed
-                - name: timeout
-                - name: all
             - name: ipv6.errors
               description: IPv6 Errors
               unit: "packets/s"
@@ -3493,6 +3470,27 @@ modules:
                 - name: InTruncatedPkts
                 - name: InNoRoutes
                 - name: OutNoRoutes
+            - name: ipv6.bcast
+              description: IPv6 Broadcast Bandwidth
+              unit: "kilobits/s"
+              chart_type: area
+              dimensions:
+                - name: received
+                - name: sent
+            - name: ipv6.mcast
+              description: IPv6 Multicast Bandwidth
+              unit: "kilobits/s"
+              chart_type: area
+              dimensions:
+                - name: received
+                - name: sent
+            - name: ipv6.mcastpkts
+              description: IPv6 Multicast Packets
+              unit: "packets/s"
+              chart_type: line
+              dimensions:
+                - name: received
+                - name: sent
             - name: ipv6.udppackets
               description: IPv6 UDP Packets
               unit: "packets/s"
@@ -3528,27 +3526,6 @@ modules:
                 - name: InErrors
                 - name: NoPorts
                 - name: InCsumErrors
-            - name: ipv6.mcast
-              description: IPv6 Multicast Bandwidth
-              unit: "kilobits/s"
-              chart_type: area
-              dimensions:
-                - name: received
-                - name: sent
-            - name: ipv6.bcast
-              description: IPv6 Broadcast Bandwidth
-              unit: "kilobits/s"
-              chart_type: area
-              dimensions:
-                - name: received
-                - name: sent
-            - name: ipv6.mcastpkts
-              description: IPv6 Multicast Packets
-              unit: "packets/s"
-              chart_type: line
-              dimensions:
-                - name: received
-                - name: sent
             - name: ipv6.icmp
               description: IPv6 ICMP Messages
               unit: "messages/s"
@@ -3657,6 +3634,23 @@ modules:
                 - name: InECT1Pkts
                 - name: InECT0Pkts
                 - name: InCEPkts
+            - name: ipv6.fragsin
+              description: IPv6 Fragments Reassembly
+              unit: "packets/s"
+              chart_type: line
+              dimensions:
+                - name: ok
+                - name: failed
+                - name: timeout
+                - name: all
+            - name: ipv6.fragsout
+              description: IPv6 Fragments Sent
+              unit: "packets/s"
+              chart_type: line
+              dimensions:
+                - name: ok
+                - name: failed
+                - name: all
   - meta:
       plugin_name: proc.plugin
       module_name: /proc/net/sockstat
@@ -3734,8 +3728,8 @@ modules:
           description: ""
           labels: []
           metrics:
-            - name: ipv4.sockstat_sockets
-              description: IPv4 Sockets Used
+            - name: ip.sockstat_sockets
+              description: Sockets used for all address families
               unit: "sockets"
               chart_type: line
               dimensions:
diff --git a/collectors/proc.plugin/proc_net_netstat.c b/collectors/proc.plugin/proc_net_netstat.c
index ce3068c0e5..170daad5d9 100644
--- a/collectors/proc.plugin/proc_net_netstat.c
+++ b/collectors/proc.plugin/proc_net_netstat.c
@@ -2,9 +2,9 @@
 
 #include "plugin_proc.h"
 
-#define RRD_TYPE_NET_NETSTAT "ip"
-#define RRD_TYPE_NET_SNMP    "ipv4"
-#define RRD_TYPE_NET_SNMP6   "ipv6"
+#define RRD_TYPE_NET_IP "ip"
+#define RRD_TYPE_NET_IP4 "ipv4"
+#define RRD_TYPE_NET_IP6 "ipv6"
 #define PLUGIN_PROC_MODULE_NETSTAT_NAME "/proc/net/netstat"
 #define CONFIG_SECTION_PLUGIN_PROC_NETSTAT "plugin:" PLUGIN_PROC_CONFIG_NAME ":" PLUGIN_PROC_MODULE_NETSTAT_NAME
 
@@ -424,7 +424,7 @@ static void do_proc_net_snmp6(int update_every) {
 
         if(unlikely(!st)) {
             st = rrdset_create_localhost(
-                    RRD_TYPE_NET_SNMP6
+                    RRD_TYPE_NET_IP6
                     , "packets"
                     , NULL
                     , "packets"
@@ -464,7 +464,7 @@ static void do_proc_net_snmp6(int update_every) {
 
         if(unlikely(!st)) {
             st = rrdset_create_localhost(
-                    RRD_TYPE_NET_SNMP6
+                    RRD_TYPE_NET_IP6
                     , "fragsout"
                     , NULL
                     , "fragments6"
@@ -506,7 +506,7 @@ static void do_proc_net_snmp6(int update_every) {
 
         if(unlikely(!st)) {
             st = rrdset_create_localhost(
-                    RRD_TYPE_NET_SNMP6
+                    RRD_TYPE_NET_IP6
                     , "fragsin"
                     , NULL
                     , "fragments6"
@@ -557,7 +557,7 @@ static void do_proc_net_snmp6(int update_every) {
 
         if(unlikely(!st)) {
             st = rrdset_create_localhost(
-                    RRD_TYPE_NET_SNMP6
+                    RRD_TYPE_NET_IP6
                     , "errors"
                     , NULL
                     , "errors"
@@ -605,7 +605,7 @@ static void do_proc_net_snmp6(int update_every) {
 
         if(unlikely(!st)) {
             st = rrdset_create_localhost(
-                    RRD_TYPE_NET_SNMP6
+                    RRD_TYPE_NET_IP6
                     , "udppackets"
                     , NULL
                     , "udp6"
@@ -647,7 +647,7 @@ static void do_proc_net_snmp6(int update_every) {
 
         if(unlikely(!st)) {
             st = rrdset_create_localhost(
-                    RRD_TYPE_NET_SNMP6
+                    RRD_TYPE_NET_IP6
                     , "udperrors"
                     , NULL
                     , "udp6"
@@ -689,7 +689,7 @@ static void do_proc_net_snmp6(int update_every) {
 
         if(unlikely(!st)) {
             st = rrdset_create_localhost(
-                    RRD_TYPE_NET_SNMP6
+                    RRD_TYPE_NET_IP6
                     , "udplitepackets"
                     , NULL
                     , "udplite6"
@@ -730,7 +730,7 @@ static void do_proc_net_snmp6(int update_every) {
 
         if(unlikely(!st)) {
             st = rrdset_create_localhost(
-                    RRD_TYPE_NET_SNMP6
+                    RRD_TYPE_NET_IP6
                     , "udpliteerrors"
                     , NULL
                     , "udplite6"
@@ -771,7 +771,7 @@ static void do_proc_net_snmp6(int update_every) {
 
         if(unlikely(!st)) {
             st = rrdset_create_localhost(
-                    RRD_TYPE_NET_SNMP6
+                    RRD_TYPE_NET_IP6
                     , "mcast"
                     , NULL
                     , "multicast6"
@@ -806,7 +806,7 @@ static void do_proc_net_snmp6(int update_every) {
 
         if(unlikely(!st)) {
             st = rrdset_create_localhost(
-                    RRD_TYPE_NET_SNMP6
+                    RRD_TYPE_NET_IP6
                     , "bcast"
                     , NULL
                     , "broadcast6"
@@ -841,7 +841,7 @@ static void do_proc_net_snmp6(int update_every) {
 
         if(unlikely(!st)) {
             st = rrdset_create_localhost(
-                    RRD_TYPE_NET_SNMP6
+                    RRD_TYPE_NET_IP6
                     , "mcastpkts"
                     , NULL
                     , "multicast6"
@@ -876,7 +876,7 @@ static void do_proc_net_snmp6(int update_every) {
 
         if(unlikely(!st)) {
             st = rrdset_create_localhost(
-                    RRD_TYPE_NET_SNMP6
+                    RRD_TYPE_NET_IP6
                     , "icmp"
                     , NULL
                     , "icmp6"
@@ -910,7 +910,7 @@ static void do_proc_net_snmp6(int update_every) {
 
         if(unlikely(!st)) {
             st = rrdset_create_localhost(
-                    RRD_TYPE_NET_SNMP6
+                    RRD_TYPE_NET_IP6
                     , "icmpredir"
                     , NULL
                     , "icmp6"
@@ -962,7 +962,7 @@ static void do_proc_net_snmp6(int update_every) {
 
         if(unlikely(!st)) {
             st = rrdset_create_localhost(
-                    RRD_TYPE_NET_SNMP6
+                    RRD_TYPE_NET_IP6
                     , "icmperrors"
                     , NULL
                     , "icmp6"
@@ -1018,7 +1018,7 @@ static void do_proc_net_snmp6(int update_every) {
 
         if(unlikely(!st)) {
             st = rrdset_create_localhost(
-                    RRD_TYPE_NET_SNMP6
+                    RRD_TYPE_NET_IP6
                     , "icmpechos"
                     , NULL
                     , "icmp6"
@@ -1064,7 +1064,7 @@ static void do_proc_net_snmp6(int update_every) {
 
         if(unlikely(!st)) {
             st = rrdset_create_localhost(
-                    RRD_TYPE_NET_SNMP6
+                    RRD_TYPE_NET_IP6
                     , "groupmemb"
                     , NULL
                     , "icmp6"
@@ -1109,7 +1109,7 @@ static void do_proc_net_snmp6(int update_every) {
 
         if(unlikely(!st)) {
             st = rrdset_create_localhost(
-                    RRD_TYPE_NET_SNMP6
+                    RRD_TYPE_NET_IP6
                     , "icmprouter"
                     , NULL
                     , "icmp6"
@@ -1151,7 +1151,7 @@ static void do_proc_net_snmp6(int update_every) {
 
         if(unlikely(!st)) {
             st = rrdset_create_localhost(
-                    RRD_TYPE_NET_SNMP6
+                    RRD_TYPE_NET_IP6
                     , "icmpneighbor"
                     , NULL
                     , "icmp6"
@@ -1189,7 +1189,7 @@ static void do_proc_net_snmp6(int update_every) {
 
         if(unlikely(!st)) {
             st = rrdset_create_localhost(
-                    RRD_TYPE_NET_SNMP6
+                    RRD_TYPE_NET_IP6
                     , "icmpmldv2"
                     , NULL
                     , "icmp6"
@@ -1239,7 +1239,7 @@ static void do_proc_net_snmp6(int update_every) {
 
         if(unlikely(!st)) {
             st = rrdset_create_localhost(
-                    RRD_TYPE_NET_SNMP6
+                    RRD_TYPE_NET_IP6
                     , "icmptypes"
                     , NULL
                     , "icmp6"
@@ -1287,7 +1287,7 @@ static void do_proc_net_snmp6(int update_every) {
 
         if (unlikely(!st)) {
             st = rrdset_create_localhost(
-                RRD_TYPE_NET_SNMP6,
+                RRD_TYPE_NET_IP6,
                 "ect",
                 NULL,
                 "packets",
@@ -1852,11 +1852,11 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
         if(unlikely(!st_system_ip)) {
             st_system_ip = rrdset_create_localhost(
                     "system"
-                    , RRD_TYPE_NET_NETSTAT
+                    , "ip" // FIXME: this is ipv4. Not changing it because it will require to do changes in cloud-frontend too
                     , NULL
                     , "network"
                     , NULL
-                    , "IP Bandwidth"
+                    , "IPv4 Bandwidth"
                     , "kilobits/s"
                     , PLUGIN_PROC_NAME
                     , PLUGIN_PROC_MODULE_NETSTAT_NAME
@@ -1874,43 +1874,6 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
         rrdset_done(st_system_ip);
     }
 
-    if(do_inerrors == CONFIG_BOOLEAN_YES || (do_inerrors == CONFIG_BOOLEAN_AUTO &&
-                                                (ipext_InNoRoutes ||
-                                                ipext_InTruncatedPkts ||
-                                                netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
-        do_inerrors = CONFIG_BOOLEAN_YES;
-        static RRDSET *st_ip_inerrors = NULL;
-        static RRDDIM *rd_noroutes = NULL, *rd_truncated = NULL, *rd_checksum = NULL;
-
-        if(unlikely(!st_ip_inerrors)) {
-            st_ip_inerrors = rrdset_create_localhost(
-                    RRD_TYPE_NET_NETSTAT
-                    , "inerrors"
-                    , NULL
-                    , "errors"
-                    , NULL
-                    , "IP Input Errors"
-                    , "packets/s"
-                    , PLUGIN_PROC_NAME
-                    , PLUGIN_PROC_MODULE_NETSTAT_NAME
-                    , NETDATA_CHART_PRIO_IP_ERRORS
-                    , update_every
-                    , RRDSET_TYPE_LINE
-            );
-
-            rrdset_flag_set(st_ip_inerrors, RRDSET_FLAG_DETAIL);
-
-            rd_noroutes  = rrddim_add(st_ip_inerrors, "InNoRoutes",      "noroutes",  1, 1, RRD_ALGORITHM_INCREMENTAL);
-            rd_truncated = rrddim_add(st_ip_inerrors, "InTruncatedPkts", "truncated", 1, 1, RRD_ALGORITHM_INCREMENTAL);
-            rd_checksum  = rrddim_add(st_ip_inerrors, "InCsumErrors",    "checksum",  1, 1, RRD_ALGORITHM_INCREMENTAL);
-        }
-
-        rrddim_set_by_pointer(st_ip_inerrors, rd_noroutes,  ipext_InNoRoutes);
-        rrddim_set_by_pointer(st_ip_inerrors, rd_truncated, ipext_InTruncatedPkts);
-        rrddim_set_by_pointer(st_ip_inerrors, rd_checksum,  ipext_InCsumErrors);
-        rrdset_done(st_ip_inerrors);
-    }
-
     if(do_mcast == CONFIG_BOOLEAN_YES || (do_mcast == CONFIG_BOOLEAN_AUTO &&
                                             (ipext_InMcastOctets ||
                                             ipext_OutMcastOctets ||
@@ -1921,7 +1884,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
 
         if(unlikely(!st_ip_mcast)) {
             st_ip_mcast = rrdset_create_localhost(
-                    RRD_TYPE_NET_NETSTAT
+                    RRD_TYPE_NET_IP4
                     , "mcast"
                     , NULL
                     , "multicast"
@@ -1930,7 +1893,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
                     , "kilobits/s"
                     , PLUGIN_PROC_NAME
                     , PLUGIN_PROC_MODULE_NETSTAT_NAME
-                    , NETDATA_CHART_PRIO_IP_MCAST
+                    , NETDATA_CHART_PRIO_IPV4_MCAST
                     , update_every
                     , RRDSET_TYPE_AREA
             );
@@ -1960,16 +1923,16 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
 
         if(unlikely(!st_ip_bcast)) {
             st_ip_bcast = rrdset_create_localhost(
-                    RRD_TYPE_NET_NETSTAT
+                    RRD_TYPE_NET_IP4
                     , "bcast"
                     , NULL
                     , "broadcast"
                     , NULL
-                    , "IP Broadcast Bandwidth"
+                    , "IPv4 Broadcast Bandwidth"
                     , "kilobits/s"
                     , PLUGIN_PROC_NAME
                     , PLUGIN_PROC_MODULE_NETSTAT_NAME
-                    , NETDATA_CHART_PRIO_IP_BCAST
+                    , NETDATA_CHART_PRIO_IPV4_BCAST
                     , update_every
                     , RRDSET_TYPE_AREA
             );
@@ -1999,16 +1962,16 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
 
         if(unlikely(!st_ip_mcastpkts)) {
             st_ip_mcastpkts = rrdset_create_localhost(
-                    RRD_TYPE_NET_NETSTAT
+                    RRD_TYPE_NET_IP4
                     , "mcastpkts"