Eric Lippmann
21c0091cdc
Merge branch 'bugfix/prefer-display_name-over-name1-name2-7843'
...
fixes #7843
2015-01-22 11:05:35 +01:00
Eric Lippmann
95657f248d
Merge branch 'master' into bugfix/prefer-display_name-over-name1-name2-7843
2015-01-22 10:58:50 +01:00
Eric Lippmann
8bd56f4387
monitoring: Use the Link helper in the eventhistory overview
2015-01-22 10:58:16 +01:00
Eric Lippmann
4589621f58
monitoring: Use host and service display_name for displaying host and service names for an object's history
...
refs #7843
2015-01-22 10:57:44 +01:00
Eric Lippmann
1aa91f0228
monitoring: Select host and service display_name for an object's history
...
refs #7843
2015-01-22 10:57:15 +01:00
Eric Lippmann
d1715c8ec6
monitoring: Escape event message in an object's event history
2015-01-22 10:45:14 +01:00
Eric Lippmann
dd83f6f757
Fix copyright year
2015-01-22 10:38:00 +01:00
Eric Lippmann
fc62a63899
Remove require version comment in the Vagrantfile
2015-01-22 10:37:44 +01:00
Eric Lippmann
a1f4d124b4
monitoring: Prefer <br> over <br /> in components/header.phtml
2015-01-22 10:36:44 +01:00
Eric Lippmann
9e5d7f43ff
monitoring: Show host_name in the detail area too if it's different from the display_name
...
refs #7843
2015-01-22 10:36:02 +01:00
Eric Lippmann
3d306c0a06
monitoring: Use display_name for displaying the host name in the detail area
...
refs #7843
2015-01-22 10:35:06 +01:00
Eric Lippmann
4539462bc7
monitoring: Select host_display_name in the host and service object
...
refs #7843
2015-01-22 10:34:35 +01:00
Eric Lippmann
e61edaaffb
monitoring: Show service_description in the detail area too if it's different from the display_name
...
refs #7843
2015-01-22 10:30:55 +01:00
Eric Lippmann
ed7dc1beb6
monitoring: Use display_name when displaying the service name in the detail area
...
refs #7843
2015-01-22 10:29:57 +01:00
Eric Lippmann
98acc9166a
monitoring: Fix coding style in components/header.phtml
2015-01-22 10:24:44 +01:00
Eric Lippmann
d064b0ac79
monitoring: Rename $showService to $isService in the header view script
...
Most views use $isService to set whether we are about to show a service.
2015-01-21 17:29:31 +01:00
Eric Lippmann
6be0224d9d
monitoring: Add sort by 'Host' and 'Service' in the comments overview
...
refs #7843
2015-01-21 16:15:38 +01:00
Eric Lippmann
3055531e2d
monitoring: Support sorting by host and service display name in the Comment data view
...
refs #7843
2015-01-21 16:15:09 +01:00
Eric Lippmann
cf391b056c
monitoring: Use display_name for displaying the host and service names in the comments overview
...
refs #7843
2015-01-21 16:12:37 +01:00
Eric Lippmann
e933b9174c
monitoring: Select the host and service display_name columns in the comments overview
...
refs #7843
2015-01-21 16:10:02 +01:00
Eric Lippmann
94be58e121
monitoring: Support host and service display_name columns in the Comment data view
...
refs #7843
2015-01-21 16:09:36 +01:00
Eric Lippmann
a91a2eba68
monitoring: Support host and service display_name columns in the CommentQuery
...
refs #7843
2015-01-21 16:09:13 +01:00
Eric Lippmann
9b7e67919f
monitoring: Use host and service icons in the notifications overview
2015-01-21 15:59:20 +01:00
Eric Lippmann
439052ad97
monitoring: Use the link helper in the downtimes overview
2015-01-21 15:56:58 +01:00
Eric Lippmann
423e4c55a8
monitoring: Use the ellipsis view helper in the notifications overview
2015-01-21 15:52:24 +01:00
Eric Lippmann
cbbd811adb
monitoring: Do not strip_tags in the notifications overview
2015-01-21 15:51:14 +01:00
Eric Lippmann
b6f87df90e
monitoring: Select the host and service display_name column when viewing notifications for a contact
...
refs #7843
2015-01-21 15:50:32 +01:00
Eric Lippmann
0ceec816c6
monitoring: Use notifications default ordering when showing a contact
2015-01-21 15:49:36 +01:00
Eric Lippmann
ece6bfe6bb
monitoring: Use display_name for displaying the host and service name in the notifications overview
...
refs #7843
2015-01-21 15:48:45 +01:00
Eric Lippmann
846f391080
monitoring: Select the host and service display_name columns in the notifications overview
...
refs #7843
2015-01-21 15:48:04 +01:00
Eric Lippmann
ad879b1ee6
monitoring: Select the host and service display_name columns in the Notification data view
...
refs #7843
2015-01-21 15:47:36 +01:00
Eric Lippmann
d8b1e63231
monitoring: Support host and service display_name in the NotificationQuery
...
refs #7843
2015-01-21 15:47:10 +01:00
Eric Lippmann
b05316340c
monitoring: Add Link view helper
...
Most of the monitoring overviews link to detail information, e.g. the full information of the involved monitored
object. Instead of reintroducing link generation and translation in those views, this helper contains most
frequently used jump links.
2015-01-21 15:46:41 +01:00
Eric Lippmann
0bcca651b2
monitoring: Remove useless PHPDoc in the NotificationQuery
2015-01-21 13:12:26 +01:00
Eric Lippmann
7621de8ec0
monitoring: Add sort by 'Host' and 'Service' to the downtimes overview
...
refs #7843
2015-01-21 13:06:32 +01:00
Eric Lippmann
91b7c31cda
monitoring: Support sorting downtimes by host and service display_name
...
refs #7843
2015-01-21 13:06:03 +01:00
Eric Lippmann
5862fc98a5
monitoring: Sort by 'downtime_scheduled_start' too when sorting by 'Is In Effect'
2015-01-21 12:58:46 +01:00
Eric Lippmann
d340b0d49d
monitoring: Let the data view handle the default ordering in the downtime overview
...
refs #7843
2015-01-21 12:55:41 +01:00
Eric Lippmann
86cc56afe6
monitoring: Display host and service names using the display_name column in the downtimes overview
...
refs #7843
2015-01-21 12:53:47 +01:00
Eric Lippmann
ab6eed03e5
monitoring: Select the host and service display_name in the downtimes overview
...
refs #7843
2015-01-21 12:53:26 +01:00
Eric Lippmann
5f0b809619
monitoring: Support host and service display_name columns in the Downtime data view
...
refs #7843
2015-01-21 12:52:58 +01:00
Eric Lippmann
85aa447516
monitoring: Support host and service display_name in the DowntimeQuery
...
refs #7843
2015-01-21 12:52:29 +01:00
Eric Lippmann
d528ddc641
monitoring: Fix that host_display_name is NULL when the object is a service in the evenhistory overview
...
refs #7843
2015-01-21 12:51:47 +01:00
Eric Lippmann
2fdeabd398
monitoring: Escape host and service name, author and comment in the downtimes overview
2015-01-21 10:47:20 +01:00
Eric Lippmann
e881a0de33
monitoring: Remove useless PHPDoc in the DowntimeQuery
2015-01-21 10:35:10 +01:00
Eric Lippmann
cd03c2164a
monitoring: Fix sorting by 'End Time' in the downtimes overview
2015-01-21 10:33:05 +01:00
Eric Lippmann
7ff1948c1a
monitoring: Use host and service display_name for displaying host and service names in the eventhistory overview
...
refs #7843
2015-01-21 10:29:22 +01:00
Eric Lippmann
3e702ac255
monitoring: Support host and service display_name in the EventHistory data view
...
refs #7843
2015-01-21 10:28:21 +01:00
Eric Lippmann
25c2e99122
monitoring: Fix duplicate array key 'service_description' in the EventHistoryQuery
2015-01-21 10:26:12 +01:00
Eric Lippmann
aa976c4198
monitoring: Support host and service display_name in the EventHistoryQuery
...
This adds two left joins to the query when selecting host_display_name and service_display_name.
If performance suffers badly, we have to evaluate whether to support the display_name column for displaying
the host and service name in the eventhistory overview.
refs #7843
2015-01-21 10:24:24 +01:00
