Commit Graph

22 Commits

Author SHA1 Message Date
Martijn Schmidt
49f206f58e Fix regression in VC hardware detection for JunOS (#9772)
PR #9546 has resulted in Platform being detected as
"Juniper Virtual Chassis Switch" when a set of devices
is stacked. Hence, no more possibility to see whether
it is for example an EX2300 or EX3400 virtual-chassis.

This commit falls back to using rewrite_junos_hardware()
if the "Juniper Virtual Chassis Switch" string is detected
in boxDescr, resulting in usable hardware data.

Caveat - it's possible to build a virtual-chassis of
multiple switch models, but only for higher end hardware:

https://www.juniper.net/documentation/en_US/junos/topics/concept/virtual-chassis-ex4200-overview.html#jd0e75

Example SNMP output:
mschmidt@nlrtm1-librenms1:~$ snmpwalk -v2c -cremoved -m JUNIPER-MIB -M /opt/librenms/mibs hostname jnxBoxDescr
JUNIPER-MIB::jnxBoxDescr.0 = STRING: Juniper Virtual Chassis Switch

Also reported previously via the community forums:
https://community.librenms.org/t/pr-9546-results-in-junos-platform-detection-quirks-in-combination-with-virtual-chassis/6537
2019-02-04 08:55:31 -06:00
Martin Smith
e0e3e08bf6 Improved hardware/platform naming for Juniper devices (#9546)
This will make the poller try to get the hardware platform from jnxBoxDescr.0, which gives a nice string without going to rewrites.  As a fallback if that oid returns nothing, the rewrites.php file and related MIB have been updated with almost 300 other Juniper devices.

For example...
Before change: Juniper jnxProductQFX520032C32Q
After change: Juniper QFX5200-32C-32Q Switch
Fallback: Juniper QFX5200-32C-32Q

DO NOT DELETE THIS TEXT

#### Please note

> Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting.

- [ ] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/)

#### 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.
2018-12-15 22:51:22 +00:00
Zmegolaz
6d97376088 Check sysDescr for JunOS version. (#9247) 2018-11-21 18:30:06 -06:00
Tony Murray
b99f14bca5 fix testing snmp timeouts and junos mib error (#9147)
convert the junos call to translate too.
Not 100% sure what was wrong with arris-c4, but removing this data fixed it and tests still pass.

DO NOT DELETE THIS TEXT

#### Please note

> Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting.

- [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/)

#### Testers

If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926`
2018-09-04 22:20:01 +01:00
Andrew Steen
d0efc742f3 Fixed Code in SRX Session Graphing (#8816)
DO NOT DELETE THIS TEXT

#### Please note

> Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting.

- [x ] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/)

#### Testers

If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926`

Fixed an issue in the SRX session graphing code which caused Junos BGP sessions to alert as down even though they were established. Previous pull to add the session graphs: #8815
2018-06-14 08:31:14 +01:00
Andrew Steen
c5a8794f9b Added Juniper SRX Branch Session Graphing (#8815)
DO NOT DELETE THIS TEXT

#### Please note

> Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting.

- [x ] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/)

#### Testers

If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926`

This was previously a pull request that was closed #8721 

Not sure why it was closed or if it was abandoned since the branch they had was deleted, but I just put everything back together along with some test data. Kudos to @centralscrutiniser for the code in the original request.
2018-06-13 21:15:43 +01:00
Neil Lathwood
42e5819130 refactor: Updated discovery/poller to use numeric sysObjectID (#7922)
* refactor: Updated discovery to use a core module for sysDescr/sysObjectID use

* final update hopefully

* revert changes

* more changes + docs

* migrated poller to use numerical sysObjectID

* more updates for sysObjectID

* update any alert rules which might have enterprises. in

* moved schema file

* small updates

* updated getHostOS()

* scrut fixes

* updated sysObjectId -> sysObjectID

* updated sysObjectId -> sysObjectID

* updated remainder of sysObjectId -> sysObjectID

* another sysObjectId -> sysObjectID

* fixed secureplatform test data

* Fix tests: $device is not pulled from the database before polling
Also, update the db in the core discovery module.
2018-01-06 23:00:47 -06:00
Tony Murray
13d047c029 device: restore old junos version code as a fallback (#6945) 2017-07-04 02:10:48 +01:00
Neil Lathwood
72da2c7b39 newdevice: Updated JunOS os polling to detect version correctly (#6904) 2017-06-29 21:56:27 -05:00
Tony Murray
edbb6ae0e3 refactor: Centralize MIB include directory specification (#4603)
* refactor: Centralize MIB include directory specification
The default is now:
```
$config['mib_dir'].'/mibdirname:'.$config['mib_dir']
```
This means we exclude OS mibs and only use ours  (we could prepend `+` if we want to include os mibs.
All snmp calls should only include the name of the subdirectory under the mibs directory.

* Remove d_echo from Proc
Fix snmpsim tests.
2016-09-28 14:19:28 +01:00
Tony Murray
9284bc60ff Update code in includes to be PSR-2 compliant (#4220)
refactor: Update code in /includes to be psr2 compliant #4220
2016-08-28 18:32:58 +01:00
Job Snijders
ebd0f6fc35 Apply "Squiz" code style on old (pre-2014) files 2015-07-11 16:12:35 +02:00
Tom Laermans
d2bec6d7d1 juniper hardware detection through chassis mib, with fancy rewrite array - makes observium recognize srx650
git-svn-id: http://www.observium.org/svn/observer/trunk@3031 61d68cd4-352d-0410-923a-c4978735b2b8
2012-04-12 23:56:45 +00:00
Tom Laermans
752bbc2af8 array keys are strings, duh
git-svn-id: http://www.observium.org/svn/observer/trunk@2863 61d68cd4-352d-0410-923a-c4978735b2b8
2012-02-14 19:01:23 +00:00
Adam Amstrong
00121fd3f8 fixes to new poller
git-svn-id: http://www.observium.org/svn/observer/trunk@2233 61d68cd4-352d-0410-923a-c4978735b2b8
2011-05-03 21:46:25 +00:00
Tom Laermans
bc2fc65b30 fix more booboo
git-svn-id: http://www.observium.org/svn/observer/trunk@1945 61d68cd4-352d-0410-923a-c4978735b2b8
2011-03-21 11:45:29 +00:00
Tom Laermans
722d912aa1 cleanup OS polling
git-svn-id: http://www.observium.org/svn/observer/trunk@1841 61d68cd4-352d-0410-923a-c4978735b2b8
2011-03-15 11:59:47 +00:00
Tom Laermans
3c10ede092 Get rid of some more execs
git-svn-id: http://www.observium.org/svn/observer/trunk@1814 61d68cd4-352d-0410-923a-c4978735b2b8
2011-03-10 15:51:56 +00:00
Tom Laermans
30bdd952ee Minor fixes, some cleanups, and standardising on echo("x") instead of echo "x"
git-svn-id: http://www.observium.org/svn/observer/trunk@1728 61d68cd4-352d-0410-923a-c4978735b2b8
2010-11-20 14:04:07 +00:00
Adam Amstrong
f29e7b755b redesigned graph defining system (still seems a bit batshit, but nevermind). lots of improvements to various pollers, only writing RRDs if valid data is returned, etc.
git-svn-id: http://www.observium.org/svn/observer/trunk@1506 61d68cd4-352d-0410-923a-c4978735b2b8
2010-07-28 19:43:02 +00:00
Adam Amstrong
84de6a0528 fix paths on includes (8 hour graph gap :[ )
git-svn-id: http://www.observium.org/svn/observer/trunk@1449 61d68cd4-352d-0410-923a-c4978735b2b8
2010-07-20 23:18:29 +00:00
Adam Amstrong
15cdf5c9fa add force10 mibs and os type detection. move per-os polling scripts from includes/polling/device-* to includes/polling/os/*
git-svn-id: http://www.observium.org/svn/observer/trunk@1442 61d68cd4-352d-0410-923a-c4978735b2b8
2010-07-20 13:49:36 +00:00