Title: [opsview] [11307] move perl/XS installable modules to opsview-perl-modules/ subdir
- Revision
- 11307
- Author
- aburzynski
- Date
- 2013-02-01 09:29:54 +0000 (Fri, 01 Feb 2013)
Log Message
move perl/XS installable modules to opsview-perl-modules/ subdir
Modified Paths
Added Paths
- trunk/opsview-core/opsview-perl-modules/
- trunk/opsview-core/opsview-perl-modules/Opsview-Utils-NDOLogsImporter-XS/
Removed Paths
- trunk/opsview-core/Opsview-Utils-NDOLogsImporter-XS/
Modified: trunk/opsview-core/Makefile
===================================================================
--- trunk/opsview-core/Makefile 2013-02-01 09:24:21 UTC (rev 11306)
+++ trunk/opsview-core/Makefile 2013-02-01 09:29:54 UTC (rev 11307)
@@ -46,7 +46,7 @@
perl -pe 's/%VERSION%/${VERSION}/g;' [email protected] > $@
ndologs_xs:
- ( cd Opsview-Utils-NDOLogsImporter-XS && perl Makefile.PL && make )
+ ( cd opsview-perl-modules/Opsview-Utils-NDOLogsImporter-XS && perl Makefile.PL && make )
# Working out community or enterprise version is a bit messy here. Can't do as a gnumake variable
# because debian packaging invokes the make. Probably should set version at top level and everything
Modified: trunk/opsview-core/etc/Log4perl.conf
===================================================================
--- trunk/opsview-core/etc/Log4perl.conf 2013-02-01 09:24:21 UTC (rev 11306)
+++ trunk/opsview-core/etc/Log4perl.conf 2013-02-01 09:29:54 UTC (rev 11307)
@@ -8,17 +8,21 @@
# Overrides to specific components
#log4perl.logger.create_and_send_configs=DEBUG
#log4perl.logger.sendcmd2slaves=DEBUG
+#log4perl.logger.opsviewadmd=DEBUG
#log4perl.logger.opsviewd=DEBUG
+log4perl.logger.opsviewadmd=DEBUG
# Setting import_ndologsd to DEBUG will also copy ndologs into var/ndologs.archive.
# Can take up to 30 seconds to acknowledge. Make sure you remember to revert back
#log4perl.logger.import_ndologsd=DEBUG
#log4perl.logger.import_perfdatarrd=DEBUG
#log4perl.logger.import_ndoconfigend=DEBUG
#log4perl.logger.ndoutils_configdumpend=DEBUG
+#log4perl.logger.opsview_master_housekeep=DEBUG
#log4perl.logger.exec_and_log=DEBUG
#log4perl.logger.import_excel=DEBUG
# You will need to increase the logging at nrd.conf to get debug messages out
#log4perl.logger.nrd=DEBUG
+#log4perl.logger.odw_expire_data=DEBUG,SCREEN
log4perl.appender.OPSVIEWD_LOGFILE=Log::Dispatch::FileRotate
log4perl.appender.OPSVIEWD_LOGFILE.filename=/var/log/opsview/opsviewd.log
Modified: trunk/opsview-core/etc/opsview.defaults
===================================================================
--- trunk/opsview-core/etc/opsview.defaults 2013-02-01 09:24:21 UTC (rev 11306)
+++ trunk/opsview-core/etc/opsview.defaults 2013-02-01 09:29:54 UTC (rev 11307)
@@ -11,17 +11,26 @@
# To access from shell script, use: ". bin/opsview.sh"
# NOTE: If you change the passwords for an existing system, you need to reload and restart Opsview and Opsview Web
-# See http://docs.opsview.com/doku.php?id=opsview-core:faq
+# See http://docs.opsview.com/doku.php?id=opsview4.3:faq
# DB for Opsview
$dbuser = "opsview";
$dbpasswd = "changeme";
$db = "opsview";
+$dbhost = "localhost";
$dbi = "dbi:mysql";
+# ODW db information for datawarehousing
+$odw_dbuser = "odw";
+$odw_dbpasswd = "changeme";
+$odw_db = "odw";
+$odw_dbhost = "localhost";
+$odw_dbi = "dbi:mysql";
+
# Use Catalyst::Engine::HTTP::Prefork
# This provides a persistent application server, but uses more memory
-# See http://docs.opsview.com/doku.php?id=opsview-core:prefork for details
+# See http://docs.opsview.com/doku.php?id=opsview4.3:prefork for details
+# This defaults to 1 for user responsiveness
$use_prefork = 1;
$bind_address = "0.0.0.0";
@@ -38,8 +47,19 @@
$runtime_dbuser = "nagios";
$runtime_dbpasswd = "changeme";
$runtime_db = "runtime";
+$runtime_dbhost = "localhost";
$runtime_dbi = "dbi:mysql";
+$ems_url = 'https://entitlements.opsview.com/ems/';
+
+$activated_url = 'http://downloads.opsview.com/activated';
+
+# Dashboard db information
+$dashboard_dbuser = "dashboard";
+$dashboard_dbpasswd = "changeme";
+$dashboard_db = "dashboard";
+$dashboard_dbhost = "localhost";
+
# Opsview will export database and create tarball of /usr/local/nagios/*
$backup_dir = "/usr/local/nagios/var/backups";
$backup_retention_days = 30;
@@ -100,10 +120,8 @@
# SNMP trap debugging. Increases load on snmptrap processing. Switch on for short periods only
#$snmptrap_debug = 1;
-# For reverse initiated slaves, need to set below to 1
-# Ports from 25800 upwards maybe used on master
+# Ports from 25800 upwards maybe used on master for reverse slaves
# NOTE: requires 'autossh' to be installed on the slaves
-$slave_initiated = 0;
$slave_base_port = 25800;
# Changes nagios.cfg's interval_length to seconds
@@ -116,7 +134,7 @@
# This is the instance id for Opsview, to allow multiple Opsview masters to write to a single
# ODW database. This can be any integer from 1 to 20. Ensure this value is not duplicated between
# all the Opsview instances.
-# WARNING: See http://docs.opsview.com/doku.php?id=opsview-core:sharedodw for other limitations
+# WARNING: See http://docs.opsview.com/doku.php?id=opsview4.3:sharedodw for other limitations
$opsview_instance_id = 1;
# NMIS settings
@@ -126,6 +144,8 @@
# NSCA settings
# Set bind address for nsca
$nsca_server_address = "127.0.0.1";
+# NSCA password and encryption method (2 = DES)
+$nsca_shared_password = "changeme";
$nsca_encryption_method = 2;
# NRD password
@@ -136,6 +156,14 @@
# nrd or nsca
$slave_send_method = "nrd";
+# Slave results import max cache (in seconds)
+$slave_results_max_cache = 300;
+
+# Detect slave status on imports - defer imports if any of slave nodes
+# is down or is up for less then 5 minutes.
+# Set to 1 to enable.
+$detect_slave_status_on_import = 0;
+
# Default graphing options
$graph_show_legend = 1;
$graph_auto_max_metrics = 10;
@@ -187,7 +215,7 @@
# The next section contains examples of how to change configuration parameters in nagios.cfg and cgi.cfg
# If you wish to change any parameters then copy entire section over to opsview.conf including 'EOF' line,
# then uncomment relevant line or add your own in.
-# See http://docs.opsview.com/doku.php?id=opsview-core:configuration_files for more details
+# See http://docs.opsview.com/doku.php?id=opsview4.3:configuration_files for more details
$overrides = <<'EOF';
@@ -209,6 +237,9 @@
# Uncomment next line to enable logging of passive check results
# nagios_log_passive_checks=1
+# Uncomment next line to set when NSCA treats client data as too old to be valid
+# nsca_max_packet_age=20
+
EOF
1;
Modified: trunk/opsview-core/filelist
===================================================================
--- trunk/opsview-core/filelist 2013-02-01 09:24:21 UTC (rev 11306)
+++ trunk/opsview-core/filelist 2013-02-01 09:29:54 UTC (rev 11307)
@@ -501,9 +501,9 @@
d nagios:nagios 0755 /usr/local/nagios/lib/auto/Opsview/Utils/NDOLogsImporter
d nagios:nagios 0755 /usr/local/nagios/lib/auto/Opsview/Utils/NDOLogsImporter/XS
d nagios:nagios 0755 /usr/local/nagios/lib/Opsview/Utils/NDOLogsImporter
-f nagios:nagios 0644 /usr/local/nagios/lib/auto/Opsview/Utils/NDOLogsImporter/XS/XS.bs Opsview-Utils-NDOLogsImporter-XS/blib/arch/auto/Opsview/Utils/NDOLogsImporter/XS/XS.bs
-f nagios:nagios 0755 /usr/local/nagios/lib/auto/Opsview/Utils/NDOLogsImporter/XS/XS.so Opsview-Utils-NDOLogsImporter-XS/blib/arch/auto/Opsview/Utils/NDOLogsImporter/XS/XS.so
-f nagios:nagios 0644 /usr/local/nagios/lib/Opsview/Utils/NDOLogsImporter/XS.pm Opsview-Utils-NDOLogsImporter-XS/blib/lib/Opsview/Utils/NDOLogsImporter/XS.pm
+f nagios:nagios 0644 /usr/local/nagios/lib/auto/Opsview/Utils/NDOLogsImporter/XS/XS.bs opsview-perl-modules/Opsview-Utils-NDOLogsImporter-XS/blib/arch/auto/Opsview/Utils/NDOLogsImporter/XS/XS.bs
+f nagios:nagios 0755 /usr/local/nagios/lib/auto/Opsview/Utils/NDOLogsImporter/XS/XS.so opsview-perl-modules/Opsview-Utils-NDOLogsImporter-XS/blib/arch/auto/Opsview/Utils/NDOLogsImporter/XS/XS.so
+f nagios:nagios 0644 /usr/local/nagios/lib/Opsview/Utils/NDOLogsImporter/XS.pm opsview-perl-modules/Opsview-Utils-NDOLogsImporter-XS/blib/lib/Opsview/Utils/NDOLogsImporter/XS.pm
d nagios:nagios 0755 /usr/local/nagios/sbin
_______________________________________________
Opsview-checkins mailing list
[email protected]
http://lists.opsview.org/lists/listinfo/opsview-checkins
