tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-06-01 04:20:10 +02:00
Code Issues Packages Projects Releases Wiki Activity
6,942 Commits 122 Branches 75 Tags
Commit Graph

269 Commits

Author SHA1 Message Date
Johannes Meyer
41ee39d48f EventHistoryQuery: Do not fetch columns which only exist in one subquery 
Uses the same technique as the NotificationhistoryQuery for the output.
 2015-06-10 13:08:57 +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
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
Johannes Meyer
9388944283 show/history: Ensure dashboard compliance 
refs #7876
 2015-04-17 16:10:21 +02:00
Eric Lippmann
796cbffbd7 Merge branch 'master' into bugfix/time-formatting-6778 
Conflicts:
	modules/monitoring/application/views/scripts/show/components/notifications.phtml
 2015-04-15 15:43:39 +02:00
Eric Lippmann
229e266daf Add new line between comment author and creation time in the detail views 
refs #6778
 2015-04-15 15:40:40 +02:00
Eric Lippmann
e500715bda Use timeAgo() when displaying comments in the detail views 
refs #6778
 2015-04-15 15:33:44 +02:00
Johannes Meyer
675d070b86 Set the view property `compact' exactly once 
refs #7876
 2015-04-15 15:33:00 +02:00
Johannes Meyer
9ef414c9ed Add separator when listing downtimes in the detail view 
fixes #9046
 2015-04-14 09:20:43 +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
5ec4919aa6 Do not filter for `contactgroup' in case the concrete group name is known 
refs #8613
 2015-04-10 12:14:47 +02:00
Eric Lippmann
df3caa61e9 Improve notifications view component for objects 
The old view did not show a hyphen if the user lacked the permissions to send a notification and if viewing a host or service not currently in a problem state.
Further the tooltip for send notification was bad English and the view generated a superfluous <br>.
 2015-04-10 10:46:19 +02:00
Eric Lippmann
5efc343f03 Add full stop to sentences in the notifications view component for objects 
refs #6778
 2015-04-10 10:28:17 +02:00
Eric Lippmann
d6374d4770 Use timeAgo() instead of timeSince() for an object's last check 
refs #6778
 2015-04-10 10:27:57 +02:00
Eric Lippmann
613de61e6d Improve English for "The last one occured %s ago" in the notifications view component for objects 
fixes #8950
 2015-04-10 10:24:15 +02:00
Eric Lippmann
80ab64e2b4 Fix typos in the notifications view partial for objects 2015-04-10 10:21:54 +02:00
Eric Lippmann
e6f070d068 Use timeAgo() instead of timeSince() when displaying object notifications 
refs #6778
 2015-04-10 10:20:10 +02:00
Johannes Meyer
8477859dc1 Fix that the user isn't being notified that no events were found for an object 2015-04-10 09:51:08 +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
3c47ba11eb monitoring/show/contact: Require contact_name' instead of contact' 
refs #8613
 2015-04-10 09:39:39 +02:00
Johannes Meyer
1e6f292910 Use servicegroup_name' instead of servicegroup' to filter services 
refs #8613
 2015-04-09 11:43:51 +02:00
Johannes Meyer
e5eca97169 Use hostgroup_name' instead of hostgroup' to filter hosts and services 
refs #8613
 2015-04-09 11:43:21 +02:00
Johannes Meyer
cee189a5fc Adjust command links so that they'll use `service_description' 
...instead of `service'

refs #8613
 2015-04-09 10:28:34 +02:00
Johannes Meyer
b9aee47d1f Adjust command links so that they'll use host_name' instead of host' 
refs #8613
 2015-04-09 10:27:41 +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