Commit Graph

2590 Commits

Author SHA1 Message Date
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
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 2ed1d6c66b Implement ::getSearchColumns()
refs #8241
2015-05-19 17:36:24 +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
Johannes Meyer fb07f0b94c Merge branch 'master' into feature/user-and-group-management-8826
Conflicts:
	library/Icinga/Authentication/Backend/LdapUserBackend.php
	library/Icinga/Protocol/Ldap/Query.php
2015-05-19 14:14:03 +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
Johannes Meyer 4cedfce07f DataView: Fix that method getOffset() calls parent::hasOffset() 2015-05-19 13:57:20 +02:00
Johannes Meyer a629adb448 DataView: Remove method paginate() 2015-05-19 13:57:20 +02:00
Eric Lippmann afe07f4814 Revert "Hostgroups view: reduce "Last Problem" column's width"
This reverts commit 8b08473341.

Common table style is subject of #8935.

refs #8054
2015-05-19 13:45:20 +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
Eric Lippmann 979f16e5f6 Use date and time format view helper function in the monitoring health view
I'm about to drop the DateFormat view helper class.

refs #6778
2015-05-19 10:13:58 +02:00
Alexander A. Klimov d539a0e017 Add PHPDoc to ::addColumns()
refs #4498
2015-05-19 10:11:54 +02:00
Eric Lippmann 8f40d76cca Use date format view helper function in the event grid
I'm about to drop the DateFormat view helper class.

refs #6778
2015-05-19 10:11:12 +02:00
Eric Lippmann 7212c038f1 Don't show ago, since, ... for monitoring list views in the dashboard
refs #6778
2015-05-19 10:00:27 +02:00
Eric Lippmann 3fdf1d2a5c Use timeAgo in the event history overview
refs #6778
2015-05-19 09:57:46 +02:00
Johannes Meyer f305a334d5 DbConnection: Drop param $columnIndex in fetchColumn(), it's unused 2015-05-19 09:48:20 +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
Alexander A. Klimov 52d1cb8c8f Merge branch 'bugfix/Toggle-FeaturesCommandForm-make-notifications-more-verbose-9023'
fixes #9023
2015-05-18 16:09:07 +02:00
Alexander A. Klimov 7caba93a28 Replace `...' w/ `..'
refs #9023
2015-05-18 16:07:28 +02:00
Johannes Meyer 0e0341f78a It's the connection which provides a cursor, not the query 2015-05-18 16:01:58 +02:00
Matthias Jentsch 592d5eadc1 Merge branch 'feature/improve-multi-select-view-8565' 2015-05-18 16:00:52 +02:00
Matthias Jentsch 1f20ba1bc6 Fix state summary base target in multi views
refs #8565
2015-05-18 15:48:04 +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
Alexander A. Klimov 0d48ddcc06 ToggleObjectFeaturesCommandForm::onSuccess(): show a notification for each feature about whether it has been enabled or disabled
refs #9023
2015-05-18 15:18:26 +02:00
Johannes Meyer 742dfcaf41 Revert "Fetchable: Add method fetch() which returns an iterator"
This reverts commit 7a6837de0e.
2015-05-18 15:17:22 +02:00
Matthias Jentsch 342a8a39d1 Fix state summary in multi views
refs #8565
2015-05-18 14:58:51 +02:00
Alexander A. Klimov 729fb9a4d1 ToggleInstanceFeaturesCommandForm::onSuccess(): notifications: show which feature has been enabled or disabled
refs #9023
2015-05-18 14:51:22 +02:00
Matthias Jentsch e84491d438 Improve multi view layout
refs #8565
2015-05-18 14:49:06 +02:00
Eric Lippmann 9ffeffdf09 Show when an object's dowtime was added
refs #6778
2015-05-18 14:39:36 +02:00
Eric Lippmann 13a38c9d18 Revert "Add new line between comment author and creation time in the detail views"
This reverts commit 229e266daf.

