Merge pull request #2676 from paulgear/smokeping-add-pings-config

Smokeping: add pings config

doc/Extensions/Smokeping.md

@@ -30,6 +30,7 @@ Now configure LibreNMS (make sure you point dir to your smokeping data directory
 
 ```php
 $config['smokeping']['dir'] = '/opt/smokeping/data';
+$config['smokeping']['pings'] = 20;		// should be equal to "pings" in your smokeping config
 $config['smokeping']['integration'] = true;
 ```
 
@@ -39,6 +40,7 @@ This is quite simple, just point your dir at the smokeping data directory - plea
 
 ```php
 $config['smokeping']['dir'] = '/opt/smokeping/data';
+$config['smokeping']['pings'] = 20;		// should be equal to "pings" in your smokeping config
 $config['own_hostname']
 ```
 
@@ -148,6 +150,7 @@ Scroll to the bottom, and paste in the following:
 
 ```bash
 $config['smokeping']['dir'] = '/var/lib/smokeping';
+$config['smokeping']['pings'] = 20;		// should be equal to "pings" in your smokeping config
 $config['smokeping']['integration'] = true;
 ```
 

doc/Support/Configuration.md

@@ -359,6 +359,13 @@ $config['smokeping']['dir']             = "/var/lib/smokeping/";
 ```
 Set the smokeping directory location.
 
+```php
+$config['smokeping']['pings']           = 20;
+```
+Should be equal to "pings" in your smokeping config.  On Debian/Ubuntu, this is set in `/etc/smokeping/config.d/Database`.
+
+You can also set it to less than the value of "pings" in your smokeping config if you don't want LibreNMS to graph all of the ping data.
+
 ```php
 $config['nfsen_enable'] = 0;
 $config['nfsen_split_char']   = "_";

html/includes/graphs/device/smokeping_all_common.inc.php

@@ -1,6 +1,5 @@
 <?php
 
-// Dear Tobias. You write in Perl, this makes me hate you forever.
 // This is my translation of Smokeping's graphing.
 // Thanks to Bill Fenner for Perl->Human translation:>
 $scale_min   = 0;
@@ -10,7 +9,7 @@ require 'includes/graphs/common.inc.php';
 require 'smokeping_common.inc.php';
 
 $i         = 0;
-$pings     = 20;
+$pings     = $config['smokeping']['pings'];
 $iter      = 0;
 $colourset = 'mixed';
 

html/includes/graphs/device/smokeping_all_common_avg.inc.php

@@ -1,6 +1,5 @@
 <?php
 
-// Dear Tobias. You write in Perl, this makes me hate you forever.
 // This is my translation of Smokeping's graphing.
 // Thanks to Bill Fenner for Perl->Human translation:>
 $scale_min   = 0;
@@ -10,7 +9,7 @@ require 'includes/graphs/common.inc.php';
 require 'smokeping_common.inc.php';
 
 $i         = 0;
-$pings     = 20;
+$pings     = $config['smokeping']['pings'];
 $iter      = 0;
 $colourset = 'mixed';
 

html/includes/graphs/smokeping/in.inc.php

@@ -2,7 +2,6 @@
 
 $src = device_by_id_cache($_GET['src']);
 
-// Dear Tobias. You write in Perl, this makes me hate you forever.
 // This is my translation of Smokeping's graphing.
 // Thanks to Bill Fenner for Perl->Human translation:>
 $scale_min   = 0;
@@ -12,7 +11,7 @@ require 'includes/graphs/common.inc.php';
 require 'smokeping_common.inc.php';
 
 $i         = 0;
-$pings     = 20;
+$pings     = $config['smokeping']['pings'];
 $iter      = 0;
 $colourset = 'mixed';
 

html/includes/graphs/smokeping/out.inc.php

@@ -2,7 +2,6 @@
 
 $dest = device_by_id_cache($_GET['dest']);
 
-// Dear Tobias. You write in Perl, this makes me hate you forever.
 // This is my translation of Smokeping's graphing.
 // Thanks to Bill Fenner for Perl->Human translation:>
 $scale_min   = 0;
@@ -12,7 +11,7 @@ require 'includes/graphs/common.inc.php';
 require 'smokeping_common.inc.php';
 
 $i         = 0;
-$pings     = 20;
+$pings     = $config['smokeping']['pings'];
 $iter      = 0;
 $colourset = 'mixed';
 

includes/defaults.inc.php

@@ -458,6 +458,7 @@ $config['rancid_ignorecomments'] = 0;
 // Ignore lines starting with #
 // $config['collectd_dir']                 = '/var/lib/collectd/rrd';
 // $config['smokeping']['dir']             = "/var/lib/smokeping/";
+$config['smokeping']['pings']             = 20;
 // $config['oxidized']['enabled']         = FALSE;//Set to TRUE
 // $config['oxidized']['url']             = 'http://127.0.0.1:8888';// Set the Oxidized rest URL
 // NFSen RRD dir.