From 2cd434860cc52ab8d807998a7c34b62bd1ce97f0 Mon Sep 17 00:00:00 2001 From: JoomlaStats Date: Sun, 5 Oct 2014 01:19:22 +0200 Subject: [PATCH 1/2] Update joomla-sessions Just a small typo that may be confusing --- plugins/joomla/joomla-sessions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/joomla/joomla-sessions b/plugins/joomla/joomla-sessions index e29a3919..d65728bb 100755 --- a/plugins/joomla/joomla-sessions +++ b/plugins/joomla/joomla-sessions @@ -1,6 +1,6 @@ #!/usr/bin/perl # -# Munin plugin for different stats over a spotweb MySQL database +# Munin plugin for different stats over a Joomla MySQL database # # Copyright (C) 2011 - Csaba Martha (http://www.zenebuzi.com) # Based on Rowdy Schwachfer (http://rowdy.nl) 's Spotweb plugin @@ -71,4 +71,4 @@ print "registered.value ".$1."\n"; #All count my $all = `$MYSQL $MYSQLOPTS -e 'SELECT COUNT(usertype) FROM $DATABASE.jos_session'`; $all =~/(\d+)/; -print "all.value ".$1."\n"; \ No newline at end of file +print "all.value ".$1."\n"; From a5d18f455449d7a75a1b9eb2f3880310ada6d76a Mon Sep 17 00:00:00 2001 From: Stig Sandbeck Mathisen Date: Sun, 5 Oct 2014 23:34:20 +0200 Subject: [PATCH 2/2] Add documentation in POD format, for munindoc --- plugins/joomla/joomla-sessions | 62 +++++++++++++++++++++++++--------- 1 file changed, 46 insertions(+), 16 deletions(-) diff --git a/plugins/joomla/joomla-sessions b/plugins/joomla/joomla-sessions index d65728bb..f98c7354 100755 --- a/plugins/joomla/joomla-sessions +++ b/plugins/joomla/joomla-sessions @@ -1,11 +1,50 @@ #!/usr/bin/perl -# -# Munin plugin for different stats over a Joomla MySQL database -# -# Copyright (C) 2011 - Csaba Martha (http://www.zenebuzi.com) -# Based on Rowdy Schwachfer (http://rowdy.nl) 's Spotweb plugin -# -# + +=head1 NAME + +joomla-sessions - Munin plugin for different stats over a Joomla MySQL +database + +=head1 CONFIGURATION + +=over + +=item env.mysql + +Optional, path to the MySQL binary. Defaults to C. + +=item env.mysqlopts + +Optional, command line options for "mysql". May be used to set +username and password. No default value. + +=item env.database + +Optional, name of the joomla database name. Defaults to C. + +=back + +=head2 Configuration example + + + [joomla_sessions*] + env.mysql /usr/bin/mysql # MySQL binary (optional) + env.mysqlopts -u -p # How to connect to the database (optional if no password is set) + env.database databasename # Joomla database (optional) + +=head1 AUTHORS + +Copyright (C) 2011 - Csaba Martha (http://www.zenebuzi.com) + +Based on Rowdy Schwachfer (http://rowdy.nl) 's Spotweb plugin + +=head1 LICENSE + +GPLv3 or later + + +=cut + # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or @@ -18,15 +57,6 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# -# -# Configuration example -# -# [joomla_sessions*] -# env.mysql /usr/bin/mysql # MySQL binary (optional) -# env.mysqlopts -u -p # How to connect to the database (optional if no password is set) -# env.database databasename # Joomla database (optional) -# use strict;