5018 Commits

Author SHA1 Message Date
Eric Lippmann
0729973045 monitoring: Add last *comment columns to the host status queries 2015-05-29 15:07:06 +02:00
Eric Lippmann
a93ef04d5d Revert "Add new tab to switch between host and service multi-selection"
This reverts commit 45a0982bebb411ed8a202696965c1438b5948c2c.

Conflicts:
	modules/monitoring/application/controllers/HostsController.php
	modules/monitoring/application/controllers/ServicesController.php

The tab was removed w/ another commit I guess. This revert removes the related not yet removed crap.
2015-05-29 13:30:02 +02:00
Eric Lippmann
e71682ffb3 monitoring: Don't join downtimes in the servicestatus query
refs #9009
2015-05-29 13:20:01 +02:00
Eric Lippmann
ba07077ca8 monitoring: Don't join downtimes in the hoststatus query
refs #9009
2015-05-29 13:13:28 +02:00
Eric Lippmann
6e94755c4c monitoring: Use host and service downtime query in the downtime query
refs #9009
2015-05-29 13:12:34 +02:00
Eric Lippmann
b833a04110 monitoring: Add data view for service downtimes
refs #9009
2015-05-29 13:12:03 +02:00
Eric Lippmann
02cabf3a50 monitoring: Add query for service downtimes
refs #9009
2015-05-29 13:11:48 +02:00
Eric Lippmann
22a83b7388 monitoring: Add data view for host downtimes
refs #9009
2015-05-29 13:11:32 +02:00
Eric Lippmann
3e53426ece monitoring: Add query for host downtimes
refs #9009
2015-05-29 13:10:20 +02:00
Eric Lippmann
3a69e8185f monitoring: Add restrictable filter columns to the downtime data view
refs #9009
2015-05-29 11:44:34 +02:00
Eric Lippmann
b1446fcb23 monitoring: Allow the hoststatus query to be filtered by restrictable columns
refs #9009
2015-05-29 11:43:41 +02:00
Eric Lippmann
c17334deee monitoring: Support restricting the downtimes overview
refs #9009
2015-05-29 11:42:05 +02:00
Eric Lippmann
4544653c2e monitoring: Don't apply restrictions in the downtime query
Restrictions should be applied from the controller.

refs #9009
2015-05-29 11:41:39 +02:00
Eric Lippmann
7793b61e4c monitoring: Combine restrictions w/ OR
If a user has more than one filter for the same restriction, the filters will be combined w/ or. The combined filters will then be applied w/ AND to the query.

refs #9009
2015-05-29 11:40:26 +02:00
Eric Lippmann
41be32adff monitoring: Provide only the monitoring/filter/objects restriction
We'll combine the hosts and services filter restrictions into a single restriction.

refs #9009
2015-05-29 11:23:47 +02:00
Eric Lippmann
9f155ea99d monitoring: Don't show SSH command when transporting a command to a remote command file failed
refs #8006
2015-05-28 16:33:35 +02:00
Eric Lippmann
a4a1a296d1 monitoring: Reduce error output when transporting a command to a local command file failed
refs #8006
2015-05-28 16:13:35 +02:00
Eric Lippmann
1a51368a76 Fix MacroTest
Pushing failing tests to the master is a mystery to me.

refs #6392
2015-05-28 16:08:21 +02:00
Matthias Jentsch
8309ab336d Merge branch 'feature/resolve-runtime-macros-6392'
resolves #6392
2015-05-28 15:42:16 +02:00
Matthias Jentsch
c7261bd481 Add missing columns for macro expansion
refs #6392
2015-05-28 15:37:01 +02:00
Matthias Jentsch
a298197e6c Fix layout of action lincs in view
refs #6392
2015-05-28 15:31:50 +02:00
Matthias Jentsch
eb5c48ade9 Access correct resolver function in IconImage
refs #6392
2015-05-28 15:21:56 +02:00
Matthias Jentsch
3b601decc5 Remove unused ResolceMacro Helper
refs #6392
2015-05-28 15:15:07 +02:00
Matthias Jentsch
2572842aa4 Add unit test cases for the new macro syntax
refs #6392
2015-05-28 15:07:46 +02:00
Matthias Jentsch
60e5608b40 Rename ResolveMacroTest
refs #6392
2015-05-28 15:02:58 +02:00
Matthias Jentsch
a66949162b Resolve macros when accessing getters on MonitoredObjects
refs #6392
2015-05-28 15:01:10 +02:00
Matthias Jentsch
37f58e55d8 Move macro resolcing functionality into separate class
Make macro resolving functionality available to all code, instead of depending on a view

