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

Fix last column of alerts table visual #9506

Merged
merged 2 commits into from Dec 5, 2018
Merged

Fix last column of alerts table visual #9506

merged 2 commits into from Dec 5, 2018

Conversation

arjitc
Copy link
Contributor

@arjitc arjitc commented Dec 1, 2018

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.

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.

Minor UI fix to add/fix the last column for alert state items

Old,
chrome_2018-12-01_17-10-17

New,
chrome_2018-12-01_17-11-40

@murrant
Copy link
Member

murrant commented Dec 1, 2018

Thanks for the fix :) We can avoid the else by moving the <td> and </td> tags outside the if :)

@arjitc
Copy link
Contributor Author

arjitc commented Dec 1, 2018

@murrant when I move it outside of the if , this happens,

chrome_2018-12-01_19-34-44

With else this is the output,

chrome_2018-12-01_19-37-21

I assume you meant this (right?)

if ($alert_state != '') {
    if ($alert_state == '0') {
        $fa_icon  = 'check';
        $fa_color = 'success';
        $text     = 'Ok';
    } elseif ($alert_state == '1') {
        $fa_icon  = 'remove';
        $fa_color = 'danger';
        $text     = 'Alert';
    } elseif ($alert_state == '2') {
        $fa_icon  = 'info-circle';
        $fa_color = 'muted';
        $text     = 'Ack';
    } elseif ($alert_state == '3') {
        $fa_icon  = 'arrow-down';
        $fa_color = 'warning';
        $text     = 'Worse';
    } elseif ($alert_state == '4') {
        $fa_icon  = 'arrow-up';
        $fa_color = 'info';
        $text     = 'Better';
    }//end if
}
echo "<td><b><i class='fa fa-fw fa-".$fa_icon." text-".$fa_color."'></i> $text</b></td>";

@murrant
Copy link
Member

murrant commented Dec 1, 2018

@arjitc no, remove the td tag only, not the b and i tag and text :)

@arjitc
Copy link
Contributor Author

arjitc commented Dec 1, 2018

@murrant ah I see, I've made the changes now 👍

