293 Commits

Author SHA1 Message Date
Alexander Fuhr
72cf023bf8 donwtime/view: Fix condition statement
refs #9266
2015-08-10 12:32:15 +02:00
Alexander Fuhr
073d695c94 downtime/views: Fix the wrong time for flexible downtime
refs #9266
2015-08-10 12:15:26 +02:00
Alexander Fuhr
c88f0c7e37 downtime/views: Use ends instead of started ...
refs #9266
2015-08-10 10:58:21 +02:00
Eric Lippmann
688a08585b Merge branch 'master' into bugfix/error-prone-generictts-9611
Conflicts:
	modules/monitoring/application/views/scripts/show/components/downtime.phtml
2015-08-03 15:05:45 +02:00
Eric Lippmann
d8e6418e94 monitoring: Fix code style in the show/components/downtime.phtml view script
refs #9611
2015-08-03 15:03:31 +02:00
Eric Lippmann
0809caa86b monitoring: Fix indent in the show/components/comments.phtml view script
refs #9611
2015-08-03 15:03:02 +02:00
Alexander Fuhr
a63b69f4a1 components/downtime: Add downtime end time information in view
fixes #8845
2015-08-03 13:44:41 +02:00
Alexander Fuhr
8860181bcc Revert "components/downtime: Add downtime end time information in view"
This reverts commit 863330e50d3aa79baed55915f237bb028e10be70.

refs #8845
2015-08-03 13:42:11 +02:00
Alexander Fuhr
1652f1e1ae Revert "components/downtime: Add the missing php script tag"
This reverts commit 95ea0e616dc418feda46cd4adb2022a94eaef8e3.

refs #8845
2015-08-03 13:41:40 +02:00
Alexander Fuhr
95ea0e616d components/downtime: Add the missing php script tag
refs #8845
2015-08-03 13:05:41 +02:00
Alexander Fuhr
863330e50d components/downtime: Add downtime end time information in view
fixes #8845
2015-08-03 12:37:09 +02:00
Eric Lippmann
d5e2f92aa9 monitoring: Use createTicketLinks helper when showing downtimes of an object
refs #9611
2015-08-03 11:00:46 +02:00
Eric Lippmann
a379a448d9 monitoring: Fix code style in the show/components/comments.phtml view script
refs #9611
2015-08-03 10:58:57 +02:00
Eric Lippmann
b6caeb6c17 monitoring: Use createTicketLinks helper when showing comments of an object
refs #9611
2015-08-03 10:53:51 +02:00
Thomas Gelf
e78a80f184 monitoring/object/show: default links for groups 2015-06-18 17:20:51 +02:00
Thomas Gelf
171b1d84ef object/show: make downtimes look like comments
refs #8281
2015-06-18 14:57:58 +02:00
Thomas Gelf
a4ab4db1ca perfdata: occupy more space, highglight like output 2015-06-18 11:39:55 +02:00
Thomas Gelf
3462f0ee9a Merge remote-tracking branch 'origin/master' into feature/refine-ui-for-rc1-9361
Conflicts:
	modules/monitoring/application/views/scripts/host/history.phtml
	modules/monitoring/application/views/scripts/list/services.phtml
2015-06-18 11:26:51 +02:00
Matthias Jentsch
1ef643e002 Improve service/host name layout in all views
refs #9361
2015-06-17 11:33:55 +02:00
Johannes Meyer
71e932bcf9 ShowController: Deprecate historyAction 2015-06-16 17:05:41 +02:00
Thomas Gelf
96ac83230c customvars.phtml: no header if no vars 2015-06-16 01:15:32 +02:00
Thomas Gelf
59ef6ff71a monitoring/show: choose fitting header tags 2015-06-16 00:35:32 +02:00
Thomas Gelf
0170d9941a Merge remote-tracking branch 'origin/master' into feature/refine-ui-for-rc1-9361 2015-06-15 23:08:17 +02:00
Alexander A. Klimov
e764bfb95d Repair command links
fixes #9392
2015-06-10 14:29:44 +02:00
Eric Lippmann
11a006681b Merge branch 'master' into bugfix/monitoring-remove-services-tab-7998
Conflicts:
	application/controllers/ConfigController.php
	library/Icinga/Web/Widget/FilterEditor.php
	modules/monitoring/application/controllers/HostsController.php
