tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,042 Commits 120 Branches 71 Tags 80 MiB
Commit Graph

1622 Commits

Author SHA1 Message Date
Johannes Meyer 95cb6dea4b Transfer changes from show/history.phtml to service/history.phtml 
Was not recognised by git as host/history.phtml is the counterpart
for show/history.phtml in the tree.

refs #9009
 2015-06-16 18:13:04 +02:00
Johannes Meyer e8058c09c5 Merge branch 'master' into feature/monitoring-restrictions-9009 
Conflicts:
	modules/monitoring/application/controllers/ShowController.php
	modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
 2015-06-16 17:12:51 +02:00
Johannes Meyer 71e932bcf9 ShowController: Deprecate historyAction 2015-06-16 17:05:41 +02:00
Johannes Meyer 196450d8cf MonitoredObjectController: Add historyAction 2015-06-16 17:04:36 +02:00
Johannes Meyer 4a2a17aba1 HostController: Do not permit to filter the servicesAction 2015-06-16 16:34:45 +02:00
Johannes Meyer d81e637ae9 HostController: Add action to show a host's services 2015-06-16 16:04:45 +02:00
Johannes Meyer c05594b124 ShowController: Fix link to show a host's services 2015-06-16 16:03:17 +02:00
Johannes Meyer c316e5ce8f Revert "monitoring: Remove the services tab when showing an object's history" 
This reverts commit b3e0851b62.
 2015-06-16 13:48:56 +02:00
Johannes Meyer d5f7ee3c56 Behave nicely when showing notifications not sent out to any contact 
I noticed that there is no output shown for the history views in case no
contact has been notified, but time is short atm...

refs #9009
refs #9430
 2015-06-16 13:32:35 +02:00
Matthias Jentsch 42de13a2b9 Merge branch 'feature/ssh-remote-connection-resource-configuration-7595' 
resolves #7595
 2015-06-15 17:30:42 +02:00
Johannes Meyer 4db9629268 AlertsummaryController: Apply object restrictions 
refs #9009
 2015-06-15 16:26:07 +02:00
Johannes Meyer 5545b4a605 AlertsummaryController: Fix filter columns 2015-06-15 16:25:48 +02:00
Johannes Meyer bd41839a19 ServicesController: Restrict the display of multiple services 
refs #9009
 2015-06-15 16:06:13 +02:00
Johannes Meyer ce48f63ac6 HostsController: Restrict the display of multiple hosts 
refs #9009
 2015-06-15 16:05:56 +02:00
Johannes Meyer ede8cc5e83 TimelineController: Restrict the displayed entries 
refs #9009
 2015-06-15 16:04:43 +02:00
Johannes Meyer efc52e3342 ShowController: Restrict the display of single contacts 
refs #9009
 2015-06-15 16:04:14 +02:00
Johannes Meyer 32c5d5a1ee ShowController: Restrict the servicestatus summary 
I doubt that this is necessary, since showing hosts and services by using
this controller is deprecated, but I've added it nonetheless..

refs #9009
 2015-06-15 16:03:46 +02:00
Johannes Meyer 8b749521ba DowntimesController: Restrict display of downtimes 
refs #9009
 2015-06-15 16:00:19 +02:00
Johannes Meyer 9a6e3a7042 DowntimeController: Restrict display of single comments 
refs #9009
 2015-06-15 15:59:50 +02:00
Johannes Meyer 8187135564 CommentsController: Restrict display of comments 
refs #9009
 2015-06-15 15:58:54 +02:00
Johannes Meyer b83abc4dbc CommentController: Restrict display of single comments 
refs #9009
 2015-06-15 15:58:15 +02:00
Johannes Meyer 1a08102531 ListController: Apply contactgroup restrictions after the filter editor 2015-06-15 15:14:09 +02:00
Johannes Meyer 53e6d4cadc ListController: Restrict the contactgroups view 
refs #9009
 2015-06-15 15:08:25 +02:00
