1560 Commits

Author SHA1 Message Date
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