Merge remote-tracking branch 'refs/remotes/librenms/master' into ajax_headers_2

doc/General/Changelog.md

@@ -86,6 +86,7 @@
     - Updated visjs to 4.14.0 (PR3031)
     - Updated apps layout to use panels (PR3117)
   - Discovery / Polling:
+    - Added VRF Lite support (PR2820)
     - Added ability to ignore device sensors from entity mib (PR2862)
     - Added `ifOperStatus_prev` and `ifAdminStatus_prev` values to db (PR2912)
     - Improved bgpPolling efficiency (PR2967)

doc/Support/Discovery Support.md

@@ -42,6 +42,7 @@ $config['discovery_modules']['ports-stack']               = 1;
 $config['discovery_modules']['entity-physical']           = 1;
 $config['discovery_modules']['processors']                = 1;
 $config['discovery_modules']['mempools']                  = 1;
+$config['discovery_modules']['cisco-vrf-lite']            = 1;
 $config['discovery_modules']['ipv4-addresses']            = 1;
 $config['discovery_modules']['ipv6-addresses']            = 1;
 $config['discovery_modules']['route']                     = 0;
@@ -57,7 +58,7 @@ $config['discovery_modules']['vlans']                     = 1;
 $config['discovery_modules']['cisco-mac-accounting']      = 1;
 $config['discovery_modules']['cisco-pw']                  = 1;
 $config['discovery_modules']['cisco-vrf']                 = 1;
-#$config['discovery_modules']['cisco-cef']                 = 1;
+#$config['discovery_modules']['cisco-cef']                = 1;
 $config['discovery_modules']['cisco-sla']                 = 1;
 $config['discovery_modules']['vmware-vminfo']             = 1;
 $config['discovery_modules']['libvirt-vminfo']            = 1;
@@ -81,6 +82,8 @@ $config['discovery_modules']['charge']                    = 1;
 
 `mempools`: Memory detection support for devices.
 
+`cisco-vrf-lite`: VRF-Lite detection and support.
+
 `ipv4-addresses`: IPv4 Address detection
 
 `ipv6-addresses`: IPv6 Address detection

html/pages/graphs.inc.php

@@ -108,7 +108,7 @@ else {
     echo('</tr></table>');
 
     $graph_array = $vars;
-    $graph_array['height'] = "300";
+    $graph_array['height'] = $config['webui']['min_graph_height'];
     $graph_array['width']  = $graph_width;
 
     if($_SESSION['screen_width']) {
@@ -125,7 +125,7 @@ else {
             $graph_array['height'] = ($_SESSION['screen_height'] - ($_SESSION['screen_height']/2));
         }
         else {
-            $graph_array['height'] = ($_SESSION['screen_height'] - ($_SESSION['screen_height']/1.5));
+            $graph_array['height'] = max($graph_array['height'],($_SESSION['screen_height'] - ($_SESSION['screen_height']/1.5)));
         }
     }
 

html/pages/settings/webui.inc.php

@@ -11,11 +11,19 @@ $search_conf = array(
     ),
 );
 
+$graph_conf = array(
+    array('name'               => 'webui.min_graph_height',
+          'descr'              => 'Set the minimum graph height',
+          'type'               => 'text',
+    ),
+);
+
 echo '
 <div class="panel-group" id="accordion">
     <form class="form-horizontal" role="form" action="" method="post">
 ';
 
+echo generate_dynamic_config_panel('Graph settings',true,$config_groups,$graph_conf);
 echo generate_dynamic_config_panel('Search settings',true,$config_groups,$search_conf);
 
 echo '

poller.php

@@ -134,6 +134,7 @@ if (!isset($query)) {
 
 foreach (dbFetch($query) as $device) {
     $device = dbFetchRow("SELECT * FROM `devices` WHERE `device_id` = '".$device['device_id']."'");
+    $device['vrf_lite_cisco'] = dbFetchRows("SELECT * FROM `vrf_lite_cisco` WHERE `device_id` = '".$device['device_id']."'");
     poll_device($device, $options);
     RunRules($device['device_id']);
     echo "\r\n";

sql-schema/114.sql

@@ -0,0 +1 @@
+INSERT INTO `config` (`config_name`,`config_value`,`config_default`,`config_descr`,`config_group`,`config_group_order`,`config_sub_group`,`config_sub_group_order`,`config_hidden`,`config_disabled`) VALUES ('webui.min_graph_height','300','300','Minimum Graph Height','webui',0,'graph',0,'1','0');

validate.php

@@ -136,11 +136,8 @@ if(strstr($strict_mode, 'STRICT_TRANS_TABLES')) {
     print_warn('You have MySQL STRICT_TRANS_TABLES enabled, it is advisable to disable this until full support has been added: https://dev.mysql.com/doc/refman/5.0/en/sql-mode.html');
 }
 
-// Test for MySQL InnoDB buffer size
-$innodb_buffer = innodb_buffer_check();
-if ($innodb_buffer['used'] > $innodb_buffer['size']) {
-    print_warn("Your Innodb buffer is full, consider increasing its size");
-    echo warn_innodb_buffer($innodb_buffer);
+if (empty(ini_get('date.timezone'))) {
+    print_fail('You have no timezone set for php: http://php.net/manual/en/datetime.configuration.php#ini.date.timezone');
 }
 
 // Test transports