Matthias Jentsch
|
3caa5b428a
|
Merge branch 'bugfix/don-t-show-more-than-the-five-worst-pies-in-list-views-8205'
fixes #8205
|
2015-06-16 18:40:03 +02:00 |
|
Johannes Meyer
|
670d6e93c7
|
MonitoredObject: Ensure that the filter is applied to all queries
refs #9009
|
2015-06-16 17:44:29 +02:00 |
|
Johannes Meyer
|
d0a7c481c2
|
MonitoredObjectController: Restrict the historyAction
refs #9009
|
2015-06-16 17:16:59 +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
|
196450d8cf
|
MonitoredObjectController: Add historyAction
|
2015-06-16 17:04:36 +02:00 |
|
Johannes Meyer
|
e96c6958b2
|
MonitoredObjectController: Show the service tab, if it was already shown
|
2015-06-16 16:36:13 +02:00 |
|
Johannes Meyer
|
c221e0c082
|
MonitoredObjectController: Fix link to show a host's services
|
2015-06-16 16:03:41 +02:00 |
|
Johannes Meyer
|
ca678a57e9
|
Revert "monitoring: Remove the services tab when showing host or service details"
This reverts commit 646cffd62d615e6a4d716440a9f5728c19b87120.
|
2015-06-16 13:49:04 +02:00 |
|
Johannes Meyer
|
bf70ec2802
|
ServicenotificationQuery: Ensure that notifications not sent to a contact are fetched
refs #9009
|
2015-06-16 13:29:31 +02:00 |
|
Johannes Meyer
|
42a1d8e56d
|
HostnotificationQuery: Ensure that notifications not sent to a contact are fetched
refs #9009
|
2015-06-16 13:29:21 +02:00 |
|
Johannes Meyer
|
05e0568ef1
|
StatusQuery: Fix invalid joins
refs #9009
|
2015-06-16 09:42:24 +02:00 |
|
Johannes Meyer
|
73e9db3704
|
ServicestatusQuery: Fix invalid joins
refs #9009
|
2015-06-16 09:42:13 +02:00 |
|
Johannes Meyer
|
c11bd6d7ee
|
ServicestatehistoryQuery: Fix invalid joins
refs #9009
|
2015-06-16 09:42:04 +02:00 |
|
Johannes Meyer
|
7a5156b0ad
|
ServicenotificationQuery: Fix invalid joins
refs #9009
|
2015-06-16 09:41:52 +02:00 |
|
Johannes Meyer
|
1dd21c2969
|
ServicegroupQuery: Fix invalid joins
refs #9009
|
2015-06-16 09:41:43 +02:00 |
|
Johannes Meyer
|
755da0c210
|
ServicedowntimestarthistoryQuery: Fix invalid joins
refs #9009
|
2015-06-16 09:41:36 +02:00 |
|
Johannes Meyer
|
0cc693810b
|
ServicedowntimeQuery: Fix invalid joins
refs #9009
|
2015-06-16 09:41:26 +02:00 |
|
Johannes Meyer
|
1983c499b0
|
ServicecommentQuery: Fix invalid joins
refs #9009
|
2015-06-16 09:41:11 +02:00 |
|
Johannes Meyer
|
13cb52b3cb
|
ServicecommenthistoryQuery: Fix invalid joins
refs #9009
|
2015-06-16 09:40:59 +02:00 |
|
Johannes Meyer
|
72e5c07da1
|
HoststatusQuery: Fix invalid joins
refs #9009
|
2015-06-16 09:40:49 +02:00 |
|
Johannes Meyer
|
627e681e74
|
HoststatehistoryQuery: Fix invalid joins
refs #9009
|
2015-06-16 09:40:40 +02:00 |
|
Johannes Meyer
|
379e80b21f
|
HostnotificationQuery: Fix invalid joins
refs #9009
|
2015-06-16 09:40:30 +02:00 |
|
Johannes Meyer
|
6745b0b677
|
HostgroupQuery: Fix invalid joins
refs #9009
|
2015-06-16 09:40:20 +02:00 |
|
Johannes Meyer
|
fee6c2f330
|
HostdowntimestarthistoryQuery: Fix invalid joins
refs #9009
|
2015-06-16 09:40:10 +02:00 |
|
Johannes Meyer
|
ba9d4538f9
|
HostdowntimeQuery: Fix invalid joins
refs #9009
|
2015-06-16 09:39:56 +02:00 |
|
Johannes Meyer
|
9a020f0218
|
HostcommentQuery: Fix invalid joins
refs #9009
|
2015-06-16 09:39:47 +02:00 |
|
Johannes Meyer
|
a70524417e
|
HostcommenthistoryQuery: Fix invalid joins
refs #9009
|
2015-06-16 09:39:37 +02:00 |
|
Johannes Meyer
|
d4f659c544
|
Revert "NotificationhistoryQuery: Improve JOIN performance"
This reverts commit a6d1115d0f17a6ba626eda23d3b6d2e891052911.
Accidentally commited..
|
2015-06-16 08:13:28 +02:00 |
|
Johannes Meyer
|
10a65f1e27
|
ServicestatehistoryQuery: Improve JOIN performance
refs #9009
|
2015-06-16 08:12:16 +02:00 |
|
Johannes Meyer
|
7d9b09fdc8
|
ServicenotificationQuery: Improve JOIN performance
refs #9009
|
2015-06-16 08:12:08 +02:00 |
|
Johannes Meyer
|
8bf269c2b3
|
ServicegroupQuery: Improve JOIN performance
refs #9009
|
2015-06-16 08:12:00 +02:00 |
|
Johannes Meyer
|
c0552b092a
|
ServicedowntimestarthistoryQuery: Improve JOIN performance
refs #9009
|
2015-06-16 08:11:54 +02:00 |
|
Johannes Meyer
|
39f692e240
|
ServicedowntimeQuery: Improve JOIN performance
refs #9009
|
2015-06-16 08:11:45 +02:00 |
|
Johannes Meyer
|
bf7e6b3591
|
ServicecommentQuery: Improve JOIN performance
refs #9009
|
2015-06-16 08:11:38 +02:00 |
|
Johannes Meyer
|
104c8e7a2b
|
ServicecommenthistoryQuery: Improve JOIN performance
refs #9009
|
2015-06-16 08:11:29 +02:00 |
|
Johannes Meyer
|
a6d1115d0f
|
NotificationhistoryQuery: Improve JOIN performance
refs #9009
|
2015-06-16 08:11:18 +02:00 |
|
Johannes Meyer
|
4c3592a82e
|
HoststatusQuery: Improve JOIN performance
refs #9009
|
2015-06-16 08:11:09 +02:00 |
|
Johannes Meyer
|
b774b2565f
|
HoststatehistoryQuery: Improve JOIN performance
refs #9009
|
2015-06-16 08:11:03 +02:00 |
|
Johannes Meyer
|
326013428e
|
HostnotificationQuery: Improve JOIN performance
refs #9009
|
2015-06-16 08:10:55 +02:00 |
|
Johannes Meyer
|
55a6b79ee5
|
HostgroupQuery: Improve JOIN performance
refs #9009
|
2015-06-16 08:10:49 +02:00 |
|
Johannes Meyer
|
0a98cb0255
|
HostdowntimestarthistoryQuery: Improve JOIN performance
refs #9009
|
2015-06-16 08:10:42 +02:00 |
|
Johannes Meyer
|
e73409eb6d
|
HostdowntimeQuery: Improve JOIN performance
refs #9009
|
2015-06-16 08:10:32 +02:00 |
|
Johannes Meyer
|
41f1d3307b
|
HostcommentQuery: Improve JOIN performance
refs #9009
|
2015-06-16 08:10:24 +02:00 |
|
Johannes Meyer
|
1a32d289b8
|
HostcommenthistoryQuery: Improve JOIN performance
refs #9009
|
2015-06-16 08:10:16 +02:00 |
|
Johannes Meyer
|
988bc2cf44
|
ServicestatusQuery: Improve JOIN performance
refs #9009
|
2015-06-16 08:09:54 +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
|
7cbcb91fd7
|
DataView\Eventhistory: Allow to filter for custom variables
refs #9009
|
2015-06-15 16:53:22 +02:00 |
|
Johannes Meyer
|
9876a53f8e
|
DataView\Eventgrid: Allow to filter for custom variables
refs #9009
|
2015-06-15 16:53:13 +02:00 |
|
Johannes Meyer
|
c6cf51b44c
|
NotificationQuery: Force that the host and service subqueries are instantiated
Quick and dirty. I do not have enough time for a more proper version...
refs #9009
|
2015-06-15 16:24:57 +02:00 |
|
Johannes Meyer
|
a32f505fdd
|
ObjectList: Fix that setFilter() violates interface Filterable
refs #9009
|
2015-06-15 16:08:04 +02:00 |
|