Johannes Meyer 2fceac9771 ListController: Fix contactgroup sorting 2015-06-15 14:15:51 +02:00
Johannes Meyer aabdfec03a ListController: Restrict the contacts view 
refs #9009
 2015-06-15 13:48:13 +02:00
Johannes Meyer d5ade9ae74 ListController: Restrict the eventgridAction 
refs #9009
 2015-06-12 16:27:34 +02:00
Johannes Meyer eb93886cc7 ListController: Do not apply restrictions before the filter editor is being set up 
Might cause the restrictions being shown to the user..

refs #9009
 2015-06-12 14:58:20 +02:00
Johannes Meyer 4996f569fe monitoring: Ensure that views and queries are all named using the same scheme 
That's "SomesuperQuery" and not "SomeSuperQuery", according to most
of the existing queries.
 2015-06-12 14:42:49 +02:00
Johannes Meyer 76b17462f9 ListController: Restrict eventhistoryAction 
refs 9009
 2015-06-12 12:52:29 +02:00
Alexander A. Klimov a9ea6a7c9a Don't use non-existent Format::timeSince() 
fixes #9400
 2015-06-10 17:50:37 +02:00
Alexander A. Klimov 98b2699e35 Documentation: use command line arguments in the format --arg=<value> 
refs #8472
 2015-06-10 17:20:27 +02:00
Alexander A. Klimov e764bfb95d Repair command links 
fixes #9392
 2015-06-10 14:29:44 +02:00
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
Johannes Meyer d5dffe9a7a Merge branch 'master' into feature/monitoring-restrictions-9009 2015-06-09 09:22:50 +02:00
Johannes Meyer f2c7d5686a Timeline: Fix url used to extend the timeline 2015-06-09 09:17:15 +02:00
Johannes Meyer 2669d0e478 monitoring: Restrict the notification overview 
refs #9009
 2015-06-08 17:10:16 +02:00
Eric Lippmann 6c07a4842b monitoring: Fix controller function fetchHostStats() 
refs #9009
 2015-06-05 15:50:11 +02:00
Eric Lippmann 8cbb83d630 Merge branch 'master' into feature/monitoring-restrictions-9009 2015-06-05 15:29:16 +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
Eric Lippmann 1d775842f9 monitoring: Restrict the service grid 
refs #9009
 2015-06-05 15:06:34 +02:00
Eric Lippmann 5bc611f772 monitoring: Use new restriction when viewing a service 
refs #9009
 2015-06-05 14:44:35 +02:00
Eric Lippmann 5745790cdd monitoring: Use new restriction when viewing a host 
refs #9009
 2015-06-05 14:44:03 +02:00
Eric Lippmann b7afec8f3c monitoring: Restrict the tactical overview 
refs #9009
 2015-06-05 12:43:24 +02:00
Eric Lippmann f8b49864bb monitoring: Restrict the services overview 
refs #9009
 2015-06-03 14:59:20 +02:00
Eric Lippmann f479ea1da8 monitoring: Restrict the service status summary 
refs #9009
 2015-06-03 14:44:36 +02:00
Eric Lippmann 8f111406f3 monitoring: Restrict the host overview and the host status summary 
refs #9009
 2015-06-03 14:16:22 +02:00
Eric Lippmann fe488c7b77 monitoring: Restrict the service group overview 
refs #9009
 2015-06-03 12:54:25 +02:00
Eric Lippmann 8bc9e46757 monitoring: Don't select host counts in the service group overview 
We're not showing the counts.

refs #9009
 2015-06-03 12:21:29 +02:00
Eric Lippmann c1c8c1c005 monitoring: Restrict the host group summary 
refs #9009
 2015-06-03 11:49:31 +02:00
Eric Lippmann 947b5436c3 monitoring: Fix host group summary select columns 
refs #9009
 2015-06-03 11:41:31 +02:00