Commit Graph

41 Commits

Author SHA1 Message Date
Tony Murray
9d35fbc6a7 Entity Physical discovery: Rewrite to modern style (#16289)
* Initial entity-physical code

* Split out Entity-MIB trait

* Cisco Cellular inventory

* Fix bad test data

* alfo80hd - we now include all entPhysical entries

* Correct aos7 test data

* Add entPhysicalClass as last resort for label in ui

* aos add previously filtered data

* Fixup arista-eos data

* Update ariast_eos data

* Arris, clean garbage in Rev fields

* Aruba Instant custom inventory ported

* ArubaOS CX add vendor type mib

* aviat-wtm test data refresh

* axos add shelf fix data fields a bit

* ciena-rls

* ciena-sds

* Skip cimc for now... no test data

* Cisco updates

* Comware data update

* Update dnos

* Clean Edgeos garbage, make code from Arris shareable

* Relaxed ifIndex match, some devices cheat and send back static strings instead of formatted OIDs

* Regex refinement and updated edgeos with new clean data

* Update edgeswitch data

* Update eltex-mes21xx data

* eltex-mes23xx

* Guess at eltex-mes24xx since there is no test data

* Update eurostor, fix firmware version

* Apply fixes from StyleCI

* fixes

* Update fortigate data

* Update fortiweb, ftd, and fusion

* Update linux LSI

* Fix hexToAscii null removal with different seperator handling

* icotera add final snmprec data to avoid snmpsim bug

* Update IOS data

* Update mrv-od

* Add junos translation

* Generic data updates n-r

* ruijie workaround snmpsim bug

* Port saf-cfm

* Recode Schleifenbauer, and fix entPhysicalIndex values

* SmartAX fixes

* sm-os and tait-infra93

* timos inventory was not right, fix it up

* ubiquoss-pon

* VRP, has custom data collection on top of normal
adapt port ifIndex lookup to handle it

* VRP exceeded the string length specified in ENTITY-MIB...

* data updates

* Final data update and code cleanup

* Apply fixes from StyleCI

* Lint fixes

* Add missing SnmpResponse->pluck() code

* Update db_schema.yaml

* Fix bad test data

* Another instant-on update

* oops

* Remove some unused code

# Conflicts:
#	includes/html/pages/device/overview.inc.php

---------

Co-authored-by: Tony Murray <murrant@users.noreply.github.com>
2024-08-21 01:12:09 -05:00
Jellyfrog
82f43cb98d Apply fixes from StyleCI (#12120) 2020-09-21 15:40:17 +02:00
Martijn Schmidt
e0da083f5c New OS: Schleifenbauer, entity-physical improvements, various html page fixes (#9471)
* Fix some comment and documentation typos.

* Fix various entphysical page display issues.

- Resolve flickering during loading (missing liClosed for nested items).
- Clicking a sensor actually takes you to the matching graph now.

* Add a few nicecase() calls to clean up html page display.

* Create discover_entity_physical() function

- Add discover_entity_physical() function into includes/discovery/functions.inc.php
- This allows for an easy implementation of OS-specific entity-physical discovery.
- Update includes/discovery/entity-physical/entity-physical.inc.php to use the new function.

* Add power_consumed and power_factor sensors.

* Two new icons, make more entPhysical data visible.

* Pre-commit fix: blank line found at end of control structure.

* Add Schleifenbauer OS support.

* Now really fix the comment typo.

* Fix parsing mistakes.

* Add a generic count sensor.

* Make the Schleifenbauer discovery use count instead of state sensors.

* Don't place count sensor at the top, add sane limits for Schleifenbauer

* Finetuning the rrd_options, changing Schleifenbauer sensor names.

* Update schleifenbauer.svg

* optimize logo too

* add test data

* fix sensor value display (spaces break it)

* update entPhysicalIndex
2019-01-20 12:24:11 -06:00
Neil Lathwood
245c15807d refactor: Update include files for disco/poller to be dynamic (#8597) 2018-04-24 20:08:06 -05:00
Tony Murray
b18c41b1a9 refactor: Use the Config class includes/discovery (#7299)
* refactor: use the Config class includes/discovery

* fix issue with $config variable not accessible in include-dir.inc.php

* improved whitespace

* Tidy up discovery_by_ip
2017-09-11 21:26:41 +01:00
Neil Lathwood
21898a3c29 Disco / Poller tidy up + Added display of module mem usage (#5778)
* tidyup + added mem usage for poller modules

* tidied up discovery modules

* fix sensors
2017-02-07 22:54:30 -06:00
Aaron Daniels
a2563c5b67 feature: Added Cisco Integrated Management Console inventory and sensor support #4454 2016-10-06 01:40:37 +01: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
laf
558dfb2344 Pretty up the discovery process output 2016-06-21 00:59:43 +01:00
Chris Freas
cf39436865 fix indentation per request 2016-05-24 13:52:04 -04:00
Chris Freas
94b2fcb9f0 remove debug print statement and submit this as a PR for Alcatel-Lucent inventory support 2016-05-18 16:48:39 -04:00
Chris Freas
75223146f3 add basic inventory support for Alcatel-Lucent SR devices 2016-05-18 16:40:10 -04:00
Rick Hodger
8c4baaacfd Removed commented code. 2015-11-20 13:03:01 +00:00
Rick Hodger
8b1dc95d83 Issue 1865, Juniper hardware inventory fix 2015-11-20 10:47:47 +00:00
Job Snijders
d8693f05ae Fix coding style part 2 2015-07-15 11:04:22 +02:00
Alexander Sosna
5a7988e2e4 chmod 0644 to php files not directly executed 2015-04-28 22:58:03 +02:00
Chris Freas
ab45804e62 Add Juniper inventory support 2015-04-17 14:59:47 -04:00
mchasteen
f70989542b Fixed entity-physical. Fixed the ifindex logic. Also fixed the update and insert function calls. 2015-02-26 23:03:20 +00:00
laf
e0ee9c01a3 Updated column on select which was incorrect 2014-06-24 21:27:30 +01:00
laf
38918c9348 Fixes for dbInsert / dbUpdate queries 2014-06-10 22:21:10 +01:00
laf
02792176fa Updated most files to use dbFacile 2014-03-12 22:21:33 +00:00
Adam Amstrong
b273e04241 /// -> //
git-svn-id: http://www.observium.org/svn/observer/trunk@3240 61d68cd4-352d-0410-923a-c4978735b2b8
2012-05-25 12:24:34 +00:00
Adam Amstrong
cacf913a55 # -> / for phpdoc
git-svn-id: http://www.observium.org/svn/observer/trunk@3239 61d68cd4-352d-0410-923a-c4978735b2b8
2012-05-25 11:29:53 +00:00
Adam Amstrong
944130f0bb pseudowire reworking. add device tab (no wonder no one ever asked about it, damn tab was missing!)
git-svn-id: http://www.observium.org/svn/observer/trunk@3116 61d68cd4-352d-0410-923a-c4978735b2b8
2012-05-02 17:23:27 +00:00
Tom Laermans
a369c442eb syntaxer run
git-svn-id: http://www.observium.org/svn/observer/trunk@2643 61d68cd4-352d-0410-923a-c4978735b2b8
2011-10-04 14:38:54 +00:00
Tom Laermans
dc0ebc7343 more code cleanup
git-svn-id: http://www.observium.org/svn/observer/trunk@2517 61d68cd4-352d-0410-923a-c4978735b2b8
2011-09-20 14:22:34 +00:00
Adam Amstrong
7cd3dc86ec fix temperature and processors discovery
git-svn-id: http://www.observium.org/svn/observer/trunk@2238 61d68cd4-352d-0410-923a-c4978735b2b8
2011-05-04 12:58:57 +00:00
Adam Amstrong
c78bfc8a4d add CISCO-ENTITY-VENDORTYPE-OID-MIB, use it for entphysical. re-enable PAgP and VTP VLAN tracking.
git-svn-id: http://www.observium.org/svn/observer/trunk@2174 61d68cd4-352d-0410-923a-c4978735b2b8
2011-04-26 22:25:35 +00:00
Tom Laermans
f55a30f744 some formatting cleanups, introduce some more FIXMEs to look at, plus replace mysql_fetch_array by mysql_fetch_assoc, for great justice
git-svn-id: http://www.observium.org/svn/observer/trunk@2029 61d68cd4-352d-0410-923a-c4978735b2b8
2011-04-06 13:54:50 +00:00
Tom Laermans
bb4746d4d0 cleanups, small fixes and remove test-*php from the root
git-svn-id: http://www.observium.org/svn/observer/trunk@1998 61d68cd4-352d-0410-923a-c4978735b2b8
2011-03-31 10:51:02 +00:00
Tom Laermans
31b2092041 more trailing spaces hunted down and shot, then shot again
git-svn-id: http://www.observium.org/svn/observer/trunk@1880 61d68cd4-352d-0410-923a-c4978735b2b8
2011-03-16 17:53:20 +00:00
Tom Laermans
f1115c6e22 discovery cleanup complete
git-svn-id: http://www.observium.org/svn/observer/trunk@1840 61d68cd4-352d-0410-923a-c4978735b2b8
2011-03-15 11:39:50 +00:00
Adam Amstrong
0db6ad08ff vastly improved entity-sensors and cisco-entity-sensors speed. improved entity-mib inventory. removed device_id element from oid caches. add min/max ranges to sensor graphs.
git-svn-id: http://www.observium.org/svn/observer/trunk@1669 61d68cd4-352d-0410-923a-c4978735b2b8
2010-08-11 17:08:56 +00:00
Adam Amstrong
e220114f4c add some mibs, update snmp functions
git-svn-id: http://www.observium.org/svn/observer/trunk@1458 61d68cd4-352d-0410-923a-c4978735b2b8
2010-07-22 21:58:49 +00:00
Adam Amstrong
f4d280ece5 small speedup to entity polling
git-svn-id: http://www.observium.org/svn/observer/trunk@1374 61d68cd4-352d-0410-923a-c4978735b2b8
2010-07-17 12:58:30 +00:00
Adam Amstrong
c22e8493f7 migrate all SNMP calls to use $config['mibdir']. automatically generated from install_dir if not present
git-svn-id: http://www.observium.org/svn/observer/trunk@1284 61d68cd4-352d-0410-923a-c4978735b2b8
2010-07-02 19:58:13 +00:00
Tom Laermans
de53ae27c6 more warning cleanups
git-svn-id: http://www.observium.org/svn/observer/trunk@705 61d68cd4-352d-0410-923a-c4978735b2b8
2010-01-16 23:56:33 +00:00
Tom Laermans
d6cff48859 ignore physical entity inventory if the hardware doesn't say what they are - HI DELL
git-svn-id: http://www.observium.org/svn/observer/trunk@657 61d68cd4-352d-0410-923a-c4978735b2b8
2010-01-10 16:03:48 +00:00
Adam Amstrong
7157ec5549 a billion changes. **** MAKE SURE TO UPDATE DATABASE AND RUN poll-os.php AND discovery.php -h all **** This is VERY important, as a lot of things have changed! Expect missing files, and another update soon!
git-svn-id: http://www.observium.org/svn/observer/trunk@531 61d68cd4-352d-0410-923a-c4978735b2b8
2009-11-28 09:48:23 +00:00
Adam Amstrong
bea6a0667f updates, including fixed procurve support! :)
git-svn-id: http://www.observium.org/svn/observer/trunk@530 61d68cd4-352d-0410-923a-c4978735b2b8
2009-11-24 23:58:56 +00:00