From 103061c0630007cf76c450920eda8c56b39ca3a7 Mon Sep 17 00:00:00 2001 From: ran Date: Sun, 17 Nov 2024 15:14:44 +0200 Subject: [PATCH 01/15] add cisco usc mibs and metrics shoter Signed-off-by: ran --- generator/Makefile | 8 +++ generator/generator.yml | 5 ++ snmp.yml | 140 +++++++++++++++++++--------------------- 3 files changed, 80 insertions(+), 73 deletions(-) diff --git a/generator/Makefile b/generator/Makefile index 97527eeb..05d5a3e8 100644 --- a/generator/Makefile +++ b/generator/Makefile @@ -62,6 +62,7 @@ READYNAS_URL := https://www.downloads.netgear.com/files/ReadyNAS/READYNAS-M READYDATAOS_URL := https://www.downloads.netgear.com/files/GDC/RD5200/READYDATA_MIB.zip SOPHOS_XG_URL := https://docs.sophos.com/nsg/sophos-firewall/MIB/SOPHOS-XG-MIB.zip POWERCOM_URL := https://www.upspowercom.com/pcm-img/Card-DA807/Upsmate_PCM.mib +CISCO_CUCS_URL := https://raw.githubusercontent.com/cisco/cisco-mibs/refs/heads/main/ucs-C-Series-mibs/UCS_Cseries3.0.tar CYBERPOWER_VERSION := 2.11 CYBERPOWER_URL := https://dl4jz3rbrsfum.cloudfront.net/software/CyberPower_MIB_v$(CYBERPOWER_VERSION).MIB.zip @@ -399,3 +400,10 @@ $(MIBDIR)/readydataos: $(MIBDIR)/powercom: @echo ">> Downloading powercom" @curl $(CURL_OPTS) -o $(MIBDIR)/powercom "$(POWERCOM_URL)" + +$(MIBDIR)/cisco_imc: + $(eval TMP := $(shell mktemp)) + $(eval TMP_DIR := $(shell mktemp -d)) + @echo ">> Downloading HPE to $(TMP)" + @curl -L $(CURL_OPTS) $(CURL_USER_AGENT) -o $(TMP) $(CISCO_CUCS_URL) + @tar -xf $(TMP) -C $(MIBDIR)/cisco_imc \ No newline at end of file diff --git a/generator/generator.yml b/generator/generator.yml index d8c83b89..9b46e2da 100644 --- a/generator/generator.yml +++ b/generator/generator.yml @@ -837,3 +837,8 @@ modules: - 1.3.6.1.4.1.935.1.1.1.9.2.2 # upsEnvUnderTemperature - 1.3.6.1.4.1.935.1.1.1.9.2.3 # upsEnvOverHumidity - 1.3.6.1.4.1.935.1.1.1.9.2.4 # upsEnvUnderHumidity + cisco_imc: + walk: + - 1.3.6.1.4.1.9.9.719.1.45.1.1.6 #cucsStorageControllerOperState + - 1.3.6.1.4.1.9.9.719.1.1.1.1.11 #cucsFaultDescription + - 1.3.6.1.4.1.9.9.719.1.1.1.1.20 #cucsFaultSeverity diff --git a/snmp.yml b/snmp.yml index 9c63b74f..299e592c 100644 --- a/snmp.yml +++ b/snmp.yml @@ -2928,6 +2928,73 @@ modules: 0: unknown 1: ipv4 2: ipv6 + cisco_imc: + walk: + - 1.3.6.1.4.1.9.9.719.1.1.1.1.11 + - 1.3.6.1.4.1.9.9.719.1.1.1.1.20 + - 1.3.6.1.4.1.9.9.719.1.45.1.1.6 + metrics: + - name: cucsFaultDescription + oid: 1.3.6.1.4.1.9.9.719.1.1.1.1.11 + type: DisplayString + help: A human-readable message providing details about the fault. - 1.3.6.1.4.1.9.9.719.1.1.1.1.11 + indexes: + - labelname: cucsFaultIndex + type: gauge + - name: cucsFaultSeverity + oid: 1.3.6.1.4.1.9.9.719.1.1.1.1.20 + type: gauge + help: A code identifying the perceived severity of the fault. - 1.3.6.1.4.1.9.9.719.1.1.1.1.20 + indexes: + - labelname: cucsFaultIndex + type: gauge + enum_values: + 0: cleared + 1: info + 3: warning + 4: minor + 5: major + 6: critical + - name: cucsStorageControllerOperState + oid: 1.3.6.1.4.1.9.9.719.1.45.1.1.6 + type: gauge + help: Cisco UCS storage:Controller:operState managed object property - 1.3.6.1.4.1.9.9.719.1.45.1.1.6 + indexes: + - labelname: cucsStorageControllerInstanceId + type: gauge + enum_values: + 0: unknown + 1: operable + 2: inoperable + 3: degraded + 4: poweredOff + 5: powerProblem + 6: removed + 7: voltageProblem + 8: thermalProblem + 9: performanceProblem + 10: accessibilityProblem + 11: identityUnestablishable + 12: biosPostTimeout + 13: disabled + 14: malformedFru + 15: backplanePortProblem + 16: chassisIntrusion + 51: fabricConnProblem + 52: fabricUnsupportedConn + 81: config + 82: equipmentProblem + 83: decomissioning + 84: chassisLimitExceeded + 100: notSupported + 101: discovery + 102: discoveryFailed + 103: identify + 104: postFailure + 105: upgradeProblem + 106: peerCommProblem + 107: autoUpgrade + 108: linkActivateBlocked cisco_wlc: walk: - 1.3.6.1.4.1.14179.2.1.1.1.2 @@ -2962,7 +3029,6 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 - fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -2981,7 +3047,6 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 - fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge - labelname: bsnAPIfNoiseChannelNo @@ -3001,7 +3066,6 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 - fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -3019,7 +3083,6 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 - fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -3043,7 +3106,6 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 - fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -3114,7 +3176,6 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 - fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -3133,7 +3194,6 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 - fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -3152,7 +3212,6 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 - fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -3171,7 +3230,6 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 - fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -3190,7 +3248,6 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 - fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -3209,7 +3266,6 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 - fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -3228,7 +3284,6 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 - fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -3247,7 +3302,6 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 - fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -3266,7 +3320,6 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 - fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -3285,7 +3338,6 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 - fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -3304,7 +3356,6 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 - fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -3323,7 +3374,6 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 - fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -3345,7 +3395,6 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 - fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -3365,7 +3414,6 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 - fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -27494,7 +27542,6 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 - fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabIface @@ -27504,7 +27551,6 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 - fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabStrength @@ -27514,7 +27560,6 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 - fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabTxBytes @@ -27524,7 +27569,6 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 - fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabRxBytes @@ -27534,7 +27578,6 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 - fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabTxPackets @@ -27544,7 +27587,6 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 - fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabRxPackets @@ -27554,7 +27596,6 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 - fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabTxRate @@ -27564,7 +27605,6 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 - fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabRxRate @@ -27574,7 +27614,6 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 - fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabRouterOSVersion @@ -27584,7 +27623,6 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 - fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabUptime @@ -27594,7 +27632,6 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 - fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabSignalToNoise @@ -27604,7 +27641,6 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 - fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabTxStrengthCh0 @@ -27614,7 +27650,6 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 - fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabRxStrengthCh0 @@ -27624,7 +27659,6 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 - fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabTxStrengthCh1 @@ -27634,7 +27668,6 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 - fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabRxStrengthCh1 @@ -27644,7 +27677,6 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 - fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabTxStrengthCh2 @@ -27654,7 +27686,6 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 - fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabRxStrengthCh2 @@ -27664,7 +27695,6 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 - fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabTxStrength @@ -27674,7 +27704,6 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 - fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabRadioName @@ -27684,7 +27713,6 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 - fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlApIndex @@ -27775,7 +27803,6 @@ modules: indexes: - labelname: mtxrWlCMRtabAddr type: PhysAddress48 - fixed_size: 6 - labelname: mtxrWlCMRtabIface type: gauge - name: mtxrWlCMRtabIface @@ -27785,7 +27812,6 @@ modules: indexes: - labelname: mtxrWlCMRtabAddr type: PhysAddress48 - fixed_size: 6 - labelname: mtxrWlCMRtabIface type: gauge - name: mtxrWlCMRtabUptime @@ -27795,7 +27821,6 @@ modules: indexes: - labelname: mtxrWlCMRtabAddr type: PhysAddress48 - fixed_size: 6 - labelname: mtxrWlCMRtabIface type: gauge - name: mtxrWlCMRtabTxBytes @@ -27805,7 +27830,6 @@ modules: indexes: - labelname: mtxrWlCMRtabAddr type: PhysAddress48 - fixed_size: 6 - labelname: mtxrWlCMRtabIface type: gauge - name: mtxrWlCMRtabRxBytes @@ -27815,7 +27839,6 @@ modules: indexes: - labelname: mtxrWlCMRtabAddr type: PhysAddress48 - fixed_size: 6 - labelname: mtxrWlCMRtabIface type: gauge - name: mtxrWlCMRtabTxPackets @@ -27825,7 +27848,6 @@ modules: indexes: - labelname: mtxrWlCMRtabAddr type: PhysAddress48 - fixed_size: 6 - labelname: mtxrWlCMRtabIface type: gauge - name: mtxrWlCMRtabRxPackets @@ -27835,7 +27857,6 @@ modules: indexes: - labelname: mtxrWlCMRtabAddr type: PhysAddress48 - fixed_size: 6 - labelname: mtxrWlCMRtabIface type: gauge - name: mtxrWlCMRtabTxRate @@ -27845,7 +27866,6 @@ modules: indexes: - labelname: mtxrWlCMRtabAddr type: PhysAddress48 - fixed_size: 6 - labelname: mtxrWlCMRtabIface type: gauge - name: mtxrWlCMRtabRxRate @@ -27855,7 +27875,6 @@ modules: indexes: - labelname: mtxrWlCMRtabAddr type: PhysAddress48 - fixed_size: 6 - labelname: mtxrWlCMRtabIface type: gauge - name: mtxrWlCMRtabTxStrength @@ -27865,7 +27884,6 @@ modules: indexes: - labelname: mtxrWlCMRtabAddr type: PhysAddress48 - fixed_size: 6 - labelname: mtxrWlCMRtabIface type: gauge - name: mtxrWlCMRtabRxStrength @@ -27875,7 +27893,6 @@ modules: indexes: - labelname: mtxrWlCMRtabAddr type: PhysAddress48 - fixed_size: 6 - labelname: mtxrWlCMRtabIface type: gauge - name: mtxrWlCMRtabSsid @@ -27885,7 +27902,6 @@ modules: indexes: - labelname: mtxrWlCMRtabAddr type: PhysAddress48 - fixed_size: 6 - labelname: mtxrWlCMRtabIface type: gauge - name: mtxrWlCMRtabEapIdent @@ -27895,7 +27911,6 @@ modules: indexes: - labelname: mtxrWlCMRtabAddr type: PhysAddress48 - fixed_size: 6 - labelname: mtxrWlCMRtabIface type: gauge - name: mtxrWlCMRtabEntryCount @@ -41391,7 +41406,6 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 - fixed_size: 6 - name: ubntStaName oid: 1.3.6.1.4.1.41112.1.4.7.1.2 type: DisplayString @@ -41401,7 +41415,6 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 - fixed_size: 6 - name: ubntStaSignal oid: 1.3.6.1.4.1.41112.1.4.7.1.3 type: gauge @@ -41411,7 +41424,6 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 - fixed_size: 6 - name: ubntStaNoiseFloor oid: 1.3.6.1.4.1.41112.1.4.7.1.4 type: gauge @@ -41421,7 +41433,6 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 - fixed_size: 6 - name: ubntStaDistance oid: 1.3.6.1.4.1.41112.1.4.7.1.5 type: gauge @@ -41431,7 +41442,6 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 - fixed_size: 6 - name: ubntStaCcq oid: 1.3.6.1.4.1.41112.1.4.7.1.6 type: gauge @@ -41441,7 +41451,6 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 - fixed_size: 6 - name: ubntStaAmp oid: 1.3.6.1.4.1.41112.1.4.7.1.7 type: gauge @@ -41451,7 +41460,6 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 - fixed_size: 6 - name: ubntStaAmq oid: 1.3.6.1.4.1.41112.1.4.7.1.8 type: gauge @@ -41461,7 +41469,6 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 - fixed_size: 6 - name: ubntStaAmc oid: 1.3.6.1.4.1.41112.1.4.7.1.9 type: gauge @@ -41471,7 +41478,6 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 - fixed_size: 6 - name: ubntStaLastIp oid: 1.3.6.1.4.1.41112.1.4.7.1.10 type: InetAddressIPv4 @@ -41481,7 +41487,6 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 - fixed_size: 6 - name: ubntStaTxRate oid: 1.3.6.1.4.1.41112.1.4.7.1.11 type: gauge @@ -41491,7 +41496,6 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 - fixed_size: 6 - name: ubntStaRxRate oid: 1.3.6.1.4.1.41112.1.4.7.1.12 type: gauge @@ -41501,7 +41505,6 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 - fixed_size: 6 - name: ubntStaTxBytes oid: 1.3.6.1.4.1.41112.1.4.7.1.13 type: counter @@ -41511,7 +41514,6 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 - fixed_size: 6 - name: ubntStaRxBytes oid: 1.3.6.1.4.1.41112.1.4.7.1.14 type: counter @@ -41521,7 +41523,6 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 - fixed_size: 6 - name: ubntStaConnTime oid: 1.3.6.1.4.1.41112.1.4.7.1.15 type: gauge @@ -41531,7 +41532,6 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 - fixed_size: 6 - name: ubntStaLocalCINR oid: 1.3.6.1.4.1.41112.1.4.7.1.16 type: gauge @@ -41541,7 +41541,6 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 - fixed_size: 6 - name: ubntStaTxCapacity oid: 1.3.6.1.4.1.41112.1.4.7.1.17 type: gauge @@ -41551,7 +41550,6 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 - fixed_size: 6 - name: ubntStaRxCapacity oid: 1.3.6.1.4.1.41112.1.4.7.1.18 type: gauge @@ -41561,7 +41559,6 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 - fixed_size: 6 - name: ubntStaTxAirtime oid: 1.3.6.1.4.1.41112.1.4.7.1.19 type: gauge @@ -41571,7 +41568,6 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 - fixed_size: 6 - name: ubntStaRxAirtime oid: 1.3.6.1.4.1.41112.1.4.7.1.20 type: gauge @@ -41581,7 +41577,6 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 - fixed_size: 6 - name: ubntStaTxLatency oid: 1.3.6.1.4.1.41112.1.4.7.1.21 type: gauge @@ -41591,7 +41586,6 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 - fixed_size: 6 - name: ubntHostLocaltime oid: 1.3.6.1.4.1.41112.1.4.8.1 type: DisplayString From 6333d22354f75389125c7c15dc8978b93fba90a0 Mon Sep 17 00:00:00 2001 From: ran Date: Sun, 17 Nov 2024 15:16:57 +0200 Subject: [PATCH 02/15] change echo in the makefile Signed-off-by: ran --- generator/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generator/Makefile b/generator/Makefile index 05d5a3e8..7002ce0f 100644 --- a/generator/Makefile +++ b/generator/Makefile @@ -404,6 +404,6 @@ $(MIBDIR)/powercom: $(MIBDIR)/cisco_imc: $(eval TMP := $(shell mktemp)) $(eval TMP_DIR := $(shell mktemp -d)) - @echo ">> Downloading HPE to $(TMP)" + @echo ">> Downloading Cisco UCS to $(TMP)" @curl -L $(CURL_OPTS) $(CURL_USER_AGENT) -o $(TMP) $(CISCO_CUCS_URL) @tar -xf $(TMP) -C $(MIBDIR)/cisco_imc \ No newline at end of file From 224346eabf97342f64e97fec6ad55f91a68293d0 Mon Sep 17 00:00:00 2001 From: ran Date: Sun, 17 Nov 2024 16:10:26 +0200 Subject: [PATCH 03/15] fix makefile Signed-off-by: ran --- generator/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generator/Makefile b/generator/Makefile index 7002ce0f..2cc992b5 100644 --- a/generator/Makefile +++ b/generator/Makefile @@ -405,5 +405,5 @@ $(MIBDIR)/cisco_imc: $(eval TMP := $(shell mktemp)) $(eval TMP_DIR := $(shell mktemp -d)) @echo ">> Downloading Cisco UCS to $(TMP)" - @curl -L $(CURL_OPTS) $(CURL_USER_AGENT) -o $(TMP) $(CISCO_CUCS_URL) + @curl $(CURL_OPTS) $(CURL_USER_AGENT) -o $(TMP) $(CISCO_CUCS_URL) @tar -xf $(TMP) -C $(MIBDIR)/cisco_imc \ No newline at end of file From c267b1d6e50726c5dec2a0646ec53d55d70fd906 Mon Sep 17 00:00:00 2001 From: ran Date: Wed, 27 Nov 2024 13:07:53 +0200 Subject: [PATCH 04/15] fix mibdir cisco_imc Signed-off-by: ran --- generator/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/generator/Makefile b/generator/Makefile index 2cc992b5..2daa5f40 100644 --- a/generator/Makefile +++ b/generator/Makefile @@ -157,7 +157,8 @@ mibs: \ $(MIBDIR)/CyberPower.MIB \ $(MIBDIR)/EAP.MIB \ $(MIBDIR)/EAP-Client.MIB \ - $(MIBDIR)/powercom + $(MIBDIR)/powercom \ + $(MIBDIR)/cisco_imc $(MIBDIR)/apc-powernet-mib: @echo ">> Downloading apc-powernet-mib" From b972c0719be75de7fdbb449c283899f990ba20f0 Mon Sep 17 00:00:00 2001 From: ran Date: Wed, 27 Nov 2024 13:18:19 +0200 Subject: [PATCH 05/15] removed space Signed-off-by: ran --- generator/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generator/Makefile b/generator/Makefile index 2daa5f40..557e2729 100644 --- a/generator/Makefile +++ b/generator/Makefile @@ -157,7 +157,7 @@ mibs: \ $(MIBDIR)/CyberPower.MIB \ $(MIBDIR)/EAP.MIB \ $(MIBDIR)/EAP-Client.MIB \ - $(MIBDIR)/powercom \ + $(MIBDIR)/powercom \ $(MIBDIR)/cisco_imc $(MIBDIR)/apc-powernet-mib: From f1d197e4b5fde3cd75e0ab7f11d0d4b6dc848b23 Mon Sep 17 00:00:00 2001 From: ran Date: Wed, 27 Nov 2024 13:22:21 +0200 Subject: [PATCH 06/15] add mkdir for cisco_imc Signed-off-by: ran --- generator/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/generator/Makefile b/generator/Makefile index 557e2729..8ac14c4c 100644 --- a/generator/Makefile +++ b/generator/Makefile @@ -405,6 +405,7 @@ $(MIBDIR)/powercom: $(MIBDIR)/cisco_imc: $(eval TMP := $(shell mktemp)) $(eval TMP_DIR := $(shell mktemp -d)) + @mkdir -p $(MIBDIR)/cisco_imc @echo ">> Downloading Cisco UCS to $(TMP)" @curl $(CURL_OPTS) $(CURL_USER_AGENT) -o $(TMP) $(CISCO_CUCS_URL) @tar -xf $(TMP) -C $(MIBDIR)/cisco_imc \ No newline at end of file From 6fe04d4618128b28589a2d78db79a61c1c0198ff Mon Sep 17 00:00:00 2001 From: ran Date: Wed, 27 Nov 2024 13:34:28 +0200 Subject: [PATCH 07/15] return fixed_size Signed-off-by: ran --- snmp.yml | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/snmp.yml b/snmp.yml index 299e592c..7939e3a7 100644 --- a/snmp.yml +++ b/snmp.yml @@ -3029,6 +3029,7 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 + fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -3047,6 +3048,7 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 + fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge - labelname: bsnAPIfNoiseChannelNo @@ -3066,6 +3068,7 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 + fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -3083,6 +3086,7 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 + fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -3106,6 +3110,7 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 + fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -3176,6 +3181,7 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 + fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -3194,6 +3200,7 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 + fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -3212,6 +3219,7 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 + fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -3230,6 +3238,7 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 + fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -3248,6 +3257,7 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 + fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -3266,6 +3276,7 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 + fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -3284,6 +3295,7 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 + fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -3302,6 +3314,7 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 + fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -3320,6 +3333,7 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 + fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -3338,6 +3352,7 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 + fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -3356,6 +3371,7 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 + fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -3374,6 +3390,7 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 + fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -3395,6 +3412,7 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 + fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -3414,6 +3432,7 @@ modules: indexes: - labelname: bsnAPDot3MacAddress type: PhysAddress48 + fixed_size: 6 - labelname: bsnAPIfSlotId type: gauge lookups: @@ -21526,6 +21545,7 @@ modules: - name: ifPhysAddress oid: 1.3.6.1.2.1.2.2.1.6 type: PhysAddress48 + fixed_size: 6 help: The interface's address at its protocol sub-layer - 1.3.6.1.2.1.2.2.1.6 indexes: - labelname: ifIndex @@ -27542,6 +27562,7 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 + fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabIface @@ -27551,6 +27572,7 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 + fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabStrength @@ -27560,6 +27582,7 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 + fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabTxBytes @@ -27569,6 +27592,7 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 + fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabRxBytes @@ -27578,6 +27602,7 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 + fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabTxPackets @@ -27587,6 +27612,7 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 + fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabRxPackets @@ -27596,6 +27622,7 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 + fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabTxRate @@ -27605,6 +27632,7 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 + fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabRxRate @@ -27614,6 +27642,7 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 + fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabRouterOSVersion @@ -27623,6 +27652,7 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 + fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabUptime @@ -27632,6 +27662,7 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 + fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabSignalToNoise @@ -27641,6 +27672,7 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 + fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabTxStrengthCh0 @@ -27650,6 +27682,7 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 + fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabRxStrengthCh0 @@ -27659,6 +27692,7 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 + fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabTxStrengthCh1 @@ -27668,6 +27702,7 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 + fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabRxStrengthCh1 @@ -27677,6 +27712,7 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 + fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabTxStrengthCh2 @@ -27686,6 +27722,7 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 + fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabRxStrengthCh2 @@ -27695,6 +27732,7 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 + fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabTxStrength @@ -27704,6 +27742,7 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 + fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlRtabRadioName @@ -27713,6 +27752,7 @@ modules: indexes: - labelname: mtxrWlRtabAddr type: PhysAddress48 + fixed_size: 6 - labelname: mtxrWlRtabIface type: gauge - name: mtxrWlApIndex @@ -27803,6 +27843,7 @@ modules: indexes: - labelname: mtxrWlCMRtabAddr type: PhysAddress48 + fixed_size: 6 - labelname: mtxrWlCMRtabIface type: gauge - name: mtxrWlCMRtabIface @@ -27812,6 +27853,7 @@ modules: indexes: - labelname: mtxrWlCMRtabAddr type: PhysAddress48 + fixed_size: 6 - labelname: mtxrWlCMRtabIface type: gauge - name: mtxrWlCMRtabUptime @@ -27821,6 +27863,7 @@ modules: indexes: - labelname: mtxrWlCMRtabAddr type: PhysAddress48 + fixed_size: 6 - labelname: mtxrWlCMRtabIface type: gauge - name: mtxrWlCMRtabTxBytes @@ -27830,6 +27873,7 @@ modules: indexes: - labelname: mtxrWlCMRtabAddr type: PhysAddress48 + fixed_size: 6 - labelname: mtxrWlCMRtabIface type: gauge - name: mtxrWlCMRtabRxBytes @@ -27839,6 +27883,7 @@ modules: indexes: - labelname: mtxrWlCMRtabAddr type: PhysAddress48 + fixed_size: 6 - labelname: mtxrWlCMRtabIface type: gauge - name: mtxrWlCMRtabTxPackets @@ -27848,6 +27893,7 @@ modules: indexes: - labelname: mtxrWlCMRtabAddr type: PhysAddress48 + fixed_size: 6 - labelname: mtxrWlCMRtabIface type: gauge - name: mtxrWlCMRtabRxPackets @@ -27857,6 +27903,7 @@ modules: indexes: - labelname: mtxrWlCMRtabAddr type: PhysAddress48 + fixed_size: 6 - labelname: mtxrWlCMRtabIface type: gauge - name: mtxrWlCMRtabTxRate @@ -27866,6 +27913,7 @@ modules: indexes: - labelname: mtxrWlCMRtabAddr type: PhysAddress48 + fixed_size: 6 - labelname: mtxrWlCMRtabIface type: gauge - name: mtxrWlCMRtabRxRate @@ -27875,6 +27923,7 @@ modules: indexes: - labelname: mtxrWlCMRtabAddr type: PhysAddress48 + fixed_size: 6 - labelname: mtxrWlCMRtabIface type: gauge - name: mtxrWlCMRtabTxStrength @@ -27884,6 +27933,7 @@ modules: indexes: - labelname: mtxrWlCMRtabAddr type: PhysAddress48 + fixed_size: 6 - labelname: mtxrWlCMRtabIface type: gauge - name: mtxrWlCMRtabRxStrength @@ -27893,6 +27943,7 @@ modules: indexes: - labelname: mtxrWlCMRtabAddr type: PhysAddress48 + fixed_size: 6 - labelname: mtxrWlCMRtabIface type: gauge - name: mtxrWlCMRtabSsid @@ -27902,6 +27953,7 @@ modules: indexes: - labelname: mtxrWlCMRtabAddr type: PhysAddress48 + fixed_size: 6 - labelname: mtxrWlCMRtabIface type: gauge - name: mtxrWlCMRtabEapIdent @@ -27911,6 +27963,7 @@ modules: indexes: - labelname: mtxrWlCMRtabAddr type: PhysAddress48 + fixed_size: 6 - labelname: mtxrWlCMRtabIface type: gauge - name: mtxrWlCMRtabEntryCount @@ -41406,6 +41459,7 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 + fixed_size: 6 - name: ubntStaName oid: 1.3.6.1.4.1.41112.1.4.7.1.2 type: DisplayString @@ -41415,6 +41469,7 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 + fixed_size: 6 - name: ubntStaSignal oid: 1.3.6.1.4.1.41112.1.4.7.1.3 type: gauge @@ -41424,6 +41479,7 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 + fixed_size: 6 - name: ubntStaNoiseFloor oid: 1.3.6.1.4.1.41112.1.4.7.1.4 type: gauge @@ -41433,6 +41489,7 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 + fixed_size: 6 - name: ubntStaDistance oid: 1.3.6.1.4.1.41112.1.4.7.1.5 type: gauge @@ -41442,6 +41499,7 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 + fixed_size: 6 - name: ubntStaCcq oid: 1.3.6.1.4.1.41112.1.4.7.1.6 type: gauge @@ -41451,6 +41509,7 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 + fixed_size: 6 - name: ubntStaAmp oid: 1.3.6.1.4.1.41112.1.4.7.1.7 type: gauge @@ -41460,6 +41519,7 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 + fixed_size: 6 - name: ubntStaAmq oid: 1.3.6.1.4.1.41112.1.4.7.1.8 type: gauge @@ -41469,6 +41529,7 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 + fixed_size: 6 - name: ubntStaAmc oid: 1.3.6.1.4.1.41112.1.4.7.1.9 type: gauge @@ -41478,6 +41539,7 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 + fixed_size: 6 - name: ubntStaLastIp oid: 1.3.6.1.4.1.41112.1.4.7.1.10 type: InetAddressIPv4 @@ -41487,6 +41549,7 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 + fixed_size: 6 - name: ubntStaTxRate oid: 1.3.6.1.4.1.41112.1.4.7.1.11 type: gauge @@ -41496,6 +41559,7 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 + fixed_size: 6 - name: ubntStaRxRate oid: 1.3.6.1.4.1.41112.1.4.7.1.12 type: gauge @@ -41505,6 +41569,7 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 + fixed_size: 6 - name: ubntStaTxBytes oid: 1.3.6.1.4.1.41112.1.4.7.1.13 type: counter @@ -41514,6 +41579,7 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 + fixed_size: 6 - name: ubntStaRxBytes oid: 1.3.6.1.4.1.41112.1.4.7.1.14 type: counter @@ -41523,6 +41589,7 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 + fixed_size: 6 - name: ubntStaConnTime oid: 1.3.6.1.4.1.41112.1.4.7.1.15 type: gauge @@ -41532,6 +41599,7 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 + fixed_size: 6 - name: ubntStaLocalCINR oid: 1.3.6.1.4.1.41112.1.4.7.1.16 type: gauge @@ -41541,6 +41609,7 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 + fixed_size: 6 - name: ubntStaTxCapacity oid: 1.3.6.1.4.1.41112.1.4.7.1.17 type: gauge @@ -41550,6 +41619,7 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 + fixed_size: 6 - name: ubntStaRxCapacity oid: 1.3.6.1.4.1.41112.1.4.7.1.18 type: gauge @@ -41559,6 +41629,7 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 + fixed_size: 6 - name: ubntStaTxAirtime oid: 1.3.6.1.4.1.41112.1.4.7.1.19 type: gauge @@ -41568,6 +41639,7 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 + fixed_size: 6 - name: ubntStaRxAirtime oid: 1.3.6.1.4.1.41112.1.4.7.1.20 type: gauge @@ -41577,6 +41649,7 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 + fixed_size: 6 - name: ubntStaTxLatency oid: 1.3.6.1.4.1.41112.1.4.7.1.21 type: gauge @@ -41586,6 +41659,7 @@ modules: type: gauge - labelname: ubntStaMac type: PhysAddress48 + fixed_size: 6 - name: ubntHostLocaltime oid: 1.3.6.1.4.1.41112.1.4.8.1 type: DisplayString From 1fbdf35ba45950f7b91a6dc8c59616bdfd830e21 Mon Sep 17 00:00:00 2001 From: ran Date: Wed, 27 Nov 2024 13:35:48 +0200 Subject: [PATCH 08/15] remove unnecessary line Signed-off-by: ran --- snmp.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/snmp.yml b/snmp.yml index 7939e3a7..8cba289e 100644 --- a/snmp.yml +++ b/snmp.yml @@ -21545,7 +21545,6 @@ modules: - name: ifPhysAddress oid: 1.3.6.1.2.1.2.2.1.6 type: PhysAddress48 - fixed_size: 6 help: The interface's address at its protocol sub-layer - 1.3.6.1.2.1.2.2.1.6 indexes: - labelname: ifIndex From 87b76f329f1bbdf61e734d5713337a5a2497e312 Mon Sep 17 00:00:00 2001 From: ran Date: Wed, 27 Nov 2024 14:22:28 +0200 Subject: [PATCH 09/15] add one more mib file Signed-off-by: ran --- generator/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/generator/Makefile b/generator/Makefile index 8ac14c4c..74649b00 100644 --- a/generator/Makefile +++ b/generator/Makefile @@ -63,6 +63,7 @@ READYDATAOS_URL := https://www.downloads.netgear.com/files/GDC/RD5200/READYDAT SOPHOS_XG_URL := https://docs.sophos.com/nsg/sophos-firewall/MIB/SOPHOS-XG-MIB.zip POWERCOM_URL := https://www.upspowercom.com/pcm-img/Card-DA807/Upsmate_PCM.mib CISCO_CUCS_URL := https://raw.githubusercontent.com/cisco/cisco-mibs/refs/heads/main/ucs-C-Series-mibs/UCS_Cseries3.0.tar +CISCO_FRU_URL := https://raw.githubusercontent.com/cisco/cisco-mibs/26b38ac1b25a38510b6bb308465dd068e79df64b/v2/CISCO-ENTITY-FRU-CONTROL-MIB.my CYBERPOWER_VERSION := 2.11 CYBERPOWER_URL := https://dl4jz3rbrsfum.cloudfront.net/software/CyberPower_MIB_v$(CYBERPOWER_VERSION).MIB.zip @@ -405,7 +406,7 @@ $(MIBDIR)/powercom: $(MIBDIR)/cisco_imc: $(eval TMP := $(shell mktemp)) $(eval TMP_DIR := $(shell mktemp -d)) - @mkdir -p $(MIBDIR)/cisco_imc @echo ">> Downloading Cisco UCS to $(TMP)" @curl $(CURL_OPTS) $(CURL_USER_AGENT) -o $(TMP) $(CISCO_CUCS_URL) - @tar -xf $(TMP) -C $(MIBDIR)/cisco_imc \ No newline at end of file + @tar --strip-components=1 -xf $(TMP) -C $(MIBDIR) + @curl $(CURL_OPTS) -o $(MIBDIR)/CISCO-ENTITY-FRU-CONTROL-MIB.my "$(CISCO_FRU_URL)" \ No newline at end of file From 5033ec4e73561a1e61d45b8cb940bc9efc6c4922 Mon Sep 17 00:00:00 2001 From: ran Date: Wed, 27 Nov 2024 14:51:07 +0200 Subject: [PATCH 10/15] retrigger checks Signed-off-by: ran From f86efe383786ee6acbdc985cdc4ace71d89d4ec0 Mon Sep 17 00:00:00 2001 From: ran Date: Wed, 27 Nov 2024 15:21:09 +0200 Subject: [PATCH 11/15] change help labels in snmp.yml Signed-off-by: ran --- snmp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/snmp.yml b/snmp.yml index 8cba289e..c1a36633 100644 --- a/snmp.yml +++ b/snmp.yml @@ -2937,14 +2937,14 @@ modules: - name: cucsFaultDescription oid: 1.3.6.1.4.1.9.9.719.1.1.1.1.11 type: DisplayString - help: A human-readable message providing details about the fault. - 1.3.6.1.4.1.9.9.719.1.1.1.1.11 + help: Cisco UCS fault:Inst:descr managed object property - 1.3.6.1.4.1.9.9.719.1.1.1.1.11 indexes: - labelname: cucsFaultIndex type: gauge - name: cucsFaultSeverity oid: 1.3.6.1.4.1.9.9.719.1.1.1.1.20 type: gauge - help: A code identifying the perceived severity of the fault. - 1.3.6.1.4.1.9.9.719.1.1.1.1.20 + help: Cisco UCS fault:Inst:severity managed object property - 1.3.6.1.4.1.9.9.719.1.1.1.1.20 indexes: - labelname: cucsFaultIndex type: gauge From 35561fb1e6231d251a6648a9957e3c7866b3006f Mon Sep 17 00:00:00 2001 From: ran Date: Sun, 1 Dec 2024 13:01:29 +0200 Subject: [PATCH 12/15] change makefile Signed-off-by: ran --- generator/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generator/Makefile b/generator/Makefile index b5ed4db8..43474e18 100644 --- a/generator/Makefile +++ b/generator/Makefile @@ -162,7 +162,7 @@ mibs: \ $(MIBDIR)/EAP.MIB \ $(MIBDIR)/EAP-Client.MIB \ $(MIBDIR)/powercom \ - $(MIBDIR)/cisco_imc + $(MIBDIR)/.cisco_imc $(MIBDIR)/apc-powernet-mib: @echo ">> Downloading apc-powernet-mib" @@ -416,7 +416,7 @@ $(MIBDIR)/powercom: @echo ">> Downloading powercom" @curl $(CURL_OPTS) -o $(MIBDIR)/powercom "$(POWERCOM_URL)" -$(MIBDIR)/cisco_imc: +$(MIBDIR)/.cisco_imc: $(eval TMP := $(shell mktemp)) $(eval TMP_DIR := $(shell mktemp -d)) @echo ">> Downloading Cisco UCS to $(TMP)" From 8e76ecd5b9f7bdcaf870d76009fa005473a311c8 Mon Sep 17 00:00:00 2001 From: ran Date: Tue, 3 Dec 2024 10:53:31 +0200 Subject: [PATCH 13/15] use only needed mibs Signed-off-by: ran --- generator/Makefile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/generator/Makefile b/generator/Makefile index 43474e18..a5376cbf 100644 --- a/generator/Makefile +++ b/generator/Makefile @@ -63,8 +63,7 @@ READYDATAOS_URL := https://www.downloads.netgear.com/files/GDC/RD5200/READYDAT SOPHOS_XG_URL := https://docs.sophos.com/nsg/sophos-firewall/MIB/SOPHOS-XG-MIB.zip POWERCOM_URL := https://www.upspowercom.com/pcm-img/Card-DA807/Upsmate_PCM.mib TPLINK_DDM := https://static.tp-link.com/upload/software/2024/202402/20240229/L2-tplinkMibs.zip -CISCO_CUCS_URL := https://raw.githubusercontent.com/cisco/cisco-mibs/refs/heads/main/ucs-C-Series-mibs/UCS_Cseries3.0.tar -CISCO_FRU_URL := https://raw.githubusercontent.com/cisco/cisco-mibs/26b38ac1b25a38510b6bb308465dd068e79df64b/v2/CISCO-ENTITY-FRU-CONTROL-MIB.my +CISCO_CUCS_URL := https://raw.githubusercontent.com/cisco/cisco-mibs/refs/heads/main/ucs-mibs CYBERPOWER_VERSION := 2.11 CYBERPOWER_URL := https://dl4jz3rbrsfum.cloudfront.net/software/CyberPower_MIB_v$(CYBERPOWER_VERSION).MIB.zip @@ -417,9 +416,8 @@ $(MIBDIR)/powercom: @curl $(CURL_OPTS) -o $(MIBDIR)/powercom "$(POWERCOM_URL)" $(MIBDIR)/.cisco_imc: - $(eval TMP := $(shell mktemp)) - $(eval TMP_DIR := $(shell mktemp -d)) @echo ">> Downloading Cisco UCS to $(TMP)" - @curl $(CURL_OPTS) $(CURL_USER_AGENT) -o $(TMP) $(CISCO_CUCS_URL) - @tar --strip-components=1 -xf $(TMP) -C $(MIBDIR) - @curl $(CURL_OPTS) -o $(MIBDIR)/CISCO-ENTITY-FRU-CONTROL-MIB.my "$(CISCO_FRU_URL)" \ No newline at end of file + @curl $(CURL_OPTS) -o $(MIBDIR)/CISCO-UNIFIED-COMPUTING-FAULT-MIB.my "$(CISCO_FRU_URL)/CISCO-UNIFIED-COMPUTING-FAULT-MIB.my" + @curl $(CURL_OPTS) -o $(MIBDIR)/CISCO-UNIFIED-COMPUTING-MIB.my "$(CISCO_FRU_URL)/CISCO-UNIFIED-COMPUTING-MIB.my" + @curl $(CURL_OPTS) -o $(MIBDIR)/CISCO-UNIFIED-COMPUTING-STORAGE-MIB.my "$(CISCO_FRU_URL)/CISCO-UNIFIED-COMPUTING-STORAGE-MIB.my" + @curl $(CURL_OPTS) -o $(MIBDIR)/CISCO-UNIFIED-COMPUTING-TC-MIB.my "$(CISCO_FRU_URL)/CISCO-UNIFIED-COMPUTING-TC-MIB.my" \ No newline at end of file From f2758100d9979879e00b19ea3d5d724e613edba1 Mon Sep 17 00:00:00 2001 From: ran Date: Tue, 3 Dec 2024 10:56:01 +0200 Subject: [PATCH 14/15] fixed url Signed-off-by: ran --- generator/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/generator/Makefile b/generator/Makefile index a5376cbf..ee72479c 100644 --- a/generator/Makefile +++ b/generator/Makefile @@ -417,7 +417,7 @@ $(MIBDIR)/powercom: $(MIBDIR)/.cisco_imc: @echo ">> Downloading Cisco UCS to $(TMP)" - @curl $(CURL_OPTS) -o $(MIBDIR)/CISCO-UNIFIED-COMPUTING-FAULT-MIB.my "$(CISCO_FRU_URL)/CISCO-UNIFIED-COMPUTING-FAULT-MIB.my" - @curl $(CURL_OPTS) -o $(MIBDIR)/CISCO-UNIFIED-COMPUTING-MIB.my "$(CISCO_FRU_URL)/CISCO-UNIFIED-COMPUTING-MIB.my" - @curl $(CURL_OPTS) -o $(MIBDIR)/CISCO-UNIFIED-COMPUTING-STORAGE-MIB.my "$(CISCO_FRU_URL)/CISCO-UNIFIED-COMPUTING-STORAGE-MIB.my" - @curl $(CURL_OPTS) -o $(MIBDIR)/CISCO-UNIFIED-COMPUTING-TC-MIB.my "$(CISCO_FRU_URL)/CISCO-UNIFIED-COMPUTING-TC-MIB.my" \ No newline at end of file + @curl $(CURL_OPTS) -o $(MIBDIR)/CISCO-UNIFIED-COMPUTING-FAULT-MIB.my "$(CISCO_CUCS_URL)/CISCO-UNIFIED-COMPUTING-FAULT-MIB.my" + @curl $(CURL_OPTS) -o $(MIBDIR)/CISCO-UNIFIED-COMPUTING-MIB.my "$(CISCO_CUCS_URL)/CISCO-UNIFIED-COMPUTING-MIB.my" + @curl $(CURL_OPTS) -o $(MIBDIR)/CISCO-UNIFIED-COMPUTING-STORAGE-MIB.my "$(CISCO_CUCS_URL)/CISCO-UNIFIED-COMPUTING-STORAGE-MIB.my" + @curl $(CURL_OPTS) -o $(MIBDIR)/CISCO-UNIFIED-COMPUTING-TC-MIB.my "$(CISCO_CUCS_URL)/CISCO-UNIFIED-COMPUTING-TC-MIB.my" \ No newline at end of file From 68b495d11572ab28fe63bd2a523559e79bfe487c Mon Sep 17 00:00:00 2001 From: ran Date: Tue, 3 Dec 2024 11:24:38 +0200 Subject: [PATCH 15/15] add missing mibs Signed-off-by: ran --- generator/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/generator/Makefile b/generator/Makefile index ee72479c..dad41da2 100644 --- a/generator/Makefile +++ b/generator/Makefile @@ -64,7 +64,7 @@ SOPHOS_XG_URL := https://docs.sophos.com/nsg/sophos-firewall/MIB/SOPHOS-XG-M POWERCOM_URL := https://www.upspowercom.com/pcm-img/Card-DA807/Upsmate_PCM.mib TPLINK_DDM := https://static.tp-link.com/upload/software/2024/202402/20240229/L2-tplinkMibs.zip CISCO_CUCS_URL := https://raw.githubusercontent.com/cisco/cisco-mibs/refs/heads/main/ucs-mibs - +CISCO_CUCS_URL_v2 := https://raw.githubusercontent.com/cisco/cisco-mibs/refs/heads/main/v2 CYBERPOWER_VERSION := 2.11 CYBERPOWER_URL := https://dl4jz3rbrsfum.cloudfront.net/software/CyberPower_MIB_v$(CYBERPOWER_VERSION).MIB.zip @@ -420,4 +420,6 @@ $(MIBDIR)/.cisco_imc: @curl $(CURL_OPTS) -o $(MIBDIR)/CISCO-UNIFIED-COMPUTING-FAULT-MIB.my "$(CISCO_CUCS_URL)/CISCO-UNIFIED-COMPUTING-FAULT-MIB.my" @curl $(CURL_OPTS) -o $(MIBDIR)/CISCO-UNIFIED-COMPUTING-MIB.my "$(CISCO_CUCS_URL)/CISCO-UNIFIED-COMPUTING-MIB.my" @curl $(CURL_OPTS) -o $(MIBDIR)/CISCO-UNIFIED-COMPUTING-STORAGE-MIB.my "$(CISCO_CUCS_URL)/CISCO-UNIFIED-COMPUTING-STORAGE-MIB.my" - @curl $(CURL_OPTS) -o $(MIBDIR)/CISCO-UNIFIED-COMPUTING-TC-MIB.my "$(CISCO_CUCS_URL)/CISCO-UNIFIED-COMPUTING-TC-MIB.my" \ No newline at end of file + @curl $(CURL_OPTS) -o $(MIBDIR)/CISCO-UNIFIED-COMPUTING-TC-MIB.my "$(CISCO_CUCS_URL)/CISCO-UNIFIED-COMPUTING-TC-MIB.my" + @curl $(CURL_OPTS) -o $(MIBDIR)/CISCO-TC.my "$(CISCO_CUCS_URL_v2)/CISCO-TC.my" + @curl $(CURL_OPTS) -o $(MIBDIR)/CISCO-SMI.my "$(CISCO_CUCS_URL_v2)/CISCO-SMI.my" \ No newline at end of file