tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,901 Commits 116 Branches 71 Tags 80 MiB
Commit Graph

6901 Commits

Author SHA1 Message Date
Eric Lippmann dd1025119d Throw HttpNotFoundException on Controller::httpNotFound() 
refs #6281
 2015-05-21 16:54:00 +02:00
Marius Hein dd654980b7 Merge branch 'bugfix/customvars-case-insensitive-8696' 
fixes #8696
 2015-05-21 16:51:31 +02:00
Marius Hein 57abafd10b Merge branch 'master' into bugfix/customvars-case-insensitive-8696 2015-05-21 16:51:04 +02:00
Eric Lippmann c4ed49cb1a lib: Add HttpNotFoundException 
The HttpNotFoundException should be used for sending a HTTP 404 response w/ a custom message.

There's also Zend_Controller_Action_Exception but this exception will always show 'Page not found' because we
want to hide messages generated by Zend, like 'Action "foobar" does not exist and was not trapped in __call()'.

refs #6281
 2015-05-21 16:43:58 +02:00
Johannes Meyer 0686bc1d86 GroupController: List members when showing a group 
refs #8826
 2015-05-21 16:38:47 +02:00
Matthias Jentsch 54f72377c5 Do not display mouse-over effect in comment multi-view 2015-05-21 16:28:00 +02:00
Eric Lippmann 0b81a1130f monitoring: Fix HTTP response code when showing an invalid host 
refs #6281
 2015-05-21 16:18:09 +02:00
Eric Lippmann e8c704b98d monitoring: Fix HTTP response code when showing an invalid service 
refs #6281
 2015-05-21 16:18:09 +02:00
Eric Lippmann ce9110d22d Revert "Add proper respond http codes to service and host controller" 
This reverts commit 6df031dc78.

I revert this commit for the following reasons:
- MissingParameterException must not be thrown manually because we have UrlParams::getRequired() which was UrlParams::req() before.
- The commit introduces the untranslated string 'host or service'.
- 4xx are client, not server errors.
- Copy and paste code for the stack trace handling in the ErrorController.

refs #6281
 2015-05-21 16:14:02 +02:00
Marius Hein 7c04664888 Make MySQL collation syntax default 
Overwrite customVarsJoinTemplate for Postgres and Oracle.

refs #8696
 2015-05-21 16:09:03 +02:00
Matthias Jentsch 8ce9989243 Merge branch 'feature/support-icon-image-alt-9300' 
resolves #9300
 2015-05-21 15:03:06 +02:00
Johannes Meyer fac2ebce80 RepositoryQuery: Fix handling of queries returning no results in fetchColumn() 
refs #8826
 2015-05-21 15:02:56 +02:00
Matthias Jentsch f808d373ea Display image icon tooltip instantly 
refs #9300
 2015-05-21 15:02:23 +02:00
Johannes Meyer 4833ff109c RepositoryQuery: Validate the table passed when calling from() 
refs #8826
 2015-05-21 15:01:13 +02:00
Matthias Jentsch 598ef1e8f4 Add alt-text to icon_images 
Print alt-text as title and alt-attribute in the helper class and add the alt-column to the backend query.

refs #9300
 2015-05-21 14:59:12 +02:00
Eric Lippmann 54577d04bd Merge branch 'master' into bugfix/time-formatting-6778 
Conflicts:
	modules/monitoring/application/views/scripts/list/comments.phtml
	modules/monitoring/application/views/scripts/list/hostgroups.phtml
	modules/monitoring/application/views/scripts/process/info.phtml
	modules/monitoring/application/views/scripts/show/components/downtime.phtml
	modules/monitoring/application/views/scripts/show/components/notifications.phtml
	modules/monitoring/public/css/module.less
 2015-05-21 14:57:01 +02:00
Marius Hein e8e3b940af Use CustomVariable names case insensitive 
refs #8696
 2015-05-21 14:42:09 +02:00
Marius Hein 0002c0be26 Provide default config name for Module::getConfig() 2015-05-21 14:40:52 +02:00
Eric Lippmann 47f21eebaa Merge branch 'bugfix/Take-display_name-into-account-when-searching-for-host-and-service-names-8241' 
fixes #8241
 2015-05-21 14:05:49 +02:00
Eric Lippmann c47465a732 lib/filter: Fix check against unset search columns 
refs #8241
 2015-05-21 14:04:04 +02:00
Eric Lippmann 57328aa6ed monitoring: Make host group and service group alias columns case insensitive 
The alias columns should be case insenstive because we now support them when searching.

refs #8241
 2015-05-21 13:58:54 +02:00
Johannes Meyer 10b158a182 LdapUserBackend: Fix sorting when sorting by user_name 
refs #8826
 2015-05-21 13:53:27 +02:00
