From 776f655055eac7b0d209253c3b16215986de8527 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Sat, 10 Jul 2010 11:47:27 +0000
Subject: [PATCH] add port parser to default config, rename some stuff

git-svn-id: http://www.observium.org/svn/observer/trunk@1328 61d68cd4-352d-0410-923a-c4978735b2b8
---
 check-errors.php          | 2 +-
 contrib/syslog2mysql.sh   | 8 ++++----
 discovery.php             | 4 ++--
 includes/defaults.inc.php | 2 ++
 includes/functions.php    | 2 +-
 poller.php                | 6 ++++--
 test-discovery.php        | 4 ++--
 test-poll.php             | 4 ++--
 8 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/check-errors.php b/check-errors.php
index 00c1bc2e02..2fcceb187c 100755
--- a/check-errors.php
+++ b/check-errors.php
@@ -30,7 +30,7 @@ if($errored) { ## If there are errored ports
     $i++;
   } 
   ## Send the alert email
-  mail($config['email_default'], "Observer detected errors on $i interface" . ($i != 1 ? 's' : ''), $msg, $config['email_headers']);
+  mail($config['email_default'], "ObserverNMS detected errors on $i interface" . ($i != 1 ? 's' : ''), $msg, $config['email_headers']);
   echo($msg);
 }
 
diff --git a/contrib/syslog2mysql.sh b/contrib/syslog2mysql.sh
index cc524c6021..b6d50c9f59 100755
--- a/contrib/syslog2mysql.sh
+++ b/contrib/syslog2mysql.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 
-if [ ! -e /var/log/observer-mysql.pipe ]
+if [ ! -e /var/log/observernms-mysql.pipe ]
 then
-mkfifo /var/log/observer-mysql.pipe
+mkfifo /var/log/observernms-mysql.pipe
 fi
-while [ -e /var/log/observer-mysql.pipe ]
+while [ -e /var/log/observernms-mysql.pipe ]
 do
-mysql -u observer --password=password observer < /var/log/observer-mysql.pipe >/dev/null
+mysql -u observernms --password=password observernms < /var/log/observernms-mysql.pipe >/dev/null
 done 
diff --git a/discovery.php b/discovery.php
index cc06b081f3..a65bdad147 100755
--- a/discovery.php
+++ b/discovery.php
@@ -9,9 +9,9 @@ include("includes/discovery/functions.inc.php");
 $start = utime();
 $runtime_stats = array();
 
-### Observer Device Discovery
+### ObserverNMS Device Discovery
 
-echo("Observer v".$config['version']." Discovery\n\n");
+echo("ObserverNMS v".$config['version']." Discovery\n\n");
 
 $options = getopt("h:t:i:n:d::a::");
 
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index 1c480cc65a..eef423c30e 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -79,6 +79,8 @@ $config['overview_show_sysDescr'] = true;
 ## Poller Modules
 
 $config['enable_port_Xbcmc']     = 1; # Enable ifXEntry broadcast/multicast
+$config['port_descr_parser']	 = "includes/port-descr-parser.inc.php"; # Parse port descriptions into fields
+
 
 ### Ignores & Allows
 
diff --git a/includes/functions.php b/includes/functions.php
index 70d3f7f5d7..798b47624a 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -5,7 +5,7 @@
 include_once("Net/IPv4.php");
 include_once("Net/IPv6.php");
 
-## Observer Includes
+## ObserverNMS Includes
 
 include_once($config['install_dir'] . "/includes/common.php");
 include_once($config['install_dir'] . "/includes/rrdtool.inc.php");
diff --git a/poller.php b/poller.php
index 0104166367..9124d9d488 100755
--- a/poller.php
+++ b/poller.php
@@ -1,12 +1,14 @@
 #!/usr/bin/php
 <?php
 
+### ObserverNMS Device Poller
+
 include("includes/defaults.inc.php");
 include("config.php");
 include("includes/functions.php");
 
 $poller_start = utime();
-echo("Observer Poller v".$config['version']."\n\n");
+echo("ObserverNMS Poller v".$config['version']."\n\n");
 
 $options = getopt("h:t:i:n:d::a::");
 
@@ -259,7 +261,7 @@ $poller_end = utime(); $poller_run = $poller_end - $poller_start; $poller_time =
 
 $string = $argv[0] . " $doing " .  date("F j, Y, G:i") . " - $polled_devices devices polled in $poller_time secs";
 if ($debug) echo("$string\n");
-shell_exec("echo '".$string."' >> ".$config['install_dir']."/observer.log"); # FIXME EWW
+shell_exec("echo '".$string."' >> ".$config['install_dir']."/observernms.log"); # FIXME EWW
 
 
 ?>
diff --git a/test-discovery.php b/test-discovery.php
index 9ce535494f..531a4f07f3 100755
--- a/test-discovery.php
+++ b/test-discovery.php
@@ -9,9 +9,9 @@ include("includes/discovery/functions.inc.php");
 
 $start = utime();
 
-### Observer Device Discovery
+### ObserverNMS Device Discovery
 
-echo("Observer v".$config['version']." Discovery\n\n");
+echo("ObserverNMS v".$config['version']." Discovery\n\n");
 
 if($argv[1] == "--device" && $argv[2]) {
   $where = "AND `device_id` = '".$argv[2]."'";
diff --git a/test-poll.php b/test-poll.php
index 8597ca3858..e32dff0c5d 100755
--- a/test-poll.php
+++ b/test-poll.php
@@ -9,9 +9,9 @@ $debug =1;
 
 $poller_start = utime();
 
-### Observer Device Polling Test
+### ObserverNMS Device Polling Test
 
-echo("Observer v".$config['version']." Discovery\n\n");
+echo("ObserverNMS v".$config['version']." Discovery\n\n");
 
 if($argv[1] == "--device" && $argv[2]) {
   $where = "AND `device_id` = '".$argv[2]."'";