Equallogic add disk status #6497
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
contained in doc/General/Contributing.md.
…statuses as individual sensors.
|
|
|
Auto-Deploy finished, Test PR at http://6497.ci.librenms.org or https://6497.ci.librenms.org |
laf
reviewed
Apr 24, 2017
| $member_id = $split_oid[(count($split_oid) - 2)]; | ||
| $num_index = $member_id.'.'.$disk_index; | ||
| $oid = $base_oid.$num_index; | ||
| $extra = snmp_get_multi($device, $oid, '-OQne', 'EQLDISK-MIB', 'equallogic'); |
There was a problem hiding this comment.
You probably just want snmp_get here.
laf
reviewed
Apr 24, 2017
| d_echo($extra); | ||
| if (!empty($extra)) { | ||
| list($foid,$pstatus) = explode(' = ', $extra, 2); | ||
| $index = (100 + $index); |
There was a problem hiding this comment.
It's probably better to use eqlDiskStatus.'.'.$disk_index here (need to also update create_sensor_to_state() as well. It will just stop the hack with adding 100 to the index).
There was a problem hiding this comment.
Should we do something similar to the power supply fetching as well?
There was a problem hiding this comment.
You can't change existing code as it will break graphs for people (rrd filename is based on the index).
There was a problem hiding this comment.
Can you give me a little more guidance here?
There was a problem hiding this comment.
Yeah I'd try $index = 'eqlDiskStatus.'.$disk_index;
There was a problem hiding this comment.
Ok; if we reassign $index then which var in create_sensor_to_state() do we need to update, the first or second one? I'm assuming one needs to be the actual index ID, and the other needs to be the more deliberate one? Should I just rename that to $disk_index in that case?
There was a problem hiding this comment.
Actually you might not need to, give it a try.
laf
reviewed
Apr 24, 2017
| d_echo($oids_disks."\n"); | ||
|
|
||
| /* | ||
| .1.3.6.1.4.1.12740.3.1.1.1.5.1.329840783.1 = RZ1wTmZ00980 |
laf
reviewed
Apr 24, 2017
|
|
||
| if (!empty($oids_disks)) { | ||
| /* | ||
| eqlDiskStatus |
There was a problem hiding this comment.
You mean remove the wrapping if statement?
There was a problem hiding this comment.
No, the /* */ data - don't always copy what people have done before you :D
There was a problem hiding this comment.
👍 In that same vein, I'm also cleaning up all the $variable1 stuff and naming things appropriately. I got a little overzealous this morning I guess and didn't bother going in and cleaning things up like I normally would have.
laf
requested changes
Apr 24, 2017
|
is it OK to unset all the variables in a single |
|
Single unset is fine :) |
|
Nice PR! |
|
I don't know what to do about the sorting; the OIDs are processed in order; the view is doing any sorting that happens. That seems like a separate bug to me relating to that view. (natural vs strict alphanumeric sorting) Not sure what happened to the status labels. They were still working on my side after the last batch of changes but i will double check this morning and see. |
|
Its still doing state translation for me...but it could be that they were already mapped previously. Here's the requested output: |
|
Think I found it. Commit inbound. |
|
Auto-Deploy finished, Test PR at http://6497.ci.librenms.org or https://6497.ci.librenms.org |
|
I'll test the new changes at work tomorrow and report back. |
|
Auto-Deploy finished, Test PR at http://6497.ci.librenms.org or https://6497.ci.librenms.org |
|
The inspection completed: 1 new issues |
laf
approved these changes
Apr 26, 2017
|
Thanks for adding this support :) |
|
I plan on adding additional things to accommodate our needs in the near future. Hopefully going to look at expanding snmp traps too. |
|
Removed the test PR, ran daily.sh then reran discovery and polling. Still not getting images as disk states and just 1 / 2's. |
5 tasks
|
Aaaand never mind. Just saw #6512. |
|
Yeah, you were correct with having to remove the translations though :) we are working out some quirks in 6512 |
|
This thread has been automatically locked since there has not been any recent activity after it was closed. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
DO NOT DELETE THIS TEXT
Please note
Testers
If you would like to test this pull request then please run:
./scripts/github-apply <pr_id>, i.e./scripts/github-apply 5926Adds individual disk statues to EqualLogic arrays. Should allow alerting for individual drive status changes.