summaryrefslogtreecommitdiffstats
path: root/lib/puppet/reports
diff options
context:
space:
mode:
authorIan Taylor <ian@lorf.org>2009-06-05 12:39:04 -0400
committerJames Turnbull <james@lovedthanlost.net>2009-06-06 09:12:00 +1000
commit4f2c066a97e59a89df64af4b25beac6f3f0553c2 (patch)
tree126540beec3c65448e01e1b48d27275ec4ee6ea4 /lib/puppet/reports
parent97e6975d69f239e24993315a25a3117b1daa48c3 (diff)
downloadpuppet-4f2c066a97e59a89df64af4b25beac6f3f0553c2.tar.gz
puppet-4f2c066a97e59a89df64af4b25beac6f3f0553c2.tar.xz
puppet-4f2c066a97e59a89df64af4b25beac6f3f0553c2.zip
Removed extra whitespace from end of lines
Diffstat (limited to 'lib/puppet/reports')
-rw-r--r--lib/puppet/reports/rrdgraph.rb8
-rw-r--r--lib/puppet/reports/store.rb2
-rw-r--r--lib/puppet/reports/tagmail.rb20
3 files changed, 15 insertions, 15 deletions
diff --git a/lib/puppet/reports/rrdgraph.rb b/lib/puppet/reports/rrdgraph.rb
index 5889750dd..0c1cbf202 100644
--- a/lib/puppet/reports/rrdgraph.rb
+++ b/lib/puppet/reports/rrdgraph.rb
@@ -3,21 +3,21 @@ Puppet::Reports.register_report(:rrdgraph) do
must have the Ruby RRDtool library installed to use this report, which
you can get from `the RubyRRDTool RubyForge page`_. This package may also
be available as ``ruby-rrd`` or ``rrdtool-ruby`` in your distribution's package
- management system. The library and/or package will both require the binary
+ management system. The library and/or package will both require the binary
``rrdtool`` package from your distribution to be installed.
.. _the RubyRRDTool RubyForge page: http://rubyforge.org/projects/rubyrrdtool/
-
+
This report will create, manage, and graph RRD database files for each
of the metrics generated during transactions, and it will create a
few simple html files to display the reporting host's graphs. At this
point, it will not create a common index file to display links to
all hosts.
-
+
All RRD files and graphs get created in the ``rrddir`` directory. If
you want to serve these publicly, you should be able to just alias that
directory in a web server.
-
+
If you really know what you're doing, you can tune the ``rrdinterval``,
which defaults to the ``runinterval``."
diff --git a/lib/puppet/reports/store.rb b/lib/puppet/reports/store.rb
index 0c7f8cea9..720e78cea 100644
--- a/lib/puppet/reports/store.rb
+++ b/lib/puppet/reports/store.rb
@@ -5,7 +5,7 @@ Puppet::Reports.register_report(:store) do
desc "Store the yaml report on disk. Each host sends its report as a YAML dump
and this just stores the file on disk, in the ``reportdir`` directory.
-
+
These files collect quickly -- one every half hour -- so it is a good idea
to perform some maintenance on them if you use this report (it's the only
default report)."
diff --git a/lib/puppet/reports/tagmail.rb b/lib/puppet/reports/tagmail.rb
index 963cc0c19..4fdaa5137 100644
--- a/lib/puppet/reports/tagmail.rb
+++ b/lib/puppet/reports/tagmail.rb
@@ -8,12 +8,12 @@ Puppet::Reports.register_report(:tagmail) do
based on the tags in the log messages. See the
`UsingTags tag documentation`:trac: for more information
on tags.
-
+
To use this report, you must create a ``tagmail.conf`` (in the location
specified by ``tagmap``). This is a simple file that maps tags to
email addresses: Any log messages in the report that match the specified
tags will be sent to the specified email addresses.
-
+
Tags must be comma-separated, and they can be negated so that messages
only match when they do not have that tag. The tags are separated from
the email addresses by a colon, and the email addresses should also
@@ -29,9 +29,9 @@ Puppet::Reports.register_report(:tagmail) do
This will send all messages to ``me@domain.com``, and all messages from
webservers that are not also from mailservers to ``httpadmins@domain.com``.
- If you are using anti-spam controls, such as grey-listing, on your mail
- server you should whitelist the sending email (controlled by ``reportform``
- configuration option) to ensure your email is not discarded as spam.
+ If you are using anti-spam controls, such as grey-listing, on your mail
+ server you should whitelist the sending email (controlled by ``reportform``
+ configuration option) to ensure your email is not discarded as spam.
"
@@ -65,10 +65,10 @@ Puppet::Reports.register_report(:tagmail) do
reports << [emails, messages.collect { |m| m.to_report }.join("\n")]
end
end
-
+
return reports
end
-
+
# Load the config file
def parse(text)
taglists = []
@@ -114,13 +114,13 @@ Puppet::Reports.register_report(:tagmail) do
end
taglists = parse(File.read(Puppet[:tagmap]))
-
+
# Now find any appropriately tagged messages.
reports = match(taglists)
send(reports)
end
-
+
# Send the email reports.
def send(reports)
pid = fork do
@@ -136,7 +136,7 @@ Puppet::Reports.register_report(:tagmail) do
p.puts "Date: " + Time.now.rfc2822
p.puts
p.puts messages
- end
+ end
end
end
rescue => detail