5104 Commits

Author SHA1 Message Date
Thomas Gelf
a4ab4db1ca perfdata: occupy more space, highglight like output 2015-06-18 11:39:55 +02:00
Johannes Meyer
b9479e7da4 ServicegroupQuery: PostgreSQL grouping...
refs #9009
2015-06-18 11:33:09 +02:00
Johannes Meyer
b128bef8f0 HostgroupQuery: PostgreSQL grouping...
refs #9009
2015-06-18 11:29:26 +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
Johannes Meyer
d66b7e85e7 ServicecommentQuery: PostgreSQL grouping...
refs #9009
2015-06-18 11:17:36 +02:00
Johannes Meyer
99b0d63e94 HostcommentQuery: PostgreSQL grouping...
refs #9009
2015-06-18 11:17:14 +02:00
Johannes Meyer
4f42da49a8 ServicenotificationQuery: PostgreSQL grouping...
refs #9009
2015-06-18 10:59:52 +02:00
Johannes Meyer
8ec494c962 HostnotificationQuery: PostgreSQL grouping...
refs #9009
2015-06-18 10:58:59 +02:00
Johannes Meyer
068c0b6ed2 ServicedowntimeQuery: PostgreSQL grouping...
refs #9009
2015-06-18 10:38:15 +02:00
Johannes Meyer
72de85ab7b HostdowntimeQuery: PostgreSQL grouping...
refs #9009
2015-06-18 10:37:54 +02:00
Johannes Meyer
6e40b79b0d DataView\Downtime: Add missing columns host_ and service_state 2015-06-18 10:37:27 +02:00
Johannes Meyer
535b740d0e ContactgroupQuery: PostgreSQL grouping...
refs #9009
2015-06-18 10:09:50 +02:00
Johannes Meyer
9cfca36f46 ContactQuery: PostgreSQL grouping..
refs #9009
2015-06-18 09:39:23 +02:00
Johannes Meyer
1169793213 IdoQuery: Add prototype for dynamic GROUP BY clauses 2015-06-18 09:36:04 +02:00
Matthias Jentsch
42e712402c Move grey hover effect back into main module
refs #9361
2015-06-17 14:30:46 +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
0d32b94eaa HostController: Open a host's service in the current column 2015-06-17 10:24:18 +02:00
Johannes Meyer
4d72832933 MonitoredObject: Don't apply restrictions to comments and downtimes
They're already filtered by object_type and the object's name.

refs #9009
2015-06-17 10:11:59 +02:00
Johannes Meyer
5c1cdbc1c8 IdoQuery: Join hosts and services automatically if required for customvars
refs #9009
fixes #9426
2015-06-17 10:00:29 +02:00
Johannes Meyer
486fbd599b HoststatusQuery: Respect IDO schema version
refs #9009
fixes #9425
2015-06-17 09:05:32 +02:00
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
Matthias Jentsch
36622101ae Use built-in php sort functions
refs #8205
2015-06-16 18:36:12 +02:00
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
Matthias Jentsch
f31f18dc51 Move security documentation for monitoring module into correct directory
refs #9377
2015-06-16 17:54:21 +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
Matthias Jentsch
5b8c308679 Merge branch 'bugfix/use-statement-error-9281'
fixes #9281
2015-06-16 17:06:47 +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
e96c6958b2 MonitoredObjectController: Show the service tab, if it was already shown 2015-06-16 16:36:13 +02:00
Johannes Meyer
4a2a17aba1 HostController: Do not permit to filter the servicesAction 2015-06-16 16:34:45 +02:00
Matthias Jentsch
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
Johannes Meyer
d81e637ae9 HostController: Add action to show a host's services 2015-06-16 16:04:45 +02:00
Johannes Meyer
c221e0c082 MonitoredObjectController: Fix link to show a host's services 2015-06-16 16:03:41 +02:00
Johannes Meyer
c05594b124 ShowController: Fix link to show a host's services 2015-06-16 16:03:17 +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
c316e5ce8f Revert "monitoring: Remove the services tab when showing an object's history"
This reverts commit b3e0851b62d079c49d486b542c7845e662e88068.
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
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