@murrant murrant merged commit 7788f93 into librenms:master Dec 5, 2018
@murrant murrant changed the title [UI] Fix last column of table Fix last column of alerts table Dec 5, 2018
@murrant murrant added the WebUI label Dec 5, 2018
@murrant murrant changed the title Fix last column of alerts table Fix last column of alerts table visual Dec 5, 2018
murrant pushed a commit that referenced this pull request Dec 20, 2018
* RouterOS wireless sensors update (#9401)

* bug-fix and new features

Fixed incorrect OID for rate, renamed rate to TX-Rate as per update from mikrotik.

Added support for link distance

* Fixed indent issue

* Added support for using Transport name in templates (#9411)

* Added ability to sort alert schedules by status (#9257)

Signed-off-by: Rémy Jacquin <remy@remyj.fr>

* Converted Polling From Ports to New Module (cisco-nac)

* Converted Polling From Ports to New Module (cisco-nac)

* Fixed alert util (#9428)

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 AlertUtil - again (#9429)

* Update BEGEMOT-HAST-MIB (#9427)

FIX: 
Due to a missing import and the uppercase after some SYNTAX this mib is not bein compiled correctly everywhere.
For example the one from Horizon OpenNMS fails with some errors 
ERROR: Cannot find symbol UNSIGNED32, Source: BEGEMOT-HAST-MIB.txt, Row: 321, Col: 17

The proposed change prevent the errors.

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.

* Fixing Travis CI and Code Climate Issues

* Fixing Travis CI and Code Climate Issues

* Fixing Travis CI and Code Climate More Issues

* Fixing Travis CI and Code Climate More Issues

* Fixes delta calculation for bgpPeers_cbgp metrics (#9431)

The values in the $peer['c_update'][$oid] array are set only if they have
changed. If the value has not changed, then zero is substituted for real
values, which leads to incorrect calculation of delta values and records
in the database:

SELECT AcceptedPrefixes,AcceptedPrefixes_prev,AcceptedPrefixes_delta
FROM bgpPeers_cbgp
WHERE device_id=115;

| AcceptedPrefixes | AcceptedPrefixes_prev | AcceptedPrefixes_delta |
|------------------|-----------------------|------------------------|
|               21 |                    21 |                    -21 |

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.

* Improve Junos state sensor discovery (#9426)

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.

Tested on MX and EX series, works fine.
Skip slots that are empty and pull all sensors in jnxFruTable, data from old code is preserved.

* Added alerts schedule notes into device notes (#9258)

* Add alerts schedule notes into device notes

Signed-off-by: Rémy Jacquin <remy@remyj.fr>

* Update preferences.inc.php

* Show port description and dns name in FDB table (#9370)

- Added Port Description field to FDB Table
- Added DNS Name field to FDB Table
- Fixed sorting by port in FDB Table

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.

* Update draytek.inc.php (#9432)

* Removed unnecessary model checks in HiveOS Wireless (#9409)

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.

* Added format field to Telegram Messages (#9404)

* Add format field to Telegram Messages

Added Telegram field to send formatted messages as Mardown or HTML

* Update Telegram.php

* Correct Mistypo.

* Correct mistypo

* Correct Mistypo

* Correct mistypo

* Update Transports.md

* Add Format field on Telegram Examples

* Change Telegram Format field to type select

* Add "blank" option to Format field

* Update Telegram.php

* Update Telegram.php

* Update Telegram.php

* Disable page refresh on health sensors pages, autorefresh most tables (#9386)

* Disable page refresh on health sensors pages
Refresh all bootgrid tables every 5 minutes

* Update legacy_index.php

* Update librenmsv1.blade.php

* Style cleanup in hiveos file (#9440)

Fix code style check for #9438

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.

* Ensure the checks for ASA context devices are strict (#9441)

* Show visually in webui + cli when using deprecated templates or transports (#9413)

* Show visually in webui + cli when using deprecated templates or transports

* Fixed query

* Added Bing geocode lookup support (#9434)

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.

* Added ScreenOS Syslog Hook (#9438)

* Add ScreenOS Syslog Hook

Adds Syslog Hook for ScreenOS
https://community.librenms.org/t/juniper-screenos-syslog-hook/6146

* Update Syslog.md

* Update syslog-notify-oxidized.php

* Discovery YAML. Do not implicitly append $index (#9315)

Require it explicitly. Makes it easier to understand and matches the style of other values

Questionable YAML changes (either broken before or now broken):
secureplatform: haStatCode
ptp600: receiveModulationMode

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.

* Update Syslog.md (#9443)

Fixed the screenOS output added in #9438 which was confusing mkdocs output. Refer to the docs currently https://docs.librenms.org/Extensions/Syslog/ - It's all mashed up at the bottom

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.

* Fix ping.php poller groups setting
confusion between dispatch(new PingCheck($groups)) and PingCheck::dispatch($groups)

* Replaced Other to Disabled on Metod Column

* Replaced Other to Disabled on Metod Column

* Removed Extra Character < on Authz Icon

* Removed Extra Character < on Authz Icon

* Created sql-schema (261)

* Created sql-schema (261)

* Update docs for virtual images (#9456)

* Added Traffic to the Windows OS overlib graph (#9445)

WebUI: added Traffic to the Windows OS overlib graph

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.

* Update World-Map.md to include pros/cons (#9442)

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.

* Added allow ipv6 address localhost nginx-status docs (#9458)

Following the modification of the SNMP Nginx agent (librenms/librenms-agent@e0dcd4a), linux distributions make requests in IPV6, so you must allow ::1 


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 altering transport mapping in rules clearing all mappings (#9455)

* Change unpolled devices toast to be based on rrd step (#9391)

* Change unpolled devices toast to be based on rrd step

* Update message

Change it back to 3x

* Added resources/links and devices/hostname/links API calls for xDP (#9444)

* api: Add list_links and get_link api calls

Signed-off-by: Misha Komarovskiy <zombah@gmail.com>

* api: Add get_links api call

Signed-off-by: Misha Komarovskiy <zombah@gmail.com>

* Update detection for Allied and Radlan OS (#9454)

"1.3.6.1.4.1.207.1.4.128" is currently reporting as allied, when it should be reporting as radlan.

Refer to https://community.librenms.org/t/allied-telesis-discovery/6189/8

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.

* Updated HiveOS wireless detection (#9459)

* Added ability to record traceroutes for devices down due to ICMP (#9457)

* Added ability to record traceroutes for devices down due to ICMP

* Update Templates.md

* Updated schema

* Update dev-overview-data.inc.php

* Filter email options based on backend in Alert settings (#9461)

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.

* Update Configuration.md

* Updated detection for AKCP devices (#9460)

* Updated support for Avocent devices (#9462)

* Updated support for Avocent devices

* Add ACS8048 hardware to json

* Update avocent.inc.php

* Update avocent_8000.json

* Syslog name translation (#9463)

* Check to see if a host exists in a lookup table to translate received name to what LibreNMS knows

* Added some documentation on how this is configured

* Use \LibreNMS\Config instead of accessing $config directly

* Fix codeclimate finding: Additional blank lines after USE statement

* murrant suggested a much cleaner way of doing this!

* fix snmp engine time (#9470)

* Added more sensors for IRD (PBI Digital Decoder) (#9339)

* added over bitrate graph

* added bitrate

* added more state sensors

* Update ird.snmprec

* Update ird.json

* Update Ird.php

* Update Ird.php

* Update Ird.php

* Update ird.json

* Updated json test data

* Update ird.snmprec

* Updated json data

* fix test value

* fix num_oid

* Add new sysDescr string for AlliedWare Plus products. (#9430)

* Add new sysDescr string for AlliedWare Plus products.

Release 5.4.8-2.1 of AlliedWare Plus will change the format of the
sysDescr string. This patch updates Allied Telesis yaml files to work with
this change.

Signed-off-by: Luuk Paulussen <luuk.paulussen@alliedtelesis.co.nz>

* save-test-data.php: Use correct variable for 'os' argument.

Signed-off-by: Luuk Paulussen <luuk.paulussen@alliedtelesis.co.nz>

* Create awplus_5.4.8-2.json

* Update awplus_5.4.8-2.json

* add a tool for working with JSON apps (#9084)

* add initial work on script for working with json apps

* finish the code portion

* -h now done

* rename it to be slightly more accurate

* make hash key strings

* exit if -a is not present

* now exit after checking the file if -s or -t is given

* now properly add the applications key

* snmp_max_oid per Os support and snmpv1 multi_oid fix (#9343)

* Added snmp_max_oid config at Os level.

* Added check for snmpv1 on multi_oid requests.

* Check  device_oid_limit on multi get

* Use array_chunk

* Update snmp.inc.php

* remove dump, unused variable and extra plodes

* per device settings should take priority over OS

* Update Settings.md

* don't discard the data :P

* fixing option to let user pick saved test data filename, exit if ther… (#9242)

* fixing option to let user pick saved test data filename, exit if there are many os/variant combination for a single output filename

* fixing style issues

* Update save-test-data.php

* Update save-test-data.php

* Add support for Firebrick Hardware (#9403)

* Added support for Firebrick devices

* Added support for Firebrick devices

* Update firebrick.inc.php

* Update firebrick.inc.php

* Update firebrick.svg

* Update firebrick.svg

* Added SNMP Check

* Added SVG View Box

* Display XML in config tab

* Update firebrick.svg

* Update firebrick.yaml

* Update showconfig.inc.php

* Create firebrick.json

* Check sysDescr for JunOS version. (#9247)

* Cisco: change notKnown status to unknown and not warning (#9222)

* Cisco: change notKnown status to unknown and not warning

* Update cisco.inc.php

* Improve the Logical Checking if Data Exist on DB

* Improve the Logical Checking if Data Exist on DB

* Update SQL-Schema File Name

* Update SQL-Schema File Name

* add app for getting status of TCP connections for specified services (#8090)

* add the poller for portactivity

* add the ability to get monitor ports for portactivity

* add the graphs for displaying stuff for the portactivity app

* add the portactivity app page

* update the docs for Portactivity

* remove extra line

* minor doc update for Portactivity

* add update_application line

* convert to use json_app_get

* convert curly brackets to square

* style fix

* remote error, errorString, and version after they stop being important so they are not processed

* add alert rule examples

* add the poller for portactivity

* add the ability to get monitor ports for portactivity

* add the graphs for displaying stuff for the portactivity app

* add the portactivity app page

* update the docs for Portactivity

* remove extra line

* minor doc update for Portactivity

* add update_application line

* convert to use json_app_get

* convert curly brackets to square

* style fix

* remote error, errorString, and version after they stop being important so they are not processed

* add alert rule examples

* remove dump of get_portactivity_ports function added during rebase

* update to the current json_app_get

* add portactivity snmprec

* add the portactivity test data

* whoops bad merge when rebasing... fix

* minor formatting cleanup and add a missing comma

* fix some odditities with what one of the tests is doing

* whoops... include the use for the exception

* set the response to okay

* attempt to make snmpsim array check happy again

* the json now lints

* more making metric testing happy

* one more update to make travis-ci happy

* now flattens arrays also add array_flatten

* rename array_flatten to data_flatten as pre-commit chokes on it as laravel has something similarly named

* go through and properly add all the metrics

* tested with the newest one and it works

* whoops, clean up json and remove prototype that was used when putting it together

* doh! make it happy with laravel now

* see if a minor changing in formatting for the numbers makes the polling unit test happy

* order them properly

* remove a comma

* a few more minor fixes

* Replace dbFetchRows to dbFetchRow on Some Exist Checks

* Replace dbFetchRows to dbFetchRow on Some Exist Checks

* Fix Some Code Climate Issues

* Fix Some Code Climate Issues

* Fixed More Code Climate Issues

* Fixed More Code Climate Issues

* Fix do not include template text in HTML page (#9476)

* Fixed $speed lenght in port parser when > 32 characters (#9479)

* Fix global read check for demo account (#9482)

* Improve documentation for service plugins (#9414)

* Begin adding preinstalled plugin documentation.

Also add information about how the titles of the plugins are displayed and detected.
Make page visible on the websites Table of Contents.

* Add note about plugin loading based on file name.

* Added all monitoring-plugins URLs.

* Format URLs on the service plugin docs list.

* Correct a URL on the plugins list.

* Removed leftover text from plugin list docs.

* Add pkg-nagios-plugins-contrib plugins to docs.

* Add DSA pkg-nagios-plugins-contrib plugins to docs

* Added a few missing lines of pkg-nagios-plugins-contrib text.

* Remove links plugins we dont have URL for.

Add a few more pkg-nagios-plugins-contrib ones.

* Remove list. Point to the main sources directly.

* order by sensor_descr aswell (#9478)

Sort sensors by sensor_descr

* Fix os additional information for some that were broke (#9466)

* Fix os additional information for several OS.
$poll_device is not available, use $device

* fix draytek test data

* Fixed Procera ports ifIndex and ports added by the poller (#9384)

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.

* Change group owner for php/session for CentOS 7 nginx install (#9393)

By default on CentOS 7, /var/lib/php/session is root:root.

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.

* Refactored and update Location Geocoding (#9359)

- Fix location so it is a regular database relation (this allows multiple devices to be accurately linked to one location and saves api calls)
- Parse coordinates from the location more consistently
- Add settings to webui
- ~~Used [PHP Geocoder](http://geocoder-php.org/), which has lots of backends and is well tested. (also includes reverse and geoip)~~
- Google Maps, Bing, Mapquest, and OpenStreetMap supported initially.
- Default to OpenStreetMap, which doesn't require a key.  They will liberally hand out bans if you exceed 1 query per second though.
- All other Geocoding APIs require an API key. (Google requires a credit card on file, but seems to be the most accurate)
- Update all (I think) sql queries to handle the new structure
- Remove final vestiges of override_sysLocation as a device attribute
- Update existing device groups and rules in DB
- Tested all APIs with good/bad location, no/bad/good key, and no connection.
- Cannot fix advanced queries that use location

This blocks #8868

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.

* Added Aprisa support (#9435)

* Created 4RF Aprisa XE support

* Made requesed change by @laf

* cleanup

* Fix sensor index and add test data

* Added support for Waystream products (#9481)

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.

This has been running in two production networks for > 3 months without any issues.

* Marathon detection

* support for Marathon based UPSs

* added Marathon Power logo

* testing marathon ups

* Fix for #9485 (#9486)

* Fix for #9485

* Update ajax_search.php

* Testing Maraton ups device type

* Fix issues cause by new location and other misc (#9490)

* Fix issues cause by new location and other misc
fix some queries so we return devices with null locations
remove unnecessary query of all ports on ports page lists
make locations menu available to non-admins for the legacy menu
fix a few issues with the old network-map

* fix graphs

* fix oxidized query

* added rfc1628 compat and removed discovery file

* small changes to verbiage

* Changes to display

* Fixed test on over section

* Removed Current graph.  Not available from this device.

* Locations UI and editing (#9480)

* Better handling of errors
Mapquest seems to return the center of the US on error.......

* Editable locations WIP

* Change to bootgrid ajax table WIP

* Graphs working, using handlebars
update js libs
add current location button

* remove sql query, change icon

* Add the map to the device view, only when gps is expanded.
Allow edit on device page, share js code

* fix chevron rotation, improve click area

* extra warning

* fix overview layout (remove containers)

* fix style

* fix html divs, change collapse ui a bit
move css, update css/js versions

* start zoomed out on new locations

* don't double load scripts, zoom to 17

* fix php-md errors, remove unused use statement

* improve non-admin experience

* Move locations page to Laravel
More functions in Url and Html util classes
reduce code duplication

* translation buttons too

* fix whitespace

* move formatters to the frontend

* small changes

* disable traffic for locations with no devices

* change down 0 to green from gray

* missing "

* Fix paginate all

* working fix for paginate all

* allow sort by counts

* fix down sort

* a little safety

* Don't call the function twice

* btn-xs

* Added json test data

* Fix locations page search (#9501)

* Add bing layer to leaflet (#9497)

Also, polyfill for IE used by both bing and google maps

* Change locations default sort order (#9502)

* changed variable name to resolve issue with Gitlab transport

* removed else to satisfy codeclimate checks

* changed tabs to spaces

* added CISCO-NAC-TC-MIB

* added CISCO-NAC-TC-MIB

* Added changelog for 1.46 release (#9510)

* Add additional composite index to speed up display of pages where a device has a lot of syslogs. In our environment, this took page loads for some devices from over 60 seconds to nearly instant

* Forgot to add db_schema.yaml in previous commit

* Update cucs mib to fix warnings (#9517)

* Added HPE Comware temperature limit (#9518)

Changed the Temperature High threshold for a HPE Comware Switch to the values provided by snmp.
This means the actual threshold configured in the switch is used over any predefined/auto calculated thresholds by LibreNMS.


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.

* Added Comtrol device detection (#9491)

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 integers fields in alert rules to be string (#9496)

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.

* Focus and select location on override (#9503)

* Focus and select location on override

* Submit location on enter key

* SAF CFM wireless device support (#9450)

* Added support for SAF CFM L4 wireless device

* Added copyright statement according to LibreNMS documentation

* Added snmp test data and excluded some discover modules from os definition

* Style issue fixed

* More descriptive function

* MIB file rename

* Rename MIB file and change other files accordingly

* Added test data

* Removed debug statement

* Last checks

* Style changes

* Style changes

* Style changes

* Style changes

* Code restructure to make it more readable

* Fixed error in foreach

* Style issues

* Formatting of states within Yaml changed to make it more readable

* Omit default arguments

* Better code and modules only in CFM-M4P-MUX

* Chaged cfml4 to cfm

* Update Sensor.php

* Update Sensor.php

* Better handling of scientific numbers

* Better handling of scientific numbers

* New test data

* Correction on handling trailing zeros

* Different way of cleaning the numbers based on Tony's input

* Audiocodes initial support (#9508)

* Create audiocodes family with very basic sensors

* audiocode polling php and test files

* audiocode polling php and test files

* audiocode test files

* audiocode cleaning

* tests with selective polling disabled

* GitHub test script updates  (#9507)

* GitHub test script updates
add --reject to apply so it will skip binary files since GitHub does not create diffs for them correctly
Add new directories to the removal cleanup. Remove non-existant ones.

* Cleaner way to apply skip png files explicitly.
That way patches are still atomic.

* [UI] Fix last column of table (#9506)

* [UI] Fix last column of table

* move td outside of if and remove else

* Add Device Dragonwave Harmony Enhanced (#9499)

* Add Dragonwave Harmony Enhanced MC Device

* Remove single quote from null and 10 divisor

* Update and rename HarmonyEnhancedMc.php to HarmonyEnhanced.php

* Rename harmony-enhanced-mc.yaml to harmony-enhanced.yaml

* Update and rename harmony-enhanced-mc.yaml to harmony-enhanced.yaml

* Rename harmony-enhanced-mc.inc.php to harmony-enhanced.inc.php

* Rename harmony-enhanced-mc.snmprec to harmony-enhanced.snmprec

* Update HarmonyEnhanced.php

* Update HarmonyEnhanced.php

* Update HarmonyEnhanced.php

* Update HarmonyEnhanced.php

* More Code Climate Fixes

* Create harmony-enhanced.json

* Dynamic_discovery_get_value in can_skip_sensor to use all oids in skip_values (#9495)

* Use of dynamic_discovery_get_value in can_skip_sensor in order to use all available oids in skip_values

* Use LibreNMS\Device\YamlDiscovery code instead of keeping duplicated function can_skip_sensor

* Fix Travis errors

* Device management fall back to http if https isn't available.
Adds a slight delay on management clicking, may be blocked by popup blocker...

* Updated harmony OS poller to use multi get (#9525)

* docs: fix images doc (#9527)

There is no capital I in the password...

* fix error when location is missing from the DB (#9523)

* get geolocation at first poll (#9522)

* get geolocation at first poll

based on the logic of code, we will have to wait 2 days from adding new device for lat and lng to be updated

* Update Location.php

* Update Location.php

* Fixed Typo in YamlDiscovery.php (#9530)

Hi,

As far as I understand the code, it seems that array_reduce should be array_replace in this line, isn't it ?

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`
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 alert log showing only green instead of all by default (#9529)

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.

By default, when you access Alert History it was showing only OK (Green) ones instead of all. You had to hit filter to show them.

* Fixed customers page (#9521)

move customers table backend to Laravel

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.

* Added detection if this is a git based install or not. (#9379)

Not sure about the warning or text.

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.

* Change snmp-scan heading (#9492)

* Fixed plugins using d_echo (#9498)

Move d_echo to helpers.php and include in autoload
Don't remove from common.php yet to be extra safe.

* Use Eloquent for DB access
Move print-nac into nac.inc.php
Rename module to generic nac, If implemented for other OS later this can be extended but the name should be the same
Add items required for testing

* Use Eloquent for DB access
Move print-nac into nac.inc.php
Rename module to generic nac, If implemented for other OS later this can be extended but the name should be the same
Add items required for testing

* test github

* test github

* test git

* test git

* Added Network Access Control polling and store on DB

* Added Network Access Control polling and store on DB

* Added NAC tab on device page

* Added NAC tab on device page

* Added NAC tab page on device main page

* Added NAC tab page on device main page

* Fixed Auth ID data parsing

* Fixed Auth ID data parsing

* Filter Device ID on NAC Tab page

* Filter Device ID on NAC Tab page

* Converted IP Address form HEX to DEC format

* Converted IP Address form HEX to DEC format

* Formated grid on NAC print page

* Formated grid on NAC print page

* Added AuthC status

* Added AuthC status

* removed useless lines

* removed useless lines

* Fix some typos

* Fix some typos

* Fix Code Climate Issues

* Fix Code Climate Issues

* Fixed more Code Climate Issues

* Fixed more Code Climate Issues

* Fixed more Code Climate Issues

* Fixed more Code Climate Issues

* converted dbQuery() to dbUpdate()

* converted dbQuery() to dbUpdate()

* Fixed more Code Climate Issues

* Fixed more Code Climate Issues

* Removed Hex to Dec test codes

* Removed Hex to Dec test codes

* removed unused classes

* removed unused classes

* Change my own IP Hex to Dec conversion to IP::fromHexString Class

* Change my own IP Hex to Dec conversion to IP::fromHexString Class

* CLA Signature

* CLA Signature

* Merge all dbUpdate on only one call

* Merge all dbUpdate on only one call

* Replaced Table to Bootgrid

* Replaced Table to Bootgrid

* Converted Polling From Ports to New Module (cisco-nac)

* Converted Polling From Ports to New Module (cisco-nac)

* Fixing Travis CI and Code Climate Issues

* Fixing Travis CI and Code Climate Issues

* Fixing Travis CI and Code Climate More Issues

* Fixing Travis CI and Code Climate More Issues

* Replaced Other to Disabled on Metod Column

* Replaced Other to Disabled on Metod Column

* Removed Extra Character < on Authz Icon

* Removed Extra Character < on Authz Icon

* Improve the Logical Checking if Data Exist on DB

* Improve the Logical Checking if Data Exist on DB

* Replace dbFetchRows to dbFetchRow on Some Exist Checks

* Replace dbFetchRows to dbFetchRow on Some Exist Checks

* Fix Some Code Climate Issues

* Fix Some Code Climate Issues

* Fixed More Code Climate Issues

* Fixed More Code Climate Issues

* added CISCO-NAC-TC-MIB

* added CISCO-NAC-TC-MIB

* Use Eloquent for DB access
Move print-nac into nac.inc.php
Rename module to generic nac, If implemented for other OS later this can be extended but the name should be the same
Add items required for testing

* Use Eloquent for DB access
Move print-nac into nac.inc.php
Rename module to generic nac, If implemented for other OS later this can be extended but the name should be the same
Add items required for testing

* no way to set device attrib and no need...

* no way to set device attrib and no need...

* add db schema

* add db schema

* fix link in device page, links for ports

* fix link in device page, links for ports

* Use ajax for table

* Use ajax for table

* fix tests

* fix tests

* change the columns to find existing entries to port_id and PortAuthSessionDomain

* change the columns to find existing entries to port_id and PortAuthSessionDomain

* Update 274.sql

* Update 274.sql

* Reorder Columns on NAC Page to Better Presentation

* Reorder Columns on NAC Page to Better Presentation

* rename database columns and update schema

* rename database columns and update schema

* add iftype to test data, rename variable

* add iftype to test data, rename variable

* correct types...

* correct types...

* Update 274.sql

* Update 274.sql

* order capture output

* Add model observer for nicer discovery output

* Add copyright to poller module

* Handle multiAuth, multiDomain and normal modes seperatly for determining unique entries.

* Use mac_address as the unique identifier

* update index

* Improve the data variety a bit

* remove accidental schema
@lock lock bot locked as resolved and limited conversation to collaborators Feb 3, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants