Merge remote-tracking branch 'upstream/master'

[nominatim.git] / munin / nominatim_throttled_ips

diff --git a/munin/nominatim_throttled_ips b/munin/nominatim_throttled_ips
index b2f28e525b3be8762c2c5ee3484aee5f05282f5b..a56ff31d20bd10db2762523fd5bdf4c74d055840 100755 (executable)
--- a/munin/nominatim_throttled_ips
+++ b/munin/nominatim_throttled_ips
@@ -11,6 +11,7 @@
 if [ "$1" = "config" ]; then
  
         echo 'graph_title Restricted IPs' 
 if [ "$1" = "config" ]; then
  
         echo 'graph_title Restricted IPs' 

+        echo 'graph_args -l 0'

         echo 'graph_vlabel number of IPs'
         echo 'graph_category nominatim'
         echo 'bulk.label bulk'
         echo 'graph_vlabel number of IPs'
         echo 'graph_category nominatim'
         echo 'bulk.label bulk'


@@ -24,4 +25,4 @@ fi
  
 BASEDIR="$(dirname "$(readlink -f "$0")")"
 
  
 BASEDIR="$(dirname "$(readlink -f "$0")")"
 

-cut -f 2 -d ' ' $BASEDIR/../settings/ip_blocks.map | uniq -c | sed 's:[[:space:]]*\([0-9]\+\) \(.*\):\2.value \1:'
+cut -f 2 -d ' ' $BASEDIR/../../bin/settings/ip_blocks.map | sort | uniq -c | sed 's:[[:space:]]*\([0-9]\+\) \(.*\):\2.value \1:'