Change the IPSLA feature to allow different metrics to be collected… #4006

Merged
merged 3 commits into from Aug 16, 2016

Projects

None yet

4 participants

@adaniels21487
Contributor

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
@adaniels21487 adaniels21487 - 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
ae7bb06
@murrant murrant commented on an outdated diff Aug 9, 2016
html/includes/graphs/device/sla.inc.php
$rrd_options .= ' -l 0 -E ';
-$rrd_options .= " COMMENT:'".str_pad($unit_long, $descr_len)." Cur Min Max\\n'";
-
-$name = '';
-if ($sla['tag']) {
- $name .= $sla['tag'];
+$rrd_filename = $config['rrd_dir']."/".$device['hostname']."/".safename('sla-'.$sla['sla_nr'].'.rrd');
@murrant
murrant Aug 9, 2016 edited Contributor

This should be (also other places too)

rrd_name($device['hostname'], array('sla', $sla['sla_nr']));
@laf
Member
laf commented Aug 10, 2016

Needs the code updating to new format.

@adaniels21487
Contributor

Thanks @murrant @laf
I'm on it.

@adaniels21487 adaniels21487 Merge branch 'master' into issue-3550
Conflicts:
	html/includes/graphs/device/sla.inc.php
	includes/polling/cisco-sla.inc.php

- Use standardised RRD functions
70a0536
@murrant murrant commented on an outdated diff Aug 12, 2016
html/pages/device/slas.inc.php
@@ -79,4 +129,4 @@
echo '</div>';
}
-$pagetitle[] = 'SLAs';
+$pagetitle[] = 'SLAs';
@murrant
murrant Aug 12, 2016 Contributor

Oopsie, files should have a blank line at the end.

@murrant
Contributor
murrant commented Aug 12, 2016

Looks, good. I only read through, didn't get a chance to test.

@adaniels21487 adaniels21487 - files should have a blank line at the end.
0fbea91
@adaniels21487
Contributor

Thanks @murrant Fixed.

@murrant murrant merged commit 232fdc2 into librenms:master Aug 16, 2016

2 checks passed

Auto-Deploy Build finished.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@adaniels21487 adaniels21487 deleted the adaniels21487:issue-3550 branch Aug 17, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment