Commit Graph

830 Commits

Author SHA1 Message Date
Johannes Meyer 29f05bf878 NotificationQuery: Provide case-insensitive filter column `service'
refs #8613
2015-04-13 15:33:19 +02:00
Johannes Meyer 3653ec810a NotificationQuery: Provide case-insensitive filter column `host'
refs #8613
2015-04-13 15:32:52 +02:00
Johannes Meyer 644a386bf8 NotificationQuery: Use query column `notification_contact_name'
...instead of `notification_contact'.

refs #8613
2015-04-13 15:26:06 +02:00
Johannes Meyer 15399d77ce NotificationQuery: Use query column `service_description' instead of `service'
refs #8613
2015-04-13 15:25:10 +02:00
Johannes Meyer 96954ea9a1 NotificationQuery: Use query column `host_name' instead of `host'
refs #8613
2015-04-13 15:24:15 +02:00
Johannes Meyer c10617d409 Servicegroups: Use query column `servicegroup_name' instead of `servicegroup'
refs #8613
2015-04-10 16:28:57 +02:00
Johannes Meyer c59d5ac7d5 Hostgroups: Use query column `hostgroup_name' instead of `hostgroup'
refs #8613
2015-04-10 16:28:33 +02:00
Johannes Meyer e7c1e552a5 EventgridQuery: Make filter column `servicegroup' case-insensitive
...and add a case-sensitive query column.

refs #8613
2015-04-10 16:01:22 +02:00
Johannes Meyer ea16d45aa3 EventgridQuery: Make filter column `hostgroup' case-insensitive
...and add a case-sensitive query column.

