mirror of
https://git.freebsd.org/ports.git
synced 2025-06-05 21:00:30 -04:00
844c50f452
Changes: - Added ART20 LICENSE - ensure that insert.pl works with nagios embedded perl - use embedded images for show/hide toggle buttons (thanks to matt perry) - ensure graph controls float above other elements - zoom when zoom rectangle drags to right or left - added hourly interval - generate text and html readme files from README.pod (thanks to matt perrry) - fix map rule for PROCS (thanks to matt perry) - increase variety of colors (thanks to matt perry) - improved controls layout (thanks to matt perry) - block right-click menu on graphs (thanks to matt perry) - fixed escaping of urls - isolate date/time formatting for graph mouseovers - include pid when logging to help isolate multi-core/multi-thread issues. - fixed debian6 packaging problems. - change authentication behavior when nagios default_user_name is defined. behavior is now aligned to that defined in nagios. - use more precise values for graph zoom bounds. - specify explicitly the default graph height. - strip leading and trailing whitespace from tuples (heartbeats, stepsizes, resolutions, steps, xffs, plotasLINE1, plotasLINE2, etc). - added fixedscale as a per host/service/database/source parameter. for backward compatibility it still works when specified as a cgi argument. note that it affects the vertical axis and the values in the legend. - handle # in database and data source names - ensure the directory containing perfdata log is writeable by nagios user. - added export.cgi to dump rrd data in csv or xml format. - automatically determine groups from the Nagios servicegroup definitions. - fixed heartbeats/stepsizes/resolutions bug. this time for real. really. - retain a copy of any modifications made to nagios.cfg and commands.cfg when removing rpm or deb packages. - fixed install.pl to work with icinga. - renamed upgrade.pl to flat2hier.pl - fixed install option typo for --check-prerequisites in install instructions. - encourage standalone installations rather than overlays unless installing from rpm or deb package. - encourage nagios pre-flight checks before restarting nagios. PR: 208483 Approved by: hizel@vyborg.ru (maintainer)
75 lines
2.9 KiB
Text
75 lines
2.9 KiB
Text
--- etc/nagiosgraph.conf.orig 2013-06-11 22:09:56 UTC
|
|
+++ etc/nagiosgraph.conf
|
|
@@ -8,19 +8,19 @@
|
|
# Author: (c) 2010 Matthew Wall
|
|
|
|
# Location of output from nagiosgraph data processing
|
|
-logfile = /var/nagiosgraph/nagiosgraph.log
|
|
+logfile = /var/spool/nagios/nagiosgraph.log
|
|
|
|
# Location of output from nagiosgraph CGI scripts
|
|
cgilogfile = /var/nagiosgraph/nagiosgraph-cgi.log
|
|
|
|
# Location of nagios performance data log file.
|
|
-perflog = /var/nagios/perfdata.log
|
|
+perflog = /var/spool/nagios/perfdata.log
|
|
|
|
# Directory in which to store RRD files
|
|
-rrddir = /var/nagiosgraph/rrd
|
|
+rrddir = /var/spool/nagios/nagiosgraph/rrd
|
|
|
|
# File containing regular expressions to identify service and perf data
|
|
-mapfile = /etc/nagiosgraph/map
|
|
+mapfile = %%PREFIX%%/etc/nagios/nagiosgraph/map
|
|
|
|
# Nagiosgraph CGI URL.
|
|
nagiosgraphcgiurl = /nagiosgraph/cgi-bin
|
|
@@ -33,27 +33,27 @@ nagiosgraphcgiurl = /nagiosgraph/cgi-bin
|
|
javascript = /nagiosgraph/nagiosgraph.js
|
|
|
|
# Stylesheet: URL to the nagiosgraph stylesheet.
|
|
-stylesheet = /nagiosgraph/nagiosgraph.css
|
|
+stylesheet = /nagios/stylesheets/nagiosgraph.css
|
|
|
|
# File containing labels for services and data (optional)
|
|
-#labelfile = /etc/nagiosgraph/labels.conf
|
|
+#labelfile = %%PREFIX%%/etc/nagios/nagiosgraph/labels.conf
|
|
|
|
# Location of showhost control file (optional)
|
|
-#hostdb = /etc/nagiosgraph/hostdb.conf
|
|
+#hostdb = %%PREFIX%%/etc/nagios/nagiosgraph/hostdb.conf
|
|
|
|
# Location of showservice control file (optional)
|
|
-#servdb = /etc/nagiosgraph/servdb.conf
|
|
+#servdb = %%PREFIX%%/etc/nagios/nagiosgraph/servdb.conf
|
|
|
|
# Groups can be enumerated explicitly in the groupdb file, gathered
|
|
# automatically from the service group definitions in the Nagios
|
|
# configuration, or a combination of both.
|
|
# Location of showgroup control file (optional)
|
|
-#groupdb = /etc/nagiosgraph/groupdb.conf
|
|
+#groupdb = %%PREFIX%%/etc/nagios/nagiosgraph/groupdb.conf
|
|
# Location of the Nagios configuration file (optional)
|
|
#groupcfgfile = /etc/nagios/nagios.cfg
|
|
|
|
# File containing sets of data sources to select in queries (optional)
|
|
-#datasetdb = /etc/nagiosgraph/datasetdb.conf
|
|
+#datasetdb = %%PREFIX%%/etc/nagios/nagiosgraph/datasetdb.conf
|
|
|
|
# Access control configuration (optional)
|
|
# The authorization method can be one of nagios3 or nagiosgraph. If no
|
|
@@ -66,12 +66,12 @@ stylesheet = /nagiosgraph/nagiosgraph.cs
|
|
# authorized_for_all_hosts, authorized_for_all_services, and default_user_name
|
|
# variables to determine permissions.
|
|
#authzmethod = nagios3
|
|
-#authzfile = /etc/nagios/cgi.cfg
|
|
+#authzfile = %%PREFIX%%/etc/nagios/cgi.cfg
|
|
|
|
# For access control via nagiosgraph, specify a single access control file.
|
|
# See the sample access control file for syntax and examples.
|
|
#authzmethod = nagiosgraph
|
|
-#authzfile = /etc/nagiosgraph/access.conf
|
|
+#authzfile = %%PREFIX%%/etc/nagios/nagiosgraph/access.conf
|
|
|
|
|
|
# Logging can be enabled for a specific CGI script and/or specific hosts or
|