Commit Graph

2992 Commits

Author SHA1 Message Date
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 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 5df2edee09 doc/style/guide: add action table
Problem: CSS in doc module is not "clean" as it has custom styling
2015-06-15 23:31:37 +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
Matthias Jentsch ea85254cc5 Fix typos and formatting in documentation
refs #9377
2015-06-15 11:09:41 +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
Johannes Meyer dadb3853d7 DowntimestarthistoryQuery: Use subqueries to fetch host and service downtimes
refs #9009
2015-06-12 12:45:49 +02:00
Johannes Meyer 95b5bba65c Introduce query ServicedowntimeendhistoryQuery
refs #9009
2015-06-12 12:45:02 +02:00
Johannes Meyer 3ed858269c Introduce query ServicedowntimestarthistoryQuery
refs #9009
2015-06-12 12:44:49 +02:00
Johannes Meyer 7afa4dac9a Introduce query HostdowntimeendhistoryQuery
refs #9009
2015-06-12 12:44:35 +02:00
Johannes Meyer 18d3fcbbf7 Introduce query HostdowntimestarthistoryQuery
refs #9009
2015-06-12 12:44:25 +02:00
Johannes Meyer 51434c7255 CommentdeletionhistoryQuery: Use subqueries to fetch removed host and service comments
refs #9009
2015-06-11 16:16:17 +02:00
Johannes Meyer b7a26c599d Introduce query ServicecommentdeletionhistoryQuery
refs #9009
2015-06-11 16:15:50 +02:00
Johannes Meyer 7ea9051d43 Introduce query HostcommentdeletionQuery
refs #9009
2015-06-11 16:15:29 +02:00
Johannes Meyer 7358eefed8 CommenthistoryQuery: Use subqueries to fetch host and service comments
refs #9009
2015-06-11 15:29:36 +02:00
Johannes Meyer bf85fd62b5 Introduce query ServicecommenthistoryQuery
refs #9009
2015-06-11 15:28:57 +02:00
Johannes Meyer 26e895aedb Introduce query HostcommenthistoryQuery
refs #9009
2015-06-11 15:28:38 +02:00
Johannes Meyer f17e9162eb StatehistoryQuery: Use subqueries for host and service state records
refs #9009
2015-06-11 12:36:10 +02:00
Johannes Meyer 5083301dea Introduce query ServicestatehistoryQuery
refs #9009
2015-06-11 12:35:29 +02:00
Johannes Meyer 0ead8d4821 Introduce query HoststatehistoryQuery
refs #9009
2015-06-11 12:35:15 +02:00
Johannes Meyer ed66c1f2e4 ServicenotificationQuery: Apply query optimization from NotificationhistoryQuery
refs #9009
2015-06-11 12:34:55 +02:00
Johannes Meyer f9948f5513 HostnotificationQuery: Apply query optimization from NotificationhistoryQuery
refs #9009
2015-06-11 12:34:40 +02:00
Matthias Jentsch 3eb4561f79 Merge branch 'feature/permission-restriction-documentation-9377'
fixes #9377
2015-06-10 19:04:47 +02:00
Matthias Jentsch edd1c2a1f3 Move monitoring permission documentation into a separate module
refs #9377
2015-06-10 18:43:54 +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
Johannes Meyer b235bb6982 NotificationQuery: Select placeholder values when joining hosts, again
I've missed that our notification list-view detects based on a attribute's
value of which type a returned row is...

refs #9009
2015-06-10 17:04:00 +02:00
Johannes Meyer 5ad93d138c ServicenotificationQuery: Fix grouping when *all* tables are being joined
refs #9009
2015-06-10 17:01:58 +02:00
Johannes Meyer 0ccb765954 HostnotificationQuery: Fix grouping when *all* tables are being joined
refs #9009
2015-06-10 17:01:46 +02:00
Alexander A. Klimov e764bfb95d Repair command links
fixes #9392
2015-06-10 14:29:44 +02:00
Johannes Meyer 51a3213fca NotificationQuery: Add support for history related queries
refs #9009
2015-06-10 13:10:28 +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 db816e4a5c ServicegroupsummaryQuery: Fix that the service severity is not being fetched 2015-06-09 12:48:15 +02:00
Alexander A. Klimov cd416f0466 Merge branch 'feature/Add-module-information-to-all-core-modules-7651'
resolves #7651
2015-06-09 10:43:59 +02:00
Alexander A. Klimov ad643e3aa5 Improve the setup module's description
refs #7651
2015-06-09 10:39:32 +02:00
Alexander A. Klimov 27c73833f9 Translation module: fix typo
refs #7651
2015-06-09 10:15:37 +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