Johannes Meyer 4d79731646 DbUserBackend: Fix sorting when sorting by user_name 
refs #8826
 2015-05-21 13:53:18 +02:00
Johannes Meyer ba31be9695 RepositoryQuery: Disim.. Fix sort order handling 
refs #8826
 2015-05-21 13:52:43 +02:00
Johannes Meyer 9278d708d7 IniUserGroupBackend: Do not sort by parent when sorting by group_name 
refs #8826
 2015-05-21 13:51:24 +02:00
Johannes Meyer 6369643145 DbUserGroupBackend: Do not sort by parent when sorting by group_name 
refs #8826
 2015-05-21 13:51:15 +02:00
Eric Lippmann 0c72686ba1 monitoring: Make display_name columns case insensitive 
The display_name columns should be case insenstive because we now support them when searching.

refs #8241
 2015-05-21 12:46:47 +02:00
Eric Lippmann ad5ab16b3f monitoring: Drop the Groupsummary data view 
We have Hostgroupsummary and Servicegroupsummary now.

refs #8241
 2015-05-21 12:43:27 +02:00
Eric Lippmann e0c6ce58c3 monitoring: Fix sort control columns for the service group summary 
refs #8241
 2015-05-21 12:42:53 +02:00
Eric Lippmann 0db7cfca88 monitoring: Default to the sort rules of the service group summary 
refs #8241
 2015-05-21 12:41:59 +02:00
Eric Lippmann 1a1f93db23 monitoring: Add sort rules to the service group summary 
refs #8241
 2015-05-21 12:41:29 +02:00
Eric Lippmann e7396ea49c monitoring: Add services_severity to the service group summary data view 
refs #8241
 2015-05-21 12:38:58 +02:00
Eric Lippmann 89bac33595 monitoring: Fix sort control columns for the host group summary 
refs #8241
 2015-05-21 12:38:20 +02:00
Eric Lippmann 73eb8cc805 monitoring: Add sort rule for total services to the host group summary 
refs #8241
 2015-05-21 12:37:53 +02:00
Eric Lippmann 4b9f7eb910 monitoring: Default to the sort rules of the host group summary 
refs #8241
 2015-05-21 12:36:05 +02:00
Eric Lippmann 58b3192ce3 monitoring: Add sort rules to the host group summary 
refs #8241
 2015-05-21 12:26:27 +02:00
Eric Lippmann 195275a716 monitoring: Don't hardcode sort direction of the severity columns 
fixes #9059
 2015-05-21 12:20:18 +02:00
Eric Lippmann 82f9425b90 Revert "Make ascending sort by host or service severity initiatable" 
This reverts commit 386d4db851.

The commit introduced the bug that changing the sort direction no longer changed the sort direction :)

refs #9059
 2015-05-21 12:20:18 +02:00
Matthias Jentsch 87a46ea5b1 Merge branch 'feature/show-icon-images-in-detail-view-8665' 
fixes #8665
 2015-05-21 11:42:57 +02:00
Matthias Jentsch ee6c669441 Deduplicate code and fix layout 
Move icon rendering code into a separate for better maintainabillity.

refs #8665
 2015-05-21 11:40:08 +02:00
Eric Lippmann a52264aa32 monitoring: Sort by hosts_severity when sorting the host group summary by severity 
refs #8241
 2015-05-21 11:26:10 +02:00
Eric Lippmann 37abc724de monitoring: Let the host group summary provide the column hosts_severity 
refs #8241
 2015-05-21 11:24:31 +02:00
Eric Lippmann bbed2cffae monitoring: Add column hosts_severity to the group summary query 
refs #8241
 2015-05-21 11:23:55 +02:00
Eric Lippmann ce463d16ef Reorder group summary query's columns by name 
refs #8241
 2015-05-21 11:19:58 +02:00
Eric Lippmann 970d4d7a4a Fix that time-until doesn't show negative partial time in the dashboard 
refs #6778
 2015-05-21 10:19:07 +02:00
Eric Lippmann 1e9337846a ui: Fix refreshing partial time counters 
refs #6778
 2015-05-21 10:16:54 +02:00
Eric Lippmann cfb819ec61 monitoring: Add missing column to the host group summary data view 
refs #8241
 2015-05-20 17:03:23 +02:00
Eric Lippmann b9a6e1042d Merge branch 'master' into bugfix/Take-display_name-into-account-when-searching-for-host-and-service-names-8241 
Conflicts:
	modules/monitoring/application/controllers/ListController.php
 2015-05-20 17:02:49 +02:00
Johannes Meyer ed166d6eb7 GroupController: Add showAction 
refs #8826
 2015-05-20 16:17:37 +02:00
Eric Lippmann 80b174f526 monitoring: Servicegroupsummary must not extend Groupsummary which is subject to remove 
refs #8241
 2015-05-20 16:16:21 +02:00