247 Commits

Author SHA1 Message Date
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
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
Johannes Meyer
f11ea04557 Revert "Require host_name' instead of host' to show or list particular objects"
This reverts commit b93d18a0fc2507d360f122afdfb27317b7708fd4.
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 09ab6019423e858d222a570c65f247bfcb09e62f.
2015-04-20 16:09:14 +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
0fe59aa519 Revert "ContactQuery: Provide ci query columns for aliases and email addresses"
This reverts commit f00adc2138158dd2c5c75b881aff5fc34cae7d70.

Conflicts:
	modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
2015-04-10 12:23:35 +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
5372dfb7f1 Fetch a comment's author using `comment_author_name'
refs #8613
2015-04-09 13:07:50 +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
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
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
Matthias Jentsch
b0b0ae157c Turn prepareStateName into more generic string utility function
refs #8565
2015-03-31 16:45:21 +02: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
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
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
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
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