2 Commits

Author SHA1 Message Date
70a05369fb Merge branch 'master' into issue-3550
Conflicts:
	html/includes/graphs/device/sla.inc.php
	includes/polling/cisco-sla.inc.php

- Use standardised RRD functions
2016-08-12 08:22:40 +10:00
ae7bb069ff - Change the IPSLA feature to allow different metrics to be collected per type.
- UDP Jitter metrics collected.
- Added opstatus code and DB field
- Discovery sets opstatus
- Added Status selector to SLA page
- Merged master and moved SQL
2016-08-09 06:59:17 +10:00