Merge in from Main Project #8
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The files where retrieved from the vmware provided mibs at https://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=1013445
Can't forget that semicolon.
* small fixes to apps doc * small fixes to apps doc
* Update avaya-vsp.yaml Extreme purchased the Avaya network assets and so I need to rebrand the VSP to be Extreme. I am changing the icon to be Extreme. I am also adding support for the 8404c which is sysObjectID .1.3.6.1.4.1.2272.220 * Create avaya-vsp_8404c.snmprec need to add a new vsp 8404c chassis support for avaya/extreme * Added generated json file * Udated test files
* Update ciena-sds.yaml Added sysObjectID for Ciena 8700 (SAOS 8) device. * Add files via upload
* alert: Added support for disabling recovery notifications * reversed use of recovery * removed debug + small update
* Fix validation sql for primary keys and first columns Remove extra space in generated sql :D * Update Database.php
pushed the first recursion loop down, makes the code cleaner.
* device: Added better detection for HiveOS devices * Added MIBs for later use
* Update ports.inc.php Adding ifAlias to the $tags that are sent into influxdb * Remove space
Only affects new installs. Leave dynamic config settings.
…aphs. (#8411) * Changed to concat 32bit high.low counters * Changed to concat 32bit high.low counters * Correction. Needed to bit shift. Correction. Needed to bit shift << 32 on high and add low. * Correction. Needed to bit shift. Correction. Needed to bit shift << 32 on high and add low. * Added storage removed processor and memory No point in processor and memory until nimble supports it. Added stroage to overhead.
* Update devices.inc.php * Update devices.inc.php * Replace $_POST with $vars Better protection for SQL injection attempts; Need to verify other files for same issue. * Fixed whitespace. *sigh* * More search options & sql injection fixes. +Allow full search on devices page; +Allow sysName search on alertlog page; +Allow sysName search on alerts page; +Allow sysName search on eventlog page; +Allow sysName search on poll-log page; +Allow sysName search on ports page; *Replaced all occurrences of $_POST with $vars in librenms/html/includes/table. ($vars are sanity-checked). * Whitespace fix * Fixed $where & $param * Add files via upload * Whitespaces.... Sometimes you want'em, sometimes you hate'em.
* Update moxa-etherdevice.inc.php Would rather rely on `sysObjectID` when getting the hardware/software information as the `sysDescr` may be changed through the web interface of the device. Use numeric OID-s only. * Update moxa-etherdevice.inc.php Converted separate `snmp_get` calls into a single `snmp_get_multi_oid` call. * Update moxa-etherdevice.inc.php Unset variables at the end. * Update moxa-etherdevice.inc.php Unset multiple variables at once. * Update moxa-etherdevice.inc.php
WD drives have a dash in the serial number, e.g. WD-WCCXXXXXXXXX. The librenms-agent script changed to using serial numbers in librenms/librenms-agent@3a84624 As we split the name by the same char, we discarded everything after WD, which made all WD drives in the system appear as one, and broke the generated links.
* Debian stretch settings * Update RRDCached.md * Update RRDCached.md
* Add mib dir that was missing * Fixed missing raritan mib dir in definitions
Add regex type for numbers Tooltips for all alert rule dialog items
Add test data There were also some sensor name collisions and an incorrect divisor. 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`
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`
* also include adsl stats for vdsl ports * Update ports.inc.php
I've created single page which shows all VMs known to LibreNMS. Also I thought not everyone would like to enable this option so it requires $config['show_allvm_list'] = true; in config.php to be enabled as a menu item (under devices) 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`
* Added new plugin menu_option in the "port" page, which contain hook calling public function port_container($device, $port) in plugins * Cleaning after pre-commit error * New method in Plugins.php to allow counting all plugins implementing a specific hook. This allow conditionnal display of the plugin menu_option in the port view. * Typo after rebase * Update plugins.inc.php * Updating the documentation with device_overview_container and port_container hooks.
* Blue Coat device updates * Blue Coat device updates * Updated PHP code per @laf comments * YAML update for Packetshaper * SSL Visibility YAML and snmprec file * Cleanup problematic MIB files which should not have been there * Reset Packetshaper YAML to original * Fixed typos and value bugs in inc files|added missing definitions.inc.php entries to display graphs * Fixed SQL typo * Corrected SQL file names * Update 251.sql
* Copyright correction, no_refresh for plugin page, and typo for parameter array * Copyright correction, no_refresh for plugin page, and typo for parameter array
Sending an empty group to Oxidized results in it not finding a node's configuration even though it will find it just fine when the group is not specified. 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`
Added prerquisite php pear
This patch provides the ability to override most aspects of the configuration output provided to Oxidized. This is now backwards compatible with any current groups defined previously but allows for extra features such as group overrides in Oxidized as well as IP changes (for hosts that are treated differently inside Oxidized), as well as ProxyHost additions. Of course, this goes further and allows for any flag that can be defined within Oxidized to be mapped in the config.
Examples
1) Define a group for these hosts
```php
$config['oxidized']['maps']['group']['sysname'][] = array('regex' => '/^(foo|bar)/', 'group' => 'myGroup');
$config['oxidized']['maps']['group']['sysname'][] = array('regex' => '/^(baz)/', 'group' => 'anotherGroup');
```
2) Provide a proxy host for these hosts to bounce through
```php
$config['oxidized']['maps']['ssh_proxy']['sysname'][] = array('regex' => '/foo/', 'ssh_proxy' => 'mySshProxyHost');
$config['oxidized']['maps']['ssh_proxy']['sysname'][] = array('regex' => '/bar/', 'ssh_proxy' => 'anotherSshProxyHost');
```
3) Allow overrides of IP addresses so the external DNS is not used for connections
```php
$config['oxidized']['maps']['ip']['sysname'][] = array('regex' => '/baz/', 'ip' => '10.10.0.23');
$config['oxidized']['maps']['ip']['sysname'][] = array('regex' => '/lala/', 'ip' => '192.168.0.243');
```
As already mentioned, this doesn't stop with the above examples.
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`
… httpd (#8761) * Don't leak passwords when users update urls to include all variables after login * Less aggressive
 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`
