Skip to content

Commit

Permalink
Updating ALL regex in the monitoring.ini to be less permissive
Browse files Browse the repository at this point in the history
  • Loading branch information
amaltaro committed Jan 10, 2014
1 parent 87b2173 commit 73edf04
Show file tree
Hide file tree
Showing 27 changed files with 40 additions and 40 deletions.
4 changes: 2 additions & 2 deletions base/monitoring.ini
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Glob pattern to search for log files under the svc logs directory,
# and the regular expression to look for in those files.
LOG_FILES='*.log'
LOG_ERROR_REGEX='.*trace:.*|.*Traceback.*'
LOG_ERROR_REGEX='trace:|Traceback'

# Perl regex to look for the service process using ps
PS_REGEX="cmsWeb.*[/]base"

# The ping test fetches the provided URL and look for the following perl regex
PING_URL="http://localhost:7999/base/"
PING_REGEX=".*TEST PAGE.*"
PING_REGEX="TEST PAGE"
2 changes: 1 addition & 1 deletion couchdb/monitoring.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ PS_REGEX="/bin/beam.smp .*/config/couchdb//local.ini.* -heart"

# The ping test fetches the provided URL and look for the following perl regex
PING_URL="http://localhost:5984/"
PING_REGEX='.*"couchdb":"Welcome",.*'
PING_REGEX='"couchdb":"Welcome",'
6 changes: 3 additions & 3 deletions das/monitoring-das-kws.ini
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# Glob pattern to search for log files under the svc logs directory,
# and the regular expression to look for in those files.
LOG_FILES='das-[^a]*.log*'
LOG_ERROR_REGEX='.*cherrypy\.error.*|.*HTTP Traceback.*'
LOG_ERROR_REGEX='cherrypy\.error|HTTP Traceback'

# Perl regex to look for the service process using ps
PS_REGEX="/DAS/web/das_server.*"
PS_REGEX="/DAS/web/das_server"

# The ping test fetches the provided URL and look for the following perl regex
PING_URL="http://localhost:8214/das"
PING_REGEX="DAS KWS Server"

# Monitor _das process
PROCESS_OWNER="_das"
PROCESS_REGEX_NAME="/DAS/web/das_server.*"
PROCESS_REGEX_NAME="/DAS/web/das_server"
PROCESS_ACTIVITY="cpu,mem,threads,user,system,rss,vms,connections,io,files"
8 changes: 4 additions & 4 deletions das/monitoring-das-web.ini
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# Glob pattern to search for log files under the svc logs directory,
# and the regular expression to look for in those files.
LOG_FILES='das-[^a]*.log*'
LOG_ERROR_REGEX='.*cherrypy\.error.*|.*HTTP Traceback.*'
LOG_ERROR_REGEX='cherrypy\.error|HTTP Traceback'

# Perl regex to look for the service process using ps
PS_REGEX="/DAS/web/das_server.*"
PS_REGEX="/DAS/web/das_server"

# The ping test fetches the provided URL and look for the following perl regex
PING_URL="http://localhost:8212/das"
PING_REGEX=".*CMS Data Aggregation Service.*"
PING_REGEX="CMS Data Aggregation Service"

# Monitor _das process
PROCESS_OWNER="_das"
PROCESS_REGEX_NAME="/DAS/web/das_server.*"
PROCESS_REGEX_NAME="/DAS/web/das_server"
PROCESS_ACTIVITY="cpu,mem,threads,user,system,rss,vms,connections,io,files"
4 changes: 2 additions & 2 deletions dbsmigration/monitoring.ini
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Glob pattern to search for log files under the svc logs directory,
# and the regular expression to look for in those files.
LOG_FILES='dbsmigration-*.log'
LOG_ERROR_REGEX='.*cherrypy\.error.*|.*HTTP Traceback.*'
LOG_ERROR_REGEX='cherrypy\.error|HTTP Traceback'

# Perl regex to look for the service process using ps
PS_REGEX="StartUp.py.*[/]Migration.py"

# The ping test fetches the provided URL and look for the following perl regex
PING_URL="http://localhost:8251/"
PING_REGEX=".*DBS3 Migration Service.*"
PING_REGEX="DBS3 Migration Service"
4 changes: 2 additions & 2 deletions dbsweb/monitoring.ini
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Glob pattern to search for log files under the svc logs directory,
# and the regular expression to look for in those files.
LOG_FILES='*.log'
LOG_ERROR_REGEX='.*error.*'
LOG_ERROR_REGEX='error'

# Perl regex to look for the service process using ps
PS_REGEX="[/]DDServer"

