From b7d0ef9dfee4666e52e126c4eb9647ccad41cb64 Mon Sep 17 00:00:00 2001 From: Dave Fennell Date: Thu, 20 Dec 2012 11:33:07 +0000 Subject: [PATCH 1/6] Added simple bind9 resolver, server and socket stats plugins. --- plugins/network/dns/bind9_resolver_stats | 101 +++++++++++++++++++++++ plugins/network/dns/bind9_server_stats | 91 ++++++++++++++++++++ plugins/network/dns/bind9_socket_stats | 85 +++++++++++++++++++ 3 files changed, 277 insertions(+) create mode 100755 plugins/network/dns/bind9_resolver_stats create mode 100755 plugins/network/dns/bind9_server_stats create mode 100755 plugins/network/dns/bind9_socket_stats diff --git a/plugins/network/dns/bind9_resolver_stats b/plugins/network/dns/bind9_resolver_stats new file mode 100755 index 00000000..6403c205 --- /dev/null +++ b/plugins/network/dns/bind9_resolver_stats @@ -0,0 +1,101 @@ +#!/bin/bash +# +# Plugin to monitor Bind9 Name Server Resolver Stats +# +# Author: +# Dave Fennell +# +# Created: +# 20th December 2012 +# +# Usage: +# Place in /etc/munin/plugins/ (or link it there using ln -s) +# +# Parameters: +# config (required) +# + +# change those to reflect your bind configuration (use plugin configuration) +# stat file +if [ "$stat_file" = "" ]; then + stat_file="/var/cache/bind/named.stats" +fi + +# rndc path +if [ "$rndc" = "" ]; then + rndc="/usr/sbin/rndc" +fi + +# The section we are looking for in the stats. +section="Resolver Statistics" +lines=18 + +# Config mode. +if [ "$1" = "config" ]; then + echo 'graph_args --lower-limit 0' + echo 'graph_category network' + echo 'graph_info '${section}' for the Bind9 Name Server' + echo 'graph_scale no' + echo 'graph_title Bind9 '${section} + echo 'graph_vlabel requests/sec' + + # Output the stat configs. + grep "++ ${section} ++" ${stat_file} -A${lines} | while read num name + do + if [ "$num" = "++" ]; then + continue; + fi + + if [ ${num:0:1} = "[" ]; then + continue; + fi + + # Shorten some names. + label=${name//queries with /} + label=${label///above} + + # All lowercase. + label=$(echo "$label" | tr 'A-Z' 'a-z') + + # Now change names to all have no spaces. + key=${label//[ -]/_} + + echo ${key}.label ${label} + echo ${key}.info ${name} + echo ${key}.type COUNTER + done + + exit 0 +fi + +# Blank the stats file (else stats are appended not replaced) +rm ${stat_file} + +# Ask to bind to build new one +${rndc} stats + +# Output the stats. +grep "++ ${section} ++" ${stat_file} -A${lines} | while read num name +do + if [ "$num" = "++" ]; then + continue; + fi + + if [ ${num:0:1} = "[" ]; then + continue; + fi + + # Shorten some names. + label=${name//queries with /} + label=${label///above} + + # All lowercase. + label=$(echo "$label" | tr 'A-Z' 'a-z') + + # Now change names to all have no spaces. + key=${label//[ -]/_} + + echo ${key}.value ${num} +done diff --git a/plugins/network/dns/bind9_server_stats b/plugins/network/dns/bind9_server_stats new file mode 100755 index 00000000..484858af --- /dev/null +++ b/plugins/network/dns/bind9_server_stats @@ -0,0 +1,91 @@ +#!/bin/bash +# +# Plugin to monitor Bind9 Name Server Stats +# +# Author: +# Dave Fennell +# +# Created: +# 20th December 2012 +# +# Usage: +# Place in /etc/munin/plugins/ (or link it there using ln -s) +# +# Parameters: +# config (required) +# + +# change those to reflect your bind configuration (use plugin configuration) +# stat file +if [ "$stat_file" = "" ]; then + stat_file="/var/cache/bind/named.stats" +fi + +# rndc path +if [ "$rndc" = "" ]; then + rndc="/usr/sbin/rndc" +fi + +# The section we are looking for in the stats. +section="Name Server Statistics" +lines=10 + +# Config mode. +if [ "$1" = "config" ]; then + echo 'graph_args --lower-limit 0' + echo 'graph_category network' + echo 'graph_info '${section}' for the Bind9 Name Server' + echo 'graph_scale no' + echo 'graph_title Bind9 '${section} + echo 'graph_vlabel requests/sec' + + # Output the stat configs. + grep "++ ${section} ++" ${stat_file} -A${lines} | while read num name + do + if [ "$num" = "++" ]; then + continue; + fi + + # Shorten some names. + label=${name//queries resulted in /} + label=${label// answer/} + + # All lowercase. + label=$(echo "$label" | tr 'A-Z' 'a-z') + + # Now change names to all have no spaces. + key=${label// /_} + + echo ${key}.label ${label} + echo ${key}.info ${name} + echo ${key}.type COUNTER + done + + exit 0 +fi + +# Blank the stats file (else stats are appended not replaced) +rm ${stat_file} + +# Ask to bind to build new one +${rndc} stats + +# Output the stats. +grep "++ ${section} ++" ${stat_file} -A${lines} | while read num name +do + if [ "$num" = "++" ]; then + continue; + fi + + # Shorten some names. + label=${name//queries resulted in /} + label=${label// answer/} + + # All lowercase. + label=$(echo "$label" | tr 'A-Z' 'a-z') + + # Now change names to all have no spaces. + key=${label// /_} + + echo ${key}.value ${num} +done diff --git a/plugins/network/dns/bind9_socket_stats b/plugins/network/dns/bind9_socket_stats new file mode 100755 index 00000000..54d7b07d --- /dev/null +++ b/plugins/network/dns/bind9_socket_stats @@ -0,0 +1,85 @@ +#!/bin/bash +# +# Plugin to monitor Bind9 Name Server Socket Stats +# +# Author: +# Dave Fennell +# +# Created: +# 20th December 2012 +# +# Usage: +# Place in /etc/munin/plugins/ (or link it there using ln -s) +# +# Parameters: +# config (required) +# + +# change those to reflect your bind configuration (use plugin configuration) +# stat file +if [ "$stat_file" = "" ]; then + stat_file="/var/cache/bind/named.stats" +fi + +# rndc path +if [ "$rndc" = "" ]; then + rndc="/usr/sbin/rndc" +fi + +# The section we are looking for in the stats. +section="Socket I/O Statistics" +lines=12 + +# Config mode. +if [ "$1" = "config" ]; then + echo 'graph_args --lower-limit 0' + echo 'graph_category network' + echo 'graph_info '${section}' for the Bind9 Name Server' + echo 'graph_scale no' + echo 'graph_title Bind9 '${section} + echo 'graph_vlabel requests/sec' + + # Output the stat configs. + grep "++ ${section} ++" ${stat_file} -A${lines} | while read num name + do + if [ "$num" = "++" ]; then + continue; + fi + + label=${name} + + # All lowercase. + key=$(echo "$name" | tr 'A-Z' 'a-z') + + # Now change names to all have no spaces. + key=${key//[\/ - ]/_} + + echo ${key}.label ${label} + echo ${key}.info ${name} + echo ${key}.type COUNTER + done + + exit 0 +fi + +# Blank the stats file (else stats are appended not replaced) +rm ${stat_file} + +# Ask to bind to build new one +${rndc} stats + +# Output the stats. +grep "++ ${section} ++" ${stat_file} -A${lines} | while read num name +do + if [ "$num" = "++" ]; then + continue; + fi + + # All lowercase. + key=$(echo "$name" | tr 'A-Z' 'a-z') + + # Now change names to all have no spaces. + key=${key//[\/ - ]/_} + + echo ${key}.value ${num} +done From 8c1e0f618d307b6719747f97600f229b8ab74693 Mon Sep 17 00:00:00 2001 From: Dave Fennell Date: Thu, 20 Dec 2012 14:01:26 +0000 Subject: [PATCH 2/6] Updated new bind9 plugins to correctly handle differing number of lines in the bind9 stats files. --- plugins/network/dns/bind9_resolver_stats | 42 +++++++++--------------- plugins/network/dns/bind9_server_stats | 34 +++++++++---------- plugins/network/dns/bind9_socket_stats | 28 +++++++++------- 3 files changed, 48 insertions(+), 56 deletions(-) diff --git a/plugins/network/dns/bind9_resolver_stats b/plugins/network/dns/bind9_resolver_stats index 6403c205..3ef69272 100755 --- a/plugins/network/dns/bind9_resolver_stats +++ b/plugins/network/dns/bind9_resolver_stats @@ -26,30 +26,34 @@ if [ "$rndc" = "" ]; then rndc="/usr/sbin/rndc" fi +# Blank the stats file (else stats are appended not replaced) +rm ${stat_file} + +# Ask to bind to build new one +${rndc} stats + # The section we are looking for in the stats. section="Resolver Statistics" -lines=18 + +# Get all the lines in the section: +# - cat the file +# - use sed to get lines after (and excluding) the section start tag +# - use sed to get lines up to (and excluding) the next section start tag +# - use grep to remove any lines starting with a [ +cmd='cat "/var/cache/bind/named.stats" | sed "0,/^\+\+ '${section}' \+\+/d" | sed -e "/^\+\+/,\$d" | grep -v "^\["' # Config mode. if [ "$1" = "config" ]; then echo 'graph_args --lower-limit 0' - echo 'graph_category network' + echo 'graph_category dns' echo 'graph_info '${section}' for the Bind9 Name Server' echo 'graph_scale no' echo 'graph_title Bind9 '${section} echo 'graph_vlabel requests/sec' # Output the stat configs. - grep "++ ${section} ++" ${stat_file} -A${lines} | while read num name + eval ${cmd} | while read num name do - if [ "$num" = "++" ]; then - continue; - fi - - if [ ${num:0:1} = "[" ]; then - continue; - fi - # Shorten some names. label=${name//queries with /} label=${label// Date: Thu, 20 Dec 2012 15:54:19 +0000 Subject: [PATCH 3/6] Created 3 new pgbouncer plugins to show stats on all pools configured in the system. --- .../postgresql/pgbouncer_client_connections | 66 +++++++++++++++++++ plugins/postgresql/pgbouncer_maxwait | 64 ++++++++++++++++++ .../postgresql/pgbouncer_server_connections | 66 +++++++++++++++++++ 3 files changed, 196 insertions(+) create mode 100755 plugins/postgresql/pgbouncer_client_connections create mode 100755 plugins/postgresql/pgbouncer_maxwait create mode 100755 plugins/postgresql/pgbouncer_server_connections diff --git a/plugins/postgresql/pgbouncer_client_connections b/plugins/postgresql/pgbouncer_client_connections new file mode 100755 index 00000000..a9471364 --- /dev/null +++ b/plugins/postgresql/pgbouncer_client_connections @@ -0,0 +1,66 @@ +#!/bin/bash +# +# Plugin to monitor PgBouncer total client connections for all pools. +# +# Author: +# Dave Fennell +# +# Created: +# 20th December 2012 +# +# Usage: +# Place in /etc/munin/plugins/ (or link it there using ln -s) +# +# Parameters: +# config (required) +# + +dbserver='' # '-h localhost' +dbuser='postgres' + +# Pgbouncer Port Number +port=6432 + +# The psql command to use. +cmd="psql ${dbserver} -U ${dbuser} -p ${port} pgbouncer -tc 'SHOW POOLS;' | grep -v '^$'" + +if [ "$1" = "config" ]; then + echo 'graph_args --lower-limit 0' + echo 'graph_category pgbouncer' + echo 'graph_info The sum of the active and waiting clients for each pool on the server.' + echo 'graph_scale no' + echo 'graph_title PgBouncer Pool Total Client Connections' + echo 'graph_vlabel client connections' + + eval ${cmd} | while read pool sep user junk + do + # Skip pgbouncer database itself. + if [ "$user" = "pgbouncer" ]; then + continue + fi + + test -z "${pool}" && continue + + echo ${pool}.label ${pool} + echo ${pool}.info ${pool} connection pool + echo ${pool}.type GAUGE + done + + exit 0 +fi + +# Output looks like this: +# database | user | cl_active | cl_waiting | sv_active | sv_idle | sv_used | sv_tested | sv_login | maxwait + +eval ${cmd} | while read pool sep user sep cl_active sep cl_waiting sep sv_active sep sv_idle sep sv_used sep sv_tested sep sv_login sep maxwait +do + # Skip pgbouncer database itself. + if [ "$user" = "pgbouncer" ]; then + continue + fi + + total=$(echo ${cl_active} + ${cl_waiting} | bc) + + echo ${pool}.value ${total} +done + diff --git a/plugins/postgresql/pgbouncer_maxwait b/plugins/postgresql/pgbouncer_maxwait new file mode 100755 index 00000000..ea9a8ade --- /dev/null +++ b/plugins/postgresql/pgbouncer_maxwait @@ -0,0 +1,64 @@ +#!/bin/bash +# +# Plugin to monitor PgBouncer max wait stat for all pools. +# +# Author: +# Dave Fennell +# +# Created: +# 20th December 2012 +# +# Usage: +# Place in /etc/munin/plugins/ (or link it there using ln -s) +# +# Parameters: +# config (required) +# + +dbserver='' # '-h localhost' +dbuser='postgres' + +# Pgbouncer Port Number +port=6432 + +# The psql command to use. +cmd="psql ${dbserver} -U ${dbuser} -p ${port} pgbouncer -tc 'SHOW POOLS;' | grep -v '^$'" + +if [ "$1" = "config" ]; then + echo 'graph_args --lower-limit 0' + echo 'graph_category pgbouncer' + echo 'graph_info PgBouncer Pool Maximum Wait' + echo 'graph_scale no' + echo 'graph_title PgBouncer Pool Maximum Wait' + echo 'graph_vlabel maximum wait (secs)' + + eval ${cmd} | while read pool sep user junk + do + # Skip pgbouncer database itself. + if [ "$user" = "pgbouncer" ]; then + continue + fi + + test -z "${pool}" && continue + + echo ${pool}.label ${pool} + echo ${pool}.info ${pool} connection pool + echo ${pool}.type GAUGE + done + + exit 0 +fi + +# Output looks like this: +# database | user | cl_active | cl_waiting | sv_active | sv_idle | sv_used | sv_tested | sv_login | maxwait + +eval ${cmd} | while read pool sep user sep cl_active sep cl_waiting sep sv_active sep sv_idle sep sv_used sep sv_tested sep sv_login sep maxwait +do + # Skip pgbouncer database itself. + if [ "$user" = "pgbouncer" ]; then + continue + fi + + echo ${pool}.value ${maxwait} +done + diff --git a/plugins/postgresql/pgbouncer_server_connections b/plugins/postgresql/pgbouncer_server_connections new file mode 100755 index 00000000..865fa70c --- /dev/null +++ b/plugins/postgresql/pgbouncer_server_connections @@ -0,0 +1,66 @@ +#!/bin/bash +# +# Plugin to monitor PgBouncer total server connections for all pools. +# +# Author: +# Dave Fennell +# +# Created: +# 20th December 2012 +# +# Usage: +# Place in /etc/munin/plugins/ (or link it there using ln -s) +# +# Parameters: +# config (required) +# + +dbserver='' # '-h localhost' +dbuser='postgres' + +# Pgbouncer Port Number +port=6432 + +# The psql command to use. +cmd="psql ${dbserver} -U ${dbuser} -p ${port} pgbouncer -tc 'SHOW POOLS;' | grep -v '^$'" + +if [ "$1" = "config" ]; then + echo 'graph_args --lower-limit 0' + echo 'graph_category pgbouncer' + echo 'graph_info The sum of the active and idle server connections for each pool on the server.' + echo 'graph_scale no' + echo 'graph_title PgBouncer Pool Total Server Connections' + echo 'graph_vlabel server connections' + + eval ${cmd} | while read pool sep user junk + do + # Skip pgbouncer database itself. + if [ "$user" = "pgbouncer" ]; then + continue + fi + + test -z "${pool}" && continue + + echo ${pool}.label ${pool} + echo ${pool}.info ${pool} connection pool + echo ${pool}.type GAUGE + done + + exit 0 +fi + +# Output looks like this: +# database | user | cl_active | cl_waiting | sv_active | sv_idle | sv_used | sv_tested | sv_login | maxwait + +eval ${cmd} | while read pool sep user sep cl_active sep cl_waiting sep sv_active sep sv_idle sep sv_used sep sv_tested sep sv_login sep maxwait +do + # Skip pgbouncer database itself. + if [ "$user" = "pgbouncer" ]; then + continue + fi + + total=$(echo ${sv_active} + ${sv_idle} | bc) + + echo ${pool}.value ${total} +done + From d79ab66b69029ed1a45c9a1bd222bafc5412d02c Mon Sep 17 00:00:00 2001 From: Dave Fennell Date: Fri, 21 Dec 2012 10:34:37 +0000 Subject: [PATCH 4/6] Updated new bind9 plugins with license information and added MUNIN_CAP_DIRTYCONFIG support. --- plugins/network/dns/bind9_resolver_stats | 14 +++++++++----- plugins/network/dns/bind9_server_stats | 14 +++++++++----- plugins/network/dns/bind9_socket_stats | 20 +++++++++----------- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/plugins/network/dns/bind9_resolver_stats b/plugins/network/dns/bind9_resolver_stats index 3ef69272..7963aff3 100755 --- a/plugins/network/dns/bind9_resolver_stats +++ b/plugins/network/dns/bind9_resolver_stats @@ -8,12 +8,12 @@ # Created: # 20th December 2012 # +# License: +# GPL-2 +# # Usage: # Place in /etc/munin/plugins/ (or link it there using ln -s) # -# Parameters: -# config (required) -# # change those to reflect your bind configuration (use plugin configuration) # stat file @@ -49,7 +49,7 @@ if [ "$1" = "config" ]; then echo 'graph_info '${section}' for the Bind9 Name Server' echo 'graph_scale no' echo 'graph_title Bind9 '${section} - echo 'graph_vlabel requests/sec' + echo 'graph_vlabel requests/${graph_period}' # Output the stat configs. eval ${cmd} | while read num name @@ -70,7 +70,11 @@ if [ "$1" = "config" ]; then echo ${key}.type COUNTER done - exit 0 + # If dirty config capability is enabled then fall through + # to output the data with the config information. + if [ "$MUNIN_CAP_DIRTYCONFIG" = "" ]; then + exit 0 + fi fi # Output the stats. diff --git a/plugins/network/dns/bind9_server_stats b/plugins/network/dns/bind9_server_stats index 800c677d..9bd78c28 100755 --- a/plugins/network/dns/bind9_server_stats +++ b/plugins/network/dns/bind9_server_stats @@ -8,12 +8,12 @@ # Created: # 20th December 2012 # +# License: +# GPL-2 +# # Usage: # Place in /etc/munin/plugins/ (or link it there using ln -s) # -# Parameters: -# config (required) -# # change those to reflect your bind configuration (use plugin configuration) # stat file @@ -49,7 +49,7 @@ if [ "$1" = "config" ]; then echo 'graph_info '${section}' for the Bind9 Name Server' echo 'graph_scale no' echo 'graph_title Bind9 '${section} - echo 'graph_vlabel requests/sec' + echo 'graph_vlabel requests/${graph_period}' # Output the stat configs. eval ${cmd} | while read num name @@ -69,7 +69,11 @@ if [ "$1" = "config" ]; then echo ${key}.type COUNTER done - exit 0 + # If dirty config capability is enabled then fall through + # to output the data with the config information. + if [ "$MUNIN_CAP_DIRTYCONFIG" = "" ]; then + exit 0 + fi fi # Output the stats. diff --git a/plugins/network/dns/bind9_socket_stats b/plugins/network/dns/bind9_socket_stats index c59bc43e..082bb18f 100755 --- a/plugins/network/dns/bind9_socket_stats +++ b/plugins/network/dns/bind9_socket_stats @@ -8,12 +8,12 @@ # Created: # 20th December 2012 # +# License: +# GPL-2 +# # Usage: # Place in /etc/munin/plugins/ (or link it there using ln -s) # -# Parameters: -# config (required) -# # change those to reflect your bind configuration (use plugin configuration) # stat file @@ -49,7 +49,7 @@ if [ "$1" = "config" ]; then echo 'graph_info '${section}' for the Bind9 Name Server' echo 'graph_scale no' echo 'graph_title Bind9 '${section} - echo 'graph_vlabel requests/sec' + echo 'graph_vlabel requests/${graph_period}' # Output the stat configs. eval ${cmd} | while read num name @@ -67,15 +67,13 @@ if [ "$1" = "config" ]; then echo ${key}.type COUNTER done - exit 0 + # If dirty config capability is enabled then fall through + # to output the data with the config information. + if [ "$MUNIN_CAP_DIRTYCONFIG" = "" ]; then + exit 0 + fi fi -# Blank the stats file (else stats are appended not replaced) -rm ${stat_file} - -# Ask to bind to build new one -${rndc} stats - # Output the stats. eval ${cmd} | while read num name do From b4d9f32859689658379b91a2ee114fd725bc0a06 Mon Sep 17 00:00:00 2001 From: Dave Fennell Date: Fri, 21 Dec 2012 10:37:29 +0000 Subject: [PATCH 5/6] Updated new pgbouncer plugins with license information and added MUNIN_CAP_DIRTYCONFIG support. --- plugins/postgresql/pgbouncer_client_connections | 12 ++++++++---- plugins/postgresql/pgbouncer_maxwait | 12 ++++++++---- plugins/postgresql/pgbouncer_server_connections | 13 ++++++++----- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/plugins/postgresql/pgbouncer_client_connections b/plugins/postgresql/pgbouncer_client_connections index a9471364..0f774911 100755 --- a/plugins/postgresql/pgbouncer_client_connections +++ b/plugins/postgresql/pgbouncer_client_connections @@ -8,12 +8,12 @@ # Created: # 20th December 2012 # +# License: +# GPL-2 +# # Usage: # Place in /etc/munin/plugins/ (or link it there using ln -s) # -# Parameters: -# config (required) -# dbserver='' # '-h localhost' dbuser='postgres' @@ -46,7 +46,11 @@ if [ "$1" = "config" ]; then echo ${pool}.type GAUGE done - exit 0 + # If dirty config capability is enabled then fall through + # to output the data with the config information. + if [ "$MUNIN_CAP_DIRTYCONFIG" = "" ]; then + exit 0 + fi fi # Output looks like this: diff --git a/plugins/postgresql/pgbouncer_maxwait b/plugins/postgresql/pgbouncer_maxwait index ea9a8ade..2d77c4f3 100755 --- a/plugins/postgresql/pgbouncer_maxwait +++ b/plugins/postgresql/pgbouncer_maxwait @@ -5,15 +5,15 @@ # Author: # Dave Fennell # +# License: +# GPL-2 +# # Created: # 20th December 2012 # # Usage: # Place in /etc/munin/plugins/ (or link it there using ln -s) # -# Parameters: -# config (required) -# dbserver='' # '-h localhost' dbuser='postgres' @@ -46,7 +46,11 @@ if [ "$1" = "config" ]; then echo ${pool}.type GAUGE done - exit 0 + # If dirty config capability is enabled then fall through + # to output the data with the config information. + if [ "$MUNIN_CAP_DIRTYCONFIG" = "" ]; then + exit 0 + fi fi # Output looks like this: diff --git a/plugins/postgresql/pgbouncer_server_connections b/plugins/postgresql/pgbouncer_server_connections index 865fa70c..26868122 100755 --- a/plugins/postgresql/pgbouncer_server_connections +++ b/plugins/postgresql/pgbouncer_server_connections @@ -8,12 +8,12 @@ # Created: # 20th December 2012 # +# License: +# GPL-2 +# # Usage: # Place in /etc/munin/plugins/ (or link it there using ln -s) # -# Parameters: -# config (required) -# dbserver='' # '-h localhost' dbuser='postgres' @@ -46,7 +46,11 @@ if [ "$1" = "config" ]; then echo ${pool}.type GAUGE done - exit 0 + # If dirty config capability is enabled then fall through + # to output the data with the config information. + if [ "$MUNIN_CAP_DIRTYCONFIG" = "" ]; then + exit 0 + fi fi # Output looks like this: @@ -63,4 +67,3 @@ do echo ${pool}.value ${total} done - From fc43808f2bede3dcaf22363a88ffbe757894cc0c Mon Sep 17 00:00:00 2001 From: Dave Fennell Date: Fri, 21 Dec 2012 11:53:59 +0000 Subject: [PATCH 6/6] Slight change to formatting of licence information in new bind9 and pgbouncer plugins. --- plugins/network/dns/bind9_resolver_stats | 2 +- plugins/network/dns/bind9_server_stats | 2 +- plugins/network/dns/bind9_socket_stats | 2 +- plugins/postgresql/pgbouncer_client_connections | 2 +- plugins/postgresql/pgbouncer_maxwait | 2 +- plugins/postgresql/pgbouncer_server_connections | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/network/dns/bind9_resolver_stats b/plugins/network/dns/bind9_resolver_stats index 7963aff3..86e410d5 100755 --- a/plugins/network/dns/bind9_resolver_stats +++ b/plugins/network/dns/bind9_resolver_stats @@ -9,7 +9,7 @@ # 20th December 2012 # # License: -# GPL-2 +# GPLv2 # # Usage: # Place in /etc/munin/plugins/ (or link it there using ln -s) diff --git a/plugins/network/dns/bind9_server_stats b/plugins/network/dns/bind9_server_stats index 9bd78c28..4d495982 100755 --- a/plugins/network/dns/bind9_server_stats +++ b/plugins/network/dns/bind9_server_stats @@ -9,7 +9,7 @@ # 20th December 2012 # # License: -# GPL-2 +# GPLv2 # # Usage: # Place in /etc/munin/plugins/ (or link it there using ln -s) diff --git a/plugins/network/dns/bind9_socket_stats b/plugins/network/dns/bind9_socket_stats index 082bb18f..be742f33 100755 --- a/plugins/network/dns/bind9_socket_stats +++ b/plugins/network/dns/bind9_socket_stats @@ -9,7 +9,7 @@ # 20th December 2012 # # License: -# GPL-2 +# GPLv2 # # Usage: # Place in /etc/munin/plugins/ (or link it there using ln -s) diff --git a/plugins/postgresql/pgbouncer_client_connections b/plugins/postgresql/pgbouncer_client_connections index 0f774911..5283d8ab 100755 --- a/plugins/postgresql/pgbouncer_client_connections +++ b/plugins/postgresql/pgbouncer_client_connections @@ -9,7 +9,7 @@ # 20th December 2012 # # License: -# GPL-2 +# GPLv2 # # Usage: # Place in /etc/munin/plugins/ (or link it there using ln -s) diff --git a/plugins/postgresql/pgbouncer_maxwait b/plugins/postgresql/pgbouncer_maxwait index 2d77c4f3..b6091363 100755 --- a/plugins/postgresql/pgbouncer_maxwait +++ b/plugins/postgresql/pgbouncer_maxwait @@ -6,7 +6,7 @@ # Dave Fennell # # License: -# GPL-2 +# GPLv2 # # Created: # 20th December 2012 diff --git a/plugins/postgresql/pgbouncer_server_connections b/plugins/postgresql/pgbouncer_server_connections index 26868122..f795f47d 100755 --- a/plugins/postgresql/pgbouncer_server_connections +++ b/plugins/postgresql/pgbouncer_server_connections @@ -9,7 +9,7 @@ # 20th December 2012 # # License: -# GPL-2 +# GPLv2 # # Usage: # Place in /etc/munin/plugins/ (or link it there using ln -s)