From 1e891c251037d862ca09050f6cdfafcfb0e2c26d Mon Sep 17 00:00:00 2001 From: Alexander Fuhr Date: Fri, 22 Aug 2014 10:58:28 +0200 Subject: [PATCH] Delete unnecessary menu.ini's and update puppet manifests refs #6639 --- .vagrant-puppet/manifests/default.pp | 26 ------- config/menu.ini | 34 --------- config/modules/doc/menu.ini | 5 -- config/modules/monitoring/menu.ini | 109 --------------------------- 4 files changed, 174 deletions(-) delete mode 100644 config/menu.ini delete mode 100644 config/modules/doc/menu.ini delete mode 100644 config/modules/monitoring/menu.ini diff --git a/.vagrant-puppet/manifests/default.pp b/.vagrant-puppet/manifests/default.pp index 72cb2b237..282803a83 100644 --- a/.vagrant-puppet/manifests/default.pp +++ b/.vagrant-puppet/manifests/default.pp @@ -709,13 +709,6 @@ file { '/etc/icingaweb/config.ini': group => 'apache', } -file { '/etc/icingaweb/menu.ini': - source => 'puppet:////vagrant/config/menu.ini', - owner => 'apache', - group => 'apache', - # replace => false, -} - file { '/etc/icingaweb/resources.ini': source => 'puppet:////vagrant/.vagrant-puppet/files/etc/icingaweb/resources.ini', owner => 'apache', @@ -747,12 +740,6 @@ file { '/etc/icingaweb/modules/monitoring/instances.ini': group => 'apache', } -file { '/etc/icingaweb/modules/monitoring/menu.ini': - source => 'puppet:////vagrant/config/modules/monitoring/menu.ini', - owner => 'apache', - group => 'apache', -} - file { '/etc/icingaweb/dashboard': ensure => 'directory', owner => 'apache', @@ -791,16 +778,3 @@ file { '/etc/bash_completion.d/icingacli': mode => 755, require => Exec['install bash-completion'] } - -file { '/etc/icingaweb/modules/doc/': - ensure => 'directory', - owner => 'apache', - group => 'apache' -} - -file { '/etc/icingaweb/modules/doc/menu.ini': - source => 'puppet:////vagrant/config/modules/doc/menu.ini', - owner => 'apache', - group => 'apache', -} - diff --git a/config/menu.ini b/config/menu.ini deleted file mode 100644 index 075f4230e..000000000 --- a/config/menu.ini +++ /dev/null @@ -1,34 +0,0 @@ -[Dashboard] -title = "Dashboard" -url = "dashboard" -icon = "img/icons/dashboard.png" -priority = 10 - -[System] -icon = img/icons/configuration.png -priority = 200 - -[System.Preferences] -title = "Preferences" -url = "preference" -priority = 200 - -[System.Configuration] -title = "Configuration" -url = "config" -priority = 300 - -[System.Modules] -title = "Modules" -url = "config/modules" -priority = 400 - -[System.ApplicationLog] -title = "Application log" -url = "list/applicationlog" -priority = 500 - -[Logout] -url = "authentication/logout" -icon = img/icons/logout.png -priority = 300 diff --git a/config/modules/doc/menu.ini b/config/modules/doc/menu.ini deleted file mode 100644 index 86889b239..000000000 --- a/config/modules/doc/menu.ini +++ /dev/null @@ -1,5 +0,0 @@ -[Documentation] -title = "Documentation" -icon = "img/icons/comment.png" -url = "doc" -priority = 80 diff --git a/config/modules/monitoring/menu.ini b/config/modules/monitoring/menu.ini deleted file mode 100644 index c185fb87d..000000000 --- a/config/modules/monitoring/menu.ini +++ /dev/null @@ -1,109 +0,0 @@ - -[Problems] -priority = 20 -icon = "img/icons/error.png" - -[Problems.Unhandled Hosts] -priority = 40 -url = "monitoring/list/hosts?host_problem=1&host_handled=0" - -[Problems.Unhandled Services] -priority = 40 -url = "monitoring/list/services?service_problem=1&service_handled=0&sort=service_severity" - -[Problems.Host Problems] -priority = 50 -url = "monitoring/list/hosts?host_problem=1&sort=host_severity" - -[Problems.Service Problems] -priority = 50 -url = "monitoring/list/services?service_problem=1&sort=service_severity&dir=desc" - -[Problems.Current Downtimes] -url = "monitoring/list/downtimes?downtime_is_in_effect=1" - -[Overview] -priority = 30 -icon = "img/icons/hostgroup.png" - -[Overview.Tactical Overview] -title = "Tactical Overview" -url = "monitoring/tactical" -priority = 40 - -[Overview.Hosts] -title = "Hosts" -url = "monitoring/list/hosts" -priority = 50 - -[Overview.Services] -title = "Services" -url = "monitoring/list/services" -priority = 50 - -[Overview.Servicematrix] -title = "Servicematrix" -url = "monitoring/list/servicematrix?service_problem=1" -priority = 51 - -[Overview.Servicegroups] -title = "Servicegroups" -url = "monitoring/list/servicegroups" -priority = 60 - -[Overview.Hostgroups] -title = "Hostgroups" -url = "monitoring/list/hostgroups" -priority = 60 - -[Overview.Contactgroups] -title = "Contactgroups" -url = "monitoring/list/contactgroups" -priority = 61 - -[Overview.Downtimes] -title = "Downtimes" -url = "monitoring/list/downtimes" -priority = 70 - -[Overview.Comments] -title = "Comments" -url = "monitoring/list/comments?comment_type=(comment|ack)" -priority = 70 - -[Overview.Contacts] -title = "Contacts" -url = "monitoring/list/contacts" -priority = 70 - -[History] -icon = "img/icons/history.png" - -[History.Critical Events] -title = "Critical Events" -url = "monitoring/list/statehistorysummary" -priority = 50 - -[History.Notifications] -title = "Notifications" -url = "monitoring/list/notifications" - -[History.Events] -title = "All Events" -url = "monitoring/list/eventhistory?timestamp>=-7%20days" - -[History.Timeline] -title = "Timeline" -url = "monitoring/timeline" - -[System.Process Info] -title = "Process Info" -url = "monitoring/process/info" -priority = 120 - -[System.Performance Info] -title = "Performance Info" -url = "monitoring/process/performance" -priority = 130 - -