2015-06-05 15:27:42 +02:00
Thomas Gelf
6e1ba30acc Styling: re-organize and style comments 2015-06-03 15:35:50 +02:00
Matthias Jentsch
a298197e6c Fix layout of action lincs in view
refs #6392
2015-05-28 15:31:50 +02:00
Matthias Jentsch
a66949162b Resolve macros when accessing getters on MonitoredObjects
refs #6392
2015-05-28 15:01:10 +02:00
Eric Lippmann
8dbb215e27 monitoring: Remove services action from the ShowController
refs #7998
2015-05-28 12:25:31 +02:00
Matthias Jentsch
6c44f6a11a Deduplicate url-attribute parsing code
Use function to fetch all host links in MonitoredObject instead.
2015-05-28 10:47:44 +02:00
Matthias Jentsch
a7135bad62 Resolve runtime macros in notes too
refs #8235
2015-05-26 16:49:08 +02:00
Matthias Jentsch
4ac7557c2f Show host and service notes in the host and service detail view
refs #8235
2015-05-26 16:40:32 +02:00
Eric Lippmann
54577d04bd Merge branch 'master' into bugfix/time-formatting-6778
Conflicts:
	modules/monitoring/application/views/scripts/list/comments.phtml
	modules/monitoring/application/views/scripts/list/hostgroups.phtml
	modules/monitoring/application/views/scripts/process/info.phtml
	modules/monitoring/application/views/scripts/show/components/downtime.phtml
	modules/monitoring/application/views/scripts/show/components/notifications.phtml
	modules/monitoring/public/css/module.less
2015-05-21 14:57:01 +02:00
Eric Lippmann
9ffeffdf09 Show when an object's dowtime was added
refs #6778
2015-05-18 14:39:36 +02:00
Eric Lippmann
13a38c9d18 Revert "Add new line between comment author and creation time in the detail views"
This reverts commit 229e266daf4d57a1052ff69ecb132575bcd40941.

The new line does not help for improving the layout but makes it more confusing.
2015-05-18 14:36:35 +02:00
Eric Lippmann
e49f938f56 Use timeSince and timeUntil when displaying object downtimes
refs #6778
2015-05-18 14:33:49 +02:00
Marius Hein
f4d25a71c8 Merge branch 'master' into feature/service-actions-9284 2015-05-18 14:07:41 +02:00
Alexander A. Klimov
4ff7d7a845 Don't parse $object->check_execution_time w/ regex as it's always a float (or null) 2015-05-18 13:37:38 +02:00
Marius Hein
62d8c441f8 Add ServiceActionsHook
refs #9284
2015-05-18 11:45:39 +02:00
Alexander A. Klimov
533c980a29 Show only three significant digits in check execution time
fixes #8849
2015-05-15 17:32:13 +02:00
Matthias Jentsch
b314c074cc Fix downtime and comment form redirects
refs #8624
2015-05-07 16:20:59 +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
a46dece136 Provie link to detail view in downtime partial
refs #8902
2015-05-07 10:34:06 +02:00
Alexander A. Klimov
a976d777b3 Show custom variables visually separated in the host and service detail views
resolves #8966
2015-04-23 13:31:02 +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
894457a1c1 Revert "Adjust command links so that they'll use host_name' instead of host'"
This reverts commit b9aee47d1f44893ef953bf9168e21f368b95ed7f.

Conflicts:
	modules/monitoring/application/views/scripts/list/comments.phtml
	modules/monitoring/application/views/scripts/list/downtimes.phtml
2015-04-20 16:11:08 +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
9bbb23ae7d Revert "Adjust command links so that they'll use `service_description'"
This reverts commit cee189a5fc2b94173eda5587ab5a5ce4125a06d0.

Conflicts:
	modules/monitoring/application/views/scripts/list/comments.phtml
	modules/monitoring/application/views/scripts/list/downtimes.phtml
2015-04-20 16:08:51 +02:00
Johannes Meyer
0997eaf459 Host detail view: Fix that the list of services is missing all tabs
refs #7876
2015-04-20 14:56:30 +02:00
Johannes Meyer
3f092ffb2d show/contact: Ensure dashboard compliance
refs #7876
2015-04-17 16:10:49 +02:00