@cryptotaxi247 / netdata-1 / commits / ca0765da3

chore(go.d/snmp-profiles): use same metric name for cpu usage (#20745)

Ilya Mashchenko committed Jul 30, 2025 at 22:34 UTC ca0765da34ed9eb962e26eb2d43521eb3e9d2c2d
51 files changed +135 -225
src/go/plugin/go.d/collector/snmp/ddsnmp/load.go
+9
@@ -17,6 +17,7 @@ import (
17 "github.com/netdata/netdata/go/plugins/logger"
18 "github.com/netdata/netdata/go/plugins/pkg/executable"
19 "github.com/netdata/netdata/go/plugins/pkg/multipath"
20 + "github.com/netdata/netdata/go/plugins/plugin/go.d/collector/snmp/ddsnmp/ddprofiledefinition"
21 )
22
23 var log = logger.New().With("component", "snmp/ddsnmp")
@@ -127,6 +128,14 @@ func loadProfileWithExtendsMap(filename string, extendsPaths multipath.MultiPath
128 prof.SourceFile, _ = filepath.Abs(filename)
129 }
130
131 + // Handle empty profiles - these are profiles where content has been deliberately removed,
132 + // but the file itself is preserved. This ensures that when users update, their existing
133 + // profile files are overwritten with empty content rather than being left with stale data.
134 + if prof.Definition == nil {
135 + prof.Definition = &ddprofiledefinition.ProfileDefinition{}
136 + return &prof, nil
137 + }
138 +
139 prof.extensionHierarchy = make([]*extensionInfo, 0, len(prof.Definition.Extends))
140
141 for _, name := range prof.Definition.Extends {
src/go/plugin/go.d/config/go.d/snmp.profiles/default/3com-huawei.yaml
+7 -2
@@ -4,21 +4,26 @@ extends:
4 sysobjectid:
5 - 1.3.6.1.4.1.43.45.1.2.* # 3Com Huawei Products (a3Com.jv-mib.huawei.hwproducts)
6
7 +# - A3COM-HUAWEI-LswDEVM-MIB
8 +# https://mibbrowser.online/mibdb_search.php?mib=A3COM-HUAWEI-LswDEVM-MIB
9 +# https://github.com/librenms/librenms/blob/master/mibs/3com/A3COM-HUAWEI-LswDEVM-MIB
10 +
11 metrics:
12 - MIB: A3COM-HUAWEI-LswDEVM-MIB
13 table:
14 name: hwCpuTable # indexes: hwCpuIndex
15 OID: 1.3.6.1.4.1.43.45.1.6.1.1
16 symbols:
13 - - name: hwCpuCostRatePer5Sec
17 + - name: cpu.usage # hwCpuCostRatePer1Min
18 OID: 1.3.6.1.4.1.43.45.1.6.1.1.1.3
19 chart_meta:
16 - description: Cpu usage percentage
20 + description: The current CPU utilization
21 family: 'System/CPU/Usage'
22 unit: "%"
23 metric_tags:
24 - tag: cpu_index
25 index: 1
26 +
27 - MIB: A3COM-HUAWEI-LswDEVM-MIB
28 table:
29 name: hwMemTable # indexes: hwMemModuleIndex
src/go/plugin/go.d/config/go.d/snmp.profiles/default/_aruba-switch-cpu-memory.yaml
+13 -2
@@ -1,3 +1,7 @@
1 +# - WLSX-SYSTEMEXT-MIB
2 +# https://mibbrowser.online/mibdb_search.php?mib=WLSX-SYSTEMEXT-MIB
3 +# https://github.com/librenms/librenms/blob/master/mibs/arubaos/WLSX-SYSTEMEXT-MIB
4 +
5 # CPU and memory metrics for Aruba switch
6 metrics:
7 ### Processor
@@ -10,9 +14,9 @@ metrics:
14 symbols:
15 # The average, over the last minute, of the percentage of time that this processor was not idle.
16 - OID: 1.3.6.1.4.1.14823.2.2.1.2.1.13.1.3
13 - name: wlsxSysExtProcessorLoad
17 + name: cpu.usage # sysExtProcessorLoad
18 chart_meta:
15 - description: The average, over the last minute, of the percentage of time that this processor was not idle
19 + description: The current CPU utilization
20 family: 'System/CPU/Usage'
21 unit: "%"
22 metric_tags:
@@ -41,6 +45,13 @@ metrics:
45 family: 'System/Memory/Used'
46 unit: "By"
47 scale_factor: 1024
48 + - OID: 1.3.6.1.4.1.14823.2.2.1.2.1.15.1.4
49 + name: sysExtMemoryFree
50 + chart_meta:
51 + description: Free memory in KB
52 + family: 'System/Memory/Free'
53 + unit: "By"
54 + scale_factor: 1024
55 metric_tags:
56 - tag: mem_index
57 index: 1
src/go/plugin/go.d/config/go.d/snmp.profiles/default/_avaya-utilization-management-mib.yaml
+2 -2
@@ -8,9 +8,9 @@ metrics:
8 name: genCpuUtilizationTable
9 symbols:
10 - OID: 1.3.6.1.4.1.6889.2.1.11.1.1.1.1.6
11 - name: genCpuCurrentUtilization
11 + name: cpu.usage # genCpuCurrentUtilization
12 chart_meta:
13 - description: The current CPU utilization. The sample interval is 5 seconds.
13 + description: The current CPU utilization
14 family: 'System/CPU/Usage'
15 unit: "%"
16 metric_tags:
src/go/plugin/go.d/config/go.d/snmp.profiles/default/_cisco-base.yaml
+3 -3
@@ -7,7 +7,6 @@ extends:
7 - _std-ospf-mib.yaml
8 - _std-bgp4-mib.yaml
9 - _std-ip-mib.yaml
10 - - _cisco-cpu-memory.yaml
10 - _cisco-metadata.yaml
11
12 metrics:
@@ -56,15 +55,16 @@ metrics:
55 metric_tags:
56 - tag: fru_index
57 index: 1
58 +
59 - MIB: CISCO-PROCESS-MIB
60 table:
61 OID: 1.3.6.1.4.1.9.9.109.1.1.1
62 name: cpmCPUTotalTable
63 symbols:
64 - OID: 1.3.6.1.4.1.9.9.109.1.1.1.1.10
65 - name: cpmCPUTotalMonIntervalValue
65 + name: cpu.usage # cpmCPUTotalMonIntervalValue
66 chart_meta:
67 - description: Overall CPU busy percentage in the last monitoring interval
67 + description: The current CPU utilization
68 family: 'System/CPU/Usage'
69 unit: "%"
70 - OID: 1.3.6.1.4.1.9.9.109.1.1.1.1.7
src/go/plugin/go.d/config/go.d/snmp.profiles/default/_cisco-cpu-memory.yaml
+1 -47
@@ -1,48 +1,2 @@
1 # CPU and memory metrics for Cisco devices.
2 -
3 -metrics:
4 - - MIB: CISCO-PROCESS-MIB
5 - table:
6 - OID: 1.3.6.1.4.1.9.9.109.1.1.1
7 - name: cpmCPUTotalTable
8 - symbols:
9 - - OID: 1.3.6.1.4.1.9.9.109.1.1.1.1.7
10 - name: cpmCPUTotal1minRev
11 - chart_meta:
12 - description: The overall CPU busy percentage in the last 1 minute period
13 - family: 'System/CPU/Usage'
14 - unit: "%"
15 - metric_tags:
16 - - tag: cpu
17 - index: 1
18 -
19 - - MIB: CISCO-MEMORY-POOL-MIB
20 - table:
21 - OID: 1.3.6.1.4.1.9.9.48.1.1
22 - name: ciscoMemoryPoolTable
23 - symbols:
24 - - OID: 1.3.6.1.4.1.9.9.48.1.1.1.5
25 - name: ciscoMemoryPoolUsed
26 - chart_meta:
27 - description: Number of bytes from the memory pool currently in use
28 - family: 'System/Memory/Pool/Used'
29 - unit: "By"
30 - - OID: 1.3.6.1.4.1.9.9.48.1.1.1.6
31 - name: ciscoMemoryPoolFree
32 - chart_meta:
33 - description: Number of bytes from the memory pool currently unused
34 - family: 'System/Memory/Pool/Free'
35 - unit: "By"
36 - - OID: 1.3.6.1.4.1.9.9.48.1.1.1.7
37 - name: ciscoMemoryPoolLargestFree
38 - chart_meta:
39 - description: Largest number of contiguous bytes from the memory pool currently unused
40 - family: 'System/Memory/Pool/LargestFree'
41 - unit: "By"
42 - metric_tags:
43 - - tag: mem_pool_index
44 - index: 1
45 - - tag: mem_pool_name
46 - symbol:
47 - OID: 1.3.6.1.4.1.9.9.48.1.1.1.2
48 - name: ciscoMemoryPoolName
2 +# TODO: remove, cpu and memory metrics are in "_cisco-base.yaml"
src/go/plugin/go.d/config/go.d/snmp.profiles/default/_f5-big-ip-cpu-memory.yaml
+1 -1
@@ -11,7 +11,7 @@ metrics:
11 name: cpu.usage # sysMultiHostCpuUsageRatio1m
12 chart_meta:
13 family: 'System/CPU/Usage'
14 - description: This is average usage ratio of CPU for the associated host in the last one minute
14 + description: The current CPU utilization
15 unit: "%"
16 metric_tags:
17 - tag: cpu
src/go/plugin/go.d/config/go.d/snmp.profiles/default/_std-host-resources-mib-feat-base.yaml
+1 -1
@@ -33,7 +33,7 @@ metrics:
33 - OID: 1.3.6.1.2.1.25.3.3.1.2
34 name: cpu.usage
35 chart_meta:
36 - description: The average, over the last minute, of the percentage of time that this processor was not idle.
36 + description: The current CPU utilization
37 family: 'System/CPU/Usage'
38 unit: "%"
39 metric_tags:
src/go/plugin/go.d/config/go.d/snmp.profiles/default/a10-thunder.yaml
+3 -2
@@ -43,12 +43,13 @@ metrics:
43
44 - MIB: A10-AX-MIB
45 symbol:
46 - name: axSysAverageCpuUsage
46 + name: cpu.usage # axSysAverageCpuUsage
47 OID: 1.3.6.1.4.1.22610.2.4.1.3.3.0
48 chart_meta:
49 family: 'System/CPU/Usage'
50 - description: The average CPU usage in last 5 seconds
50 + description: The current CPU utilization
51 unit: "%"
52 +
53 - MIB: A10-AX-MIB
54 symbol:
55 name: axSysDiskTotalSpace
src/go/plugin/go.d/config/go.d/snmp.profiles/default/alcatel-lucent-ent.yaml
+2 -2
@@ -17,11 +17,11 @@ metrics:
17 name: healthModuleTable
18 OID: 1.3.6.1.4.1.6486.801.1.2.1.16.1.1.1.1
19 symbols:
20 - - name: healthModuleCpuLatest
20 + - name: cpu.usage # healthModuleCpuLatest
21 OID: 1.3.6.1.4.1.6486.801.1.2.1.16.1.1.1.1.1.11
22 chart_meta:
23 family: 'System/CPU/Usage'
24 - description: Cpu usage percentage
24 + description: The current CPU utilization
25 unit: "%"
26 metric_tags:
27 - tag: cpu_index
src/go/plugin/go.d/config/go.d/snmp.profiles/default/alcatel-lucent-omni-access-wlc.yaml
+3 -3
@@ -35,16 +35,16 @@ metrics:
35 name: wlsxSysXProcessorTable
36 OID: 1.3.6.1.4.1.14823.2.2.1.1.1.9
37 symbols:
38 - - name: sysXProcessorLoad
38 + - name: cpu.usage # sysXProcessorLoad
39 OID: 1.3.6.1.4.1.14823.2.2.1.1.1.9.1.3
40 chart_meta:
41 family: 'System/CPU/Usage'
42 - description: The average, over the last minute, of the percentage of time that this processor was not idle
42 + description: The current CPU utilization
43 unit: "%"
44 metric_tags:
45 - tag: cpu_index
46 index: 1
47 - - tag: sys_x_processor_descr
47 + - tag: _sys_x_processor_descr
48 symbol:
49 OID: 1.3.6.1.4.1.14823.2.2.1.1.1.9.1.2
50 name: sysXProcessorDescr
src/go/plugin/go.d/config/go.d/snmp.profiles/default/aruba-clearpass.yaml
+2 -2
@@ -42,10 +42,10 @@ metric_tags:
42 metrics:
43 - MIB: HOST-RESOURCES-MIB
44 symbol:
45 - name: hrProcessorLoad
45 + name: cpu.usage # hrProcessorLoad
46 OID: 1.3.6.1.2.1.25.3.3.1.2.196608
47 chart_meta:
48 - description: Average percentage of time that this processor was not idle over the last minute
48 + description: The current CPU utilization
49 family: 'System/CPU/Usage'
50 unit: "%"
51 - MIB: UCD-SNMP-MIB
src/go/plugin/go.d/config/go.d/snmp.profiles/default/aruba-cx-switch.yaml
+1 -21
@@ -1,5 +1,6 @@
1 extends:
2 - aruba.yaml
3 + - _std-host-resources-mib-feat-base.yaml
4
5 metadata:
6 device:
@@ -23,27 +24,6 @@ sysobjectid:
24 - 1.3.6.1.4.1.47196.4.1.1.1.405
25
26 metrics:
26 - # - MIB: HOST-RESOURCES-MIB
27 - # symbol:
28 - # name: hrStorageSize
29 - # OID: 1.3.6.1.2.1.25.2.3.1.5.1 # hrStorageSize.1
30 - # description: The size of the storage represented by this entry, in units of hrStorageAllocationUnits.
31 - # unit: "{logical_storage_area}"
32 - # - MIB: HOST-RESOURCES-MIB
33 - # symbol:
34 - # name: hrStorageUsed
35 - # OID: 1.3.6.1.2.1.25.2.3.1.6.1 # hrStorageUsed.1
36 - # description: The amount of the storage represented by this entry that is allocated, in units of hrStorageAllocationUnits.
37 - # unit: "{logical_storage_area}"
38 - # TODO This is not yet supported by the collector
39 - - MIB: HOST-RESOURCES-MIB
40 - symbol:
41 - name: hrProcessorLoad
42 - OID: 1.3.6.1.2.1.25.3.3.1.2.196608 # hrProcessorLoad.196608
43 - chart_meta:
44 - description: The average, over the last minute, of the percentage of time that this processor was not idle
45 - family: 'System/CPU/Usage'
46 - unit: "%"
27 - MIB: ARUBAWIRED-TEMPSENSOR-MIB
28 table:
29 OID: 1.3.6.1.4.1.47196.4.1.1.3.11.3.1
src/go/plugin/go.d/config/go.d/snmp.profiles/default/aruba-switch.yaml
-52
@@ -113,58 +113,6 @@ metrics:
113 OID: 1.3.6.1.4.1.14823.2.2.1.2.1.18.1.1
114 name: sysExtPowerSupplyIndex
115
116 - # The table of processors contained by the controller.
117 - - MIB: WLSX-SYSTEMEXT-MIB
118 - table:
119 - OID: 1.3.6.1.4.1.14823.2.2.1.2.1.13
120 - name: wlsxSysExtProcessorTable
121 - symbols:
122 - # The average, over the last minute, of the percentage of time that this processor was not idle.
123 - - OID: 1.3.6.1.4.1.14823.2.2.1.2.1.13.1.3
124 - name: sysExtProcessorLoad
125 - chart_meta:
126 - description: The average over the last minute of the percentage of time that this processor was not idle
127 - family: 'System/CPU/Usage'
128 - unit: "%"
129 - metric_tags:
130 - - tag: cpu_index
131 - symbol:
132 - OID: 1.3.6.1.4.1.14823.2.2.1.2.1.13.1.1
133 - name: sysExtProcessorID
134 -
135 - # The memory status of the controller. All memory values measured in KB.
136 - - MIB: WLSX-SYSTEMEXT-MIB
137 - table:
138 - OID: 1.3.6.1.4.1.14823.2.2.1.2.1.15.1
139 - name: wlsxSysExtMemoryTable
140 - symbols:
141 - - OID: 1.3.6.1.4.1.14823.2.2.1.2.1.15.1.2
142 - name: sysExtMemorySize
143 - chart_meta:
144 - description: Total memory in KB
145 - family: 'System/Memory/Total'
146 - unit: "By"
147 - scale_factor: 1024
148 - - OID: 1.3.6.1.4.1.14823.2.2.1.2.1.15.1.3
149 - name: sysExtMemoryUsed
150 - chart_meta:
151 - description: Used memory in KB
152 - family: 'System/Memory/Used'
153 - unit: "By"
154 - scale_factor: 1024
155 - - OID: 1.3.6.1.4.1.14823.2.2.1.2.1.15.1.4
156 - name: sysExtMemoryFree
157 - chart_meta:
158 - description: Free memory in KB
159 - family: 'System/Memory/Free'
160 - unit: "By"
161 - scale_factor: 1024
162 - metric_tags:
163 - - tag: memory_index
164 - symbol:
165 - OID: 1.3.6.1.4.1.14823.2.2.1.2.1.15.1.1
166 - name: sysExtMemoryIndex
167 -
116 # The packet loss count of the switch.
117 - MIB: WLSX-SYSTEMEXT-MIB
118 symbol:
src/go/plugin/go.d/config/go.d/snmp.profiles/default/aruba-wireless-controller.yaml
+1 -1
@@ -80,7 +80,7 @@ metrics:
80 name: cpu.usage
81 OID: 1.3.6.1.4.1.14823.2.2.1.2.1.30.0
82 chart_meta:
83 - description: Cpu usage percentage
83 + description: The current CPU utilization
84 family: 'System/CPU/Usage'
85 unit: "%"
86 - MIB: WLSX-SYSTEMEXT-MIB
src/go/plugin/go.d/config/go.d/snmp.profiles/default/avaya-nortel-ethernet-routing-switch.yaml
+1 -1
@@ -28,7 +28,7 @@ metrics:
28 name: cpu.usage
29 OID: 1.3.6.1.4.1.45.1.6.3.8.1.1.5.3.10.0 # s5ChasUtilCPUUsageLast1Minute.3.10.0
30 chart_meta:
31 - description: Percentage of time the CPU has been busy over the last 1 minute
31 + description: The current CPU utilization
32 family: 'System/CPU/Usage'
33 unit: "%"
34 - MIB: S5-CHASSIS-MIB
src/go/plugin/go.d/config/go.d/snmp.profiles/default/brocade-fc-switch.yaml
+1 -1
@@ -31,7 +31,7 @@ metrics:
31 OID: 1.3.6.1.4.1.1588.2.1.1.1.26.1.0
32 name: cpu.usage
33 chart_meta:
34 - description: System's cpu usage
34 + description: The current CPU utilization
35 family: 'System/CPU/Usage'
36 unit: "%"
37 - MIB: RESOURCE-MIB
src/go/plugin/go.d/config/go.d/snmp.profiles/default/checkpoint.yaml
+2 -2
@@ -86,9 +86,9 @@ metrics:
86 family: 'System/CPU/Time/Idle'
87 unit: "%"
88 - OID: 1.3.6.1.4.1.2620.1.6.7.5.1.5
89 - name: multiProcUsage
89 + name: cpu.usage # multiProcUsage
90 chart_meta:
91 - description: "Processor usage"
91 + description: The current CPU utilization
92 family: 'System/CPU/Usage'
93 unit: "%"
94 metric_tags:
src/go/plugin/go.d/config/go.d/snmp.profiles/default/cisco-firepower-asa.yaml
+2 -1
@@ -40,12 +40,13 @@ metrics:
40 - OID: 1.3.6.1.4.1.9.9.109.1.1.1.1.7 # cpmCPUTotal1minRev
41 name: cpu.usage
42 chart_meta:
43 - description: The overall CPU busy percentage in the last 1 minute period
43 + description: The current CPU utilization
44 family: 'System/CPU/Usage'
45 unit: "%"
46 metric_tags:
47 - tag: cpu_index
48 index: 1 # cpmCPUTotalIndex
49 +
50 - MIB: CISCO-ENHANCED-MEMPOOL-MIB
51 symbol:
52 name: memory.used
src/go/plugin/go.d/config/go.d/snmp.profiles/default/cisco-firepower.yaml
+2 -1
@@ -31,12 +31,13 @@ metrics:
31 - OID: 1.3.6.1.4.1.9.9.109.1.1.1.1.7 # cpmCPUTotal1minRev
32 name: cpu.usage
33 chart_meta:
34 - description: The overall CPU busy percentage in the last 1 minute period.
34 + description: The current CPU utilization
35 family: 'System/CPU/Usage'
36 unit: "%"
37 metric_tags:
38 - tag: cpu_index
39 index: 1 # cpmCPUTotalIndex
40 +
41 - MIB: CISCO-FIREPOWER-SM-MIB
42 table:
43 OID: 1.3.6.1.4.1.9.9.826.1.71.20
src/go/plugin/go.d/config/go.d/snmp.profiles/default/cisco-ironport-email.yaml
+1 -1
@@ -48,7 +48,7 @@ metrics:
48 name: cpu.usage
49 OID: 1.3.6.1.4.1.15497.1.1.1.2.0
50 chart_meta:
51 - description: This object provides a general idea of how busy the CPU is according to the appliance software, within the last 5 seconds of utilization
51 + description: The current CPU utilization
52 family: 'System/CPU/Usage'
53 unit: "%"
54 - MIB: ASYNCOS-MAIL-MIB
src/go/plugin/go.d/config/go.d/snmp.profiles/default/cisco-legacy-wlc.yaml
+1 -1
@@ -43,7 +43,7 @@ metrics:
43 OID: 1.3.6.1.4.1.14179.1.1.5.1 # agentCurrentCPUUtilization
44 name: cpu.usage
45 chart_meta:
46 - description: Current CPU load of the switch
46 + description: The current CPU utilization
47 family: 'System/CPU/Usage'
48 unit: "%"
49 - MIB: AIRESPACE-SWITCHING-MIB
src/go/plugin/go.d/config/go.d/snmp.profiles/default/cisco-sb.yaml
+1 -1
@@ -21,6 +21,6 @@ metrics:
21 name: cpu.usage
22 OID: 1.3.6.1.4.1.9.6.1.101.1.8
23 chart_meta:
24 - description: Cpu usage percentage
24 + description: The current CPU utilization
25 family: 'System/CPU/Usage'
26 unit: "%"
src/go/plugin/go.d/config/go.d/snmp.profiles/default/citrix-netscaler-sdx.yaml
+1 -1
@@ -258,7 +258,7 @@ metrics:
258 - name: cpu.usage
259 OID: 1.3.6.1.4.1.5951.6.3.1.1.8
260 chart_meta:
261 - description: "Cpu usage percentage of host"
261 + description: The current CPU utilization
262 family: 'System/CPU/Usage'
263 unit: "%"
264 - name: memory.usage
src/go/plugin/go.d/config/go.d/snmp.profiles/default/citrix-netscaler.yaml
+1 -1
@@ -35,7 +35,7 @@ metrics:
35 name: cpu.usage
36 OID: 1.3.6.1.4.1.5951.4.1.1.41.1.0
37 chart_meta:
38 - description: CPU utilization percentage
38 + description: The current CPU utilization
39 family: 'System/CPU/Usage'
40 unit: "%"
41 - MIB: NS-ROOT-MIB
src/go/plugin/go.d/config/go.d/snmp.profiles/default/dell-emc-data-domain.yaml
+6 -8
@@ -42,6 +42,9 @@ sysobjectid:
42 - 1.3.6.1.4.1.19746.3.1.36 # EMC dd2500
43 - 1.3.6.1.4.1.19746.3.1.37 # EMC dd4200
44
45 +# - DATA-DOMAIN-MIB
46 +# https://mibbrowser.online/mibdb_search.php?mib=DATA-DOMAIN-MIB
47 +
48 metrics:
49 - MIB: HOST-RESOURCES-MIB
50 symbol:
@@ -292,17 +295,12 @@ metrics:
295 name: systemStatsTable
296 OID: 1.3.6.1.4.1.19746.1.5.1.1
297 symbols:
295 - - name: cpu.usage
298 + - name: cpu.usage # cpu0PercentageBusy
299 + # TODO: need to collect both cpu0PercentageBusy and cpu1PercentageBusy
300 OID: 1.3.6.1.4.1.19746.1.5.1.1.1.2
301 chart_meta:
302 family: 'System/CPU/Usage'
299 - description: CPU 0 percentage busy
300 - unit: "%"
301 - - name: datadomain.cpuMaxPercentageBusy
302 - OID: 1.3.6.1.4.1.19746.1.5.1.1.1.3
303 - chart_meta:
304 - family: 'System/CPU/Usage/Maximum'
305 - description: CPU 1 percentage busy
303 + description: The current CPU utilization
304 unit: "%"
305 - name: datadomain.nfsOpsPerSecond
306 OID: 1.3.6.1.4.1.19746.1.5.1.1.1.4
src/go/plugin/go.d/config/go.d/snmp.profiles/default/dell-force10.yaml
+6 -2
@@ -11,14 +11,18 @@ metadata:
11 type:
12 value: "switch"
13
14 +# - F10-S-SERIES-CHASSIS-MIB
15 +# https://mibbrowser.online/mibdb_search.php?mib=F10-S-SERIES-CHASSIS-MIB
16 +# https://github.com/librenms/librenms/blob/master/mibs/dell/F10-S-SERIES-CHASSIS-MIB
17 +
18 metrics:
19 - MIB: F10-S-SERIES-CHASSIS-MIB
20 symbol:
17 - OID: 1.3.6.1.4.1.6027.3.10.1.2.9.1.4
21 + OID: 1.3.6.1.4.1.6027.3.10.1.2.9.1.2 # chStackUnitCpuUtil5Sec
22 name: cpu.usage
23 chart_meta:
24 family: 'System/CPU/Usage'
21 - description: Cpu utilization in percentage for last 5 minutes.
25 + description: The current CPU utilization
26 unit: "%"
27 - MIB: F10-S-SERIES-CHASSIS-MIB
28 symbol:
src/go/plugin/go.d/config/go.d/snmp.profiles/default/dell-powerconnect.yaml
+6 -2
@@ -93,15 +93,19 @@ sysobjectid:
93 - 1.3.6.1.4.1.674.10895.3114 # PowerConnect N3248P-ON
94 - 1.3.6.1.4.1.674.10895.3115 # PowerConnect N1108EP-ON
95
96 +# - DNOS-SWITCHING-MIB
97 +# https://mibbrowser.online/mibdb_search.php?mib=DNOS-SWITCHING-MIB
98 +# https://github.com/DanielleHuisman/observium-community-edition/blob/main/mibs/dell/DNOS-SWITCHING-MIB
99 +
100 metrics:
101 - MIB: DNOS-SWITCHING-MIB
102 symbol:
99 - name: cpu.usage
103 + name: cpu.usage # agentSwitchCpuProcessTotalUtilization
104 OID: 1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.9.0
105 extract_value: 60 Secs.*?(\d+[.]?\d+)
106 chart_meta:
107 family: 'System/CPU/Usage'
104 - description: "Cpu usage in percent over 60 seconds"
108 + description: "The current CPU utilization"
109 unit: "%"
110 - MIB: DNOS-SWITCHING-MIB
111 symbol:
src/go/plugin/go.d/config/go.d/snmp.profiles/default/dell-sonicwall.yaml
+6 -2
@@ -26,14 +26,18 @@ metadata:
26 OID: 1.3.6.1.4.1.8741.2.1.1.1.0
27 name: snwlSysModel
28
29 +# - SONICWALL-FIREWALL-IP-STATISTICS-MIB
30 +# https://mibbrowser.online/mibdb_search.php?mib=SONICWALL-FIREWALL-IP-STATISTICS-MIB
31 +# https://github.com/librenms/librenms/blob/master/mibs/sonicwall/SONICWALL-FIREWALL-IP-STATISTICS-MIB
32 +
33 metrics:
34 - MIB: SONICWALL-FIREWALL-IP-STATISTICS-MIB
35 symbol:
32 - name: cpu.usage
36 + name: cpu.usage # sonicCurrentCPUUtil
37 OID: 1.3.6.1.4.1.8741.1.3.1.3.0
38 chart_meta:
39 family: 'System/CPU/Usage'
36 - description: Instantaneous CPU Utilization in percent
40 + description: The current CPU utilization
41 unit: "%"
42 - MIB: SONICWALL-FIREWALL-IP-STATISTICS-MIB
43 symbol:
src/go/plugin/go.d/config/go.d/snmp.profiles/default/dlink-dgs-switch.yaml
+6 -2
@@ -11,6 +11,10 @@ metadata:
11 type:
12 value: "switch"
13
14 +# - DLINKSW-ENTITY-EXT-MIB
15 +# https://mibbrowser.online/mibdb_search.php?mib=DLINKSW-ENTITY-EXT-MIB
16 +# https://github.com/librenms/librenms/blob/master/mibs/dlink/DLINKSW-ENTITY-EXT-MIB
17 +
18 metrics:
19 - MIB: DLINKSW-ENTITY-EXT-MIB
20 table:
@@ -18,9 +22,9 @@ metrics:
22 OID: 1.3.6.1.4.1.171.14.5.1.7
23 symbols:
24 - name: cpu.usage
21 - OID: 1.3.6.1.4.1.171.14.5.1.7.1.3 # dEntityExtCpuUtilOneMinute
25 + OID: 1.3.6.1.4.1.171.14.5.1.7.1.3 # dEntityExtCpuUtilFiveSeconds
26 chart_meta:
23 - description: Overall CPU busy percentage in the last 1 minute period
27 + description: The current CPU utilization
28 family: 'System/CPU/Usage'
29 unit: "%"
30 metric_tags:
src/go/plugin/go.d/config/go.d/snmp.profiles/default/extreme-switching.yaml
+6 -2
@@ -22,14 +22,18 @@ metric_tags:
22 OID: 1.3.6.1.4.1.1916.1.1.1.14.0
23 symbol: extremeSecondarySoftwareRev
24
25 +# - EXTREME-SOFTWARE-MONITOR-MIB
26 +# https://mibbrowser.online/mibdb_search.php?mib=EXTREME-SOFTWARE-MONITOR-MIB
27 +# https://github.com/librenms/librenms/blob/master/mibs/extreme/EXTREME-SOFTWARE-MONITOR-MIB
28 +
29 metrics:
30 - MIB: EXTREME-SOFTWARE-MONITOR-MIB
31 symbol:
28 - name: cpu.usage
32 + name: cpu.usage # extremeCpuMonitorTotalUtilization
33 OID: 1.3.6.1.4.1.1916.1.32.1.2.0
34 chart_meta:
35 family: 'System/CPU/Usage'
32 - description: Total CPU utilization
36 + description: The current CPU utilization
37 unit: "%"
38 - MIB: EXTREME-SOFTWARE-MONITOR-MIB
39 table:
src/go/plugin/go.d/config/go.d/snmp.profiles/default/f5-big-ip.yaml
+2 -2
@@ -142,9 +142,9 @@ metrics:
142 metric_type: gauge
143 symbols:
144 - OID: 1.3.6.1.4.1.3375.2.1.7.5.2.1.11
145 - name: sysMultiHostCpuUsageRatio
145 + name: cpu.usage # sysMultiHostCpuUsageRatio
146 chart_meta:
147 - description: This is usage ratio of CPU for the associated host
147 + description: The current CPU utilization
148 family: 'System/CPU/Usage'
149 unit: "%"
150 metric_tags:
src/go/plugin/go.d/config/go.d/snmp.profiles/default/fortinet-appliance.yaml
+3 -3
@@ -74,10 +74,10 @@ sysobjectid:
74 metrics:
75 - MIB: FORTINET-FORTIMANAGER-FORTIANALYZER-MIB
76 symbol:
77 - name: cpu.usage
77 + name: cpu.usage # fmSysCpuUsage
78 OID: 1.3.6.1.4.1.12356.103.2.1.1.0
79 chart_meta:
80 - description: Current CPU usage
80 + description: The current CPU utilization
81 family: 'System/CPU/Usage'
82 unit: "%"
83 - MIB: FORTINET-FORTIMANAGER-FORTIANALYZER-MIB
@@ -122,7 +122,7 @@ metrics:
122 OID: 1.3.6.1.4.1.12356.103.2.1.6.0
123 chart_meta:
124 description: Current CPU usage excluded nice processes usage (percentage)
125 - family: 'System/CPU/Usage/ExcludeNice'
125 + family: 'System/CPU/Usage'
126 unit: "%"
127 - MIB: FORTINET-FORTIMANAGER-FORTIANALYZER-MIB
128 symbol:
src/go/plugin/go.d/config/go.d/snmp.profiles/default/fortinet-fortigate.yaml
+2 -2
@@ -72,9 +72,9 @@ metrics:
72 - MIB: FORTINET-FORTIGATE-MIB
73 symbol:
74 OID: 1.3.6.1.4.1.12356.101.4.1.3.0
75 - name: fgSysCpuUsage
75 + name: cpu.usage # fgSysCpuUsage
76 chart_meta:
77 - description: Current CPU usage
77 + description: The current CPU utilization
78 family: 'System/CPU/Usage'
79 unit: "%"
80
src/go/plugin/go.d/config/go.d/snmp.profiles/default/fortinet-fortiswitch.yaml
+2 -2
@@ -27,10 +27,10 @@ metric_tags:
27 metrics:
28 - MIB: FORTINET-FORTISWITCH-MIB
29 symbol:
30 - name: cpu.usage
30 + name: cpu.usage # fsSysCpuUsage
31 OID: 1.3.6.1.4.1.12356.106.4.1.2.0
32 chart_meta:
33 - description: Current CPU usage
33 + description: The current CPU utilization
34 family: 'System/CPU/Usage'
35 unit: "%"
36 - MIB: FORTINET-FORTISWITCH-MIB
src/go/plugin/go.d/config/go.d/snmp.profiles/default/hp-h3c-switch.yaml
+2 -2
@@ -38,9 +38,9 @@ metrics:
38 name: hh3cEntityExtStateTable
39 symbols:
40 - OID: 1.3.6.1.4.1.25506.2.6.1.1.1.1.6
41 - name: cpu.usage
41 + name: cpu.usage # hh3cEntityExtCpuUsage
42 chart_meta:
43 - description: "Cpu usage for this entity"
43 + description: The current CPU utilization
44 family: 'System/CPU/Usage'
45 unit: "%"
46 metric_tags:
src/go/plugin/go.d/config/go.d/snmp.profiles/default/hp-icf-switch.yaml
+2 -2
@@ -20,10 +20,10 @@ metadata:
20 metrics:
21 - MIB: STATISTICS-MIB
22 symbol:
23 - name: cpu.usage
23 + name: cpu.usage # hpSwitchCpuStat
24 OID: 1.3.6.1.4.1.11.2.14.11.5.1.9.6.1.0
25 chart_meta:
26 - description: The CPU utilization in percent(%).
26 + description: The current CPU utilization
27 family: 'System/CPU/Usage'
28 unit: "%"
29 - MIB: NETSWITCH-MIB
src/go/plugin/go.d/config/go.d/snmp.profiles/default/hpe-proliant.yaml
+3 -21
@@ -101,28 +101,10 @@ metrics:
101 name: cpqHoCpuUtilTable
102 symbols:
103 - OID: 1.3.6.1.4.1.232.11.2.3.1.1.2
104 - name: cpqHoCpuUtilMin
104 + name: cpu.usage # cpqHoCpuUtilMin
105 chart_meta:
106 - description: Cpu utilization as a percentage of the theoretical maximum during the last minute
107 - family: 'System/CPU/Usage/1Min'
108 - unit: "%"
109 - - OID: 1.3.6.1.4.1.232.11.2.3.1.1.3
110 - name: cpqHoCpuUtilFiveMin
111 - chart_meta:
112 - description: Cpu utilization as a percentage of the theoretical maximum during the last five minutes
113 - family: 'System/CPU/Usage/5Min'
114 - unit: "%"
115 - - OID: 1.3.6.1.4.1.232.11.2.3.1.1.4
116 - name: cpqHoCpuUtilThirtyMin
117 - chart_meta:
118 - description: Cpu utilization as a percentage of the theoretical maximum during the last thirty minutes
119 - family: 'System/CPU/Usage/30Min'
120 - unit: "%"
121 - - OID: 1.3.6.1.4.1.232.11.2.3.1.1.5
122 - name: cpqHoCpuUtilHour
123 - chart_meta:
124 - description: Cpu utilization as a percentage of the theoretical maximum during the last hour
125 - family: 'System/CPU/Usage/1Hour'
106 + description: The current CPU utilization
107 + family: 'System/CPU/Usage'
108 unit: "%"
109 metric_tags:
110 - tag: cpu_unit_index
src/go/plugin/go.d/config/go.d/snmp.profiles/default/huawei.yaml
+2 -2
@@ -197,10 +197,10 @@ metrics:
197 name: hwCpuDevTable
198 OID: 1.3.6.1.4.1.2011.6.3.4
199 symbols:
200 - - name: huawei.hwAvgDuty1min
200 + - name: cpu.usage # huawei.hwAvgDuty1min
201 OID: 1.3.6.1.4.1.2011.6.3.4.1.3
202 chart_meta:
203 - description: The overall CPU duty percentage in the last 1 minute period
203 + description: The current CPU utilization
204 family: 'System/CPU/Usage'
205 unit: "%"
206 metric_tags:
src/go/plugin/go.d/config/go.d/snmp.profiles/default/ibm-datapower-gateway.yaml
+1 -1
@@ -12,7 +12,7 @@ metrics:
12 name: cpu.usage
13 OID: 1.3.6.1.4.1.14685.3.1.14.2.0 # dpStatusCPUUsageoneMinute
14 chart_meta:
15 - description: Cpu usage percentage over one minute
15 + description: The current CPU utilization
16 family: 'System/CPU/Usage'
17 unit: "%"
18 - MIB: DATAPOWER-STATUS-MIB
src/go/plugin/go.d/config/go.d/snmp.profiles/default/infoblox-ipam.yaml
+2 -2
@@ -86,10 +86,10 @@ metric_tags:
86 metrics:
87 - MIB: IB-PLATFORMONE-MIB
88 symbol:
89 - name: cpu.usage
89 + name: cpu.usage # ibSystemMonitorCpuUsage
90 OID: 1.3.6.1.4.1.7779.3.1.1.2.1.8.1.1.0
91 chart_meta:
92 - description: Current average CPU usage
92 + description: The current CPU utilization
93 family: 'System/CPU/Usage'
94 unit: "%"
95 - MIB: IB-PLATFORMONE-MIB
src/go/plugin/go.d/config/go.d/snmp.profiles/default/juniper-pulse-secure.yaml
+2 -2
@@ -37,9 +37,9 @@ metrics:
37 - MIB: JUNIPER-IVE-MIB
38 symbol:
39 OID: 1.3.6.1.4.1.12532.10.0
40 - name: iveCpuUtil
40 + name: cpu.usage # iveCpuUtil
41 chart_meta:
42 - description: The cpu utilization of the ive system
42 + description: The current CPU utilization
43 family: 'System/CPU/Usage'
44 unit: "%"
45 - MIB: JUNIPER-IVE-MIB
src/go/plugin/go.d/config/go.d/snmp.profiles/default/mcafee-web-gateway.yaml
+2 -2
@@ -65,10 +65,10 @@ metric_tags:
65 metrics:
66 - MIB: MCAFEE-MWG-MIB
67 symbol:
68 - name: cpu.usage
68 + name: cpu.usage # stCPULoad
69 OID: 1.3.6.1.4.1.1230.2.7.2.5.1.0
70 chart_meta:
71 - description: Current overall CPU usage in percent
71 + description: The current CPU utilization
72 family: 'System/CPU/Usage'
73 unit: "%"
74 - MIB: MCAFEE-MWG-MIB
src/go/plugin/go.d/config/go.d/snmp.profiles/default/mikrotik-router.yaml
+2 -2
@@ -141,9 +141,9 @@ metrics:
141 name: hrProcessorTable
142 symbols:
143 - OID: 1.3.6.1.2.1.25.3.3.1.2
144 - name: cpu.usage
144 + name: cpu.usage # hrProcessorLoad
145 chart_meta:
146 - description: The average, over the last minute, of the percentage of time that this processor was not idle.
146 + description: The current CPU utilization
147 family: 'System/CPU/Usage'
148 unit: "%"
149 metric_tags:
src/go/plugin/go.d/config/go.d/snmp.profiles/default/nec-univerge.yaml
+1 -1
@@ -48,7 +48,7 @@ metrics:
48 name: cpu.usage
49 OID: 1.3.6.1.4.1.119.2.3.84.2.5.3.0
50 chart_meta:
51 - description: CPU usage percentage
51 + description: The current CPU utilization
52 family: 'System/CPU/Usage'
53 unit: "%"
54 - MIB: PICO-SMI
src/go/plugin/go.d/config/go.d/snmp.profiles/default/peplink.yaml
+1 -1
@@ -42,7 +42,7 @@ metrics:
42 OID: 1.3.6.1.4.1.23695.200.1.1.1.3.1.0
43 chart_meta:
44 family: 'System/CPU/Usage'
45 - description: Cpu usage
45 + description: The current CPU utilization
46 unit: "%"
47 - MIB: PEPLINK-DEVICE
48 symbol:
src/go/plugin/go.d/config/go.d/snmp.profiles/default/raritan-dominion.yaml
+1 -1
@@ -31,7 +31,7 @@ metrics:
31 OID: 1.3.6.1.4.1.13742.3.1.2.0
32 chart_meta:
33 family: 'System/CPU/Usage'
34 - description: CPU usage
34 + description: The current CPU utilization
35 unit: "%"
36
37 - MIB: RemoteKVMDevice-MIB
src/go/plugin/go.d/config/go.d/snmp.profiles/default/ruckus-unleashed.yaml
+2 -2
@@ -33,10 +33,10 @@ metrics:
33 - MIB: RUCKUS-UNLEASHED-SYSTEM-MIB
34 symbol:
35 name: cpu.usage
36 - OID: 1.3.6.1.4.1.25053.1.15.1.1.1.15.13.0
36 + OID: 1.3.6.1.4.1.25053.1.15.1.1.1.15.13.0 # ruckusUnleashedSystemStatsCPUUtil
37 chart_meta:
38 family: 'System/CPU/Usage'
39 - description: CPU utilization
39 + description: The current CPU utilization
40 unit: "%"
41 - MIB: RUCKUS-UNLEASHED-SYSTEM-MIB
42 symbol:
src/go/plugin/go.d/config/go.d/snmp.profiles/default/ruckus-wap.yaml
+1 -1
@@ -17,7 +17,7 @@ metrics:
17 OID: 1.3.6.1.4.1.25053.1.1.11.1.1.1.1.0
18 chart_meta:
19 family: 'System/CPU/Usage'
20 - description: CPU utilization
20 + description: The current CPU utilization
21 unit: "%"
22 - MIB: RUCKUS-SYSTEM-MIB
23 symbol:
src/go/plugin/go.d/config/go.d/snmp.profiles/default/tp-link.yaml
+2 -2
@@ -23,9 +23,9 @@ metrics:
23 OID: 1.3.6.1.4.1.11863.6.4.1.1.1
24 symbols:
25 - name: cpu.usage
26 - OID: 1.3.6.1.4.1.11863.6.4.1.1.1.1.3
26 + OID: 1.3.6.1.4.1.11863.6.4.1.1.1.1.2 # tpSysMonitorCpu5Seconds
27 chart_meta:
28 - description: CPU utilization in 1 minute
28 + description: The current CPU utilization
29 family: 'System/CPU/Usage'
30 unit: "%"
31 metric_tags:
src/go/plugin/go.d/config/go.d/snmp.profiles/default/zyxel-switch.yaml
+2 -2
@@ -38,10 +38,10 @@ metric_tags:
38 metrics:
39 - MIB: ZYXEL-ES-COMMON
40 symbol:
41 - name: cpu.usage
41 + name: cpu.usage # sysMgmtCPUUsage
42 OID: 1.3.6.1.4.1.890.1.15.3.2.4.0
43 chart_meta:
44 - description: Device CPU usage
44 + description: The current CPU utilization
45 family: 'System/CPU/Usage'
46 unit: "%"
47