resf #6392
2015-05-28 14:44:16 +02:00
Alexander Fuhr
f3a37e9575 Update documentation for resources and instances
I've just only renamed the identity_key to the private_key thats it

refs #7595
2015-05-28 14:15:01 +02:00
Alexander Fuhr
49589128ef Rename identity_key with private_key in ssh resource
refs #7595
2015-05-28 14:09:13 +02:00
Johannes Meyer
58d78f59f3 DbQuery: Initialize self::$select as early as possible
I'd like to use Zend's implementation instead of re-inventing the wheel just
because someone decided to only work with a copy of it in the frameworks
query but do exactly the opposite in the monitoring module's IDO query...
2015-05-28 13:49:36 +02:00
Eric Lippmann
5fdaa2cd7e monitoring: Fix command links when showing multiple selected hosts
fixes #9327
2015-05-28 13:17:00 +02:00
Eric Lippmann
e0fe6440d2 monitoring: Show host's services in the next container
refs #7998
2015-05-28 12:26:22 +02:00
Eric Lippmann
8dbb215e27 monitoring: Remove services action from the ShowController
refs #7998
2015-05-28 12:25:31 +02:00
Eric Lippmann
b3e0851b62 monitoring: Remove the services tab when showing an object's history
refs #7998
2015-05-28 12:24:00 +02:00
Eric Lippmann
646cffd62d monitoring: Remove the services tab when showing host or service details
refs #7998
2015-05-28 12:22:57 +02:00
Alexander Fuhr
a47d05a038 Add identity key usage for a specific user in remote command
refs #7595
fixes #7447
2015-05-28 10:51:56 +02:00
Alexander Fuhr
558120e23b Add resource ssh usage to resources and instances
refs #7595
2015-05-28 10:50:13 +02:00
Matthias Jentsch
6c44f6a11a Deduplicate url-attribute parsing code
Use function to fetch all host links in MonitoredObject instead.
2015-05-28 10:47:44 +02:00
Alexander Fuhr
9fdf2a215c Update instance documentation with the usage of a ssh resource
refs #7595
2015-05-28 10:43:30 +02:00
Eric Lippmann
344e17a605 monitoring: Fix command links when showing multiple selected hosts
fixes #9327
2015-05-28 10:33:13 +02:00
Alexander A. Klimov
38cecdb724 Setup Wizard: show how to add a system group "icingaweb2" and how to add the webserver's user to it
refs #8705
2015-05-27 11:39:13 +02:00
Eric Lippmann
0c1df335fc monitoring: Fix select columns for downtimes, again
refs #9009
refs #9319
2015-05-26 17:15:03 +02:00
Eric Lippmann
61565543ab monitoring: Fix downtime filter columns
refs #9009
refs #9319
2015-05-26 17:10:23 +02:00
Eric Lippmann
cd1ee3e306 monitoring: Fix select columns for downtimes
refs #9009
refs #9319
2015-05-26 17:07:58 +02:00
Eric Lippmann
bb9b9bc754 monitoring: Apply host and service restrictions to downtimes
refs #9009
refs #9319
2015-05-26 17:05:47 +02:00
Eric Lippmann
788481e2b1 monitoring: Add Servicestatus query
refs #7344
refs #9009
2015-05-26 17:02:41 +02:00
Eric Lippmann
18499a4a59 monitoring: Support joining downtimes on the Hoststatus query
refs #7344
refs #9009
2015-05-26 17:02:13 +02:00
Eric Lippmann
b0576d93de monitoring: Support selecting NULL as column
refs #9009
2015-05-26 17:00:56 +02:00
Eric Lippmann
b24e3393f0 monitoring: Prohibit sorting the HostStatus data view by service columns
refs #7344
refs #9009
2015-05-26 17:00:48 +02:00
Eric Lippmann
e240f7b955 monitoring: Don't select host last ack, comment and downtime
Where unsure whether or not we will still support this.

refs #7344
refs #9009
2015-05-26 17:00:39 +02:00