5c1cdbc1c8
IdoQuery: Join hosts and services automatically if required for customvars
...
refs #9009
fixes #9426
2015-06-17 10:00:29 +02:00
486fbd599b
HoststatusQuery: Respect IDO schema version
...
refs #9009
fixes #9425
2015-06-17 09:05:32 +02:00
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
36622101ae
Use built-in php sort functions
...
refs #8205
2015-06-16 18:36:12 +02:00
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
f31f18dc51
Move security documentation for monitoring module into correct directory
...
refs #9377
2015-06-16 17:54:21 +02:00
670d6e93c7
MonitoredObject: Ensure that the filter is applied to all queries
...
refs #9009
2015-06-16 17:44:29 +02:00
d0a7c481c2
MonitoredObjectController: Restrict the historyAction
...
refs #9009
2015-06-16 17:16:59 +02:00
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
5b8c308679
Merge branch 'bugfix/use-statement-error-9281'
...
fixes #9281
2015-06-16 17:06:47 +02:00
71e932bcf9
ShowController: Deprecate historyAction
2015-06-16 17:05:41 +02:00
196450d8cf
MonitoredObjectController: Add historyAction
2015-06-16 17:04:36 +02:00
e96c6958b2
MonitoredObjectController: Show the service tab, if it was already shown
2015-06-16 16:36:13 +02:00
4a2a17aba1
HostController: Do not permit to filter the servicesAction
2015-06-16 16:34:45 +02:00
5bf7bbdb8b
Remove unneeded use statements from global namespaces
...
Use statements on global classes from the global namespace don't have any effect, prevent warnings from being displayed in php versions >= 5.6.9 and version >= 5.5.25.
refs #9281
2015-06-16 16:10:52 +02:00
d81e637ae9
HostController: Add action to show a host's services
2015-06-16 16:04:45 +02:00
c221e0c082
MonitoredObjectController: Fix link to show a host's services
2015-06-16 16:03:41 +02:00
c05594b124
ShowController: Fix link to show a host's services
2015-06-16 16:03:17 +02:00
ba4dd255ec
Tabs: Merge the action's params into the current request url's params
2015-06-16 16:02:32 +02:00
68be11b929
UrlParams: Allow conversion to an associative array
2015-06-16 16:01:42 +02:00
ca678a57e9
Revert "monitoring: Remove the services tab when showing host or service details"
...
This reverts commit 646cffd62d
2015-06-16 13:49:04 +02:00
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
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
bf70ec2802
ServicenotificationQuery: Ensure that notifications not sent to a contact are fetched
...
refs #9009
2015-06-16 13:29:31 +02:00
42a1d8e56d
HostnotificationQuery: Ensure that notifications not sent to a contact are fetched
...
refs #9009
2015-06-16 13:29:21 +02:00
b3028e9988
Merge remote-tracking branch 'origin/master' into feature/refine-ui-for-rc1-9361
2015-06-16 11:49:03 +02:00
7a18638504
Revert "Web/Menu: move "About" to config section"
...
Has been fixed in current master.
This reverts commit 56d67def00
2015-06-16 11:48:40 +02:00
aa0b1d43ef
Menu: Move about page into the system menu as sub-entry
2015-06-16 11:43:58 +02:00
3cf7e93a10
Remove file Reftest.php
...
Looks like an accident.
refs #9009
2015-06-16 11:39:15 +02:00
05e0568ef1
StatusQuery: Fix invalid joins
...
refs #9009
2015-06-16 09:42:24 +02:00
73e9db3704
ServicestatusQuery: Fix invalid joins
...
refs #9009
2015-06-16 09:42:13 +02:00
c11bd6d7ee
ServicestatehistoryQuery: Fix invalid joins
...
refs #9009
2015-06-16 09:42:04 +02:00
7a5156b0ad
ServicenotificationQuery: Fix invalid joins
...
refs #9009
2015-06-16 09:41:52 +02:00
1dd21c2969
ServicegroupQuery: Fix invalid joins
...
refs #9009
2015-06-16 09:41:43 +02:00
755da0c210
ServicedowntimestarthistoryQuery: Fix invalid joins
...
refs #9009
2015-06-16 09:41:36 +02:00
0cc693810b
ServicedowntimeQuery: Fix invalid joins
...
refs #9009
2015-06-16 09:41:26 +02:00
1983c499b0
ServicecommentQuery: Fix invalid joins
...
refs #9009
2015-06-16 09:41:11 +02:00
13cb52b3cb
ServicecommenthistoryQuery: Fix invalid joins
...
refs #9009
2015-06-16 09:40:59 +02:00
72e5c07da1
HoststatusQuery: Fix invalid joins
...
refs #9009
2015-06-16 09:40:49 +02:00
627e681e74
HoststatehistoryQuery: Fix invalid joins
...
refs #9009
2015-06-16 09:40:40 +02:00
379e80b21f
HostnotificationQuery: Fix invalid joins
...
refs #9009
2015-06-16 09:40:30 +02:00
6745b0b677
HostgroupQuery: Fix invalid joins
...
refs #9009
2015-06-16 09:40:20 +02:00
fee6c2f330
HostdowntimestarthistoryQuery: Fix invalid joins
...
refs #9009
2015-06-16 09:40:10 +02:00
ba9d4538f9
HostdowntimeQuery: Fix invalid joins
...
refs #9009
2015-06-16 09:39:56 +02:00
9a020f0218
HostcommentQuery: Fix invalid joins
...
refs #9009
2015-06-16 09:39:47 +02:00
a70524417e
HostcommenthistoryQuery: Fix invalid joins
...
refs #9009
2015-06-16 09:39:37 +02:00
d4f659c544
Revert "NotificationhistoryQuery: Improve JOIN performance"
...
This reverts commit a6d1115d0f
2015-06-16 08:13:28 +02:00
10a65f1e27
ServicestatehistoryQuery: Improve JOIN performance
...
refs #9009
2015-06-16 08:12:16 +02:00
7d9b09fdc8
ServicenotificationQuery: Improve JOIN performance
...
refs #9009
2015-06-16 08:12:08 +02:00
8bf269c2b3
ServicegroupQuery: Improve JOIN performance
...
refs #9009
2015-06-16 08:12:00 +02:00
Johannes Meyer
Matthias Jentsch
Thomas Gelf