Can't install auto-updates due to unmerged files

Help
1

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;)

2

Pastebin the output of git status

3

Here you go.
https://pastebin.com/raw/g6QBZjQP
Seems that installing nagios plugins changed some things too…
And tried loading new mibs which didnt work.

But the update to 2nd of december had been working without issues before I played around with the services/git

4

You have a lot of files in your LibreNMS directory that should not be there.

MIB files by themselves do nothing, also, most of the MIB files you’ve added are duplicates.

I suggest you use ./scripts/github-remove to remove any files that don’t belong there. Update should then resume functioning.

5

Excellent, that worked, thanks a million.

Not sure why I added the mibs there, probably been trying to get them to convert to something usable, but found its not as easy as I had hoped for;)
Else it was some files from CheckNwcHealth which probably were not to git’s liking;)

Removing contrib/CheckNwcHealthStack.pm
Removing contrib/check_nwc_health.exe
Removing contrib/check_nwc_health.php
Removing contrib/cygwin.sys.tgz

Kind regards,

6

You had run git add on some files, so it could not update until those were removed.