Follow up to master #2
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
I added some description how to attach templates to rules, because this was not very obvious to me. 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`
…9060) Fixed Device-> Eventlog to show number of rows per page and pagination. FIxed when you filter by Hostname in Overview->Syslog, the Hostname filter dissapear as is like you were in Device->Syslog. 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`
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`
set it to 0 instead of null
if there are no instances, don't check for areas, neighbors, and ports 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`
An exception in one module should not interrupt the process for other modules. 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`
* Fix Debian Stretch Base_Path * Update RRDCached.md
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`
Most were fine as they hardcoded the in into the query. Change them all to use PDO properly. Did not fix IRCBot, they are are all hardcoded. 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 tests for v1 of the JSON NTP client stuff * update the NTP stuff to work with legacy and JSON * add the NTP client legacy tests * Update ntp-server.inc.php
Fix test-template.php to work like the actual alert code. 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`
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`
Added more information on how to setup collectd. Noted that the rrd location set in config.php needs to match /etc/collectd.conf and /etc/collectd.d/rrdtool.conf. 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` One note: As bgpLocalAs field in database is a varchar, ordering could be inconsistent with 4-byte asn as it will order using the first char. If you have 2 ASN (203524 and 32137) and your order by ASC (default) you will get: 203524 32137
* Improved port polling in certain scenarios * Update ports.inc.php * Update ports.inc.php * Remove temporary variables
* Create Installation-Ubuntu-1804-Nginx.md A few tweaks are required to the Ubuntu 16.04 instructions to install on the newly released 18.04 version mostly relating to php being bumped to 7.2 from 7.0 and no mcrypt module for this php version in the distro repository. * Create Installation-Ubuntu-1804-Apache.md Used instructions from 1604 Apache as template and updated to work on Bionic (18.04). * Update Installation-Ubuntu-1804-Nginx.md Removed instructions for installing mcrypt module as I confirmed it works without it and it was mentioned it was no longer needed. * Update Installation-Ubuntu-1804-Apache.md The 1604 directions had a mixture of vi and vim for editing files. Since this is ubuntu and we want the instructions to be as easy as possible, I updated editor to be nano. I have no personal preference and can make it whatever we prefer, just figured it should be consistent between the two guides. * Update mkdocs.yml Added Ubuntu 18.04 instruction pages * Update Installation-Ubuntu-1804-Apache.md Corrected to libapache2-mod-php7.2 from libapache2-mod-php7.0 * Updated Ubuntu install docs * Added missing mbstring + curl packages
- Add filtering by severity in list_alerts. - Added ability to filter only active devices (not ignored and not disabled) in list_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`
* Fix invalid test data and add test for it * fix bgp * add missing comma back
* Add 18.04 install guide and and move 16.04 guide Adds 18.04 install guides to "Installing LibreNMS" page. Moves 16.04 install guides to "Old install docs" section. * Update index.md Update index tree to 1804 over 1604
* Update devices.bgpLocalAs field from varchar to int * Fixed reorder * Fix to requested changes * Fix reorder again
* Fix BENU MIB timestamp * Fix comware bgp order * fix ntp json data * Fix occamos json
* Add fanspeed for EdgeSwitch * Added test files * Move existing EdgeSwitch discovery to yaml * Updated json test data * remove bgp test data
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` 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.
Always post generic full fix commands. Use chmod instead of setfacl in case the filesystem doesn't support acls. 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` 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.
* Fixed PagerDuty alert to show rule name + device as summary * Update Pagerduty.php
* Added support for AVG in rules * More updates * Final work to have advanced sql queries * Added missing use * Fix exception when invalid json is passed * Fixed api for alert rules * updated docs
* fixing sentry3 temperature sensor issues: read all sensors not just first two, fix reading limit and current values, fixing snmp get options * fixing sentry4 temperature sensor issues: read all sensors not just first two, fix reading limit and current values, fixing snmp get options * fixing code style issues * addressing review items from murrant, removing individual snmp_gets, fixing fahrenheit to celcius code back * addressing review items, putting back the celcius fahrenheit conversion logic back * using snmpwalk_cache_oid instead of reinventing in sentry3 code * using pre-cache for sentry4 temp sensors, addressing review items * checking all sentry3 humidity sensors instead of first two, bulk reading instead of individual gets * addressing style issues * pre-caching sentry4 humidity warning table removing duplicate temp sensor event config table * adding two more sentry snmprec files after temperature and humidity sensor updates * making sensor index values for sentry3/4 unique * adding sentry3 and 4 test data files after temperature and humidity sensors update
* Huawei Mib file update * VRP: Improve sensor discovery for optical equipment * VRP: Improve sensor discovery for optical equipment * VRP: Adding Test data after sensor dbm update
adjustment to ## Install Required Packages ## section > add-apt-repository universe
adjustment to ## Install Required Packages ## section > add-apt-repository universe
remember me and AuthenticateSession are incompatible on Laravel 5.4 laravel/framework@6ca154f More info: https://kfirba.me/blog/the-undocumented-authenticatesession-middleware-decoded 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` 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.
https://phpunit.de/manual/6.5/en/textui.html#textui.examples.filter-patterns 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` 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.
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` 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. ---------------------------- **APC Automatic Transfer Switch are now detected has generic APC device like a PDU, but the overall information is not the same.** Long time that I've not added a new device, sorry in advance for the mistakes...  <img width="912" alt="screen shot 2018-09-18 at 10 38 10" src="https://user-images.githubusercontent.com/1927109/45676644-7fb30e00-bb32-11e8-84e9-bab33ccce72a.png"> <img width="899" alt="screen shot 2018-09-18 at 10 40 07" src="https://user-images.githubusercontent.com/1927109/45676645-7fb30e00-bb32-11e8-867e-caa5d731981a.png">
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.
* Add support for allowing alerts to un-ack * Updated db_schema.yaml * Update and rename 263.sql to 265.sql * Fix up ui a bit. * Renamed sql file
* Disable used rules in template map for select them * WIP Enable/Disable options dynamically * Enable/Disable options dynamically * Even better. Selected options for template are not disabled * Didnt work so reverting back * Update attach_alert_template.inc.php
…uired) (#9229) * Move ext-mysqlnd to suggested for now (even though it is actually required) Remove extra dependency version locks, they are more trouble than they are worth. I just run composer with php 5.6 when updating composer.lock. Update dependencies. * Trigger full build on composer updates * Update composer.json
* Fixed edit dashboard permissions + moved to toastr * Moved $_POST to $vars
* Update syslog display backend select boxes now dynamically load instead of loading all on pageload select and table ajax backends completely redone with Laravel (just syslog for now) duplicate url creation to Url utility class for now (uses Device model instead of array) build short hostname functionality into Device->displayName() helper * Fix whitespace * Some tidying up. Split out displayName() and shortDisplayName() * Enable auto-sizing. Fix small error in Url * Eager load device Use bootstrap theme for select2
Changed EXIM status download instructions to match other extensions
Wrong one :/ htmlentities the rest...
Config class collides with Config in model namespace
…cs. (#9250) 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` 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.
higher resolution icon for ASUSWRT-Merlin
* WIP Eventlog table * Initial Eventlog rework * fromdevice is not a request parameter * updates * remove unneeded field * Cleanups
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