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 |