refs #8613
2015-04-10 16:01:09 +02:00
Johannes Meyer 42e93ffb63 DataView\Eventgrid: Add missing query and filter columns
refs #8613
2015-04-10 15:58:55 +02:00
Johannes Meyer 8b2c0191c4 EventgridQuery: Remove COLLATE from query column `service_description'
refs #8613
2015-04-10 15:54:55 +02:00
Johannes Meyer 904e91bfa9 EventgridQuery: Remove COLLATE from query column `host_name'
refs #8613
2015-04-10 15:54:18 +02:00
Johannes Meyer 629becf2cc DataView\Servicegroup: Add missing query and filter columns
refs #8613
2015-04-10 15:35:24 +02:00
Johannes Meyer 4bc3afaca4 ServicegroupQuery: Make query column `servicegroup_alias' case-insensitive
refs #8613
2015-04-10 15:34:55 +02:00
Johannes Meyer fdd6a4d59b ServicegroupQuery: Remove COLLATE from query column `servicegroup_name'
...and add a case-insensitive alternative called `servicegroup'.

refs #8613
2015-04-10 15:34:28 +02:00
Johannes Meyer 055cd61421 ServicegroupQuery: Remove COLLATE from query column `service_desription'
refs #8613
2015-04-10 15:32:47 +02:00
Johannes Meyer a17c2eddb7 ServicegroupQuery: Remove COLLATE from query column `service_host_name'
refs #8613
2015-04-10 15:31:51 +02:00
Johannes Meyer 26f0b46516 ServicegroupQuery: Remove COLLATE from query column `host_name'
refs #8613
2015-04-10 15:31:09 +02:00
Johannes Meyer f61370f55a DataView\Hostgroup: Add missing query columns
refs #8613
2015-04-10 15:21:18 +02:00
Johannes Meyer 69e520a514 HostgroupQuery: Remove COLLATE from query column `host_name'
refs #8613
2015-04-10 15:20:19 +02:00
Johannes Meyer 9f075e0691 HostgroupQuery: Remove COLLATE from query column `hostgroup_name'
refs #8613
2015-04-10 15:19:55 +02:00
Johannes Meyer 92634a1921 DowntimeQuery: Provide case-insensitive filter column `service_host'
refs #8613
2015-04-10 14:25:53 +02:00
Johannes Meyer 5ccf6a7efa DowntimeQuery: Remove redundant query columns
refs #8613
2015-04-10 14:25:26 +02:00
Johannes Meyer 0f0727491e DowntimeQuery: Make query column `author' case-insensitive
refs #8613
2015-04-10 14:24:53 +02:00
Johannes Meyer 1c32d8ebe5 DowntimeQuery: Add _name suffix to the query column `downtime_author'
...to indicate that it's a case-sensitive column.

refs #8613
2015-04-10 14:23:05 +02:00
Johannes Meyer b8efe01170 CustomvarQuery: Remove COLLATE from query columns
...and provide case-insensitive filter columns alternatively.

refs #8613
2015-04-10 12:56:18 +02:00
Johannes Meyer 0628efb4cd ContactgroupQuery: Make query column `contact_email' case-insensitive
refs #8613
2015-04-10 12:27:44 +02:00
Johannes Meyer 638eda7773 ContactgroupQuery: Make query column `contact_alias' case-insensitive
refs #8613
2015-04-10 12:27:24 +02:00
Johannes Meyer 0fe59aa519 Revert "ContactQuery: Provide ci query columns for aliases and email addresses"
This reverts commit f00adc2138.

Conflicts:
	modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
2015-04-10 12:23:35 +02:00
Johannes Meyer 03c8de5d7b ContactgroupQuery: Provide case-insensitive filter column `service_host'
refs #8613
2015-04-10 12:20:28 +02:00
Johannes Meyer 31a05a3ec0 DataView\Contactgroup: Add missing query columns 2015-04-10 12:19:19 +02:00
Johannes Meyer a51b93ebfb DataView\Contactgroup: Do not permit querying case-insensitive columns
refs #8163
2015-04-10 12:17:52 +02:00
Johannes Meyer 71c013178e ContactgroupQuery: Make query column `contactgroup_alias' case-insensitive
refs #8613
2015-04-10 12:14:11 +02:00
Johannes Meyer 6536878d5d ContactgroupQuery: Remove COLLATE from query column `contact_name'
refs #8613
2015-04-10 12:13:23 +02:00
Johannes Meyer 1dc16a1ab6 ContactgroupQuery: Remove COLLATE from query column `contactgroup_name'
refs #8613
2015-04-10 12:12:50 +02:00
Johannes Meyer 3d7e418032 ContactQuery: Provide case insensitive filter column `service_host'
refs #8613
2015-04-10 09:50:26 +02:00
Johannes Meyer 6d03b2fe8f DataView\Contact: Add missing filter columns
refs #8613
2015-04-10 09:49:47 +02:00
Johannes Meyer 0ec1a18844 ContactQuery: Fix query column `service' not referencing a service's name
refs #8613
2015-04-10 09:48:22 +02:00
Johannes Meyer 52dcecfd08 ContactQuery: Change query column `contact_name' to be case sensitive
...and provide `contact' as case-insensitive alternative.

refs #8613
2015-04-10 09:46:41 +02:00
Johannes Meyer f00adc2138 ContactQuery: Provide ci query columns for aliases and email addresses
refs #8613
2015-04-10 09:45:23 +02:00
Johannes Meyer ea874f8402 *historyQuery: Remove COLLATE from `host_name' and `service_description'
refs #8613
2015-04-09 15:29:01 +02:00
Johannes Meyer 51bf5cfbc8 *historyQuery: Drop redundant query columns
refs #8613
2015-04-09 15:13:59 +02:00
Johannes Meyer 9e79419eb1 EventHistoryQuery: Provide `hostgroup_name' as alternative to `hostgroup'
This can't be queried though until #7274 has been resolved.

refs #8613
2015-04-09 14:44:10 +02:00
Johannes Meyer ec67c28629 DataView\EventHistory: Do not permit `host' and `service' to be queried
refs #8613
2015-04-09 14:41:10 +02:00
Johannes Meyer b7e1c2d518 EventHistoryQuery: Remove COLLATE from the column `service_description'
refs #8613
2015-04-09 14:40:12 +02:00
Johannes Meyer ae10e01ed6 EventHistoryQuery: Remove COLLATE from the column `host_name'
refs #8613
2015-04-09 14:39:47 +02:00
Johannes Meyer 2c38ccda5c EventHistoryQuery: Drop column `service_host_name'
refs #8613
2015-04-09 14:19:31 +02:00
Johannes Meyer bc6a086ff8 DataView\Comment: Do not permit `comment_author' to be queried
refs #8163
2015-04-09 13:08:49 +02:00
Johannes Meyer 5372dfb7f1 Fetch a comment's author using `comment_author_name'
refs #8613
2015-04-09 13:07:50 +02:00
Johannes Meyer 21c76010d4 CommentQuery: Add `comment_author_name' as additional query column
refs #8613
2015-04-09 13:06:38 +02:00
Johannes Meyer 8ed1c8eeb6 DataView\Comment: Add `service_host_name' as allowed query column
refs #8613
2015-04-09 12:56:31 +02:00
Johannes Meyer 002b820835 CommentQuery: Provide `service_host' additionally to `service_host_name'
refs #8613
2015-04-09 12:55:57 +02:00
Johannes Meyer 480f5516d6 DataView\Comment: Do not permit querying `host' and `service'
refs #8613
2015-04-09 12:53:28 +02:00
Johannes Meyer cb95f53dba CommentQuery: Fetch and display object names with their initial collation
i.e. `host_name' instead of `comment_host' alias `host'
and `service_description' instead of `comment_service' alias `service'.

