Added support for Oxidized

html/pages/device.inc.php

@@ -342,6 +342,9 @@ if (device_permitted($vars['device']) || $check_device == $vars['device'])
         if ($configs[strlen($configs)-1] != '/') { $configs .= '/'; }
         if (is_file($configs . $device['hostname'])) { $device_config_file = $configs . $device['hostname']; }
       }
+      if ($config['oxidized']['enabled'] === TRUE && isset($config['oxidized']['url'])) {
+          $device_config_file = TRUE;
+      }
     }
 
     if ($device_config_file)

html/pages/device/showconfig.inc.php

@@ -9,82 +9,121 @@ if ($_SESSION['userlevel'] >= "7")
 
   if (!is_array($config['rancid_configs'])) { $config['rancid_configs'] = array($config['rancid_configs']); }
 
-  foreach ($config['rancid_configs'] as $configs)
+  if (isset($config['rancid_configs'][0])) {
-  {
+
-    if ($configs[strlen($configs)-1] != '/') { $configs .= '/'; }
+      foreach ($config['rancid_configs'] as $configs) {
-    if (is_file($configs . $device['hostname'])) { $file = $configs . $device['hostname']; }
+          if ($configs[strlen($configs) - 1] != '/') {
+              $configs .= '/';
+          }
+          if (is_file($configs . $device['hostname'])) {
+              $file = $configs . $device['hostname'];
+          }
+      }
+
+      echo('<div style="clear: both;">');
+
+      print_optionbar_start('', '');
+
+      echo("<span style='font-weight: bold;'>Config</span> &#187; ");
+
+      if (!$vars['rev']) {
+          echo('<span class="pagemenu-selected">');
+          echo(generate_link('Latest', array('page' => 'device', 'device' => $device['device_id'], 'tab' => 'showconfig')));
+          echo("</span>");
+      } else {
+          echo(generate_link('Latest', array('page' => 'device', 'device' => $device['device_id'], 'tab' => 'showconfig')));
+      }
+
+      if (function_exists('svn_log')) {
+
+          $sep = " | ";
+          $svnlogs = svn_log($file, SVN_REVISION_HEAD, NULL, 8);
+          $revlist = array();
+
+          foreach ($svnlogs as $svnlog) {
+
+              echo($sep);
+              $revlist[] = $svnlog["rev"];
+
+              if ($vars['rev'] == $svnlog["rev"]) {
+                  echo('<span class="pagemenu-selected">');
+              }
+              $linktext = "r" . $svnlog["rev"] . " <small>" . date("d M H:i", strtotime($svnlog["date"])) . "</small>";
+              echo(generate_link($linktext, array('page' => 'device', 'device' => $device['device_id'], 'tab' => 'showconfig', 'rev' => $svnlog["rev"])));
+
+              if ($vars['rev'] == $svnlog["rev"]) {
+                  echo("</span>");
+              }
+
+              $sep = " | ";
+          }
+      }
+
+      print_optionbar_end();
+
+      if (function_exists('svn_log') && in_array($vars['rev'], $revlist)) {
+          list($diff, $errors) = svn_diff($file, $vars['rev'] - 1, $file, $vars['rev']);
+          if (!$diff) {
+              $text = "No Difference";
+          } else {
+              $text = "";
+              while (!feof($diff)) {
+                  $text .= fread($diff, 8192);
+              }
+              fclose($diff);
+              fclose($errors);
+          }
+
+      } else {
+          $fh = fopen($file, 'r') or die("Can't open file");
+          $text = fread($fh, filesize($file));
+          fclose($fh);
+      }
+
+      if ($config['rancid_ignorecomments']) {
+          $lines = explode("\n", $text);
+          for ($i = 0; $i < count($lines); $i++) {
+              if ($lines[$i][0] == "#") {
+                  unset($lines[$i]);
+              }
+          }
+          $text = join("\n", $lines);
+      }
+  } elseif ($config['oxidized']['enabled'] === TRUE && isset($config['oxidized']['url'])) {
+      $node_info = json_decode(file_get_contents($config['oxidized']['url']."/node/show/".$device['hostname']."?format=json"),TRUE);
+      $text = file_get_contents($config['oxidized']['url']."/node/fetch/".$device['hostname']);
+
+      if (is_array($node_info)) {
+          echo('<br />
+            <div class="row">
+                <div class="col-sm-4">
+                    <div class="panel panel-primary">
+                        <div class="panel-heading">Sync status: <strong>'.$node_info['last']['status'].'</strong></div>
+                        <ul class="list-group">
+                            <li class="list-group-item"><strong>Node:</strong> '. $node_info['name'].'</strong></li>
+                            <li class="list-group-item"><strong>IP:</strong> '. $node_info['ip'].'</strong></li>
+                            <li class="list-group-item"><strong>Model:</strong> '. $node_info['model'].'</strong></li>
+                            <li class="list-group-item"><strong>Last Sync:</strong> '. $node_info['last']['end'].'</strong></li>
+                        </ul>
+                    </div>
+                </div>
+            </div>');
+      } else {
+          echo "<br />";
+          print_error("We couldn't retrieve the device information from Oxidized");
+          $text = '';
+      }
+
   }
 
-  echo('<div style="clear: both;">');
+  if (!empty($text)) {
-
+      $language = "ios";
-  print_optionbar_start('', '');
+      $geshi = new GeSHi($text, $language);
-
+      $geshi->enable_line_numbers(GESHI_FANCY_LINE_NUMBERS);
-  echo("<span style='font-weight: bold;'>Config</span> &#187; ");
+      $geshi->set_overall_style('color: black;');
-
+      #$geshi->set_line_style('color: #999999');
-  if (!$vars['rev']) {
+      echo($geshi->parse_code());
-    echo('<span class="pagemenu-selected">');
-    echo(generate_link('Latest',array('page'=>'device','device'=>$device['device_id'],'tab'=>'showconfig')));
-    echo("</span>");
-  } else {
-    echo(generate_link('Latest',array('page'=>'device','device'=>$device['device_id'],'tab'=>'showconfig')));
   }
-
-  if (function_exists('svn_log')) {
-
-    $sep     = " | ";
-    $svnlogs = svn_log($file, SVN_REVISION_HEAD, NULL, 8);
-    $revlist = array();
-
-    foreach ($svnlogs as $svnlog) {
-
-      echo($sep);
-      $revlist[] = $svnlog["rev"];
-
-      if ($vars['rev'] == $svnlog["rev"]) { echo('<span class="pagemenu-selected">'); }
-      $linktext = "r" . $svnlog["rev"] ." <small>". date("d M H:i", strtotime($svnlog["date"])) . "</small>";
-      echo(generate_link($linktext,array('page'=>'device','device'=>$device['device_id'],'tab'=>'showconfig','rev'=>$svnlog["rev"])));
-
-      if ($vars['rev'] == $svnlog["rev"]) { echo("</span>");  }
-
-      $sep = " | ";
-    }
-  }
-
-  print_optionbar_end();
-
-  if (function_exists('svn_log') && in_array($vars['rev'], $revlist)) {
-    list($diff, $errors) = svn_diff($file, $vars['rev']-1, $file, $vars['rev']);
-    if (!$diff) {
-      $text = "No Difference";
-    } else {
-      $text = "";
-      while (!feof($diff)) { $text .= fread($diff, 8192); }
-      fclose($diff);
-      fclose($errors);
-    }
-
-  } else {
-    $fh = fopen($file, 'r') or die("Can't open file");
-    $text = fread($fh, filesize($file));
-    fclose($fh);
-  }
-
-  if ($config['rancid_ignorecomments'])
-  {
-    $lines = explode("\n",$text);
-    for ($i = 0;$i < count($lines);$i++)
-    {
-      if ($lines[$i][0] == "#") { unset($lines[$i]); }
-    }
-    $text = join("\n",$lines);
-  }
-
-  $language = "ios";
-  $geshi = new GeSHi($text, $language);
-  $geshi->enable_line_numbers(GESHI_FANCY_LINE_NUMBERS);
-  $geshi->set_overall_style('color: black;');
-  #$geshi->set_line_style('color: #999999');
-  echo($geshi->parse_code());
 }
 
 $pagetitle[] = "Config";

includes/defaults.inc.php

@@ -343,6 +343,8 @@ $config['billing']['base']              = 1000; # Set the base to divider bytes
 $config['rancid_ignorecomments']        = 0; # Ignore lines starting with #
 #$config['collectd_dir']                 = '/var/lib/collectd/rrd';
 #$config['smokeping']['dir']             = "/var/lib/smokeping/";
+//$config['oxidized']['enabled']         = FALSE;//Set to TRUE
+//$config['oxidized']['url']             = 'http://127.0.0.1:8888';// Set the Oxidized rest URL
 
 # NFSen RRD dir.
 $config['nfsen_enable'] = 0;