@cryptotaxi247 / netdata / commits / c1910bb45

update generic snmp profiles (#20599)

Ilya Mashchenko committed Jun 30, 2025 at 13:37 UTC c1910bb45cb6985902e74683fb1b59e0b3e3216e
16 files changed +361 -368
src/go/plugin/go.d/collector/snmp/ddsnmp/ddsnmpcollector/collector.go
+6
@@ -146,6 +146,12 @@ func (c *Collector) updateMetrics(pms []*ddsnmp.ProfileMetrics) {
146 m.Family = metricMetaReplacer.Replace(m.Family)
147 m.Unit = metricMetaReplacer.Replace(m.Unit)
148 for k, v := range m.Tags {
149 + // Remove tags prefixed with "rm:", which are intended for temporary use during transforms
150 + // and should not appear in the final exported metric.
151 + if strings.HasPrefix(k, "rm:") {
152 + delete(m.Tags, k)
153 + continue
154 + }
155 m.Tags[k] = metricMetaReplacer.Replace(v)
156 }
157 }
src/go/plugin/go.d/collector/snmp/ddsnmp/transform.go
+3 -9
@@ -165,15 +165,9 @@ func newMetricTransformFuncMap() template.FuncMap {
165 - Works across vendors (Cisco, Juniper, HPE, Dell, etc.)
166 */
167
168 - sensorType := m.Tags["sensor_type"]
169 - sensorScale := m.Tags["sensor_scale"]
170 - sensorPrecision := m.Tags["sensor_precision"]
171 -
172 - defer func() {
173 - delete(m.Tags, "sensor_type")
174 - delete(m.Tags, "sensor_scale")
175 - delete(m.Tags, "sensor_precision")
176 - }()
168 + sensorType := m.Tags["rm:sensor_type"]
169 + sensorScale := m.Tags["rm:sensor_scale"]
170 + sensorPrecision := m.Tags["rm:sensor_precision"]
171
172 config := map[string]map[string]interface{}{
173 "1": {"name": "unspecified", "family": "Sensor/Generic/Value", "desc": "Unspecified or vendor-specific sensor"},
src/go/plugin/go.d/config/go.d/snmp.profiles/default/_cisco-catalyst.yaml
+3 -3
@@ -41,15 +41,15 @@ metrics:
41 symbol:
42 OID: 1.3.6.1.2.1.47.1.1.1.1.2
43 name: entPhysicalDescr
44 - - tag: sensor_type # needed for transform
44 + - tag: rm:sensor_type # needed for transform
45 symbol:
46 OID: 1.3.6.1.4.1.9.9.91.1.1.1.1.1
47 name: entSensorType
48 - - tag: sensor_scale # needed for transform
48 + - tag: rm:sensor_scale # needed for transform
49 symbol:
50 OID: 1.3.6.1.4.1.9.9.91.1.1.1.1.2
51 name: entSensorScale
52 - - tag: sensor_precision # needed for transform
52 + - tag: rm:sensor_precision # needed for transform
53 symbol:
54 OID: 1.3.6.1.4.1.9.9.91.1.1.1.1.3
55 name: entSensorPrecision
src/go/plugin/go.d/config/go.d/snmp.profiles/default/_generic-bgp4.yaml
+8 -8
@@ -9,7 +9,7 @@ metrics:
9 - OID: 1.3.6.1.2.1.15.3.1.3
10 name: bgpPeerAdminStatus
11 description: The desired state of the BGP connection
12 - family: BGP4/Peer Connections/Status
12 + family: Routing/BGP/Peer/Admin/Status
13 unit: "{status}"
14 mapping:
15 1: stop
@@ -17,7 +17,7 @@ metrics:
17 - OID: 1.3.6.1.2.1.15.3.1.2
18 name: bgpPeerState
19 description: The BGP peer connection state
20 - family: BGP4/Peer Connections/Status
20 + family: Routing/BGP/Peer/Connection/Status
21 unit: "{status}"
22 mapping:
23 1: idle
@@ -29,32 +29,32 @@ metrics:
29 - OID: 1.3.6.1.2.1.15.3.1.12
30 name: bgpPeerInTotalMessages
31 description: The total number of messages received from the remote peer on this connection
32 - family: BGP4/Peer Connections/Messages
32 + family: Routing/BGP/Peer/Message/Total/In
33 unit: "{message}"
34 - OID: 1.3.6.1.2.1.15.3.1.13
35 name: bgpPeerOutTotalMessages
36 description: The total number of messages transmitted to the remote peer on this connection
37 - family: BGP4/Peer Connections/Messages
37 + family: Routing/BGP/Peer/Message/Total/Out
38 unit: "{message}"
39 - OID: 1.3.6.1.2.1.15.3.1.10
40 name: bgpPeerInUpdates
41 description: The number of BGP UPDATE messages received on this connection
42 - family: BGP4/Peer Connections/Messages
42 + family: Routing/BGP/Peer/Message/Update/In
43 unit: "{message}"
44 - OID: 1.3.6.1.2.1.15.3.1.11
45 name: bgpPeerOutUpdates
46 description: The number of BGP UPDATE messages transmitted on this connection
47 - family: BGP4/Peer Connections/Messages
47 + family: Routing/BGP/Peer/Message/Update/Out
48 unit: "{message}"
49 - OID: 1.3.6.1.2.1.15.3.1.15
50 name: bgpPeerFsmEstablishedTransitions
51 description: The total number of times the BGP FSM transitioned into the established state
52 - family: BGP4/Peer Connections/Finite State Machine/Status
52 + family: Routing/BGP/Peer/FSM/Transition/Established/Count
53 unit: "{transition}"
54 - OID: 1.3.6.1.2.1.15.3.1.16
55 name: bgpPeerFsmEstablishedTime
56 description: Time in seconds this peer has been in the Established state or since last in Established state
57 - family: BGP4/Peer Connections/Finite State Machine/Status
57 + family: Routing/BGP/Peer/FSM/Duration/Established
58 unit: "s"
59 metric_tags:
60 - tag: remote_as
src/go/plugin/go.d/config/go.d/snmp.profiles/default/_generic-entity-sensor.yaml
+3 -3
@@ -35,15 +35,15 @@ metrics:
35 symbol:
36 OID: 1.3.6.1.2.1.99.1.1.1.6
37 name: entPhySensorUnitsDisplay
38 - - tag: sensor_type # needed for transform
38 + - tag: rm:sensor_type # needed for transform
39 symbol:
40 OID: 1.3.6.1.2.1.99.1.1.1.1
41 name: entPhySensorType
42 - - tag: sensor_scale # needed for transform
42 + - tag: rm:sensor_scale # needed for transform
43 symbol:
44 OID: 1.3.6.1.2.1.99.1.1.1.2
45 name: entPhySensorScale
46 - - tag: sensor_precision # needed for transform
46 + - tag: rm:sensor_precision # needed for transform
47 symbol:
48 OID: 1.3.6.1.2.1.99.1.1.1.3
49 name: entPhySensorPrecision
src/go/plugin/go.d/config/go.d/snmp.profiles/default/_generic-host-cpu-memory.yaml deleted
-41
@@ -1,41 +0,0 @@
1 -# CPU and memory metrics for devices
2 -
3 -metrics:
4 - #
5 - # Memory
6 - #
7 - - MIB: HOST-RESOURCES-MIB
8 - table:
9 - OID: 1.3.6.1.2.1.25.2.3
10 - name: hrStorageTable
11 - symbols:
12 - - OID: 1.3.6.1.2.1.25.2.3.1.5
13 - # core check only
14 - name: memory.total
15 - description: The size of the storage represented by this entry, in units of hrStorageAllocationUnits.
16 - unit: "By"
17 - - OID: 1.3.6.1.2.1.25.2.3.1.6
18 - # core check only
19 - name: memory.used
20 - description: The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
21 - unit: "By"
22 - metric_tags:
23 - - tag: mem
24 - index: 1
25 -
26 - #
27 - # Processor Load
28 - #
29 - - MIB: HOST-RESOURCES-MIB
30 - table:
31 - OID: 1.3.6.1.2.1.25.3.3
32 - name: hrProcessorTable
33 - symbols:
34 - - OID: 1.3.6.1.2.1.25.3.3.1.2
35 - # core check only
36 - name: cpu.usage
37 - description: The average, over the last minute, of the percentage of time that this processor was not idle.
38 - unit: "%"
39 - metric_tags:
40 - - tag: cpu
41 - index: 1
src/go/plugin/go.d/config/go.d/snmp.profiles/default/_generic-host-resources-base.yaml
+58 -57
@@ -1,88 +1,89 @@
1 # Generic Resource metrics for devices
2
3 -# Currently covers basic uptime and system process count along with storage stats
4 -# TODO: add device table
3 +
4 +# https://www.net-snmp.org/docs/mibs/host.html
5
6 metrics:
7 - #
8 - # General System Information
9 - #
10 - - MIB: HOST-RESOURCES-MIB
11 - symbol:
12 - OID: 1.3.6.1.2.1.25.1.1.0
13 - name: hrSystemUptime
14 - description: The amount of time since this host was last initialized. Note that this is different from sysUpTime in the SNMPv2-MIB [RFC1907] because sysUpTime is the uptime of the network management portion of the system.
15 - unit: "cs"
7 + # Scalar Objects (https://www.net-snmp.org/docs/mibs/host.html#scalar_current)
8 - MIB: HOST-RESOURCES-MIB
9 symbol:
10 OID: 1.3.6.1.2.1.25.1.5.0
11 name: hrSystemNumUsers
20 - description: The number of user sessions for which this host is storing state information. A session is a collection of processes requiring a single act of user authentication and possibly subject to collective job control.
21 - unit: "{session}"
12 + description: The number of user sessions for which this host is storing state information. A session is a collection of processes requiring a single act of user authentication and possibly subject to collective job control.
13 + family: System/User/Session/Active
14 + unit: "{session}"
15 - MIB: HOST-RESOURCES-MIB
16 symbol:
17 OID: 1.3.6.1.2.1.25.1.6.0
18 name: hrSystemProcesses
26 - description: The number of process contexts currently loaded or running on this system.
27 - unit: "{process}"
19 + description: The number of process contexts currently loaded or running on this system.
20 + family: System/Process/Active
21 + unit: "{process}"
22 - MIB: HOST-RESOURCES-MIB
23 symbol:
24 OID: 1.3.6.1.2.1.25.1.7.0
25 name: hrSystemMaxProcesses
32 - description: The maximum number of process contexts this system can support. If there is no fixed maximum, the value should be zero. On systems that have a fixed maximum, this object can help diagnose failures that occur when this maximum is reached.
33 - unit: "{process}"
26 + description: The maximum number of process contexts this system can support. If there is no fixed maximum, the value should be zero. On systems that have a fixed maximum, this object can help diagnose failures that occur when this maximum is reached.
27 + family: System/Process/Maximum
28 + unit: "{process}"
29 +
30 + # Table Objects
31 +
32 + # CPU hrProcessorTable (https://www.net-snmp.org/docs/mibs/host.html#hrProcessorTable)
33 + - MIB: HOST-RESOURCES-MIB
34 + table:
35 + OID: 1.3.6.1.2.1.25.3.3
36 + name: hrProcessorTable
37 + symbols:
38 + - OID: 1.3.6.1.2.1.25.3.3.1.2
39 + name: cpu.usage
40 + description: The average, over the last minute, of the percentage of time that this processor was not idle.
41 + family: CPU/Usage
42 + unit: "%"
43 + metric_tags:
44 + - tag: cpu_index
45 + index: 1
46 + - tag: _cpu_descr
47 + table: hrDeviceTable
48 + symbol:
49 + OID: 1.3.6.1.2.1.25.3.2.1.3
50 + name: hrDeviceDescr
51 +
52
35 - #
36 - # Storage Devices
37 - #
53 + # Storage hrStorageTable (https://www.net-snmp.org/docs/mibs/host.html#hrStorageTable)
54 + # This table includes disk partitions, file systems, ram (for some architectures this is further segmented into
55 + # regular memory, extended memory, and so on), backing store for virtual memory (`swap space').
56 - MIB: HOST-RESOURCES-MIB
57 table:
58 OID: 1.3.6.1.2.1.25.2.3
59 name: hrStorageTable
60 symbols:
43 - - OID: 1.3.6.1.2.1.25.2.3.1.4
44 - name: hrStorageAllocationUnits
45 - description: The size, in bytes, of the data objects allocated from this pool. If this entry is monitoring sectors, blocks, buffers, or packets, for example, this number will commonly be greater than one. Otherwise this number will typically be one.
46 - unit: "By"
61 - OID: 1.3.6.1.2.1.25.2.3.1.5
62 name: hrStorageSize
49 - description: The size of the storage represented by this entry, in units of hrStorageAllocationUnits. This object is writable to allow remote configuration of the size of the storage area in those cases where such an operation makes sense and is possible on the underlying system. For example, the amount of main memory allocated to a buffer pool might be modified or the amount of disk space allocated to virtual memory might be modified.
50 - unit: "{storage_unit}"
63 + description: The size of the storage represented by this entry, in units of hrStorageAllocationUnits.
64 + family: Storage/Total
65 + unit: "By"
66 + transform: |
67 + {{- $unit := index .Metric.Tags "rm:storage_alloc_unit" | default "1" -}}
68 + {{- $factor := int64 $unit -}}
69 + {{- setValue .Metric (mul .Metric.Value $factor) -}}
70 - OID: 1.3.6.1.2.1.25.2.3.1.6
71 name: hrStorageUsed
72 description: The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
54 - unit: "{storage_unit}"
55 - - OID: 1.3.6.1.2.1.25.2.3.1.7
56 - name: hrStorageAllocationFailures
57 - description: The number of requests for storage represented by this entry that could not be honored due to not enough storage. It should be noted that as this object has a SYNTAX of Counter32, that it does not have a defined initial value. However, it is recommended that this object be initialized to zero, even though management stations must not depend on such an initialization.
58 - unit: "{request}"
59 -
73 + family: Storage/Used
74 + unit: "By"
75 + transform: |
76 + {{- $unit := index .Metric.Tags "rm:storage_alloc_unit" | default "1" -}}
77 + {{- $factor := int64 $unit -}}
78 + {{- setValue .Metric (mul .Metric.Value $factor) -}}
79 metric_tags:
61 - - tag: storagedesc
80 + - tag: storage_index
81 + index: 1
82 + - tag: _storage_descr
83 symbol:
84 OID: 1.3.6.1.2.1.25.2.3.1.3
64 - name: hrStorageDescr
65 - - tag: storagetype
66 - symbol:
67 - OID: 1.3.6.1.2.1.25.2.3.1.2
68 - name: hrStorageType
69 -
70 - #
71 - # Processor Load
72 - #
73 - - MIB: HOST-RESOURCES-MIB
74 - table:
75 - OID: 1.3.6.1.2.1.25.3.3
76 - name: hrProcessorTable
77 - symbols:
78 - - OID: 1.3.6.1.2.1.25.3.3.1.2
79 - name: hrProcessorLoad
80 - description: The average, over the last minute, of the percentage of time that this processor was not idle. Implementations may approximate this one minute smoothing period if necessary.
81 - unit: "%"
82 - metric_tags:
83 - - index: 1 # hrDeviceIndex
84 - tag: hr_device_index
85 - - tag: processorid
85 + name: hrDeviceDescr
86 + - tag: rm:storage_alloc_unit # Needed for transformation
87 symbol:
87 - OID: 1.3.6.1.2.1.25.3.3.1.1
88 - name: hrProcessorFrwID
88 + OID: 1.3.6.1.2.1.25.2.3.1.4
89 + name: hrStorageAllocationUnits
src/go/plugin/go.d/config/go.d/snmp.profiles/default/_generic-host-resources.yaml
-1
@@ -1,4 +1,3 @@
1 # Generic Resource metrics for devices with cpu and memory metrics combined
2 extends:
3 - _generic-host-resources-base.yaml
4 - - _generic-host-cpu-memory.yaml
src/go/plugin/go.d/config/go.d/snmp.profiles/default/_generic-if.yaml
+2 -2
@@ -37,7 +37,7 @@ metrics:
37 - OID: 1.3.6.1.2.1.2.2.1.7
38 name: ifAdminStatus
39 description: Current administrative state of the interface
40 - family: Interfaces/Admin/Status
40 + family: Interfaces/Status/Admin
41 unit: "{status}"
42 mapping:
43 1: up
@@ -46,7 +46,7 @@ metrics:
46 - OID: 1.3.6.1.2.1.2.2.1.8
47 name: ifOperStatus
48 description: Current operational state of the interface
49 - family: Interfaces/Operational/Status
49 + family: Interfaces/Status/Operational
50 unit: "{status}"
51 mapping:
52 1: up
src/go/plugin/go.d/config/go.d/snmp.profiles/default/_generic-ip.yaml
+138 -116
@@ -5,152 +5,155 @@ metrics:
5 table:
6 OID: 1.3.6.1.2.1.4.31.1
7 name: ipSystemStatsTable
8 - metric_type: monotonic_count
8 symbols:
9 - OID: 1.3.6.1.2.1.4.31.1.1.6
10 name: ipSystemStatsHCInOctets
11 description: Octets received in input IP datagrams
13 - family: Network/Traffic
14 - unit: "By"
12 + family: Network/IP/Traffic/Total/In
13 + unit: "bit/s"
14 + scale_factor: 8
15 - OID: 1.3.6.1.2.1.4.31.1.1.33
16 name: ipSystemStatsHCOutOctets
17 description: The total number of octets in IP datagrams delivered to the lower layers for transmission
18 - family: Network/Traffic
19 - unit: "By"
18 + family: Network/IP/Traffic/Total/Out
19 + unit: "bit/s"
20 + scale_factor: 8
21 - OID: 1.3.6.1.2.1.4.31.1.1.37
22 name: ipSystemStatsHCInMcastOctets
23 description: The total number of octets received in IP multicast datagrams
23 - family: Network/Traffic
24 - unit: "By"
24 + family: Network/IP/Traffic/Multicast/In
25 + unit: "bit/s"
26 + scale_factor: 8
27 - OID: 1.3.6.1.2.1.4.31.1.1.41
28 name: ipSystemStatsHCOutMcastOctets
29 description: The total number of octets transmitted in IP multicast datagrams
28 - family: Network/Traffic
29 - unit: "By"
30 + family: Network/IP/Traffic/Multicast/Out
31 + unit: "bit/s"
32 + scale_factor: 8
33
34 - OID: 1.3.6.1.2.1.4.31.1.1.4
35 name: ipSystemStatsHCInReceives
36 description: Input IP datagrams received
34 - family: Network/Packets
35 - unit: "{packet}"
37 + family: Network/IP/Datagram/Total/In
38 + unit: "{packet}/s"
39 - OID: 1.3.6.1.2.1.4.31.1.1.21
40 name: ipSystemStatsHCOutRequests
41 description: The total number of IP datagrams that local IP user-protocols including ICMP supplied to IP in requests for transmission
39 - family: Network/Packets
40 - unit: "{packet}"
42 + family: Network/IP/Datagram/Request/Out
43 + unit: "{packet}/s"
44 - OID: 1.3.6.1.2.1.4.31.1.1.31
45 name: ipSystemStatsHCOutTransmits
46 description: The total number of IP datagrams that this entity supplied to the lower layers for transmission
44 - family: Network/Packets
45 - unit: "{packet}"
47 + family: Network/IP/Datagram/Total/Out
48 + unit: "{packet}/s"
49 - OID: 1.3.6.1.2.1.4.31.1.1.43
50 name: ipSystemStatsHCInBcastPkts
51 description: The number of IP broadcast datagrams received
49 - family: Network/Packets
50 - unit: "{packet}"
52 + family: Network/IP/Datagram/Broadcast/In
53 + unit: "{packet}/s"
54 - OID: 1.3.6.1.2.1.4.31.1.1.45
55 name: ipSystemStatsHCOutBcastPkts
56 description: The number of IP broadcast datagrams transmitted
54 - family: Network/Packets
55 - unit: "{packet}"
57 + family: Network/IP/Datagram/Broadcast/Out
58 + unit: "{packet}/s"
59 - OID: 1.3.6.1.2.1.4.31.1.1.35
60 name: ipSystemStatsHCInMcastPkts
61 description: The number of IP multicast datagrams received
59 - family: Network/Packets
60 - unit: "{packet}"
62 + family: Network/IP/Datagram/Multicast/In
63 + unit: "{packet}/s"
64 - OID: 1.3.6.1.2.1.4.31.1.1.39
65 name: ipSystemStatsHCOutMcastPkts
66 description: The number of IP multicast datagrams transmitted
64 - family: Network/Packets
65 - unit: "{packet}"
67 + family: Network/IP/Datagram/Multicast/Out
68 + unit: "{packet}/s"
69
70 - OID: 1.3.6.1.2.1.4.31.1.1.13
71 name: ipSystemStatsHCInForwDatagrams
72 description: Input datagrams for which this entity was not their final IP destination and for which this entity attempted to find a route to forward them to that final destination
70 - family: Network/Forwards
71 - unit: "{forward}"
73 + family: Network/IP/Forward/In
74 + unit: "{forward}/s"
75 - OID: 1.3.6.1.2.1.4.31.1.1.24
76 name: ipSystemStatsHCOutForwDatagrams
77 description: The number of datagrams for which this entity was not their final IP destination and for which it was successful in finding a path to their final destination
75 - family: Network/Forwards
76 - unit: "{packet}"
78 + family: Network/IP/Forward/Out
79 + unit: "{packet}/s"
80
81 - OID: 1.3.6.1.2.1.4.31.1.1.7
82 name: ipSystemStatsInHdrErrors
83 description: Discarded input IP datagrams due to errors in their IP headers
81 - family: Network/Errors
82 - unit: "{error}"
84 + family: Network/IP/Error/Header/In
85 + unit: "{error}/s"
86 - OID: 1.3.6.1.2.1.4.31.1.1.8
87 name: ipSystemStatsInNoRoutes
88 description: Input IP datagrams discarded because no route could be found to transmit them to their destination
86 - family: Network/Errors
87 - unit: "{errors}"
89 + family: Network/IP/Error/NoRoute/In
90 + unit: "{errors}/s"
91 - OID: 1.3.6.1.2.1.4.31.1.1.9
92 name: ipSystemStatsInAddrErrors
93 description: Input IP datagrams discarded due to invalid IP address in header
91 - family: Network/Errors
92 - unit: "{error}"
94 + family: Network/IP/Error/Address/In
95 + unit: "{error}/s"
96 - OID: 1.3.6.1.2.1.4.31.1.1.10
97 name: ipSystemStatsInUnknownProtos
98 description: Locally-addressed IP datagrams received successfully but discarded due to an unknown or unsupported protocol
96 - family: Network/Errors
97 - unit: "{error}"
99 + family: Network/IP/Error/UnknownProtocol/In
100 + unit: "{error}/s"
101 - OID: 1.3.6.1.2.1.4.31.1.1.11
102 name: ipSystemStatsInTruncatedPkts
103 description: Input IP datagrams discarded due to datagram frame not carrying enough data
101 - family: Network/Errors
102 - unit: "{error}"
104 + family: Network/IP/Error/Truncated/In
105 + unit: "{error}/s"
106 - OID: 1.3.6.1.2.1.4.31.1.1.16
107 name: ipSystemStatsReasmFails
108 description: The number of failures detected by the IP re-assembly algorithm
106 - family: Network/Errors
107 - unit: "{error}"
109 + family: Network/IP/Error/ReassemblyFailure/Count
110 + unit: "{error}/s"
111 - OID: 1.3.6.1.2.1.4.31.1.1.17
112 name: ipSystemStatsInDiscards
113 description: The number of input IP datagrams for which no problems were encountered to prevent their continued processing, but were discarded
111 - family: Network/Errors
112 - unit: "{error}"
114 + family: Network/IP/Discard/In
115 + unit: "{error}/s"
116 - OID: 1.3.6.1.2.1.4.31.1.1.22
117 name: ipSystemStatsOutNoRoutes
118 description: The number of locally generated IP datagrams discarded because no route could be found to transmit them to their destination
116 - family: Network/Errors
117 - unit: "{error}"
119 + family: Network/IP/Error/NoRoute/Out
120 + unit: "{error}/s"
121 - OID: 1.3.6.1.2.1.4.31.1.1.28
122 name: ipSystemStatsOutFragFails
123 description: The number of IP datagrams that have been discarded because they needed to be fragmented but could not be
121 - family: Network/Errors
122 - unit: "{error}"
124 + family: Network/IP/Error/FragmentationFailure/Out
125 + unit: "{error}/s"
126 - OID: 1.3.6.1.2.1.4.31.1.1.25
127 name: ipSystemStatsOutDiscards
128 description: The number of output IP datagrams for which no problem was encountered to prevent their transmission to their destination, but were discarded
126 - family: Network/Errors
127 - unit: "{error}"
129 + family: Network/IP/Discard/Out
130 + unit: "{error}/s"
131
132 - OID: 1.3.6.1.2.1.4.31.1.1.26
133 name: ipSystemStatsOutFragReqds
134 description: The number of IP datagrams that would require fragmentation in order to be transmitted
132 - family: Network/Fragmentation
133 - unit: "{packet}"
135 + family: Network/IP/Fragmentation/Required/Out
136 + unit: "{packet}/s"
137 - OID: 1.3.6.1.2.1.4.31.1.1.27
138 name: ipSystemStatsOutFragOKs
139 description: The number of IP datagrams that have been successfully fragmented
137 - family: Network/Fragmentation
138 - unit: "{packet}"
140 + family: Network/IP/Fragmentation/Success/Out
141 + unit: "{packet}/s"
142 - OID: 1.3.6.1.2.1.4.31.1.1.29
143 name: ipSystemStatsOutFragCreates
144 description: The number of output datagram fragments that have been generated as a result of IP fragmentation
142 - family: Network/Fragmentation
143 - unit: "{fragment}"
145 + family: Network/IP/Fragmentation/Created/Out
146 + unit: "{fragment}/s"
147 - OID: 1.3.6.1.2.1.4.31.1.1.14
148 name: ipSystemStatsReasmReqds
149 description: The number of IP fragments received that needed to be reassembled at this interface
147 - family: Network/Fragmentation
148 - unit: "{fragment}"
150 + family: Network/IP/Fragmentation/ReassemblyRequired/In
151 + unit: "{fragment}/s"
152 - OID: 1.3.6.1.2.1.4.31.1.1.15
153 name: ipSystemStatsReasmOKs
154 description: The number of IP datagrams successfully reassembled
152 - family: Network/Fragmentation
153 - unit: "{packet}"
155 + family: Network/IP/Fragmentation/ReassemblySuccess/Count
156 + unit: "{packet}/s"
157 metric_tags:
158 - index: 1
159 tag: ipversion
@@ -165,150 +168,155 @@ metrics:
168 table:
169 OID: 1.3.6.1.2.1.4.31.3
170 name: ipIfStatsTable
168 - metric_type: monotonic_count
171 symbols:
172 - OID: 1.3.6.1.2.1.4.31.3.1.6
173 name: ipIfStatsHCInOctets
174 description: The total number of octets received in input IP datagrams, including those received in error
173 - family: Network/Interfaces/Traffic
174 - unit: "By"
175 + family: Interfaces/IP/Traffic/Total/In
176 + unit: "bit/s"
177 + scale_factor: 8
178 - OID: 1.3.6.1.2.1.4.31.3.1.33
179 name: ipIfStatsHCOutOctets
180 description: The total number of octets in IP datagrams delivered to the lower layers for transmission
178 - family: Network/Interfaces/Traffic
179 - unit: "By"
181 + family: Interfaces/IP/Traffic/Total/Out
182 + unit: "bit/s"
183 + scale_factor: 8
184 - OID: 1.3.6.1.2.1.4.31.3.1.37
185 name: ipIfStatsHCInMcastOctets
186 description: The total number of octets received in IP multicast datagrams
183 - family: Network/Interfaces/Traffic
184 - unit: "By"
187 + family: Interfaces/IP/Traffic/Multicast/In
188 + unit: "bit/s"
189 + scale_factor: 8
190 - OID: 1.3.6.1.2.1.4.31.3.1.41
191 name: ipIfStatsHCOutMcastOctets
192 description: The total number of octets transmitted in IP multicast datagrams
188 - family: Network/Interfaces/Traffic
189 - unit: "By"
193 + family: Interfaces/IP/Traffic/Multicast/Out
194 + unit: "bit/s"
195 + scale_factor: 8
196
197 - OID: 1.3.6.1.2.1.4.31.3.1.19
198 name: ipIfStatsHCInDelivers
199 description: The total number of datagrams successfully delivered to IP user-protocols including ICMP
194 - family: Network/Interfaces/Packets
195 - unit: "{packet}"
200 + family: Interfaces/IP/Datagram/Delivered/In
201 + unit: "{packet}/s"
202 - OID: 1.3.6.1.2.1.4.31.3.1.21
203 name: ipIfStatsHCOutRequests
204 description: The total number of IP datagrams that local IP user-protocols including ICMP supplied to IP in requests for transmission
199 - family: Network/Interfaces/Packets
200 - unit: "{packet}"
205 + family: Interfaces/IP/Datagram/Request/Out
206 + unit: "{packet}/s"
207 - OID: 1.3.6.1.2.1.4.31.3.1.31
208 name: ipIfStatsHCOutTransmits
209 description: The total number of IP datagrams that this entity supplied to the lower layers for transmission
204 - family: Network/Interfaces/Packets
205 - unit: "{packet}"
210 + family: Interfaces/IP/Datagram/Total/Out
211 + unit: "{packet}/s"
212 - OID: 1.3.6.1.2.1.4.31.3.1.35
213 name: ipIfStatsHCInMcastPkts
214 description: The number of IP multicast datagrams received
209 - family: Network/Interfaces/Packets
210 - unit: "{packet}"
215 + family: Interfaces/IP/Datagram/Multicast/In
216 + unit: "{packet}/s"
217 - OID: 1.3.6.1.2.1.4.31.3.1.39
218 name: ipIfStatsHCOutMcastPkts
219 description: The number of IP multicast datagrams transmitted
214 - family: Network/Interfaces/Packets
215 - unit: "{packet}"
220 + family: Interfaces/IP/Datagram/Multicast/Out
221 + unit: "{packet}/s"
222 - OID: 1.3.6.1.2.1.4.31.3.1.43
223 name: ipIfStatsHCInBcastPkts
224 description: The number of IP broadcast datagrams received
219 - family: Network/Interfaces/Packets
220 - unit: "{packet}"
225 + family: Interfaces/IP/Datagram/Broadcast/In
226 + unit: "{packet}/s"
227 - OID: 1.3.6.1.2.1.4.31.3.1.45
228 name: ipIfStatsHCOutBcastPkts
229 description: The number of IP broadcast datagrams transmitted
224 - family: Network/Interfaces/Packets
225 - unit: "{packet}"
230 + family: Interfaces/IP/Datagram/Broadcast/Out
231 + unit: "{packet}/s"
232
233 - OID: 1.3.6.1.2.1.4.31.3.1.17
234 name: ipIfStatsInDiscards
235 description: The number of input IP datagrams for which no problems were encountered to prevent their continued processing, but were discarded
230 - family: Network/Interfaces/Errors
231 - unit: "{error}"
236 + family: Interfaces/IP/Discard/In
237 + unit: "{error}/s"
238 - OID: 1.3.6.1.2.1.4.31.3.1.25
239 name: ipIfStatsOutDiscards
240 description: The number of output IP datagrams for which no problem was encountered to prevent their transmission to their destination, but were discarded
235 - family: Network/Interfaces/Errors
236 - unit: "{error}"
241 + family: Interfaces/IP/Discard/Out
242 + unit: "{error}/s"
243 - OID: 1.3.6.1.2.1.4.31.3.1.7
244 name: ipIfStatsInHdrErrors
245 description: The number of input IP datagrams discarded due to errors in their IP headers
240 - family: Network/Interfaces/Errors
241 - unit: "{error}"
246 + family: Interfaces/IP/Error/Header/In
247 + unit: "{error}/s"
248 - OID: 1.3.6.1.2.1.4.31.3.1.8
249 name: ipIfStatsInNoRoutes
250 description: The number of input IP datagrams discarded because no route could be found to transmit them to their destination
245 - family: Network/Interfaces/Errors
246 - unit: "{error}"
251 + family: Interfaces/IP/Error/NoRoute/In
252 + unit: "{error}/s"
253 - OID: 1.3.6.1.2.1.4.31.3.1.9
254 name: ipIfStatsInAddrErrors
255 description: The number of input IP datagrams discarded because the IP address in their IP header's destination field was not a valid address to be received at this entity
250 - family: Network/Interfaces/Errors
251 - unit: "{error}"
256 + family: Interfaces/IP/Error/Address/In
257 + unit: "{error}/s"
258 - OID: 1.3.6.1.2.1.4.31.3.1.10
259 name: ipIfStatsInUnknownProtos
260 description: The number of locally-addressed IP datagrams received successfully but discarded because of an unknown or unsupported protocol
255 - family: Network/Interfaces/Errors
256 - unit: "{error}"
261 + family: Interfaces/IP/Error/UnknownProtocol/In
262 + unit: "{error}/s"
263 - OID: 1.3.6.1.2.1.4.31.3.1.11
264 name: ipIfStatsInTruncatedPkts
265 description: The number of input IP datagrams discarded because the datagram frame didn't carry enough data
260 - family: Network/Interfaces/Errors
261 - unit: "{error}"
266 + family: Interfaces/IP/Error/Truncated/In
267 + unit: "{error}/s"
268 - OID: 1.3.6.1.2.1.4.31.3.1.28
269 name: ipIfStatsOutFragFails
270 description: The number of IP datagrams that have been discarded because they needed to be fragmented but could not be
265 - family: Network/Interfaces/Errors
266 - unit: "{packet}"
271 + family: Interfaces/IP/Error/FragmentationFailure/Out
272 + unit: "{packet}/s"
273 - OID: 1.3.6.1.2.1.4.31.3.1.16
274 name: ipIfStatsReasmFails
275 description: The number of failures detected by the IP re-assembly algorithm
270 - family: Network/Interfaces/Errors
271 - unit: "{error}"
276 + family: Interfaces/IP/Error/ReassemblyFailure/Count
277 + unit: "{error}/s"
278
279 - OID: 1.3.6.1.2.1.4.31.3.1.27
280 name: ipIfStatsOutFragOKs
281 description: The number of IP datagrams that have been successfully fragmented
276 - family: Network/Interfaces/Fragmentation
277 - unit: "{packet}"
282 + family: Interfaces/IP/Fragmentation/Success/Out
283 + unit: "{packet}/s"
284 - OID: 1.3.6.1.2.1.4.31.3.1.26
285 name: ipIfStatsOutFragReqds
286 description: The number of IP datagrams that would require fragmentation in order to be transmitted
281 - family: Network/Interfaces/Fragmentation
282 - unit: "{packet}"
287 + family: Interfaces/IP/Fragmentation/Required/Out
288 + unit: "{packet}/s"
289 - OID: 1.3.6.1.2.1.4.31.3.1.29
290 name: ipIfStatsOutFragCreates
291 description: The number of output datagram fragments that have been generated as a result of IP fragmentation
286 - family: Network/Interfaces/Fragmentation
287 - unit: "{fragment}"
292 + family: Interfaces/IP/Fragmentation/Created/Out
293 + unit: "{fragment}/s"
294 - OID: 1.3.6.1.2.1.4.31.3.1.14
295 name: ipIfStatsReasmReqds
296 description: The number of IP fragments received that needed to be reassembled at this interface
291 - family: Network/Interfaces/Fragmentation
292 - unit: "{fragment}"
297 + family: Interfaces/IP/Fragmentation/ReassemblyRequired/In
298 + unit: "{fragment}/s"
299 - OID: 1.3.6.1.2.1.4.31.3.1.15
300 name: ipIfStatsReasmOKs
301 description: The number of IP datagrams successfully reassembled
296 - family: Network/Interfaces/Fragmentation
297 - unit: "{packet}"
302 + family: Interfaces/IP/Fragmentation/ReassemblySuccess/Count
303 + unit: "{packet}/s"
304
305 - OID: 1.3.6.1.2.1.4.31.3.1.13
306 name: ipIfStatsHCInForwDatagrams
307 description: The number of input datagrams for which this entity was not their final IP destination and for which this entity attempted to find a route to forward them to that final destination
302 - family: Network/Interfaces/Forwards
303 - unit: "{forward}"
308 + family: Interfaces/IP/Forward/In
309 + unit: "{forward}/s"
310 - OID: 1.3.6.1.2.1.4.31.3.1.24
311 name: ipIfStatsHCOutForwDatagrams
312 description: The number of datagrams for which this entity was not their final IP destination and for which it was successful in finding a path to their final destination
307 - family: Network/Interfaces/Forwards
308 - unit: "{packet}"
313 + family: Interfaces/IP/Forward/Out
314 + unit: "{packet}/s"
315 metric_tags:
310 - - index: 1
311 - tag: ipversion
316 + - tag: interface_index
317 + index: 2
318 + - tag: ipversion
319 + index: 1
320 mapping:
321 0: unknown
322 1: ipv4
@@ -316,5 +324,19 @@ metrics:
324 3: ipv4z
325 4: ipv6z
326 16: dns
319 - - index: 2
320 - tag: interface
327 + - tag: _interface
328 + table: ifXTable
329 + symbol:
330 + OID: 1.3.6.1.2.1.31.1.1.1.1
331 + name: ifName
332 + index_transform:
333 + - start: 1
334 + end: 1
335 + - tag: _interface
336 + table: ifTable
337 + symbol:
338 + OID: 1.3.6.1.2.1.2.2.1.2
339 + name: ifDescr
340 + index_transform:
341 + - start: 1
342 + end: 1
src/go/plugin/go.d/config/go.d/snmp.profiles/default/_generic-ospf.yaml
+10 -10
@@ -7,7 +7,7 @@ metrics:
7 - OID: 1.3.6.1.2.1.14.10.1.6
8 name: ospfNbrState
9 description: The state of the relationship with this neighbor
10 - family: OSPF/Neighbors/Status
10 + family: Routing/OSPF/Neighbor/State/Status
11 unit: "{status}"
12 mapping:
13 1: down
@@ -21,12 +21,12 @@ metrics:
21 - OID: 1.3.6.1.2.1.14.10.1.7
22 name: ospfNbrEvents
23 description: The number of times this neighbor relationship has changed state or an error has occurred
24 - family: OSPF/Neighbors/Events
24 + family: Routing/OSPF/Neighbor/Event/Count
25 unit: "{event}"
26 - OID: 1.3.6.1.2.1.14.10.1.8
27 name: ospfNbrLsRetransQLen
28 description: The current length of the retransmission queue
29 - family: OSPF/Neighbors/Queue
29 + family: Routing/OSPF/Neighbor/Queue/RetransmitLength
30 unit: "{message}"
31 metric_tags:
32 - symbol:
@@ -46,7 +46,7 @@ metrics:
46 - OID: 1.3.6.1.2.1.14.11.1.5
47 name: ospfVirtNbrState
48 description: The state of the virtual neighbor relationship
49 - family: OSPF/Virtual Neighbors/Status
49 + family: Routing/OSPF/VirtualNeighbor/State/Status
50 unit: "{status}"
51 mapping:
52 1: down
@@ -60,12 +60,12 @@ metrics:
60 - OID: 1.3.6.1.2.1.14.11.1.6
61 name: ospfVirtNbrEvents
62 description: The number of times this virtual link has changed its state or an error has occurred
63 - family: OSPF/Virtual Neighbors/Events
63 + family: Routing/OSPF/VirtualNeighbor/Event/Count
64 unit: "{change}"
65 - OID: 1.3.6.1.2.1.14.11.1.7
66 name: ospfVirtNbrLsRetransQLen
67 description: The current length of the retransmission queue
68 - family: OSPF/Virtual Neighbors/Queue
68 + family: Routing/OSPF/VirtualNeighbor/Queue/RetransmitLength
69 unit: "{message}"
70 metric_tags:
71 - symbol:
@@ -85,7 +85,7 @@ metrics:
85 - OID: 1.3.6.1.2.1.14.7.1.12
86 name: ospfIfState
87 description: The OSPF Interface State
88 - family: OSPF/Interfaces/Status
88 + family: Routing/OSPF/Interface/State/Status
89 unit: "{status}"
90 mapping:
91 1: down
@@ -98,7 +98,7 @@ metrics:
98 - OID: 1.3.6.1.2.1.14.7.1.21
99 name: ospfIfLsaCount
100 description: The total number of link-local link state advertisements in this interface's link-local link state database
101 - family: OSPF/Interfaces/Link State
101 + family: Routing/OSPF/Interface/LinkStateAdvertisement/Count
102 unit: "{advertisement}"
103 metric_tags:
104 - symbol:
@@ -120,7 +120,7 @@ metrics:
120 - OID: 1.3.6.1.2.1.14.9.1.7
121 name: ospfVirtIfState
122 description: OSPF virtual interface states
123 - family: OSPF/Virtual Interfaces/Status
123 + family: Routing/OSPF/VirtualInterface/State/Status
124 unit: "{status}"
125 mapping:
126 1: down
@@ -128,7 +128,7 @@ metrics:
128 - OID: 1.3.6.1.2.1.14.9.1.12
129 name: ospfVirtIfLsaCount
130 description: The total number of link-local link state advertisements in this virtual interface's link-local link state database
131 - family: OSPF/Virtual Interfaces/Link State
131 + family: Routing/OSPF/VirtualInterface/LinkStateAdvertisement/Count
132 unit: "{advertisement}"
133 metric_tags:
134 - symbol:
src/go/plugin/go.d/config/go.d/snmp.profiles/default/_generic-rtp.yaml
+9 -9
@@ -7,17 +7,17 @@ metrics:
7 - OID: 1.3.6.1.2.1.87.1.3.1.6
8 name: rtpSessionSenderJoins
9 description: The number of senders that have been observed to have joined the session since this conceptual row was created
10 - family: Protocols/RTP/Sessions
10 + family: RTP/Session/Join/Sender/Count
11 unit: "{sender}"
12 - OID: 1.3.6.1.2.1.87.1.3.1.7
13 name: rtpSessionReceiverJoins
14 description: The number of receivers that have been been observed to have joined this session since this conceptual row was created
15 - family: Protocols/RTP/Sessions
15 + family: RTP/Session/Join/Receiver/Count
16 unit: "{receiver}"
17 - OID: 1.3.6.1.2.1.87.1.3.1.8
18 name: rtpSessionByes
19 description: "A count of RTCP BYE messages received by this entity"
20 - family: Protocols/RTP/Sessions
20 + family: RTP/Session/Message/Bye/In
21 unit: "{message}"
22 metric_tags:
23 - index: 1
@@ -38,12 +38,12 @@ metrics:
38 - OID: 1.3.6.1.2.1.87.1.5.1.4
39 name: rtpSenderPackets
40 description: Count of RTP packets sent by this sender, or observed by an RTP monitor, since rtpSenderStartTime
41 - family: Protocols/RTP/Senders/Packets
41 + family: RTP/Sender/Packet/Out
42 unit: "{packet}"
43 - OID: 1.3.6.1.2.1.87.1.5.1.5
44 name: rtpSenderOctets
45 description: Count of non-header RTP octets sent by this sender, or observed by an RTP monitor, since rtpSenderStartTime
46 - family: Protocols/RTP/Senders/Traffic
46 + family: RTP/Sender/Traffic/Out
47 unit: "By"
48 metric_tags:
49 - index: 1
@@ -58,22 +58,22 @@ metrics:
58 - OID: 1.3.6.1.2.1.87.1.7.1.13
59 name: rtpRcvrOctets
60 description: Count of non-header RTP octets received by this receiving RTP host since rtpRcvrStartTime
61 - family: Protocols/RTP/Receivers/Traffic
61 + family: RTP/Receiver/Traffic/In
62 unit: "By"
63 - OID: 1.3.6.1.2.1.87.1.7.1.12
64 name: rtpRcvrPackets
65 description: Count of RTP packets received by this RTP host receiver since rtpRcvrStartTime
66 - family: Protocols/RTP/Receivers/Packets
66 + family: RTP/Receiver/Packet/In
67 unit: "{packet}"
68 - OID: 1.3.6.1.2.1.87.1.7.1.7
69 name: rtpRcvrJitter
70 description: An estimate of delay variation as observed by this receiver
71 - family: Protocols/RTP/Receivers/Latency
71 + family: RTP/Receiver/Jitter/Value
72 unit: "ms"
73 - OID: 1.3.6.1.2.1.87.1.7.1.6
74 name: rtpRcvrLostPackets
75 description: A count of RTP packets lost as observed by this receiver since rtpRcvrStartTime
76 - family: Protocols/RTP/Receivers/Errors
76 + family: RTP/Receiver/Packet/Lost/Count
77 unit: "{packet}"
78 metric_tags:
79 - index: 1
src/go/plugin/go.d/config/go.d/snmp.profiles/default/_generic-tcp.yaml
+10 -10
@@ -6,68 +6,68 @@ metrics:
6 OID: 1.3.6.1.2.1.6.9.0
7 name: tcpCurrEstab
8 description: Current TCP connections in ESTABLISHED or CLOSE-WAIT state
9 - family: Network/TCP/Connection/Current
9 + family: Network/TCP/Connection/Active/Count
10 unit: "{connection}"
11 - MIB: TCP-MIB
12 symbol:
13 OID: 1.3.6.1.2.1.6.5.0
14 name: tcpActiveOpens
15 description: TCP connections transitioning from CLOSED to SYN-SENT
16 - family: Network/TCP/Connection/ActiveOpen
16 + family: Network/TCP/Connection/Open/Active/Count
17 unit: "{transition}/s"
18 - MIB: TCP-MIB
19 symbol:
20 OID: 1.3.6.1.2.1.6.6.0
21 name: tcpPassiveOpens
22 description: TCP connections transitioning from LISTEN to SYN-RCVD
23 - family: Network/TCP/Connection/PassiveOpen
23 + family: Network/TCP/Connection/Open/Passive/Count
24 unit: "{transition}/s"
25 - MIB: TCP-MIB
26 symbol:
27 OID: 1.3.6.1.2.1.6.17.0
28 name: tcpHCInSegs
29 description: TCP segments received
30 - family: Network/TCP/Segment/In
30 + family: Network/TCP/Segment/Total/In
31 unit: "{packet}/s"
32 - MIB: TCP-MIB
33 symbol:
34 OID: 1.3.6.1.2.1.6.18.0
35 name: tcpHCOutSegs
36 description: TCP segments sent
37 - family: Network/TCP/Segment/Out
37 + family: Network/TCP/Segment/Total/Out
38 unit: "{packet}/s"
39 - MIB: TCP-MIB
40 symbol:
41 OID: 1.3.6.1.2.1.6.14.0
42 name: tcpInErrs
43 description: TCP segments received with errors
44 - family: Network/TCP/Error/In
44 + family: Network/TCP/Segment/Error/In
45 unit: "{error}/s"
46 - MIB: TCP-MIB
47 symbol:
48 OID: 1.3.6.1.2.1.6.7.0
49 name: tcpAttemptFails
50 description: Failed TCP connection attempts
51 - family: Network/TCP/Connection/Failed
51 + family: Network/TCP/Connection/Failure/Count
52 unit: "{failure}/s"
53 - MIB: TCP-MIB
54 symbol:
55 OID: 1.3.6.1.2.1.6.8.0
56 name: tcpEstabResets
57 description: TCP connections reset from ESTABLISHED/CLOSE-WAIT
58 - family: Network/TCP/Reset/Connection
58 + family: Network/TCP/Connection/Reset/Count
59 unit: "{reset}/s"
60 - MIB: TCP-MIB
61 symbol:
62 OID: 1.3.6.1.2.1.6.15.0
63 name: tcpOutRsts
64 description: TCP segments sent with RST flag
65 - family: Network/TCP/Reset/Out
65 + family: Network/TCP/Segment/Reset/Out
66 unit: "{reset}/s"
67 - MIB: TCP-MIB
68 symbol:
69 OID: 1.3.6.1.2.1.6.12.0
70 name: tcpRetransSegs
71 description: TCP segments retransmitted
72 - family: Network/TCP/Retransmit/Out
72 + family: Network/TCP/Segment/Retransmit/Out
73 unit: "{retransmit}/s"
src/go/plugin/go.d/config/go.d/snmp.profiles/default/_generic-ucd.yaml
+78 -66
@@ -4,71 +4,80 @@ metrics:
4 name: ucd.cpuLoad
5 OID: 1.3.6.1.4.1.2021.10.1.5.1
6 description: The 1,5 and 15 minute load averages as an integer
7 - family: System/Compute/Load
7 + family: CPU/LoadAverage/1Min
8 unit: "{load_average}"
9 - MIB: UCD-SNMP-MIB
10 symbol:
11 name: ucd.memoryTotal
12 OID: 1.3.6.1.4.1.2021.4.5.0
13 description: The total amount of real/physical memory installed on this host
14 - family: System/Memory/RAM
15 - unit: "kBy"
14 + family: Memory/Physical/Total
15 + unit: "By"
16 + scale_factor: 1024
17 - MIB: UCD-SNMP-MIB
18 symbol:
19 name: memory.free
20 OID: 1.3.6.1.4.1.2021.4.6.0
21 description: The amount of real/physical memory currently unused or available
21 - family: System/Memory/RAM
22 - unit: "kBy"
22 + family: Memory/Physical/Free
23 + unit: "By"
24 + scale_factor: 1024
25 - MIB: UCD-SNMP-MIB
26 symbol:
27 name: ucd.memTotalSwap
28 OID: 1.3.6.1.4.1.2021.4.3.0
29 description: The total amount of swap space configured for this host
28 - family: System/Memory/Swap
29 - unit: "kBy"
30 + family: Memory/Swap/Total
31 + unit: "By"
32 + scale_factor: 1024
33 - MIB: UCD-SNMP-MIB
34 symbol:
35 name: ucd.memAvailSwap
36 OID: 1.3.6.1.4.1.2021.4.4.0
37 description: The amount of swap space currently unused or available
35 - family: System/Memory/Swap
36 - unit: "kBy"
38 + family: Memory/Swap/Available
39 + unit: "By"
40 + scale_factor: 1024
41 - MIB: UCD-SNMP-MIB
42 symbol:
43 name: ucd.memTotalFree
44 OID: 1.3.6.1.4.1.2021.4.11.0
45 description: The total amount of memory free or available for use on this host
42 - family: System/Memory/RAM
43 - unit: "kBy"
46 + family: Memory/Available/Total
47 + unit: "By"
48 + scale_factor: 1024
49 - MIB: UCD-SNMP-MIB
50 symbol:
51 name: ucd.memMinimumSwap
52 OID: 1.3.6.1.4.1.2021.4.12.0
53 description: The minimum amount of swap space expected to be kept free or available during normal operation of this host
49 - family: System/Memory/Swap
50 - unit: "kBy"
54 + family: Memory/Swap/Minimum
55 + unit: "By"
56 + scale_factor: 1024
57 - MIB: UCD-SNMP-MIB
58 symbol:
59 name: ucd.memShared
60 OID: 1.3.6.1.4.1.2021.4.13.0
61 description: The total amount of real or virtual memory currently allocated for use as shared memory
56 - family: System/Memory/RAM
57 - unit: "kBy"
62 + family: Memory/Physical/Shared
63 + unit: "By"
64 + scale_factor: 1024
65 - MIB: UCD-SNMP-MIB
66 symbol:
67 name: ucd.memBuffer
68 OID: 1.3.6.1.4.1.2021.4.14.0
69 description: The total amount of real or virtual memory currently allocated for use as memory buffers
63 - family: System/Memory/RAM
64 - unit: "kBy"
70 + family: Memory/Physical/Buffer
71 + unit: "By"
72 + scale_factor: 1024
73 - MIB: UCD-SNMP-MIB
74 symbol:
75 name: ucd.memCached
76 OID: 1.3.6.1.4.1.2021.4.15.0
77 description: The total amount of real or virtual memory currently allocated for use as cached memory
70 - family: System/Memory/RAM
71 - unit: "kBy"
78 + family: Memory/Physical/Cached
79 + unit: "By"
80 + scale_factor: 1024
81 - MIB: UCD-SNMP-MIB
82 table:
83 OID: 1.3.6.1.4.1.2021.9
@@ -77,32 +86,35 @@ metrics:
86 - name: ucd.dskTotal
87 OID: 1.3.6.1.4.1.2021.9.1.6
88 description: Total size of the disk/partition
80 - family: Storage/Disks/Size
81 - unit: "kBy"
89 + family: Disk/Space/Total
90 + unit: "By"
91 + scale_factor: 1024
92 - name: ucd.dskAvail
93 OID: 1.3.6.1.4.1.2021.9.1.7
94 description: Available space on the disk
85 - family: Storage/Disks/Space/Usage
86 - unit: "kBy"
95 + family: Disk/Space/Available
96 + unit: "By"
97 + scale_factor: 1024
98 - name: ucd.dskUsed
99 OID: 1.3.6.1.4.1.2021.9.1.8
100 description: Used space on the disk
90 - family: Storage/Disks/Space/Usage
91 - unit: "kBy"
101 + family: Disk/Space/Used
102 + unit: "By"
103 + scale_factor: 1024
104 - name: ucd.dskPercent
105 OID: 1.3.6.1.4.1.2021.9.1.9
106 description: Percentage of space used on disk
95 - family: Storage/Disks/Space/Utilization
107 + family: Disk/Usage
108 unit: "%"
109 - name: ucd.dskPercentNode
110 OID: 1.3.6.1.4.1.2021.9.1.10
111 description: Percentage of inodes used on disk
100 - family: Storage/Disks/Inodes/Utilization
112 + family: Disk/Inode/Usage
113 unit: "%"
114 - name: ucd.dskErrorFlag
115 OID: 1.3.6.1.4.1.2021.9.1.100
116 description: Flag signaling that the disk or partition is under the minimum required space configured for it
105 - family: Storage/Disks/Status
117 + family: Disk/Error/Status
118 unit: "{status}"
119 mapping:
120 0: no_error
@@ -126,40 +138,40 @@ metrics:
138 OID: 1.3.6.1.4.1.2021.13.15.1.1.5
139 metric_type: monotonic_count
140 description: The number of read accesses from this device since boot
129 - family: Storage/Disks/IOPS
141 + family: Disk/IO/Read/Count
142 unit: "{read}"
143 - name: ucd.diskIOWrites
144 OID: 1.3.6.1.4.1.2021.13.15.1.1.6
145 metric_type: monotonic_count
146 description: The number of write accesses to this device since boot
135 - family: Storage/Disks/IOPS
147 + family: Disk/IO/Write/Count
148 unit: "{write}"
149 - name: ucd.diskIOLA1
150 OID: 1.3.6.1.4.1.2021.13.15.1.1.9
151 description: The 1 minute average load of disk (%)
140 - family: Storage/Disks/Load
152 + family: Disk/LoadAverage/1Min
153 unit: "%"
154 - name: ucd.diskIOLA5
155 OID: 1.3.6.1.4.1.2021.13.15.1.1.10
156 description: The 5 minute average load of disk (%)
145 - family: Storage/Disks/Load
157 + family: Disk/LoadAverage/5Min
158 unit: "%"
159 - name: ucd.diskIOLA15
160 OID: 1.3.6.1.4.1.2021.13.15.1.1.11
161 description: The 15 minute average load of disk (%)
150 - family: Storage/Disks/Load
162 + family: Disk/LoadAverage/15Min
163 unit: "%"
164 - name: ucd.diskIONReadX
165 OID: 1.3.6.1.4.1.2021.13.15.1.1.12
166 metric_type: monotonic_count
167 description: The number of bytes read from this device since boot
156 - family: Storage/Disks/IO
168 + family: Disk/Traffic/Read
169 unit: "By"
170 - name: ucd.diskIONWrittenX
171 OID: 1.3.6.1.4.1.2021.13.15.1.1.13
172 metric_type: monotonic_count
173 description: The number of bytes written to this device since boot
162 - family: Storage/Disks/IO
174 + family: Disk/Traffic/Write
175 unit: "By"
176 metric_tags:
177 - tag: ucd_disk_io_device
@@ -171,75 +183,75 @@ metrics:
183 name: ucd.ssCpuUser
184 OID: 1.3.6.1.4.1.2021.11.9.0
185 description: The percentage of CPU time spent processing user-level code, calculated over the last minute
174 - family: System/Compute/CPU
186 + family: CPU/Usage/User
187 unit: "%"
188 - MIB: UCD-SNMP-MIB
189 symbol:
190 name: ucd.ssCpuSystem
191 OID: 1.3.6.1.4.1.2021.11.10.0
192 description: The percentage of CPU time spent processing system-level code, calculated over the last minute
181 - family: System/Compute/CPU
193 + family: CPU/Usage/System
194 unit: "%"
195 - MIB: UCD-SNMP-MIB
196 symbol:
197 name: ucd.ssCpuIdle
198 OID: 1.3.6.1.4.1.2021.11.11.0
199 description: The percentage of processor time spent idle, calculated over the last minute
188 - family: System/Compute/CPU
200 + family: CPU/Usage/Idle
201 unit: "%"
202 - MIB: UCD-SNMP-MIB
203 symbol:
204 name: ucd.ssCpuRawUser
205 OID: 1.3.6.1.4.1.2021.11.50.0
194 - metric_type: monotonic_count
195 - description: The number of 'ticks' spent processing user-level code
196 - family: System/Compute/CPU
197 - unit: "{tick}"
206 + metric_type: monotonic_count
207 + description: The number of 'ticks' spent processing user-level code
208 + family: CPU/Time/User
209 + unit: "{tick}"
210 - MIB: UCD-SNMP-MIB
211 symbol:
212 name: ucd.ssCpuRawNice
213 OID: 1.3.6.1.4.1.2021.11.51.0
202 - metric_type: monotonic_count
203 - description: The number of 'ticks' spent processing reduced-priority code
204 - family: System/Compute/CPU
205 - unit: "{tick}"
214 + metric_type: monotonic_count
215 + description: The number of 'ticks' spent processing reduced-priority code
216 + family: CPU/Time/Nice
217 + unit: "{tick}"
218 - MIB: UCD-SNMP-MIB
219 symbol:
220 name: ucd.ssCpuRawSystem
221 OID: 1.3.6.1.4.1.2021.11.52.0
210 - metric_type: monotonic_count
211 - description: The number of 'ticks' spent processing system-level code
212 - family: System/Compute/CPU
213 - unit: "{tick}"
222 + metric_type: monotonic_count
223 + description: The number of 'ticks' spent processing system-level code
224 + family: CPU/Time/System
225 + unit: "{tick}"
226 - MIB: UCD-SNMP-MIB
227 symbol:
228 name: ucd.ssCpuRawIdle
229 OID: 1.3.6.1.4.1.2021.11.53.0
218 - metric_type: monotonic_count
219 - description: The number of 'ticks' spent idle
220 - family: System/Compute/CPU
221 - unit: "{tick}"
230 + metric_type: monotonic_count
231 + description: The number of 'ticks' spent idle
232 + family: CPU/Time/Idle
233 + unit: "{tick}"
234 - MIB: UCD-SNMP-MIB
235 symbol:
236 name: ucd.ssCpuRawWait
237 OID: 1.3.6.1.4.1.2021.11.54.0
226 - metric_type: monotonic_count
227 - description: The number of 'ticks' spent waiting for IO
228 - family: System/Compute/CPU
229 - unit: "{tick}"
238 + metric_type: monotonic_count
239 + description: The number of 'ticks' spent waiting for IO
240 + family: CPU/Time/IOWait
241 + unit: "{tick}"
242 - MIB: UCD-SNMP-MIB
243 symbol:
244 name: ucd.ssCpuRawKernel
245 OID: 1.3.6.1.4.1.2021.11.55.0
234 - metric_type: monotonic_count
235 - description: The number of 'ticks' spent processing kernel-level code
236 - family: System/Compute/CPU
237 - unit: "{tick}"
246 + metric_type: monotonic_count
247 + description: The number of 'ticks' spent processing kernel-level code
248 + family: CPU/Time/Kernel
249 + unit: "{tick}"
250 - MIB: UCD-SNMP-MIB
251 symbol:
252 name: ucd.ssCpuRawInterrupt
253 OID: 1.3.6.1.4.1.2021.11.56.0
242 - metric_type: monotonic_count
243 - description: The number of 'ticks' spent processing hardware interrupts
244 - family: System/Compute/CPU
245 - unit: "{tick}"
254 + metric_type: monotonic_count
255 + description: The number of 'ticks' spent processing hardware interrupts
256 + family: CPU/Time/Interrupt
257 + unit: "{tick}"
src/go/plugin/go.d/config/go.d/snmp.profiles/default/_generic-udp.yaml
+4 -4
@@ -6,26 +6,26 @@ metrics:
6 OID: 1.3.6.1.2.1.7.8.0
7 name: udpHCInDatagrams
8 description: UDP datagrams received
9 - family: Network/UDP/Datagram/In
9 + family: Network/UDP/Datagram/Total/In
10 unit: "{packet}/s"
11 - MIB: UDP-MIB
12 symbol:
13 OID: 1.3.6.1.2.1.7.9.0
14 name: udpHCOutDatagrams
15 description: UDP datagrams sent
16 - family: Network/UDP/Datagram/Out
16 + family: Network/UDP/Datagram/Total/Out
17 unit: "{packet}/s"
18 - MIB: UDP-MIB
19 symbol:
20 OID: 1.3.6.1.2.1.7.3.0
21 name: udpInErrors
22 description: UDP datagrams received but couldn't be delivered (not due to missing app)
23 - family: Network/UDP/Error/In
23 + family: Network/UDP/Datagram/Error/In
24 unit: "{error}/s"
25 - MIB: UDP-MIB
26 symbol:
27 OID: 1.3.6.1.2.1.7.2.0
28 name: udpNoPorts
29 description: UDP datagrams received with no app on the destination port
30 - family: Network/UDP/Error/NoPort
30 + family: Network/UDP/Datagram/Error/NoPort
31 unit: "{error}/s"
src/go/plugin/go.d/config/go.d/snmp.profiles/default/_generic-ups.yaml
+29 -29
@@ -4,7 +4,7 @@ metrics:
4 OID: 1.3.6.1.2.1.33.1.2.1.0
5 name: upsBatteryStatus
6 description: The indication of the capacity remaining in the UPS system's batteries
7 - family: UPS/Battery/Status
7 + family: Battery/Operational/Status
8 unit: "{status}"
9 mapping:
10 1: unknown
@@ -16,49 +16,49 @@ metrics:
16 OID: 1.3.6.1.2.1.33.1.2.2.0
17 name: upsSecondsOnBattery
18 description: If the unit is on battery power, the elapsed time since the UPS last switched to battery power, or the time since the network management subsystem was last restarted, whichever is less. Zero shall be returned if the unit is not on battery power
19 - family: UPS/Battery/Charge
19 + family: Battery/Runtime/OnBattery
20 unit: "s"
21 - MIB: UPS-MIB
22 symbol:
23 OID: 1.3.6.1.2.1.33.1.2.3.0
24 name: upsEstimatedMinutesRemaining
25 description: An estimate of the time to battery charge depletion under the present load conditions if the utility power is off and remains off, or if it were to be lost and remain off
26 - family: UPS/Battery/Charge
26 + family: Battery/Runtime/Remaining
27 unit: "min"
28 - MIB: UPS-MIB
29 symbol:
30 OID: 1.3.6.1.2.1.33.1.2.4.0
31 name: upsEstimatedChargeRemaining
32 description: An estimate of the battery charge remaining expressed as a percent of full charge
33 - family: UPS/Battery/Charge
33 + family: Battery/Charge/Remaining
34 unit: "%"
35 - MIB: UPS-MIB
36 symbol:
37 OID: 1.3.6.1.2.1.33.1.2.5.0
38 name: upsBatteryVoltage
39 description: The magnitude of the present battery voltage
40 - family: UPS/Battery/Voltage
40 + family: Battery/Voltage/Value
41 unit: "V"
42 - MIB: UPS-MIB
43 symbol:
44 OID: 1.3.6.1.2.1.33.1.2.6.0
45 name: upsBatteryCurrent
46 description: The present battery current
47 - family: UPS/Battery/Current
47 + family: Battery/Current/Value
48 unit: "A"
49 - MIB: UPS-MIB
50 symbol:
51 OID: 1.3.6.1.2.1.33.1.2.7.0
52 name: upsBatteryTemperature
53 description: The ambient temperature at or near the UPS Battery casing
54 - family: UPS/Battery/Temperature
54 + family: Battery/Temperature/Value
55 unit: "Cel"
56 - MIB: UPS-MIB
57 symbol:
58 OID: 1.3.6.1.2.1.33.1.3.1.0
59 name: upsInputLineBads
60 description: A count of the number of times the input entered an out-of-tolerance condition as defined by the manufacturer. This count is incremented by one each time the input transitions from zero out-of-tolerance lines to one or more input lines out-of-tolerance
61 - family: UPS/Input/Tolerance
61 + family: Input/Error/OutOfTolerance/Count
62 unit: "{transition}"
63 metric_type: monotonic_count
64 - MIB: UPS-MIB
@@ -66,14 +66,14 @@ metrics:
66 OID: 1.3.6.1.2.1.33.1.3.2.0
67 name: upsInputNumLines
68 description: The number of input lines utilized in this device. This variable indicates the number of rows in the input table
69 - family: UPS/Input/Lines
69 + family: Input/Line/Count
70 unit: "{line}"
71 - MIB: UPS-MIB
72 symbol:
73 OID: 1.3.6.1.2.1.33.1.4.1.0
74 name: upsOutputSource
75 description: The present source of output power
76 - family: UPS/Output/Source
76 + family: Output/Source/Status
77 unit: "{status}"
78 mapping:
79 1: other
@@ -88,42 +88,42 @@ metrics:
88 OID: 1.3.6.1.2.1.33.1.4.2.0
89 name: upsOutputFrequency
90 description: The present output frequency
91 - family: UPS/Output/Frequency
91 + family: Output/Frequency/Value
92 unit: "Hz"
93 - MIB: UPS-MIB
94 symbol:
95 OID: 1.3.6.1.2.1.33.1.4.3.0
96 name: upsOutputNumLines
97 description: The number of output lines utilized in this device. This variable indicates the number of rows in the output table
98 - family: UPS/Output/Lines
98 + family: Output/Line/Count
99 unit: "{line}"
100 - MIB: UPS-MIB
101 symbol:
102 OID: 1.3.6.1.2.1.33.1.5.1.0
103 name: upsBypassFrequency
104 description: The present bypass frequency
105 - family: UPS/Bypass/Frequency
105 + family: Bypass/Frequency/Value
106 unit: "Hz"
107 - MIB: UPS-MIB
108 symbol:
109 OID: 1.3.6.1.2.1.33.1.5.2.0
110 name: upsBypassNumLines
111 description: The number of bypass lines utilized in this device. This entry indicates the number of rows in the bypass table
112 - family: UPS/Bypass/Lines
112 + family: Bypass/Line/Count
113 unit: "{line}"
114 - MIB: UPS-MIB
115 symbol:
116 OID: 1.3.6.1.2.1.33.1.6.1.0
117 name: upsAlarmsPresent
118 description: The present number of active alarm conditions
119 - family: UPS/Alarms
119 + family: Alarm/Active/Count
120 unit: "{alarm}"
121 - MIB: UPS-MIB
122 symbol:
123 OID: 1.3.6.1.2.1.33.1.7.3.0
124 name: upsTestResultsSummary
125 description: The results of the current or last UPS diagnostics test performed
126 - family: UPS/Test
126 + family: Test/Result/Status
127 unit: "{status}"
128 mapping:
129 1: donePass
@@ -137,7 +137,7 @@ metrics:
137 OID: 1.3.6.1.2.1.33.1.7.5.0
138 name: upsTestStartTime
139 description: The value of sysUpTime at the time the test in progress was initiated, or, if no test is in progress, the time the previous test was initiated
140 - family: UPS/Test
140 + family: Test/StartTime/Value
141 unit: "s"
142 - MIB: UPS-MIB
143 table:
@@ -147,22 +147,22 @@ metrics:
147 - OID: 1.3.6.1.2.1.33.1.4.4.1.2
148 name: upsOutputVoltage
149 description: The present output voltage
150 - family: UPS/Output/Voltage
150 + family: Output/Voltage/Value
151 unit: "V"
152 - OID: 1.3.6.1.2.1.33.1.4.4.1.3
153 name: upsOutputCurrent
154 description: The present output current
155 - family: UPS/Output/Current
155 + family: Output/Current/Value
156 unit: "A"
157 - OID: 1.3.6.1.2.1.33.1.4.4.1.4
158 name: upsOutputPower
159 description: The present output true power
160 - family: UPS/Output/Power
160 + family: Output/Power/Active
161 unit: "W"
162 - OID: 1.3.6.1.2.1.33.1.4.4.1.5
163 name: upsOutputPercentLoad
164 description: The percentage of the UPS power capacity presently being used on this output line
165 - family: UPS/Output/Load
165 + family: Output/Load/Usage
166 unit: "%"
167 metric_tags:
168 - symbol:
@@ -177,22 +177,22 @@ metrics:
177 - OID: 1.3.6.1.2.1.33.1.3.3.1.2
178 name: upsInputFrequency
179 description: The present input frequency
180 - family: UPS/Input/Frequency
180 + family: Input/Frequency/Value
181 unit: "Hz"
182 - OID: 1.3.6.1.2.1.33.1.3.3.1.3
183 name: upsInputVoltage
184 description: The magnitude of the present input voltage
185 - family: UPS/Input/Voltage
185 + family: Input/Voltage/Value
186 unit: "V"
187 - OID: 1.3.6.1.2.1.33.1.3.3.1.4
188 name: upsInputCurrent
189 description: The magnitude of the present input current
190 - family: UPS/Input/Current
190 + family: Input/Current/Value
191 unit: "A"
192 - OID: 1.3.6.1.2.1.33.1.3.3.1.5
193 name: upsInputTruePower
194 description: The magnitude of the present input true power
195 - family: UPS/Input/Power
195 + family: Input/Power/Active
196 unit: "W"
197 metric_tags:
198 - symbol:
@@ -207,17 +207,17 @@ metrics:
207 - OID: 1.3.6.1.2.1.33.1.5.3.1.2
208 name: upsBypassVoltage
209 description: The present bypass voltage
210 - family: UPS/Bypass/Voltage
210 + family: Bypass/Voltage/Value
211 unit: "V"
212 - OID: 1.3.6.1.2.1.33.1.5.3.1.3
213 name: upsBypassCurrent
214 description: The present bypass current
215 - family: UPS/Bypass/Current
215 + family: Bypass/Current/Value
216 unit: "A"
217 - OID: 1.3.6.1.2.1.33.1.5.3.1.4
218 name: upsBypassPower
219 description: The present true power conveyed by the bypass
220 - family: UPS/Bypass/Power
220 + family: Bypass/Power/Active
221 unit: "W"
222 metric_tags:
223 - symbol:
@@ -232,7 +232,7 @@ metrics:
232 - OID: 1.3.6.1.2.1.33.1.6.2.1.3
233 name: upsAlarmTime
234 description: The value of sysUpTime when the alarm condition was detected. If the alarm condition was detected at the time of agent startup and presumably existed before agent startup, the value of upsAlarmTime shall equal 0
235 - family: UPS/Alarms
235 + family: Alarm/Time/Value
236 unit: "s"
237 metric_tags:
238 - symbol: