Hi
I have installed check_nwc_health (a nagios plugin) yesterday to get data on some non-snmp enabled devices. After a dependency hell it actually is working fine now, I have added it to the services on my librenms box. Not sure how to move this data to the appropriate class (temperature, power) yet but I will have a look into that later.
For now I have broken my auto-update capability since I ran a pull request from git for check_nwc_health:
git pull check_nwc_health; cd check_nwc_health; git submodule init; git submodule update; configure; make
Since I ran that as librenms user I assume I added this to my local git repository so now it’s not in sync any more with the global one.
So now daily.sh is complaining:
librenms@LibreNMS:~$ ./daily.sh
Checking PHP version OK
Updating to latest codebase FAIL
error: Pull is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm '
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
Updating SQL-Schema OK
Updating submodules OK
Cleaning up DB OK
Fetching notifications OK
Caching PeeringDB data OK
To resolve this I assume
- I can simply follow this ( stackoverflow /questions/4157189/git-pull-while-ignoring-local-changes) to ‘hide’ my local changes but that does not look smart since I’d need to modify daily.sh I assume.
- I can remove the git code since I already made the package (and assuming I don’t need to update) ?
- I could merge it to the repo but given that I can’t verify the src, its probably not in the correct location and I basically have no clue how to do it I don’t think thats a good option
So option 2 would be easiest I guess - what do you think?
Thanks,
regards
Edit: Links have been mangled due to a weird error message saying I can only have two links which is what I have but so what;)