* Add hostName cleaning to Clean
* Apply RFC 5952 formatting to Clean::hostName output
* Use more liberal cleaning for hostnames
* Remove unwanted whitespace
* Apply Clean::hostName() to all relevant fields
* Fix docstring
* Use IP::isValid inline
* Update Clean.php
* Update services.inc.php
Co-authored-by: Tony Murray <murraytony@gmail.com>
* Run Alert Rules on Service status change.
Added Alert Rules to the poll_service function to trigger alerts outside of polling interval.
* Update services.inc.php
Co-authored-by: Tony Murray <murraytony@gmail.com>
* service templates - move to blade - jellyfrog fixes - revert get to find and fix discovery lookup
* service templates - move to blade - wip
* service templates - move to blade - wip
* service templates - move to blade - deprecate delete_service_template
* service templates - move to blade - deprecate delete_service_template
* service templates - move to blade - deprecate remove_service_template
* service templates - move to blade - deprecate remove_service_template
* service templates - move to blade - fix permisson lookup
* service templates - move to blade - fix remove route
* service templates - move to blade - fix remove route
* service templates - move to blade - fix permisson lookup
* service templates - move to blade - fix permisson lookup
* service templates - move to blade - fix permisson lookup
* service templates - move to blade - fix permisson lookup
* service templates - move to blade - fixs
* service templates - move to blade - fixes
* service templates - move to blade - fixes
* service templates - move to blade - fixes
* service templates - move to blade - nullable input?
* service templates - move to blade - nullable input?
* service templates - move to blade - nullable input?
* service templates - move to blade - add selected for device group id and type
* service templates - move to blade - add selected for device group id and type
* service templates - move to blade - add selected for device group id and type
* service templates - move to blade - fix discovery response
* service templates - move to blade - fix device group index display
* service templates - move to blade - add delete to discover_service_template
* service templates - move to blade - add discover all button - function foobar
* service templates - move to blade - add discover all button - function foobar
* service templates - move to blade - add discover all button - function foobar
* service templates - move to blade - fixes
* service templates - move to blade - fixes
* service templates - move to blade - fixes
* service templates - move to blade - button fixes
* service templates - move to blade - button fixes
* service templates - move to blade - button fixes
* service templates - move to blade - attempt route fix
* service templates - move to blade - attempt route fix
* service templates - move to blade - attempt route fix
* service templates - move to blade - attempt route fix
* service templates - move to blade - fix discovery function
* service templates - move to blade - fix discovery function
* service templates - move to blade - fix return values - thanks SourceDoctor
* service templates - move to blade - attempt route fix
* service templates - move to blade - button variable fix
* service templates - move to blade - button variable fix
* service templates - move to blade - button variable fix
* service templates - move to blade - function fix
* service templates - move to blade - permissions fix
* service templates - move to blade - permissions fix
* service templates - move to blade - permissions fix
* service templates - move to blade - permissions fix
* service templates - move to blade - permissions fix
* service templates - move to blade - permissions fix
* service templates - move to blade - permissions fix
* service templates - move to blade - permissions fix
* service templates - move to blade - permissions fix
* service templates - add initial api - and model permissions fix
* service templates - add initial api - discovery too
* service templates - add initial api - discovery too
* service templates - merge fix
* service templates - api fixes
* service templates - api fixes
* service templates - remove bad fixe
* service templates - discover null? :)
* service templates - Policy requires Facade?
* service templates - Policy requires Facade?
* service templates - REVERT Policy requires Facade?
* service templates - REVERT Policy requires Facade?
* Revert "service templates - REVERT Policy requires Facade?"
This reverts commit 7752b3e4e5.
* service templates - clean up discover api call
* service templates - clean up discover api call
* service templates - clean up discover api call
* service templates - clean up discover api call
* service templates - clean up discover api call
* service templates - attempt route fix
* Revert "service templates - attempt route fix"
This reverts commit b48970351e.
* service templates - jellyfrog fixes - DeviceGroup relates to Service Template
* service templates - jellyfrog fixes - DeviceGroup relates to Service Template
* service templates - jellyfrog fixes - DeviceGroup relates to Service Template
* service templates - jellyfrog fixes - DeviceGroup relates to Service Template
* service templates - jellyfrog fixes - DeviceGroup relates to Service Template
* service templates - jellyfrog fixes - DeviceGroup relates to Service Template
* service templates - jellyfrog fixes - dbchanged - DeviceGroup relates to Service Template
* service templates - jellyfrog fixes - dbchanged - DeviceGroup relates to Service Template
* service templates - jellyfrog fixes - dbchanged - DeviceGroup relates to Service Template
* service templates - jellyfrog fixes - dbchanged - DeviceGroup relates to Service Template
* Revert "service templates - jellyfrog fixes - dbchanged - DeviceGroup relates to Service Template"
This reverts commit ef93315db5.
* Revert "service templates - jellyfrog fixes - dbchanged - DeviceGroup relates to Service Template"
This reverts commit 73af819a60.
* Revert "service templates - jellyfrog fixes - dbchanged - DeviceGroup relates to Service Template"
This reverts commit dd019c3105.
* Revert "service templates - jellyfrog fixes - dbchanged - DeviceGroup relates to Service Template"
This reverts commit 94aaaf7976.
* service templates - jellyfrog fixes - DeviceGroup relates to Service Template
* service templates - fix permissions
* service templates - db service_templates_perms
* service templates - fix permissions
* service templates - fix permissions
* service templates - fix permissions
* service templates - fix permissions
* service templates - fix permissions
* service templates - fix edit.blade missing parameters - still 403 :(
* service templates - jellyfrog -fix route and construct
* service templates - jellyfrog -fix route and construct
* service templates - jellyfrog -fix route and construct
* Revert "service templates - jellyfrog -fix route and construct"
This reverts commit ec1eea7a99.
* service templates - jellyfrog -fix routes
* service templates - jellyfrog -fix services lookup
* service templates - edit blade fixes
* service templates - edit blade fixes - service or services or template or serviceTemplate or service_template good luck
* service templates - edit blade fixes
* service templates - index blade fixes
* service templates - discover return fix
* service templates - remove return fix
* service templates - fix discovery api returns
* service templates - fix discovery api returns
* service templates - fix discovery api returns
* service templates - fix discovery - test
* service templates - fix discovery
* service templates - fix checkbox integer
* service templates - fix checkbox integer
* service templates - fix checkbox integer
* service templates - fix checkbox integer
* service templates - fix checkbox integer
* service templates - fix discover all
* service templates - fix discover all
* service templates - fix discover all
* service templates - fix discover all
* service templates - fix discover all
* service templates - fix discover all
* service templates - fix discover all
* service templates - fix discover
* service templates - fix discover
* service templates - fix discover
* service templates - fix discover
* service templates - fix discover
* service templates - move discover/apply to blade - last of the old functions - wip
* service templates - move discover/apply to blade - last of the old functions - wip
* service templates - move discover/apply to blade - last of the old functions - wip
* service templates - change all relevant to template for sanity
* service templates - inspection fixes
* service templates - inspection fixes
* service templates - inspection fixes
* service templates - murrant fixes - use createOrUpdate - add obervers - fix function call
* service templates - murrant fixes - add ServiceController store - not used
* service templates - murrant fixes - add Observers file)
* service templates - murrant fixes - correct ServiceController
* service templates - murrant fixes - fix observers load
* service templates - observer fix
* service templates - schedule discovery function call fix, cheeky, is this allowed?
* service templates - attempt route fix.
* service templates - attempt route fix 2
* service templates - blade route applyall missing url - ie the route lol
* service templates - blade route applyall missing url - ie the route lol
* service templates - fix routes - bingo!
* service templates - fix routes - bingo!
* service templates - fix blade missing quote
* service templates - jellyfrog fix - remove pluck
* service templates - missing template id on service update
* service templates - jellyfrog fix - add get
* service templates - fix service db defaults / null
* service templates - fix service update
* service templates - fix service update
* service templates - fix service update
* service templates - fix service devicegroup change - obsoletes service_template_change in servicesdb
* service templates - fix service devicegroup change - obsoletes service_template_change in servicesdb
* Add service templates - phpcs fixes - and attemp whereNotIn scope
* Add service templates - styleci
* Add service templates - styleci
* Add service templates - fix notindevicegroup scope
* Add service templates - removed service service_template_changed - not required for delete or update
* Add service templates - removed service service_template_changed - not required for delete or update
* Add service templates - murrant fixes - add protected casts - fix checkbox
* Add service templates - fix checkbox - attempt2
* Add service templates - fix checkbox - attempt3
* Add service templates - fix checkbox - attempt3
* Add service templates - fix checkbox - attempt4
* Add service templates - fix delete row selection
* Revert "Add service templates - fix delete row selection"
This reverts commit 4d9e4990f2.
* Add service templates - fix delete row selection
* Add service templates - fix automatic discovery
* Add service templates - fix automatic discovery
* Add service templates - checkbox - add hidden input
* Add service templates - checkbox - add old value back?
* Add service templates - checkbox - fix disabled
* Add service templates - checkbox - fix disabled
* Add service templates - service fixes - styleci
* Add service templates - make devicegroup required
* Add service templates - let Disable text wrap
* Add service templates - dont allow device group to be deleted when service templates exist
* Add service templates - dont allow device group to be deleted when service templates exist
* Add service templates - enable multiple device groups - wip
* Add service templates - enable multiple device groups - wip
* Add service templates - enable multiple device groups - wip
* Add service templates - enable multiple device groups - dbschema - wip
* Add service templates - enable multiple device groups - db migration - wip
* Add service templates - enable multiple device groups - db migration - wip
* Add service templates - enable multiple device groups - wip
* Add service templates - enable multiple device groups - wip
* Add service templates - enable service template Groups - relationships to device AND device groups
* Add service templates - styleci fixes
* Add service templates - styleci fixes
* Add service templates - fixes
* Add service templates - fixes
* Add service templates - fixes
* Add service templates - fixes
* Add service templates - fixes
* Add service templates - fixes
* Add service templates - fixes
* Add service templates - fixes
* Add service templates - db - primarykey issues
* Add service templates - fix migrations
* Add service templates - fix migrations
* Add service templates - fix migrations
* Add service templates - fix migrations
* Add service templates - fix migrations
* Add service templates - fix migrations
* Add service templates - fix migrations
* Add service templates - fix migrations
* Add service templates - fix migrations
* Add service templates - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - blade view - fixes
* Add service templates - misc update for travis build trigger
* Add service templates - restrict view to only show device/groups that have templates applied
* Add service templates - fix devicegroup update
* remove permissions table stuff
* Fix schema rollback
* fix style
* Update ServiceTemplateController.php
Co-authored-by: Tony Murray <murraytony@gmail.com>
When attempting to add a new services this was showing up in the logs:
[2019-07-07 09:44:53] production.ERROR: SQLSTATE[42S22]: Column not found: 1054 Unknown column 'servcie_disabled' in 'field list' (SQL: INSERT IGNORE INTO `services` (`device_id`,`service_ip`,`service_type`,`service_changed`,`service_desc`,`service_param`,`service_ignore`,`service_status`,`service_message`,`service_ds`,`servcie_disabled`)
No error was presented in the gui, it said the service was added but in fact it was not and when you went back to the list of all services the one you tried to add was not present.
* Added disable and ignore checkboxes to services modal
* Updated add_services function to set disabled field
* Modified check-services.php respect service_disable value
* Minor code change for consistency in new_service.inc.php
* Removed unneeded includes
Hello
Here is a proposal for a pièce of code to log (using log_events) each service status change onto the device itself.
Let me know if we should create the "getStatusText()" function to convert the int to "OK", "Critical" etc etc . I searched for such a function but did not find it.
I also add to use a hack for the SQL cause it would prevent the device_id valueto be available in the resulting $service when device_attribs is empty for the device. If you have a better way to suggest, I'll be happy to use 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`
* fix: issue #4934
Required for service checks, which include multiple quotes or regex.
Proposed patch tested, works.
* fix: issue #4934
Required for service checks, which include multiple quotes or regex.
Proposed patch tested, works.
* feature: Allow customisation of rrd step/heartbeat when creating new rrd files
* revert defaults
* added docs + webui config option
* Move RrdDefinition to an Object to make them easier to create and remove the possibility of typos.
* Fix style/lint issues and missing use statements
* 3 more missing use statements
* updated doc + moved schema file
* New event log severity model
* Revert "New event log severity model"
This reverts commit 0783527af8.
* New event log severity model
* Fixed spaces vs tabs
* Learning the format requirements
* Learning the format requirements
* Moved the colours in to the stylesheet
* change SQL file to stop conflicting
* refactor log_event so severity isn't last, but reference is.
* keep having to move the file due to new PR conflicts
* Revert "keep having to move the file due to new PR conflicts"
This reverts commit f3030e7218.
* extended support to dashboard and eventlog page
* formatting
* webui: make d_echo work in webui
Remove d_print_r(), it is redundant to d_echo()
Remove d_echo calls in services.inc.php
* Switched debug check to work with nginx
Use data_update instead of rrd_update/rrd_create and influx_update
Centralize rrd file check so we can check against a remote rrdcached server too
Use rrd_name() to generate rrd file names
- Moved check-services.php to a poller module
- Added performance data collection to the poller
- Centralised DB functions to includes/services.inc.php
- Created add/edit/delete functions off the device, services page
- Removed legacy edit/delete interfaces.
- Moved and modified check.inc scripts
- Documentation Updates
- Modified services table
