Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

Add cisco IMC MIBs #1293

Merged
merged 19 commits into from
Dec 3, 2024
Merged

Add cisco IMC MIBs #1293

merged 19 commits into from
Dec 3, 2024

Conversation

ranmalka
Copy link
Contributor

Cisco IMC MIBS to monitor Cisco CUCS server IMC (parallel to HPE-ILO)

@SuperQ
@bastischubert
@RichiH
Signed-off-by: ran rmalka@trigoretail.com

@ranmalka
add cisco usc mibs and metrics shoter
103061c 
Signed-off-by: ran <rmalka@trigoretail.com>
@ranmalka
change echo in the makefile
6333d22 
Signed-off-by: ran <rmalka@trigoretail.com>
@ranmalka
fix makefile
224346e 
Signed-off-by: ran <rmalka@trigoretail.com>
@ranmalka
Copy link
Contributor Author

@bastischubert I reduced it to 3 metrics instead of 3000 lines, hope its ok now

bastischubert
bastischubert reviewed Nov 18, 2024
View reviewed changes
bastischubert
bastischubert reviewed Nov 27, 2024
View reviewed changes
bastischubert
bastischubert reviewed Nov 27, 2024
View reviewed changes
ranmalka and others added 10 commits November 27, 2024 13:07
@ranmalka
fix mibdir cisco_imc
c267b1d 
Signed-off-by: ran <rmalka@trigoretail.com>
@ranmalka
removed space
b972c07 
Signed-off-by: ran <rmalka@trigoretail.com>
@ranmalka
add mkdir for cisco_imc
f1d197e 
Signed-off-by: ran <rmalka@trigoretail.com>
@ranmalka
return fixed_size
6fe04d4 
Signed-off-by: ran <rmalka@trigoretail.com>
@ranmalka
remove unnecessary line
1fbdf35 
Signed-off-by: ran <rmalka@trigoretail.com>
@ranmalka
Merge branch 'main' into add_imc_mibs_short
c7b417b
@ranmalka
add one more mib file
87b76f3 
Signed-off-by: ran <rmalka@trigoretail.com>
@ranmalka
Merge branch 'add_imc_mibs_short' of https://github.com/ranmalka/snmp…
80ef36a 
…_exporter into add_imc_mibs_short
@ranmalka
retrigger checks
5033ec4 
Signed-off-by: ran <rmalka@trigoretail.com>
@ranmalka
change help labels in snmp.yml
f86efe3 
Signed-off-by: ran <rmalka@trigoretail.com>
@ranmalka
Copy link
Contributor Author

I would like to get your approval :)
@bastischubert @SuperQ

Thanks,

@bastischubert
Copy link
Member

@ranmalka have you checked my last comments? after that i think we're ready to merge

@ranmalka
Copy link
Contributor Author

@ranmalka have you checked my last comments? after that i think we're ready to merge

@bastischubert do you mean to put the files directly in the mibs location? so yes that's what I did

@bastischubert
Copy link
Member

@ranmalka i left a few comments that still need to be adressed with the Makefile

bastischubert and others added 2 commits November 29, 2024 00:42
@bastischubert
Merge branch 'main' into add_imc_mibs_short
f93ae1c
@ranmalka
Merge branch 'main' into add_imc_mibs_short
088c1f6 
Signed-off-by: ranmalka <85930332+ranmalka@users.noreply.github.com>
@ranmalka
Copy link
Contributor Author

ranmalka commented Dec 1, 2024

@bastischubert conflicts have been fixed :)

@bastischubert
Copy link
Member

@ranmalka did you notice the comments i left and are still not yet addressed ? https://github.com/prometheus/snmp_exporter/pull/1293/files you should see them there.

  • i asked why you added the CISCO_FRU_URL which seems unused.
  • $(MIBDIR)/cisco_imc to $(MIBDIR)/.cisco_imc still needs to be addressed

everything else already looks good and ready to get merged 👍

@ranmalka
Copy link
Contributor Author

ranmalka commented Dec 1, 2024

@bastischubert CISCO_FRU_URL used by 1.3.6.1.4.1.9.9.719.1.1.1.1.11 it didn't work before that

why do I need to add .cisco_imc folder? I added all the mibs files into the /mibs directory

@ranmalka
change makefile
35561fb 
Signed-off-by: ran <rmalka@trigoretail.com>
@bastischubert
Copy link
Member

bastischubert commented Dec 3, 2024 •
edited
Loading

@ranmalka

CISCO_FRU_URL used by 1.3.6.1.4.1.9.9.719.1.1.1.1.11 it didn't work before that

i checked, you only need those 4 mibs to get config working:
CISCO-UNIFIED-COMPUTING-FAULT-MIB.my
CISCO-UNIFIED-COMPUTING-MIB.my
CISCO-UNIFIED-COMPUTING-STORAGE-MIB.my
CISCO-UNIFIED-COMPUTING-TC-MIB.my

why do I need to add .cisco_imc folder? I added all the mibs files into the /mibs directory

basically to prevent the download on every run of make mibs - plus putting that marker in a hidden file instead of a directory.

@ranmalka
use only needed mibs
8e76ecd 
Signed-off-by: ran <rmalka@trigoretail.com>
@ranmalka
fixed url
f275810 
Signed-off-by: ran <rmalka@trigoretail.com>
@ranmalka
add missing mibs
68b495d 
Signed-off-by: ran <rmalka@trigoretail.com>
@ranmalka
Copy link
Contributor Author

ranmalka commented Dec 3, 2024

@bastischubert

CISCO_FRU_URL used by 1.3.6.1.4.1.9.9.719.1.1.1.1.11 it didn't work before that

i checked, you only need those 4 mibs to get config working: CISCO-UNIFIED-COMPUTING-FAULT-MIB.my CISCO-UNIFIED-COMPUTING-MIB.my CISCO-UNIFIED-COMPUTING-STORAGE-MIB.my CISCO-UNIFIED-COMPUTING-TC-MIB.my

I also added cisco-TCI and CISCO-SMI to your list, looks fine (tests passed)

basically to prevent the download on every run of make mibs - plus putting that marker in a hidden file instead of a directory.

Now is that ok?

let me know what else is needed

bastischubert
bastischubert approved these changes Dec 3, 2024
View reviewed changes
Copy link
Member

@bastischubert bastischubert left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@bastischubert bastischubert merged commit e9a9866 into prometheus:main Dec 3, 2024
6 checks passed
@bastischubert
Copy link
Member

@ranmalka thanks for your patience and your contribution 🚀

SuperQ added a commit that referenced this pull request Jan 3, 2025
@bastischubert @SuperQ
Release v0.27.0 (#1327)
4c054bf 
BREAKING CHANGES:

This version of the exporter introduces a cleaned up default snmp.yml that moved all
ucd-snmp-mib oids into a separate module.

If you used one of the following modules:
* synology
* ddwrt
* kemp_loadmaster 

you will need to change your scrape config to also include the ucd_la_table module as well.
See https://github.com/prometheus/snmp_exporter/tree/main?tab=readme-ov-file#multi-module-handling for further instructions.

* [CHANGE] generator: Update generator default MIBOPTS #1231
* [CHANGE] adopt log/slog, drop go-kit/log #1249
* [ENHANCEMENT] generator: Improve config error message #1274
* [FEATURE] add ParseDateAndTime type #1234 
* [FEATURE] Set UseUnconnectedUDPSocket option if one of the modules has if set #1247
* [FEATURE] add NTPTimeStamp type #1315
* [BUGFIX] fixed dashboard mixins #1319

snmp.yml changes:
* cleanup ucd-snmp-mibs #1200
  * moved oids from synology,ddwrt and kemp_loadmaster to new module ucd_la_table 
* Added support for Sophos XG Series #1239
* Added support for HPE #1267
* Added support for powercom #1275
* Added support for Cisco IMC #1293
* Updated mib for apc #1303
* Added support for TPLink DDM #1304

---------

Signed-off-by: Sebastian Schubert <basti@schubert.digital>
Signed-off-by: Sebastian Schubert <16682281+bastischubert@users.noreply.github.com>
Co-authored-by: Ben Kochie <superq@gmail.com>
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@SuperQ SuperQ SuperQ left review comments

@bastischubert bastischubert bastischubert approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ranmalka @bastischubert @SuperQ