Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Update hikvision camera detection #14943

Merged
merged 1 commit into from Apr 6, 2023
Merged

Conversation

torbeckattsp
Copy link
Contributor

@torbeckattsp torbeckattsp commented Apr 6, 2023

Hikvision cameras model number does not forcibly starts with 'DS-' anymore.
Here is an sample of a new OEM model made by HIKVISION
[
.1.3.6.1.4.1.39165.1.1.0 = STRING: "IPC7A27-ANPR"
.1.3.6.1.4.1.39165.1.2.0 = STRING: "0"
.1.3.6.1.4.1.39165.1.3.0 = STRING: "V5.7.80 build 220525"
...
.1.3.6.1.4.1.39165.1.6.0 = STRING: "IPcamera"
...]

Please give a short description what your pull request is for

Instead of searching for a string starting with 'DS-', this allow to add models with just the sysObjectID of HIKVISION
It's a very small change and its impact only devices having sysObjectID of HIKVISION cameras
Sorry I'm not able to do test right now because of lack of time but hope this minor change will be accepted and helps.

Screenshot 2023-04-05 151008

DO NOT DELETE THE UNDERLYING TEXT

Please note

Please read this information carefully. You can run ./lnms dev:check to check your code before submitting.

  • Have you followed our code guidelines?
  • If my Pull Request does some changes/fixes/enhancements in the WebUI, I have inserted a screenshot of it.
  • If my Pull Request makes discovery/polling/yaml changes, I have added/updated test data.

Testers

If you would like to test this pull request then please run: ./scripts/github-apply <pr_id>, i.e ./scripts/github-apply 5926
After you are done testing, you can remove the changes with ./scripts/github-remove. If there are schema changes, you can ask on discord how to revert.

Hikvision cameras model number does not forcibly starts with 'DS-' anymore.
Here is an sample of a OEM new model made by HIKVISION 
[
.1.3.6.1.4.1.39165.1.1.0 = STRING: "IPC7A27-ANPR"
.1.3.6.1.4.1.39165.1.2.0 = STRING: "0"
.1.3.6.1.4.1.39165.1.3.0 = STRING: "V5.7.80 build 220525"
.1.3.6.1.4.1.39165.1.4.0 = STRING: "98-f1-12-c7-0b-a2"
.1.3.6.1.4.1.39165.1.5.0 = STRING: "88"
.1.3.6.1.4.1.39165.1.6.0 = STRING: "IPcamera"
.1.3.6.1.4.1.39165.1.7.0 = STRING: "38 PERCENT"
...]
@CLAassistant
Copy link

CLAassistant commented Apr 6, 2023

CLA assistant check
All committers have signed the CLA.

@electrocret electrocret merged commit 13d8ac2 into librenms:master Apr 6, 2023
8 checks passed
@murrant murrant added the Device 🖥️ New or added device support label Apr 6, 2023
@murrant murrant changed the title Update hikvision-cam.yaml Update hikvision camera detection Apr 6, 2023
@librenms-bot
Copy link

This pull request has been mentioned on LibreNMS Community. There might be relevant details there:

https://community.librenms.org/t/23-4-0-changelog/21194/1

TheMysteriousX pushed a commit to TheMysteriousX/librenms that referenced this pull request Aug 9, 2023
Hikvision cameras model number does not forcibly starts with 'DS-' anymore.
Here is an sample of a OEM new model made by HIKVISION 
[
.1.3.6.1.4.1.39165.1.1.0 = STRING: "IPC7A27-ANPR"
.1.3.6.1.4.1.39165.1.2.0 = STRING: "0"
.1.3.6.1.4.1.39165.1.3.0 = STRING: "V5.7.80 build 220525"
.1.3.6.1.4.1.39165.1.4.0 = STRING: "98-f1-12-c7-0b-a2"
.1.3.6.1.4.1.39165.1.5.0 = STRING: "88"
.1.3.6.1.4.1.39165.1.6.0 = STRING: "IPcamera"
.1.3.6.1.4.1.39165.1.7.0 = STRING: "38 PERCENT"
...]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Device 🖥️ New or added device support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants