diff --git a/config/config.ini.in b/config/config.ini.in index 2bf6871a8..4d12e67cb 100644 --- a/config/config.ini.in +++ b/config/config.ini.in @@ -49,9 +49,3 @@ configPath = "@icingaweb_config_path@/preferences" ; Use database storage to save preferences in either a MySQL or PostgreSQL database ;type = db ;resource = icingaweb-mysql - -[logfile] -type = file -filename = "/vagrant/var/log/icingaweb.log" -fields = "/^(?[0-9]{4}(-[0-9]{2}){2}T[0-9]{2}(:[0-9]{2}){2}(\\+[0-9]{2}:[0-9]{2})?) (?[A-Za-z]+)( \([0-9]+\))?: (?.*)$/" -; format: PCRE diff --git a/config/menu.ini b/config/menu.ini index b63914202..65959c93a 100644 --- a/config/menu.ini +++ b/config/menu.ini @@ -18,8 +18,12 @@ title = "Configuration" url = "config" priority = 300 +[System.ApplicationLog] +title = "Application log" +url = "list/applicationlog" +priority = 400 + [Logout] url = "authentication/logout" icon = img/icons/logout.png priority = 300 - diff --git a/config/resources.ini.in b/config/resources.ini.in index 7fc4a1490..c5eafeb55 100644 --- a/config/resources.ini.in +++ b/config/resources.ini.in @@ -47,3 +47,9 @@ port = @ldap_port@ root_dn = "@ldap_rootdn@" bind_dn = "@ldap_binddn@" bind_pw = @ldap_bindpass@ + +[logfile] +type = file +filename = "/vagrant/var/log/icingaweb.log" +fields = "/^(?[0-9]{4}(-[0-9]{2}){2}T[0-9]{2}(:[0-9]{2}){2}(\\+[0-9]{2}:[0-9]{2})?) (?[A-Za-z]+)( \([0-9]+\))?: (?.*)$/" +; format: PCRE