- patch for unbound_munin_ script to handle arbitrary thread count by

  Sven Ulland.

git-svn-id: file:///svn/unbound/trunk@2707 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/contrib/unbound_munin_ b/contrib/unbound_munin_
index db6c33f38af4e2663ea2f8a7e87926a79a404f52..5c047323cae273ea0c41597623ca3082049f9446 100755 (executable)
--- a/contrib/unbound_munin_
+++ b/contrib/unbound_munin_
@@ -230,9 +230,8 @@ if test "$1" = "config" ; then
                echo "graph_args --base 1000 -l 0"
                echo "graph_vlabel queries / second"
                echo "graph_category DNS"
-               for x in thread0.num.queries thread1.num.queries \
-               thread2.num.queries thread3.num.queries thread4.num.queries \
-               thread5.num.queries thread6.num.queries thread7.num.queries; do
+               for x in `grep "^thread[0-9][0-9]*\.num\.queries=" $state |
+                       sed -e 's/=.*//'`; do
                        exist_config $x "queries handled by `basename $x .num.queries`"
                done
                p_config "total.num.queries" "total queries from clients"
@@ -423,9 +422,8 @@ print_value ( ) {
 
 case $id in
 hits)
-       for x in thread0.num.queries thread1.num.queries thread2.num.queries \
-               thread3.num.queries thread4.num.queries thread5.num.queries \
-               thread6.num.queries thread7.num.queries total.num.queries \
+       for x in `grep "^thread[0-9][0-9]*\.num\.queries=" $state |
+               sed -e 's/=.*//'` total.num.queries \
                total.num.cachehits total.num.prefetch num.query.tcp \
                num.query.ipv6 unwanted.queries unwanted.replies; do
                if grep "^"$x"=" $state >/dev/null 2>&1; then

diff --git a/doc/Changelog b/doc/Changelog
index 00c5af9ba73f373f61c629a453e9ee8bb093238d..dc6d7f699e63f32441789ba141e6f1d812acf95d 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+29 June 2012: Wouter
+       - patch for unbound_munin_ script to handle arbitrary thread count by
+         Sven Ulland.
+
 28 June 2012: Wouter
        - detect if openssl has FIPS_mode.
        - code review: return value of cache_store can be ignored for better