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

743 Commits

Author SHA1 Message Date
Eric Lippmann a93ef04d5d Revert "Add new tab to switch between host and service multi-selection" 
This reverts commit 45a0982beb.

Conflicts:
	modules/monitoring/application/controllers/HostsController.php
	modules/monitoring/application/controllers/ServicesController.php

The tab was removed w/ another commit I guess. This revert removes the related not yet removed crap.
 2015-05-29 13:30:02 +02:00
Eric Lippmann c17334deee monitoring: Support restricting the downtimes overview 
refs #9009
 2015-05-29 11:42:05 +02:00
Eric Lippmann 0c1df335fc monitoring: Fix select columns for downtimes, again 
refs #9009
refs #9319
 2015-05-26 17:15:03 +02:00
Eric Lippmann cd1ee3e306 monitoring: Fix select columns for downtimes 
refs #9009
refs #9319
 2015-05-26 17:07:58 +02:00
Eric Lippmann e240f7b955 monitoring: Don't select host last ack, comment and downtime 
Where unsure whether or not we will still support this.

refs #7344
refs #9009
 2015-05-26 17:00:39 +02:00
Eric Lippmann ea8c497539 Fix exception when following command links for multiple selected hosts 2015-05-22 16:51:23 +02:00
Eric Lippmann 53ca68903a Merge branch 'bugfix/time-formatting-6778' 
fixes #6778
 2015-05-22 11:34:43 +02:00
Eric Lippmann 8d6d52f9db monitoring: Fix date and time formatting in the timeline 
refs #6778
 2015-05-22 10:59:17 +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
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
Matthias Jentsch 8ce9989243 Merge branch 'feature/support-icon-image-alt-9300' 
resolves #9300
 2015-05-21 15:03:06 +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
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 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 89bac33595 monitoring: Fix sort control columns for the host group summary 
refs #8241
 2015-05-21 12:38:20 +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
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 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 f9952cf231 monitoring: Don't sort the service group summary by service severity 
refs #8241
 2015-05-20 16:15:38 +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 5efbad3a71 monitoring: Don't sort the host group summary by service severity 
refs #8241
 2015-05-20 15:50:13 +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 6ba07b089d Implement and use Hostgroupsummary and Servicegroupsummary 
refs #8241
 2015-05-19 18:17:40 +02:00
Matthias Jentsch c0cf6e4918 Display icon_images in all host and service detail views 
refs #8665
 2015-05-19 18:08:26 +02:00
Alexander A. Klimov 36713fb519 Rename parameter $query of ::filterQuery() to $dataView 
refs #8241
 2015-05-19 17:36:23 +02:00
Alexander A. Klimov b1b2e3fc21 Revert "Merge branch 'bugfix/Take-display_name-into-account-when-searching-for-host-and-service-names-8241'" 
This reverts commit 75b004dc42, reversing
changes made to bd7c7f9636.
 2015-05-19 17:13:46 +02:00
Eric Lippmann 0a8c9ad195 Merge branch 'feature/list-number-of-hosts-in-host-groups-8054' 
resolves #8054
 2015-05-19 15:10:20 +02:00
Alexander A. Klimov a2b262eab1 Take display_name into account when searching for host and service names 
refs #8241
 2015-05-19 14:04:23 +02:00
Alexander A. Klimov 85dd496d35 Add parameter $searchColumns to ::filterQuery() 
refs #8241
 2015-05-19 14:01:18 +02:00
Eric Lippmann 3296522d90 Merge branch 'feature/Allow-to-add-columns-to-monitoring-views-via-URL-4498' 
resolves #4498
 2015-05-19 13:35:04 +02:00
Eric Lippmann b5a0f7950e Use PHP's DateTime instead of our DateTimeFactory in the TimeLineController 
I'm about to drop the DateTimeFactory because date_default_timezone_set() in combination w/ PHP's DateTime is sufficient.

refs #6778
 2015-05-19 11:17:00 +02:00
Alexander A. Klimov d539a0e017 Add PHPDoc to ::addColumns() 
refs #4498
 2015-05-19 10:11:54 +02:00
Matthias Jentsch 94555d7998 Streamline layout of all multi-views 
Fix small inconsistencies between layout of downtime, comment, service and host multi-views.
 2015-05-18 17:17:30 +02:00
Alexander A. Klimov 0bde465295 Rename ::extraColumns() to ::addColumns() 
refs #4498
 2015-05-18 16:29:33 +02:00
Matthias Jentsch 592d5eadc1 Merge branch 'feature/improve-multi-select-view-8565' 2015-05-18 16:00:52 +02:00
Matthias Jentsch c3129890aa Improve multi-view tabs 
Display the current object count next to the tab title, to clarify that those views display a summary of multiple items. Only display the current tab for hosts or services, to avoid confusion.

refs #8565
 2015-05-18 15:25:12 +02:00
Matthias Jentsch 00bbb762a1 Integrate comments and downtimes into MonitoredObjectsController 
Add option to list all related commends and downtimes into the specific hosts and serivces views.

refs #8565
 2015-05-18 14:03:10 +02:00
Matthias Jentsch fe2ee3617b Remove pie charts from multi-views 
refs #8565
 2015-05-18 13:56:35 +02:00
Marius Hein 62d8c441f8 Add ServiceActionsHook 
refs #9284
 2015-05-18 11:45:39 +02:00
Johannes Meyer d0cc2ae704 ShowController: Use a default limit of 50 for an object's history listing 
refs #8337
 2015-05-15 15:23:49 +02:00
Johannes Meyer fbf0ad4339 Drop interface Browsable 
We're not required to handle objects of Zend_Paginator in any way, so
creating such as part of a query is not necessary since QueryAdapter
accepts any instance of QueryInterface. (gets enforced in the near future)

refs #8339
 2015-05-15 14:37:41 +02:00
Johannes Meyer 3b7f27f614 Revert "ListController: set up sort control before paginating a query" 
This reverts commit ca79b020e3.
 2015-05-15 14:37:41 +02:00