Commit Graph

1001 Commits

Author SHA1 Message Date
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 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 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 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
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 a9d6a94957 monitoring: Use the groupsummary query for the service group summary view
refs #8241
2015-05-20 16:09:30 +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 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 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
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
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
Johannes Meyer f305a334d5 DbConnection: Drop param $columnIndex in fetchColumn(), it's unused 2015-05-19 09:48:20 +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 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
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 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
Marius Hein 62d8c441f8 Add ServiceActionsHook
refs #9284
2015-05-18 11:45:39 +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
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 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 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
Alexander A. Klimov 9e3d65e4e9 Display performance data metrics with value 0
fixes #8744
2015-05-12 17:44:53 +02:00
Alexander A. Klimov 7353c0d287 IdoQuery::initializeForPostgres(): cast only valid IP addresses to inet
fixes #7165
2015-05-12 16:35:14 +02:00
Matthias Jentsch 25f397042b Merge branch 'master' into feature/improve-multi-select-view-8565
Conflicts:
	modules/monitoring/application/controllers/HostsController.php
	modules/monitoring/application/controllers/ServicesController.php
	modules/monitoring/application/views/scripts/hosts/show.phtml
	modules/monitoring/application/views/scripts/list/hosts.phtml
	modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
	modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
	modules/monitoring/application/views/scripts/services/show.phtml
	modules/monitoring/public/css/module.less
	public/js/icinga/behavior/tooltip.js
2015-05-11 13:28:43 +02:00
Matthias Jentsch 83efc3a4a3 Conform to coding guidelines 2015-05-07 17:23:50 +02:00
Matthias Jentsch 7cf2cb034e Remove unused and redundant controller actions
refs #8624
2015-05-07 16:22:17 +02:00
Matthias Jentsch 4463f16f04 Add abbillity to remove multiple comments by id
refs #8624
2015-05-07 15:11:54 +02:00
Matthias Jentsch ffd12e325c Improve up downtime command form properties
Use a flag instead of a enumeration in delete downtime command form, to remove needless boilerplate.

refs #8624
2015-05-07 14:05:16 +02:00
Matthias Jentsch b35dd4ddfe Separate forms for deleting single and multiple comments
refs #8624
2015-05-07 14:03:09 +02:00
Matthias Jentsch d316b31cbb Fix downtime removal command in detail view
Use removal command for single downtimes in detail view. Move removing single and multiple downtimees into seperate forms.

refs #8902
2015-05-07 10:34:06 +02:00
Matthias Jentsch 6ddb004230 Move removal command actions into the downtime controllers
refs #8902
2015-05-07 10:34:06 +02:00
Michael Friedrich defda53ff5 Show icinga program version in Monitoring Health
Also emphasize on the backends used.

fixes #9207
2015-05-05 17:02:45 +02:00
Alexander Fuhr d1f1f5d7d7 ProgrammStatusQuery: Add fallback if ido_version is older than required
resolves #9223
2015-05-05 16:32:18 +02:00
Alexander Fuhr 0e4201a997 Add info about the active ido endpoint to monitoring health overview
resolves #9223
2015-05-05 15:20:25 +02:00
Alexander Fuhr 8484a27b56 Add a backend problem menu item renderer to system menu
refs #4139
2015-04-30 16:13:10 +02:00
Alexander Fuhr 5f3aafd3bd Merge branch 'bugfix/menu-item-renderer-deduplication-7658'
fixes #7658
2015-04-20 17:15:21 +02:00
Alexander Fuhr 9ebf4742de Use the MenuItemRenderer render() implemnetations
refs #7658
2015-04-20 17:07:34 +02:00
Johannes Meyer f11ea04557 Revert "Require `host_name' instead of `host' to show or list particular objects"
This reverts commit b93d18a0fc.
2015-04-20 16:11:22 +02:00
Johannes Meyer 96fb0370a4 Revert "Require `service_description' instead of `service' to show a particular service"
This reverts commit 09ab601942.
2015-04-20 16:09:14 +02:00
Johannes Meyer da7aa23820 Merge branch 'master' into bugfix/make-all-views-dashboard-compliant-7876 2015-04-20 15:20:23 +02:00
Alexander Fuhr c76e4e3583 Change the global namespace to the module specific namespace
refs #7642
2015-04-20 13:05:23 +02:00
Alexander Fuhr 593ea7add5 Move monitoring module renderers from global module to monitoring module
refs #7642
2015-04-20 13:02:12 +02:00
Johannes Meyer 54a370ca22 Merge branch 'master' into bugfix/make-all-views-dashboard-compliant-7876 2015-04-20 11:15:04 +02:00
Johannes Meyer 32e8b606b4 Monitoring\Controller: Drop `compactView' property, as it's not used anywere 2015-04-15 15:17:59 +02:00
Eric Lippmann 9d4460d02f Use inheritdoc in the ScheduleServiceCheckCommand 2015-04-15 14:59:29 +02:00
Eric Lippmann b8849c0ac9 Return $this in the setters of the SendCustomNotificationCommand
Further fixed bad PHPDoc.
2015-04-15 14:59:29 +02:00
Johannes Meyer 923bc11b39 GroupsummaryQuery: Provide case insensitive filter columns for group names
I've renamed those and made them case sensitive as part of #8613 but
missed that they are required by the global search.

fixes #9056
2015-04-14 12:44:24 +02:00
Johannes Meyer 2618d4a468 DataView\Contact: Add missing query columns
fixes #9057
2015-04-14 12:27:54 +02:00
Johannes Meyer 638c00d685 Merge branch 'master' into feature/non-collated-ido-queries-8613 2015-04-13 15:55:32 +02:00
Johannes Meyer 9cc5469305 NotificationQuery: Provide case-insensitive filter column `contact'
refs #8613
2015-04-13 15:33:33 +02:00
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
Eric Lippmann e72670cb75 Use default sorting for an object's event history
refs #8614
2015-03-11 13:01:14 +01:00
Eric Lippmann ea32d3dfb3 Add PHPDoc to the EventHistory query
refs #8614
2015-03-11 13:01:14 +01:00
Eric Lippmann c69a46d005 Add PHPDoc to the Downtime query
refs #8614
2015-03-11 13:01:14 +01:00
Eric Lippmann 132ae9e44c Use {@inheritdoc} in the Comment data view ...
... instead of duplicating method documentation.

