Remove user-facing references to Observium

This eliminates nearly all of the user-facing references to Observium,
including in the names of temporary files and in the metadata of PDFs.  Many
of these may not be used any more, but I've adjusted them anyway.  These
changes should also make it easier to change the branding later if it is
needed.  There are a few references of which I still don't understand the
significance, so I've left them as-is for now.  The Unix agent in particular
is rather untidy.
This commit is contained in:
Paul Gear
2013-11-05 09:33:32 +10:00
parent 346ca22a97
commit aa9dded019
32 changed files with 109 additions and 169 deletions

View File

@@ -1,4 +1,4 @@
These are local plugin scripts for the Observium Unix Agent.
These are local plugin scripts for the LibreNMS Unix Agent.
*DO NOT* put all of these files into your local folder, only use the scripts you want.

View File

@@ -14,7 +14,7 @@
use LWP::Simple;
$CACHETIME = 30;
$CACHEFILE = '/tmp/observium-agent-apache';
$CACHEFILE = '/tmp/agent-local-apache';
# check for cache file newer CACHETIME seconds ago
if ( -f $CACHEFILE && time - (stat( $CACHEFILE ))[9] < $CACHETIME) {

View File

@@ -4,7 +4,7 @@
# We cache because it is a 1sec delay, which is painful for the poller
if [ -x /usr/bin/dpkg-query ]; then
DATE=$(date +%s)
FILE=/tmp/observium-agent-dpkg
FILE=/tmp/agent-local-dpkg
if [ ! -e $FILE ]; then
dpkg-query -W --showformat='${Status} ${Package} ${Version} ${Architecture} ${Installed-Size}\n'|grep " installed "|cut -d\ -f4- > $FILE

View File

@@ -283,7 +283,7 @@ function ss_get_mysql_stats( $options ) {
}
$sanitized_host = str_replace(array(":", "/"), array("", "_"), $host);
$cache_file = "$cache_dir/observium-agent-mysql";
$cache_file = "$cache_dir/agent-local-mysql";
debug("Cache file is $cache_file");
# First, check the cache.

View File

@@ -4,7 +4,7 @@
# We cache because it is a 1sec delay, which is painful for the poller
if [ -x /bin/rpm ]; then
DATE=$(date +%s)
FILE=/tmp/observium-agent-rpm
FILE=/tmp/agent-local-rpm
if [ ! -e $FILE ]; then
/bin/rpm -q --all --queryformat '%{N} %{V} %{R} %{ARCH} %{SIZE}\n' > $FILE
fi

View File

@@ -20,7 +20,7 @@
// START SETTINGS ///
$mailstats = "/opt/observium/scripts/watchmaillog/watchmaillog_counters";
$mailstats = "/opt/librenms/scripts/watchmaillog/watchmaillog_counters";
// END SETTINGS ///
@@ -72,4 +72,4 @@
doSNMPv2($mailstats);
//clearStats($mailstats);
?>
?>

View File

@@ -40,6 +40,8 @@ if (!array_key_exists('SCRIPT_FILENAME', $_SERVER)
# here, you can define them in another file named the same as this file, with a
# .cnf extension.
# ============================================================================
# FIXME: why are these not taken from config.php?
$mysql_user = 'observium';
$mysql_pass = 'flobbleobservium';
$mysql_host = 'localhost';

View File

@@ -28,6 +28,8 @@
# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
# Boston, MA 02110-1301 USA.
# FIXME: rename agent
service check_mk
{
type = UNLISTED

View File

@@ -21,8 +21,8 @@
// START SETTINGS ///
$config = "/opt/observium/scripts/shoutcast.conf";
$cache = "/opt/observium/scripts/shoutcast.cache";
$config = "/opt/librenms/scripts/shoutcast.conf";
$cache = "/opt/librenms/scripts/shoutcast.cache";
// END SETTINGS ///

View File

@@ -27,9 +27,9 @@
$debug=0; # 1=Debug messages are displayed, 0=No debug messages are displayed
$daemon=1; # 1=Daemonize the program, 0=Run interactive
$syslog=1; # 1=Log stuff to syslog, 0=No logging to syslog
$self="/opt/observium/scripts/watchmaillog/watchmaillog.sh"; # Location of this script
$counterfile="/opt/observium/scripts/watchmaillog/watchmaillog_counters"; # Location to store the counter file
$resetfile="/opt/observium/scripts/watchmaillog/watchmaillog_reset"; # Location of the reset counter flag file
$self="/opt/librenms/scripts/watchmaillog/watchmaillog.sh"; # Location of this script
$counterfile="/opt/librenms/scripts/watchmaillog/watchmaillog_counters"; # Location to store the counter file
$resetfile="/opt/librenms/scripts/watchmaillog/watchmaillog_reset"; # Location of the reset counter flag file
$pidfile="/var/run/watchmaillog.pid"; # Location of the running process ID file (used in logrotate)
use Sys::Syslog;