The new line does not help for improving the layout but makes it more confusing.
2015-05-18 14:36:35 +02:00
Eric Lippmann e49f938f56 Use timeSince and timeUntil when displaying object downtimes
refs #6778
2015-05-18 14:33:49 +02:00
Alexander A. Klimov 4fbadaea2c ToggleInstanceFeaturesCommandForm::createElements(): make form labels shorter
refs #9023
2015-05-18 14:20:17 +02:00
Eric Lippmann bd51bed9d7 Use timeSince and timeUntil in the dowtimes overview
refs #6778
2015-05-18 14:18:22 +02:00
Eric Lippmann e1f6aee2e7 Use timeAgo in the notifications overview
refs #6778
2015-05-18 14:17:48 +02:00
Marius Hein f4d25a71c8 Merge branch 'master' into feature/service-actions-9284 2015-05-18 14:07:41 +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
Johannes Meyer 7a6837de0e Fetchable: Add method fetch() which returns an iterator 2015-05-18 13:59:16 +02:00
Matthias Jentsch fe2ee3617b Remove pie charts from multi-views
refs #8565
2015-05-18 13:56:35 +02:00
Alexander A. Klimov 4ff7d7a845 Don't parse $object->check_execution_time w/ regex as it's always a float (or null) 2015-05-18 13:37:38 +02:00
Marius Hein 62d8c441f8 Add ServiceActionsHook
refs #9284
2015-05-18 11:45:39 +02:00
Johannes Meyer 524c449649 Merge branch 'master' into feature/user-and-group-management-8826 2015-05-18 11:28:07 +02:00
Alexander A. Klimov 533c980a29 Show only three significant digits in check execution time
fixes #8849
2015-05-15 17:32:13 +02:00
Alexander A. Klimov 58434d9743 ToggleInstanceFeaturesCommandForm::onSuccess(): show a notification for each feature about whether it has been enabled or disabled
fixes #9023
2015-05-15 17:01:28 +02:00
Alexander Fuhr 2cbcea25cb Merge branch 'feature/ido-resource-validation-9203'
fixes #9214
resolves #9203
2015-05-15 15:59:18 +02:00
Alexander Fuhr e6ba3d6470 Add descriptive message to custom validations
refs #9203
2015-05-15 15:49:57 +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 5faebb4a88 DataView: Implement interface IteratorAggregate
I'd like to foreach such.
2015-05-15 14:37:41 +02:00
Johannes Meyer 3770741ba5 DataView: Implement QueryInterface
An instance of DataView should implement the full interface, not only
parts of it.
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
Alexander Fuhr df7b56881f Add IDO instance validation
refs #9203
2015-05-15 13:06:33 +02:00
Alexander A. Klimov 8b08473341 Hostgroups view: reduce "Last Problem" column's width 2015-05-15 12:34:59 +02:00
Alexander A. Klimov c7d1a7211f Show host states in host groups 2015-05-15 11:28:16 +02:00
Alexander A. Klimov 386d4db851 Make ascending sort by host or service severity initiatable
fixes #9059
2015-05-15 11:19:52 +02:00
Johannes Meyer 149e893ecd Revert "Make ascending sort by host or service severity initiatable"
This reverts commit 7e1f9f6dcc.
2015-05-15 10:54:30 +02:00
Alexander A. Klimov e879ba445d List number of hosts in host groups
refs #8054
2015-05-13 18:15:04 +02:00
Alexander A. Klimov ead0a64244 GroupsummaryQuery: add column `hosts_total'
refs #8054
2015-05-13 18:10:18 +02:00
Alexander A. Klimov 7e1f9f6dcc Make ascending sort by host or service severity initiatable
fixes #9059
2015-05-13 17:48:34 +02:00
Alexander A. Klimov ab2f8e09d6 Calculate states for host group view from host states
refs #8860
2015-05-13 16:31:25 +02:00
Alexander A. Klimov 43d8968bd2 GroupsummaryQuery: add columns
hosts_up_last_state_change
hosts_pending_last_state_change
hosts_down_last_state_change_handled
hosts_unreachable_last_state_change_handled
hosts_down_last_state_change_unhandled
hosts_unreachable_last_state_change_unhandled

refs #8860
2015-05-13 16:22:47 +02:00