* Added SFP sensor discovery for Procurve devices * Added SFP sensor discovery for Procurve devices * Added json test data
#8762) Hello The "scrollable-menu" class appears incompatible with nested submenus. Removing it for Plugin submenu would allow a plugin to use SubMenus itself. Use case: WeatherMap would list in a submenu all the weathermaps defined, allowing a quick access. The patch for weathermap would come if this one is accepted. Bye PipoCanaja 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`
New product name change confirmed via Barracuda chat on May 9, 2018 I plan on extending this a bit further but I'll submit a pull for that later.
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`
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`
* add json_app_get function * add numeric testing and version support * now use json_app_get * remove some unneeded code * update the docs for json_app_get some more * make the format checker happy * add in min version support and now take extend name instead of the partial OID * hmm... don't make min version optional * add Exception usage for this all make min version actually work * minor formatting cleanup * minor style cleanup * update json_app_get with $throw_me setting * Use exceptions to fully handle errors. Always update the application. Include error message for use in UI. Move data to data key for easier parsing. Add test data * make a few changes to the lovely changes from @murrant * style cleanup * now attempt parsing it the old way if a error of -5 is returned * add new exceptions and rework them all * add new exceptions and min version 0 no longer bypasses the key checks * redo the error codes a bit and improve the comment about it all * fix a a bit of formatting * added JsonAppException and make the other JsonApp stuff a sub of it * note JsonAppException * fix class creation * JsonAppBlank now extends JsonApp * doh! add <?php * update the poller to properly use the new exceptions * no longer check for error twice and make sure the data key is present * cleanup processing of legacy scripts * tweak this a bit * white space fix * fix the tests for fail2ban
* testing: Added test unit for Docs * Update mkdocs.yml * Avoid extra function * contains -> diff
* Add vrf for non mpls cisco devices, add mib and test data * Fix custom_where in vrf module * Better VRF module test data collection * Update ios_6500.json * don't include ifVrf in ports * update all ports add dependencies to pre-commit.php * new json files
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`
I added simple details and a link to the integration doc.
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`
Nothing major, just spotted it as I went through the docs. 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`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
DO NOT DELETE THIS TEXT
Please note
Testers
If you would like to test this pull request then please run:
./scripts/github-apply <pr_id>, i.e./scripts/github-apply 5926