Commit Graph

2673 Commits

Author SHA1 Message Date
Thomas Gelf 02f3c333eb monitoring/object/show: reorder elements 2015-06-18 16:53:39 +02:00
Thomas Gelf da8d0a46fd monitoring/object/show: adjust font sizes / width 2015-06-18 16:48:25 +02:00
Johannes Meyer f5554b6aa0 IdoQuery: Handle non translated customvars properly 2015-06-18 16:43:20 +02:00
Johannes Meyer fb9641fb3c Controller: Validate restriction columns 2015-06-18 16:43:20 +02:00
Johannes Meyer 22feb08f44 monitoring: Update security documentation 2015-06-18 15:48:01 +02:00
Thomas Gelf cd70c27519 Merge remote-tracking branch 'origin/master' into feature/refine-ui-for-rc1-9361 2015-06-18 15:18:42 +02:00
Thomas Gelf bf68edf65c monitoring/css: improve plugin output readability 2015-06-18 15:13:48 +02:00
Thomas Gelf c085e9cfbd monitoring/css: try better monospace fonts 2015-06-18 15:11:27 +02:00
Thomas Gelf 171b1d84ef object/show: make downtimes look like comments
refs #8281
2015-06-18 14:57:58 +02:00
Johannes Meyer 2bffe56bd5 Merge branch 'master' into feature/monitoring-restrictions-9009 2015-06-18 14:54:01 +02:00
Johannes Meyer dd81de39fd NotificationQuery: Do not fetch non-history related columns for history queries
refs #9009
2015-06-18 14:34:30 +02:00
Johannes Meyer f2425a97d5 Select -1 as `state' for history queries not providing a valid state
PostgreSQL does not seem to be able to union null values with
integers...

refs #9009
2015-06-18 14:33:41 +02:00
Johannes Meyer 77fe094870 ServicedowntimestarthistoryQuery: PostgreSQL grouping...
refs #9009
2015-06-18 13:19:25 +02:00
Johannes Meyer dc66c24a1d HostdowntimestarthistoryQuery: PostgreSQL grouping...
refs #9009
2015-06-18 13:19:14 +02:00
Johannes Meyer 11ed6d6cfa ServicecommenthistoryQuery: PostgreSQL grouping...
refs #9009
2015-06-18 13:19:01 +02:00
Johannes Meyer f20193edb9 HostcommenthistoryQuery: PostgreSQL grouping...
refs #9009
2015-06-18 13:18:52 +02:00
Johannes Meyer b56114c824 ServicestatehistoryQuery: PostgreSQL grouping...
refs #9009
2015-06-18 13:18:40 +02:00
Johannes Meyer 5c19c05a8a HoststatehistoryQuery: PostgreSQL grouping...
refs #9009
2015-06-18 13:18:21 +02:00
Johannes Meyer b25d8e2f34 ServicegroupsummaryQuery: PostgreSQL grouping...
refs #9009
2015-06-18 12:35:41 +02:00
Johannes Meyer a43cae9eb8 HostgroupsummaryQuery: PostgreSQL grouping...
refs #9009
2015-06-18 12:35:21 +02:00
Johannes Meyer 5ef56fc9b2 ServicestatusQuery: Group by host- and servicegroup pk's if required
refs #9009
2015-06-18 12:34:49 +02:00
Johannes Meyer b24b650a94 HoststatusQuery: Group by host- and servicegroup pk's if required
refs #9009
2015-06-18 12:34:30 +02:00
Johannes Meyer e181c57a70 ServicestatusQuery: PostgreSQL grouping...
refs #9009
2015-06-18 12:08:05 +02:00
Johannes Meyer 37103cf72d HoststatusQuery: PostgreSQL grouping...
refs #9009
2015-06-18 11:52:58 +02:00
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
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
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 646cffd62d.
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 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
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 a6d1115d0f.
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
Thomas Gelf b579c65038 monitoring/css: more font cleanups 2015-06-16 02:49:41 +02:00
Thomas Gelf 09c0ebcacd list/services: flip host/service for readability
Re-allow table.action to manually choose row action link if it should not
be the first one. This existed once but got lost.
2015-06-16 02:36:53 +02:00
Thomas Gelf 3f926b1568 monitoring/css: reduce object state size 2015-06-16 02:13:44 +02:00
Thomas Gelf ea0c93c21b main-content.less: move even more CSS to monitoring 2015-06-16 01:57:34 +02:00
Thomas Gelf 0b6345acec monitoring/css: less styles 2015-06-16 01:52:12 +02:00
Thomas Gelf 686f73858f monitoring/list: move object flags to the right 2015-06-16 01:45:48 +02:00
Thomas Gelf 6c98e87593 monitoring/css: revert small-caps 2015-06-16 01:42:45 +02:00
Thomas Gelf 0d290441f2 monitoring/css: fix header styling, try small-caps 2015-06-16 01:32:30 +02:00
Thomas Gelf 7669fd88bc ToggleObjectFeaturesCommandForm: use h2 instead of h4 2015-06-16 01:28:38 +02:00
Thomas Gelf f18921c406 monitoring/css: no special styling for h3 2015-06-16 01:28:12 +02:00
Thomas Gelf 96ac83230c customvars.phtml: no header if no vars 2015-06-16 01:15:32 +02:00
Thomas Gelf 64ac2ea4c8 comments, downtimes: these should never have used...
...that styling. Those are headers and have nothing to do with statesummaries
2015-06-16 00:51:25 +02:00
Thomas Gelf a5a529bc99 Tiny summaries: use header tag instead of div 2015-06-16 00:50:40 +02:00
Thomas Gelf 33025f1b6e monitoring/css: no special margin for tinystates 2015-06-16 00:49:59 +02:00
Thomas Gelf 59ef6ff71a monitoring/show: choose fitting header tags 2015-06-16 00:35:32 +02:00
Thomas Gelf f1cf1392ba monitoring/css: no more bold, fix hover colors 2015-06-15 23:30:40 +02:00
Thomas Gelf f33e3f77f9 monitoring/css: use monospace for plugin output 2015-06-15 23:30:09 +02:00
Thomas Gelf 259a1d271c monitoring/css: remove header reset 2015-06-15 23:29:11 +02:00
Thomas Gelf 0170d9941a Merge remote-tracking branch 'origin/master' into feature/refine-ui-for-rc1-9361 2015-06-15 23:08:17 +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 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 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
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 a1e4e6e92b ObjectList: Implement interface Filterable
Allows to use instances of it for Controller::applyRestriction().

refs #9009
2015-06-15 16:05:37 +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 09d9d00844 ContactgroupQuery: Do not use Zend_Select::group() but self::group()
Avoids duplicate GROUP BY expressions.
2015-06-15 15:10:58 +02:00
Johannes Meyer 53e6d4cadc ListController: Restrict the contactgroups view
refs #9009
2015-06-15 15:08:25 +02:00
Johannes Meyer 548aec4233 DataView\Contactgroup: Add support for object restrictions
refs #9009
2015-06-15 15:08:04 +02:00
Johannes Meyer 2fceac9771 ListController: Fix contactgroup sorting 2015-06-15 14:15:51 +02:00
Johannes Meyer b8efe314a0 DbQuery: Ignore wildcard only filters
This increases query performance vastly, since LIKE '%' comparisons
prevent the dbms from utilizing an index.
2015-06-15 13:59:46 +02:00
Johannes Meyer aabdfec03a ListController: Restrict the contacts view
refs #9009
2015-06-15 13:48:13 +02:00
Johannes Meyer 07ebf11a07 DataView\Contact: Add support for object restrictions
refs #9009
2015-06-15 13:47:48 +02:00
Johannes Meyer d5ade9ae74 ListController: Restrict the eventgridAction
refs #9009
2015-06-12 16:27:34 +02:00
Johannes Meyer 470c4a54a3 Eventgrid: Add support for object restrictions
refs #9009
2015-06-12 16:27:13 +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 b6a7b43dd0 MonitoringBackend: Enforce that views and queries are of a particular naming scheme
I'm adding this mainly to not to break support with modules which are
utilizing our queries.
2015-06-12 14:46:46 +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
Johannes Meyer 528df1b26a EventHistory: Add support for object restrictions
refs #9009
2015-06-12 12:52:07 +02:00
Johannes Meyer c35be4023b DowntimeendhistoryQuery: Use subqueries to fetch host and service downtimes
refs #9009
2015-06-12 12:45:59 +02:00