safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

remove hard-coded DB name in munin plugins

Browse Source 
Use PGDATABASE environment variable instead.
This commit is contained in:
Sarah Hoffmann
2013-07-07 16:36:01 +02:00
parent 3ccf466e2f
commit 9ed49e50a6
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
munin/nominatim_importlag
View File

@@ -2,6 +2,9 @@
# #
# Plugin to monitor the age of the imported data in the rendering db # Plugin to monitor the age of the imported data in the rendering db
# #
# Can be configured through libpq environment variables, for example
# PGUSER, PGDATABASE, etc. See man page of psql for more information
#
# Parameters: # Parameters:
# #
# config (required) # config (required)
@@ -21,7 +24,7 @@ if [ "$1" = "config" ]; then
fi fi
delay=`psql -d nominatim -c "copy (select extract(epoch from timezone('utc', now())-lastimportdate)::int from import_status) to stdout"` delay=`psql -c "copy (select extract(epoch from timezone('utc', now())-lastimportdate)::int from import_status) to stdout"`
echo "age.value $delay" echo "age.value $delay"

11
munin/nominatim_requests
View File

@@ -2,6 +2,9 @@
# #
# Plugin to monitor the types of requsts made to the API # Plugin to monitor the types of requsts made to the API
# #
# Can be configured through libpq environment variables, for example
# PGUSER, PGDATABASE, etc. See man page of psql for more information.
#
# Parameters: # Parameters:
# #
# config (required) # config (required)
@@ -32,10 +35,10 @@ fi
query="select count(*)/5.0 from new_query_log where starttime > (now() - interval '5 min') and " query="select count(*)/5.0 from new_query_log where starttime > (now() - interval '5 min') and "
reverse=`psql -d nominatim -c "copy ($query type='reverse') to stdout"` reverse=`psql -c "copy ($query type='reverse') to stdout"`
searchy=`psql -d nominatim -c "copy ($query type='search' and results>0) to stdout"` searchy=`psql -c "copy ($query type='search' and results>0) to stdout"`
searchn=`psql -d nominatim -c "copy ($query type='search' and results=0) to stdout"` searchn=`psql -c "copy ($query type='search' and results=0) to stdout"`
details=`psql -d nominatim -c "copy ($query type='details') to stdout"` details=`psql -c "copy ($query type='details') to stdout"`
echo "z1.value $reverse" echo "z1.value $reverse"
echo "z2.value $searchy" echo "z2.value $searchy"