refs #8614
2015-03-11 12:57:43 +01:00
Eric Lippmann 5ed6838f50 Don't select host_display_name twice in the service detail view
refs #8614
2015-03-10 14:18:08 +01:00
Eric Lippmann e6949eaab4 Reorder columns to select in the Service object
refs #8614
2015-03-10 14:17:09 +01:00
Eric Lippmann fcb94af93c Don't select service_process_performance_data twice in the service detail view
refs #8614
2015-03-10 14:11:50 +01:00
Eric Lippmann e0acebf474 Don't select service_host_name in the service detail view
We already select the host_name.

refs #8614
2015-03-10 14:09:53 +01:00
Eric Lippmann 62f0f5b6a4 Don't select service_modified_service_attributes in the service detail view
The column service_modified_service_attributes is not used in the service detail view.

refs #8614
2015-03-10 14:00:17 +01:00
Eric Lippmann 87e5bdfa4c Do not select columns for check attempt twice in the service detail view
The column service_attempt is used in favor of service_current_check_attempt and service_max_check_attempts.

refs #8614
2015-03-10 13:47:20 +01:00
Eric Lippmann 0cc6b5d0c2 Don't select service_last_time_* in the service detail view
The columns service_last_time_ ok, warning, critical and unknown are not used in the service detail view.

refs #8614
2015-03-10 13:46:09 +01:00
Eric Lippmann 70ef6263b2 Don't select service_last_hard_state* in the service detail view
The columns service_last_hard_state and service_last_hard_state_change are not used in the service detail view.

refs #8614
2015-03-10 13:45:20 +01:00
Eric Lippmann 88dce0c1f4 Don't select host and service columns in the service detail view
The columns host and service are not used in the service detail view.

refs #8614
2015-03-10 13:42:53 +01:00
Eric Lippmann 3bbd68dc95 Don't select service_problem in the service detail view
The column service_problem is not used in the service detail view.

refs #8614
2015-03-10 13:38:12 +01:00
Eric Lippmann 4e308016bf Don't select service_hard_state in the service detail view
The column service_hard_state is not used in the service detail view.

refs #8614
2015-03-10 13:37:40 +01:00
Eric Lippmann d65aa39ebd Don't select host_modified_host_attributes in the service detail view
The column host_modified_host_attributes is not used in the service detail view.

refs #8614
2015-03-10 13:33:17 +01:00
Eric Lippmann 34ad174f89 Don't select host_last_time_* in the service detail view
The columns host_last_time_ up, down and unreachable are not used in the service detail view.

refs #8614
2015-03-10 13:32:28 +01:00
Eric Lippmann 2cbeab55da Don't select host_last_hard_state* in the service detail view
The columns host_last_hard_state and host_last_hard_state_change are not used in the service detail view.

refs #8614
2015-03-10 13:31:32 +01:00
Eric Lippmann 232b3d3a9f Don't select host_perfdata in the service detail view
The column host_perfdata is not used in the service detail view.

refs #8614
2015-03-10 13:30:03 +01:00
Eric Lippmann e1dbe0b9a7 Don't select host_severity in the service detail view
The column host_severity is not used in the service detail view.

refs #8614
2015-03-10 13:29:39 +01:00
Eric Lippmann 9146a62573 Don't select host_ipv4 in the service detail view
The column host_ipv4 is not used in the service detail view.

refs #8614
2015-03-10 13:28:44 +01:00
Eric Lippmann 5f57e290c7 Don't select host_notes_url in the service detail view
The column host_notes_url is not used in the service detail view.

refs #8614
2015-03-10 13:27:07 +01:00
Eric Lippmann 0f65f83374 Don't select host_action_url in the service detail view
The column host_action_url is not used in the service detail view.

refs #8614
2015-03-10 13:26:47 +01:00
Eric Lippmann b9ec2844f5 Don't select host_unhandled_services in the service detail view
The column host_unhandled_services is not used in the service detail view.

refs #8614
2015-03-10 13:25:25 +01:00
Eric Lippmann 4102ee290b Don't select host_last_check in the service detail view
The column host_last_check is not used in the service detail view.

refs #8614
2015-03-10 13:22:28 +01:00
Eric Lippmann 151d87f38c Don't select host_is_flapping in the service detail view
The column host_is_flapping is not used in the service detail view.

refs #8614
2015-03-10 13:19:37 +01:00
Eric Lippmann da7f959db5 Don't select host_long_output in the service detail view
The column host_long_output is not used in the service detail view.

refs #8614
2015-03-10 13:09:59 +01:00
Eric Lippmann 9dc6e65e5f Don't select host_output column in the service detail view
The column host_output is not used in the service detail view

refs #8614
2015-03-10 13:05:54 +01:00
Eric Lippmann 6d78ab69ef Don't select service_severity column in the service detail view
The column service_severity is not used in the service detail view.

refs #8614
2015-03-10 13:03:55 +01:00