refs #8613
2015-04-09 12:49:06 +02:00
Johannes Meyer f7550f55c1 Permit to filter hosts and services by hostgroup_name and servicegroup_name
refs #8613
2015-04-09 11:41:56 +02:00
Matthias Jentsch 878ef05896 Fix "show all downtimes" links
refs #8565
2015-04-09 11:19:13 +02:00
Johannes Meyer 09ab601942 Require `service_description' instead of `service' to show a particular service
`service' implies that it is possible to provide case-less identifiers which is
*not* possible.

refs #8613
2015-04-08 16:49:52 +02:00
Johannes Meyer b93d18a0fc Require `host_name' instead of `host' to show or list particular objects
`host' implies that it is possible to provide case-less identifiers which is
*not* possible.

refs #8613
2015-04-08 16:25:29 +02:00
Alexander A. Klimov 20b09d3bda Inherit from Icinga\Web\Controller rather than from Icinga\Web\Controller\ModuleActionController 2015-04-08 15:13:59 +02:00
Johannes Meyer c56c5655bd Do not permit querying columns with changed collation and a valid alternative
refs #8613
2015-04-08 14:51:04 +02:00
Johannes Meyer 9557585f6a Add an additional column for servicegroup names with unchanged collation
refs #8613
2015-04-08 14:49:18 +02:00
Johannes Meyer c476ee6855 Add an additional column for hostgroup names with unchanged collation
refs #8613
2015-04-08 14:42:57 +02:00
Johannes Meyer 98c76a693e Do not adjust the collation when querying service descriptions
refs #8613
2015-04-08 14:41:13 +02:00
Johannes Meyer b449127680 Do not adjust the collation when querying host names
refs #8613
2015-04-08 14:40:34 +02:00
Matthias Jentsch 9ac89edb86 Add filter to summary links
Add the multiselection filter as a base filter to the state summary, to ensure that the summary links only selected services.

refs #8565
2015-04-07 18:00:36 +02:00
Matthias Jentsch 46da404452 Add docstrings to ObjectList and coding style 2015-04-07 16:34:20 +02:00
Matthias Jentsch 1c5a091584 Generate filter in host and service lists
refs #8565
2015-04-07 16:29:10 +02:00
Alexander Klimov 967a2e82dc Use (only) "@return $this" in fluent interfaces' documentation 2015-04-07 14:24:11 +02:00
Matthias Jentsch 5619ac960c Add inline pies to host and service back to multi-select views
Add old inline pie code and visualize handled/unhandled state.

refs #8565
2015-04-02 16:25:20 +02:00
Eric Lippmann 06d9e4113c Fix that sending multiple commands over SSH failed
The config object has to cloned before unsetting the transport because else the
transport is removed for all subsequent calls to CommandTransport::fromConfig().

fixes #8815
2015-04-01 13:53:44 +02:00
Matthias Jentsch b0b0ae157c Turn prepareStateName into more generic string utility function
refs #8565
2015-03-31 16:45:21 +02:00
Eric Lippmann ab1dc1faa0 Do not translate format strings 2015-03-30 11:28:05 +02:00
Eric Lippmann 0a7e76d190 Fix typo in Perfdata::formatLabel()'s PHPDoc 2015-03-30 11:27:17 +02:00
Eric Lippmann f1cdc8c904 Sort host and service overview by display_name by default
refs #8716
2015-03-13 17:19:56 +01:00
Eric Lippmann dbb5aba737 Sort by host_display_name too when sorting by host_severity
refs #8716
2015-03-13 17:14:14 +01:00
Eric Lippmann 03d85ac6ae Sort by service_display_name too when sorting by service_severity
refs #8716
2015-03-13 17:13:52 +01:00
Eric Lippmann 7ddd8d7ad2 Add support for order next to the column to DataView::getSortRules()
refs #8716
2015-03-13 17:12:16 +01:00
Eric Lippmann e17f9d7ebe Sort host overview by severity by default ...
... as indicated by the sort control.
2015-03-13 17:08:36 +01:00
Eric Lippmann 32487e4e21 Ignore settings from instances.ini that don't have a setter on the transport class used
fixes #8543
2015-03-13 03:41:33 +01:00
Eric Lippmann 1c8c49e732 Select service_is_reachable in the service detail view
refs #6875
2015-03-13 00:26:02 +01:00
Eric Lippmann 37823f0415 Select host_is_reachable in the host detail view
refs #6875
2015-03-13 00:25:44 +01:00
Eric Lippmann a4731ebbb3 Select is_reachable from host and service status
refs #6875
2015-03-13 00:25:08 +01:00
Eric Lippmann be041435d3 Merge branch 'bugfix/unnecessary-joins-8614'
fixes #8614
2015-03-12 16:47:10 +01:00
Marius Hein cb28f00c4d Merge branch 'master' into feature/custom-notification-command-8644 2015-03-12 16:45:57 +01:00
Eric Lippmann 53626ccfeb Merge branch 'master' into bugfix/unnecessary-joins-8614 2015-03-12 16:40:16 +01:00
Eric Lippmann 7156bd7dfb Fetch object comments by host_name and service_description
refs #8614
2015-03-12 16:39:20 +01:00
Eric Lippmann 29b5e4fd43 Add host_name and service_description columns w/o collation to the comment query
refs #8614
2015-03-12 16:38:32 +01:00
Eric Lippmann 112f8eb2f9 Remove COLLATE from host_name and service_description in the Contactgroup query
refs #8614
refs #8613
2015-03-12 16:33:28 +01:00
Eric Lippmann 7212434856 Remove COLLATE from host_name and service_description in the Contact query
refs #8614
refs #8613
2015-03-12 16:32:05 +01:00
Marius Hein df3d81e181 SendCustomNotificationCommand: Update phpdoc strings
refs #8644
2015-03-12 16:30:11 +01:00
Eric Lippmann 8563d5ed3f PHPDoc: Use @var instead of @type
Becasue of too many kittens PSR-5 backed off of deprecating @var.
So that's the way we go too.
2015-03-12 16:08:47 +01:00
Marius Hein ddc8dd5d4c Add command send custom notification to monitoring module
refs #8644
2015-03-12 16:08:22 +01:00
Thomas Gelf 16ca8d0654 StatusQuery: fix join on wrong alias
Looks like a copy & paste error, resulted in hosts been shown multiple
times.

fixes #8699
2015-03-12 09:46:38 +01:00
Eric Lippmann 361afdcf13 Use ! empty in favor of count > 0 in the MonitoredObjectController
refs #8614
2015-03-11 14:08:43 +01:00
Eric Lippmann 2286ab1846 Merge branch 'master' into bugfix/unnecessary-joins-8614 2015-03-11 13:38:07 +01:00
Eric Lippmann 0286641369 Don't fetch comments and downtimes twice in an object's detail view
The controller counts comments and downtimes on the object, which will automatically fetch comments and downtimes.
After that came a call to MonitoredObject::populate() which again fetched comments and downtimes.
Now the object is populated before counting comments and dowtimes.

refs #8614
2015-03-11 13:32:54 +01:00
Eric Lippmann b501fef62b Rearrange columns in the Host object
refs #8614
2015-03-11 13:10:55 +01:00
Eric Lippmann ef4970c0c1 Don't select host_process_performance_data twice in the host detail view
refs #8614
2015-03-11 13:08:53 +01:00
Eric Lippmann 84f56f4e51 Don't select host_problem in the host detail view
The column host_problem is not used in the host detail view.

refs #8614
2015-03-11 13:08:11 +01:00
Eric Lippmann 37d09511c6 Don't select host_modified_host_attributes in the host detail view
The column host_modified_host_attributes is not used in the host detail view.

refs #8614
2015-03-11 13:07:33 +01:00