Eric Lippmann
3970d7dec2
Lower doc modules search priority
...
refs #8668
2015-03-12 18:09:43 +01:00
Eric Lippmann
5749ff72b1
Fix typo in configuration.php
2015-03-12 16:48:29 +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
Marius Hein
ddd280d57b
Fix permission send-custom-notification
...
refs #8644
2015-03-12 16:40:32 +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
Johannes Meyer
b37757ca6e
Disable the LdapDiscoveryConfirmPage
...
As long as the discovery code does not report multiple results, as it should,
actually, it's useless to demand the user to confirm the result.
resolves #8602
refs #8725
refs #8708
2015-03-12 16:14:58 +01:00
Eric Lippmann
b74ef2527a
CSS: Remove .sort-box ...
...
... because we don't use it
2015-03-12 16:08:47 +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
90971f2caf
Revert "Merge branch 'feature/organize-headings-7976'"
...
This reverts commit ea2a17a76c
, reversing
changes made to e72de8dfe1
.
refs #7976
fixes #8647
2015-03-12 16:08:34 +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
Johannes Meyer
39a74c4f3d
LDAP-Auth backend config: Add support for custom LDAP filter rules
...
refs #8365
2015-03-11 09:52:14 +01:00
Johannes Meyer
e4e6c1cb28
Wizard: Fix that the wrong form element is used in case a user already exists
...
fixes #8678
2015-03-11 07:59:04 +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