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

2521 Commits

Author SHA1 Message Date
Johannes Meyer 59ff4221f6 CommandTransport: Make sure to reset the config before calling current() 2015-05-22 14:01:11 +02:00
Johannes Meyer 265725447d Merge branch 'master' into feature/user-and-group-management-8826 2015-05-22 10:06:31 +02:00
Eric Lippmann 2bdb725370 Merge branch 'bugfix/monitoring-controllers-response-codes-6281' 
fixes #6281
 2015-05-22 09:27:51 +02:00
Eric Lippmann e137263c4b monitoring: Fix HTTP response code when showing an invalid comment 
refs #6281
 2015-05-22 09:20:27 +02:00
Eric Lippmann 8f42d7a1d3 monitoring: Fix HTTP response code when showing an invalid downtime 
refs #6281
 2015-05-21 17:17:25 +02:00
Marius Hein 57abafd10b Merge branch 'master' into bugfix/customvars-case-insensitive-8696 2015-05-21 16:51:04 +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
Matthias Jentsch f808d373ea Display image icon tooltip instantly 
refs #9300
 2015-05-21 15:02:23 +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
Marius Hein e8e3b940af Use CustomVariable names case insensitive 
refs #8696
 2015-05-21 14:42:09 +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 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
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 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
Eric Lippmann 80b174f526 monitoring: Servicegroupsummary must not extend Groupsummary which is subject to remove 
refs #8241
 2015-05-20 16:16:21 +02:00
Eric Lippmann f9952cf231 monitoring: Don't sort the service group summary by service severity 
refs #8241
 2015-05-20 16:15:38 +02:00
Eric Lippmann a9d6a94957 monitoring: Use the groupsummary query for the service group summary view 
refs #8241
 2015-05-20 16:09:30 +02:00
Eric Lippmann 2dc6d5467d monitoring: Don't select unnecessary columns in the host group summary 
refs #8241
 2015-05-20 16:07:49 +02:00
Eric Lippmann d379b27c24 monitoring: Hostgroupsummary must not extend Groupsummary which is subject to remove 
refs #8241
 2015-05-20 15:50:19 +02:00
Eric Lippmann 5efbad3a71 monitoring: Don't sort the host group summary by service severity 
refs #8241
 2015-05-20 15:50:13 +02:00
Eric Lippmann 41e72396ee monitoring: Use the groupsummary query for the host group summary view 
refs #8241
 2015-05-20 15:50:06 +02:00
Eric Lippmann 2493535ac7 Revert "Implement classes HostgroupsummaryQuery and ServicegroupsummaryQuery" 
This reverts commit 9b4f08eb43.

There's DataView::getQueryName() for this.

refs #8241
 2015-05-20 15:29:45 +02:00
Johannes Meyer 71fa736144 Merge branch 'master' into feature/user-and-group-management-8826 2015-05-20 10:46:55 +02:00
Alexander A. Klimov 9b4f08eb43 Implement classes HostgroupsummaryQuery and ServicegroupsummaryQuery 
Without this the Hostgroupsummary and Servicegroupsummary DataViews would not work

refs #8241
 2015-05-20 10:43:54 +02:00
Alexander A. Klimov 0b937c86dc Get columns for FilterEditor::setSearchColumns() from DataView::getSearchColumns() 
refs #8241
 2015-05-19 18:17:41 +02:00
Alexander A. Klimov 93db1d15cb Override ::getSearchColumns() 
refs #8241
 2015-05-19 18:17:40 +02:00
Alexander A. Klimov 6ba07b089d Implement and use Hostgroupsummary and Servicegroupsummary 
refs #8241
 2015-05-19 18:17:40 +02:00