# The ping test fetches the provided URL and look for the following perl regex
PING_URL="http://localhost:8003/DDServer/_status"
PING_REGEX=".*DBS STATUS PAGE.*"
PING_REGEX="DBS STATUS PAGE"
4 changes: 2 additions & 2 deletions dmwmmon/monitoring-dmwmmon.ini
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Glob pattern to search for log files under the svc logs directory,
# and the regular expression to look for in those files.
LOG_FILES='datasvc-*'
LOG_ERROR_REGEX='.*\[error\].*'
LOG_ERROR_REGEX='\[error\]'

# Perl regex to look for the service process using ps
PS_REGEX="/httpd -f .*/state/dmwmmon/server.conf"

# The ping test fetches the provided URL and look for the following perl regex
PING_URL="http://localhost:8280/dmwmmon/datasvc/doc"
PING_REGEX=".*DMWMMON::Web::Core.*"
PING_REGEX="DMWMMON::Web::Core"
2 changes: 1 addition & 1 deletion dqmgui/monitoring-dqm-caf-agents.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ENABLE_IF='app_is_enabled and host == "vocms138"'

LOG_FILES='caf/agent-*.log'
LOG_ERROR_REGEX='ERROR|WARNING'
LOG_ERROR_REGEX='Traceback \(most recent|.*cherrypy\.error.*|File ".*", line \d+, in'
LOG_ERROR_REGEX='Traceback \(most recent|cherrypy\.error|File ".*", line \d+, in'

REPORT_FILES='caf/agent-*.log'
REPORT_REGEX='\[(?P<AGENT>[A-Za-z0-9]+)/\d+\] found (?P<QUEUE>\d+) new files'
Expand Down
2 changes: 1 addition & 1 deletion dqmgui/monitoring-dqm-caf-web.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ LOG_ERROR_REGEX='\S+ \(pid=\d+ ppid=\d+\) received fatal signal'
LOG_ERROR_REGEX='^assertion failed: '
LOG_ERROR_REGEX=': Assertion .* failed'
LOG_ERROR_REGEX='ABORTING|WATCHDOG|ERROR|WARNING'
LOG_ERROR_REGEX='Traceback \(most recent|.*cherrypy\.error.*|File ".*", line \d+, in'
LOG_ERROR_REGEX='Traceback \(most recent|cherrypy\.error|File ".*", line \d+, in'
LOG_ERROR_REGEX='^(Warning|Error) in '

PS_REGEX='[/]monGui .*/server-conf-caf.py'
Expand Down
2 changes: 1 addition & 1 deletion dqmgui/monitoring-dqm-dev-agents.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ENABLE_IF='app_is_enabled and host not in ("vocms139", "vocms138", "dqm-c2d07-01

LOG_FILES='dev/agent-*.log'
LOG_ERROR_REGEX='ERROR|WARNING'
LOG_ERROR_REGEX='Traceback \(most recent|.*cherrypy\.error.*|File ".*", line \d+, in'
LOG_ERROR_REGEX='Traceback \(most recent|cherrypy\.error|File ".*", line \d+, in'

REPORT_FILES='dev/agent-*.log'
REPORT_REGEX='\[(?P<AGENT>[A-Za-z0-9]+)/\d+\] found (?P<QUEUE>\d+) new files'
Expand Down
2 changes: 1 addition & 1 deletion dqmgui/monitoring-dqm-dev-web.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ LOG_ERROR_REGEX='\S+ \(pid=\d+ ppid=\d+\) received fatal signal'
LOG_ERROR_REGEX='^assertion failed: '
LOG_ERROR_REGEX=': Assertion .* failed'
LOG_ERROR_REGEX='ABORTING|WATCHDOG|ERROR|WARNING'
LOG_ERROR_REGEX='Traceback \(most recent|.*cherrypy\.error.*|File ".*", line \d+, in'
LOG_ERROR_REGEX='Traceback \(most recent|cherrypy\.error|File ".*", line \d+, in'
LOG_ERROR_REGEX='^(Warning|Error) in '

PS_REGEX='[/]monGui .*/server-conf-dev.py'
Expand Down
2 changes: 1 addition & 1 deletion dqmgui/monitoring-dqm-offline-agents.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ENABLE_IF='app_is_enabled and host == "vocms138"'

LOG_FILES='offline/agent-*.log'
LOG_ERROR_REGEX='ERROR|WARNING'
LOG_ERROR_REGEX='Traceback \(most recent|.*cherrypy\.error.*|File ".*", line \d+, in'
LOG_ERROR_REGEX='Traceback \(most recent|cherrypy\.error|File ".*", line \d+, in'

REPORT_FILES='offline/agent-*.log'
REPORT_REGEX='\[(?P<AGENT>[A-Za-z0-9]+)/\d+\] found (?P<QUEUE>\d+) new files'
Expand Down
2 changes: 1 addition & 1 deletion dqmgui/monitoring-dqm-offline-web.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ LOG_ERROR_REGEX='\S+ \(pid=\d+ ppid=\d+\) received fatal signal'
LOG_ERROR_REGEX='^assertion failed: '
LOG_ERROR_REGEX=': Assertion .* failed'
LOG_ERROR_REGEX='ABORTING|WATCHDOG|ERROR|WARNING'
LOG_ERROR_REGEX='Traceback \(most recent|.*cherrypy\.error.*|File ".*", line \d+, in'
LOG_ERROR_REGEX='Traceback \(most recent|cherrypy\.error|File ".*", line \d+, in'
LOG_ERROR_REGEX='^(Warning|Error) in '

PS_REGEX='[/]monGui .*/server-conf-offline.py'
Expand Down
2 changes: 1 addition & 1 deletion dqmgui/monitoring-dqm-online-base-agents.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ENABLE_IF='app_is_enabled and host in ["dqm-c2d07-%02d" % x for x in [1,2,11,12,

LOG_FILES='agent-*.log'
LOG_ERROR_REGEX='ERROR|WARNING'
LOG_ERROR_REGEX='Traceback \(most recent|.*cherrypy\.error.*|File ".*", line \d+, in'
LOG_ERROR_REGEX='Traceback \(most recent|cherrypy\.error|File ".*", line \d+, in'

REPORT_FILES='agent-*.log'
REPORT_REGEX='\[(?P<AGENT>[A-Za-z0-9]+)/\d+\] found (?P<QUEUE>\d+) new files'
Expand Down
2 changes: 1 addition & 1 deletion dqmgui/monitoring-dqm-online-base-web.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ LOG_ERROR_REGEX='\S+ \(pid=\d+ ppid=\d+\) received fatal signal'
LOG_ERROR_REGEX='^assertion failed: '
LOG_ERROR_REGEX=': Assertion .* failed'
LOG_ERROR_REGEX='ABORTING|WATCHDOG|ERROR|WARNING'
LOG_ERROR_REGEX='Traceback \(most recent|.*cherrypy\.error.*|File ".*", line \d+, in'
LOG_ERROR_REGEX='Traceback \(most recent|cherrypy\.error|File ".*", line \d+, in'
LOG_ERROR_REGEX='^(Warning|Error) in '
2 changes: 1 addition & 1 deletion dqmgui/monitoring-dqm-relval-agents.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ENABLE_IF='app_is_enabled and host == "vocms139"'

LOG_FILES='relval/agent-*.log'
LOG_ERROR_REGEX='ERROR|WARNING'
LOG_ERROR_REGEX='Traceback \(most recent|.*cherrypy\.error.*|File ".*", line \d+, in'
LOG_ERROR_REGEX='Traceback \(most recent|cherrypy\.error|File ".*", line \d+, in'

REPORT_FILES='relval/agent-*.log'
REPORT_REGEX='\[(?P<AGENT>[A-Za-z0-9]+)/\d+\] found (?P<QUEUE>\d+) new files'
Expand Down
2 changes: 1 addition & 1 deletion dqmgui/monitoring-dqm-relval-web.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ LOG_ERROR_REGEX='\S+ \(pid=\d+ ppid=\d+\) received fatal signal'
LOG_ERROR_REGEX='^assertion failed: '
LOG_ERROR_REGEX=': Assertion .* failed'
LOG_ERROR_REGEX='ABORTING|WATCHDOG|ERROR|WARNING'
LOG_ERROR_REGEX='Traceback \(most recent|.*cherrypy\.error.*|File ".*", line \d+, in'
LOG_ERROR_REGEX='Traceback \(most recent|cherrypy\.error|File ".*", line \d+, in'
LOG_ERROR_REGEX='^(Warning|Error) in '

PS_REGEX='[/]monGui .*/server-conf-relval.py'
Expand Down
4 changes: 2 additions & 2 deletions filemover/monitoring.ini
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Glob pattern to search for log files under the svc logs directory,
# and the regular expression to look for in those files.
LOG_FILES='*.log'
LOG_ERROR_REGEX='.*trace:.*|.*Traceback.*'
LOG_ERROR_REGEX='trace:|Traceback'

# Perl regex to look for the service process using ps
PS_REGEX="[/]Root.py --ini=.*fm_config.py"

# The ping test fetches the provided URL and look for the following perl regex
PING_URL="http://localhost:8201/filemover/js/util.js"
PING_REGEX=".*Fetch your favorite LFN.*"
PING_REGEX="Fetch your favorite LFN"
2 changes: 1 addition & 1 deletion mongodb/monitoring.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ PS_REGEX="/bin/mongod"

# The ping test fetches the provided URL and look for the following perl regex
PING_URL="http://localhost:8230/"
PING_REGEX=".*You are trying to access MongoDB.*"
PING_REGEX="You are trying to access MongoDB"
2 changes: 1 addition & 1 deletion overview/monitoring.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
LOG_FILES='*.log'
LOG_ERROR_REGEX='WATCHDOG|ERROR|WARNING'
LOG_ERROR_REGEX='Traceback \(most recent|.*cherrypy\.error.*|File ".*", line \d+, in'
LOG_ERROR_REGEX='Traceback \(most recent|cherrypy\.error|File ".*", line \d+, in'

PS_REGEX='[/]monGui .*/overview/server-conf.py'

Expand Down
4 changes: 2 additions & 2 deletions phedex/monitoring-phedex-datasvc.ini
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Glob pattern to search for log files under the svc logs directory,
# and the regular expression to look for in those files.
LOG_FILES='datasvc-*'
LOG_ERROR_REGEX='.*\[error\].*'
LOG_ERROR_REGEX='\[error\]'

# Perl regex to look for the service process using ps
PS_REGEX="/httpd -f .*/state/phedex/server.conf"

# The ping test fetches the provided URL and look for the following perl regex
PING_URL="http://localhost:7001/phedex/datasvc/doc"
PING_REGEX=".*PHEDEX::Web::Core.*"
PING_REGEX="PHEDEX::Web::Core"
4 changes: 2 additions & 2 deletions phedex/monitoring-phedex-web.ini
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Glob pattern to search for log files under the svc logs directory,
# and the regular expression to look for in those files.
LOG_FILES='web-*'
LOG_ERROR_REGEX='.*\[error\].*'
LOG_ERROR_REGEX='\[error\]'

# Perl regex to look for the service process using ps
PS_REGEX="/httpd -f .*/state/phedex/server.conf"

# The ping test fetches the provided URL and look for the following perl regex
PING_URL="http://localhost:7101/phedex"
PING_REGEX=".*PhEDEx.*"
PING_REGEX="PhEDEx"
4 changes: 2 additions & 2 deletions phedex/monitoring-phedex-webapp.ini
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Glob pattern to search for log files under the svc logs directory,
# and the regular expression to look for in those files.
LOG_FILES='webapp-*'
LOG_ERROR_REGEX='.*\[error\].*'
LOG_ERROR_REGEX='\[error\]'

# Perl regex to look for the service process using ps
PS_REGEX="/httpd -f .*/state/phedex/server.conf"

# The ping test fetches the provided URL and look for the following perl regex
PING_URL="http://localhost:7001/phedex/datasvc/app"
PING_REGEX=".*PhEDEx Web Application.*"
PING_REGEX="PhEDEx Web Application"
2 changes: 1 addition & 1 deletion reqmgr/monitoring.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ PS_REGEX="WebTools.Root.*[/]reqmgr[/]ReqMgrConfig.py"

# The ping test fetches the provided URL and look for the following perl regex
PING_URL="http://localhost:8240/reqmgr/"
PING_REGEX=".*Welcome to the DMWM web framework.*"
PING_REGEX="Welcome to the DMWM web framework"
2 changes: 1 addition & 1 deletion sitedb/monitoring-sitedb-legacy.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ PS_REGEX="cmsWeb.*[/]sitedb"

# The ping test fetches the provided URL and look for the following perl regex
PING_URL="http://localhost:8055/json/index/CMSNametoCE?name=T1_CH_CERN"
PING_REGEX=".*'ce[0-9]+.cern.ch'.*"
PING_REGEX="'ce[0-9]+.cern.ch'"
2 changes: 1 addition & 1 deletion sitedb/monitoring.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Glob pattern to search for log files under the svc logs directory,
# and the regular expression to look for in those files.
LOG_FILES='*.log'
LOG_ERROR_REGEX='.*error:.*'
LOG_ERROR_REGEX='ERROR'

# Perl regex to look for the service process using ps
PS_REGEX="wmc-httpd.*[/]sitedb/config.py"
Expand Down
2 changes: 1 addition & 1 deletion t0wmadatasvc/monitoring.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Glob pattern to search for log files under the svc logs directory,
# and the regular expression to look for in those files.
LOG_FILES='*.log'
LOG_ERROR_REGEX='.*error:.*'
LOG_ERROR_REGEX='error:'

# Perl regex to look for the service process using ps
PS_REGEX="wmc-httpd.*[/]t0wmadatasvc[/]config.py"
Expand Down

0 comments on commit 73edf04

Please sign in to comment.