Eric Lippmann
8bf66425d1
Merge branch 'master' into bugfix/commands-6593
2014-09-15 09:27:56 +02:00
Eric Lippmann
9e0d6657b7
Merge branch 'bugfix/rebuild-form-builder-5525' into bugfix/commands-6593
...
Conflicts:
application/forms/Preference/GeneralForm.php
2014-09-15 09:27:07 +02:00
Eric Lippmann
a18287d183
monitoring/commands: Rename `PropagateHostDowntime' to `PropagateHostDowntimeCommand'
...
refs #6593
2014-09-13 20:34:51 +02:00
Eric Lippmann
33e0fbb7d9
monitoring/commands: Fix code compliance
...
refs #6593
2014-09-12 16:53:48 +02:00
Eric Lippmann
3a9774e6e5
monitoring/commands: Support toggling instance features
...
refs #6593
2014-09-12 16:43:18 +02:00
Eric Lippmann
1d54c7f836
monitoring/commands: Support 'DISABLE_NOTIFICATIONS_EXPIRE_TIME'
...
refs #6593
2014-09-12 10:42:48 +02:00
Eric Lippmann
3f216f26ff
monitoring/commands: Remove superseded command forms and command objects
...
refs #6593
2014-09-12 10:20:38 +02:00
Eric Lippmann
c0e3447339
monitoring: Adapt host and service classes to match their base class' interface
2014-09-12 10:17:46 +02:00
Eric Lippmann
aca5a2e466
monitoring: Fetch Icinga object properties lazily
2014-09-12 10:16:31 +02:00
Eric Lippmann
b6ac31d10f
monitoring/commands: Let transports use the Icinga command file command renderer
...
refs #6593
2014-09-11 17:39:59 +02:00
Eric Lippmann
1df8076234
monitoring/commands: Add command renderer for the Icinga command file
...
refs #6593
2014-09-11 17:39:13 +02:00
Eric Lippmann
3845301dfb
monitoring/commands: Add object command classes
...
refs #6593
2014-09-11 17:18:07 +02:00
Eric Lippmann
c40ac6f9dc
monitoring/commands: Add `DisableNotificationsExpireCommand'
...
refs #6593
2014-09-11 17:11:32 +02:00
Eric Lippmann
1247fdcad4
monitoring/commands: Move toggle instance feature commands into a single command
...
refs #6593
2014-09-11 17:10:20 +02:00
Marius Hein
9c2cf0bd0f
StateHistoryQuery: Make whereToSql robust
...
This fixes bugs is a array for expression comes in or types
does not exist.
fixes #7133
2014-09-10 10:07:03 +02:00
Eric Lippmann
5757a6f34b
monitoring: Fix typo in the `Downtime' data view
2014-09-10 09:29:01 +02:00
Eric Lippmann
171b366744
monitoring/commands: Let `AddCommentCommand' be the command object for adding both host and service commands
...
refs #6593
2014-09-09 16:41:41 +02:00
Eric Lippmann
28a66c8541
monitoring/commands: Introduce `ObjectCommand' for commands that involve a Icinga object
...
refs #6593
2014-09-09 16:40:09 +02:00
Eric Lippmann
d9fbbca447
monitoring/commands: Move `AddCommentCommand' to `WithCommentCommand'
...
`AddCommentCommand' will be the command for adding both host and service comments.
refs #6593
2014-09-09 16:39:22 +02:00
Eric Lippmann
a841b0956d
monitoring/commands: Do not require command objects to return the command string
...
There will be command renderer instead.
refs #6593
2014-09-09 16:35:06 +02:00
Johannes Meyer
83772c6684
Merge branch 'master' into bugfix/rebuild-form-builder-5525
2014-09-09 16:03:22 +02:00
Eric Lippmann
0e7ca591ec
Merge branch 'master' into bugfix/commands-6593
...
Conflicts:
application/forms/Preference/GeneralForm.php
application/views/helpers/FormDateTime.php
modules/monitoring/application/forms/Command/CommandForm.php
2014-09-08 10:16:05 +02:00
Johannes Meyer
ae9e5a40cc
Merge branch 'master' into bugfix/rebuild-form-builder-5525
...
Conflicts:
application/forms/Preference/GeneralForm.php
2014-09-08 08:46:53 +02:00
Thomas Gelf
6095e44064
Host/Service: provide process_perfdata attribute
2014-09-05 19:05:13 +02:00
Thomas Gelf
cbaa2d8ae9
StateHistoryQuery: tune type queries
2014-09-05 18:41:51 +02:00
Thomas Gelf
9ea377fd45
NotificationHistoryQuery: names instead of aliases
...
refs #7104
2014-09-05 18:16:59 +02:00
Thomas Gelf
38c6d6aaf8
StatusSummaryQuery: reorganize, add new columns
...
refs #6993
2014-09-05 18:16:58 +02:00
Johannes Meyer
7d212658bc
Fix "Use statement with non compound name..." in TimelineController
2014-09-05 09:17:54 +02:00
Johannes Meyer
d021747bde
Fix form widgets
...
refs #5525
2014-09-05 09:17:09 +02:00
Eric Lippmann
a83ddb9d8e
monitoring/commands: Let `ScheduleDowntimeCommand' extend `AddCommentCommand'
...
refs #6593
2014-09-04 15:52:20 +02:00
Eric Lippmann
a94e84f3b0
monitoring/commands: Add common `AddCommentCommand'
...
refs #6593
2014-09-04 15:51:41 +02:00
Eric Lippmann
fe47441efc
monitoring/commands: Add command to schedule a service downtime
...
refs #6593
2014-09-04 15:42:11 +02:00
Eric Lippmann
1c8f880d18
modules/command: Remove old `ScheduleDowntimeCommand'
...
refs #6593
2014-09-04 15:38:48 +02:00
Eric Lippmann
f57bb0f6a1
modules/commands: Add common `ScheduleDowntimeCommand'
...
`ScheduleDowntimeCommand' is the base class for commands scheduling downtimes.
refs #6593
2014-09-04 15:37:30 +02:00
Marius Hein
f8b3ffb3c8
AbstractObject: Rename to MonitoredObject
...
refs #6932
2014-09-04 14:00:48 +02:00
Eric Lippmann
a45b17fcd0
monitoring/lib: Add methods `Service::getHostName()' and `Service::getName()'
...
The upcoming service command objects will require a service object.
In order to build the command string, the service command objects require
retrieval of the service's host name and the service's name.
The actual implementation of the methods is subject to change
refs #6593
2014-09-04 12:54:52 +02:00
Eric Lippmann
c3c0043307
Merge branch 'master' into bugfix/commands-6593
2014-09-03 23:23:20 +02:00
Thomas Gelf
8fdf20fbf2
Groupsummary: remove invalid sort column discovery
...
This didn't result in a loop 'til now as it wasn't even used. The problem
here is that the same View is used for tow differend things, this makes no
sense. In the meantime removing that code fixes related problems.
2014-09-03 18:55:20 +02:00
Thomas Gelf
1734f01040
CommentdeletionhistoryQuery: 1970-01-01 -> -02
...
refs #7000
2014-09-02 17:02:58 +02:00
Thomas Gelf
a58b2aac00
Ido\StatusQuery: join ALL latest comment
...
And it was soooo fast :p
refs #7057
2014-09-02 15:31:06 +02:00
Marius Hein
19136b548a
StatusQuery: Separate last comment fields
...
fixes #7057
2014-09-02 13:57:43 +02:00
Thomas Gelf
307787cfb7
DataView: use default sort order if none given
...
We should not be forced to order(null) to have the default order, that
should be the default in case order has not been called.
refs #6644
2014-09-02 12:54:38 +02:00
Thomas Gelf
6be31f4f51
Downtime*Query: use 1970-01-02 as "null"
...
refs #7000
2014-09-02 12:47:03 +02:00
Thomas Gelf
4a95b9d942
StatusSummaryQuery: respect pending, add columns
2014-09-02 12:45:15 +02:00
Thomas Gelf
153013bbc6
Ido\StatusQuery: pending hosts are not problems
2014-09-02 12:28:25 +02:00
Thomas Gelf
8f124051e3
MonitoringBackend: use correct config object
2014-09-02 11:32:48 +02:00
Marius Hein
1c24273c9b
Backend: Better implementation for createBackend
...
Thanks eric!
fixes #7043
2014-09-01 16:11:34 +02:00
Eric Lippmann
920c0b9c6d
monitoring/commands: Add (ENABLE|DISABLE)_PERFORMANCE_DATA commands
...
`TogglePerformanceData' is the command object for enabling/disabling the processing of host and service performance data on an Icinga instance.
refs #6593
2014-09-01 15:20:14 +02:00
Eric Lippmann
0edd14559c
monitoring/commands: Add (ENABLE|DISABLE)_PASSIVE_SERVICE_CHECKS commands
...
`TogglePassiveServiceChecks' is the command object for enabling/disabling passive service checks on an Icinga instance.
refs #6593
2014-09-01 15:18:40 +02:00
Eric Lippmann
efd16ba79f
monitoring/commands: Add (ENABLE|DISABLE)_PASSIVE_HOST_CHECKS commands
...
`TogglePassiveHostChecks' is the command object for enabling/disabling passive host checks on an Icinga instance.
refs #6593
2014-09-01 15:18:31 +02:00
Eric Lippmann
c5e35c9614
monitoring/commands: Add (START|STOP)_OBSESSING_OVER_SERVICE_CHECKS commands
...
`ToggleObsessingOverServiceChecks' is the command object for enabling/disabling processing of service checks via the OCHP command on an Icinga instance.
refs #6593
2014-09-01 15:15:11 +02:00
Eric Lippmann
cd29adc0bd
monitoring/commands: Add (START|STOP)_OBSESSING_OVER_HOST_CHECKS commands
...
`ToggleObsessingOverHostChecks' is the command object for enabling/disabling processing of host checks via the OCHP command on an Icinga instance.
refs #6593
2014-09-01 15:14:49 +02:00
Eric Lippmann
cdbd24ec99
monitoring/commands: Add (ENABLE|DISABLE)_NOTIFICATIONS/DISABLE_NOTIFICATIONS_EXPIRE_TIME commands
...
`ToggleNotifications' is the command object for enabling/disabling host and service notifications on an Icinga instance with an optional expire time for disabling notifications.
refs #6593
2014-09-01 15:14:39 +02:00
Eric Lippmann
5474c661e1
monitoring/commands: Add (ENABLE|DISABLE)_FLAP_DETECTION commands
...
`ToggleFlapDetection' is the command object for enabling/disabling host and service flap detection on an Icinga instance.
refs #6593
2014-09-01 15:14:31 +02:00
Eric Lippmann
010c5b45ba
monitoring/commands: Add (ENABLE|DISABLE)_EVENT_HANDLERS commands
...
`ToggleEventHandlers' is the command object for enabling/disabling host and service event handlers on an Icinga instance.
refs #6593
2014-09-01 15:14:23 +02:00
Eric Lippmann
fda48788ff
monitoring/commands: Add (START|STOP)_EXECUTING_SVC_CHECKS commands
...
`ToggleActiveServiceChecks' is the command object for enabling/disabling active service checks on an Icinga instance.
refs #6593
2014-09-01 15:14:15 +02:00
Eric Lippmann
d2d69b9bcd
monitoring/commands: Add (START|STOP)_EXECUTING_HOST_CHECKS commands
...
`ToggleActiveHostChecks' is the command object for enableing/disabling active host checks on an Icinga instance.
refs #6593
2014-09-01 15:13:59 +02:00
Marius Hein
160fc900d0
Backend: Set name if create default backend
...
fixes #7043
2014-09-01 14:46:06 +02:00
Eric Lippmann
57dd9a699e
monitoring/commands: ToggleFeature: Use 'return $this' for documenting fluent interfaces
...
refs #6593
2014-09-01 10:29:34 +02:00
Marius Hein
f47bc46654
GroupSummary/Postgres: Fix group by in initial join query
...
refs #5896
2014-09-01 10:00:04 +02:00
Marius Hein
21f0b4c925
CommandQuery: Remove select * from joins (Postgres)
...
refs #5896
2014-09-01 10:00:04 +02:00
Marius Hein
b4e9bad87a
NotificationHistoryQuery: Add missing field to group statement
...
refs #5896
2014-09-01 10:00:04 +02:00
Marius Hein
e46dd4bdfd
DowntimeQuery: Postgres fixes
...
Change is_fixed to boolean check and illegal postgres timerange of
'0000-00-00 00:00:00'.
refs #5896
2014-09-01 10:00:04 +02:00
Marius Hein
62f502d276
Postgres/StatusQuery: Fix concatenation and group by
...
refs #5896
2014-09-01 10:00:04 +02:00
Eric Lippmann
a01ee00c27
Merge branch 'bugfix/rebuild-form-builder-5525' into bugfix/commands-6593
...
Conflicts:
library/Icinga/Protocol/Commandpipe/Transport/Transport.php
2014-08-29 17:24:44 +02:00
Johannes Meyer
fb5685bac3
Merge branch 'master' into bugfix/rebuild-form-builder-5525
...
Conflicts:
application/forms/Config/Authentication/BaseBackendForm.php
application/forms/Config/Authentication/DbBackendForm.php
application/forms/Config/Authentication/LdapBackendForm.php
application/forms/Config/Authentication/ReorderForm.php
application/forms/Config/LoggingForm.php
application/forms/Config/ResourceForm.php
application/forms/Preference/GeneralForm.php
library/Icinga/Application/Config.php
library/Icinga/Web/Form.php
modules/monitoring/application/controllers/ConfigController.php
modules/monitoring/application/forms/Config/Backend/CreateBackendForm.php
modules/monitoring/application/forms/Config/Instance/CreateInstanceForm.php
modules/monitoring/application/forms/Config/Instance/EditInstanceForm.php
modules/monitoring/application/forms/Config/SecurityForm.php
2014-08-29 16:05:56 +02:00
Eric Lippmann
8c82f1a868
monitoring/commands: Add common `ToggleFeature' command
...
`ToggleFeature' should be used for enabling/disabling concrete features of the monitoring host.
refs #6593
2014-08-29 15:45:35 +02:00
Eric Lippmann
4d353ac7bf
monitoring/commands: Add `CommandTransport' factory
...
Instead of auto-detecting which transport class to use, the instances configuration
now supports a new setting named `transport' with the possible values 'local' and 'remote'.
refs #6593
2014-08-29 15:36:55 +02:00
Eric Lippmann
6324192127
monitoring/commands: Throw `LogicException' if the remote host is not set in `RemoteCommandFile'
...
refs #6593
2014-08-29 15:36:11 +02:00
Eric Lippmann
6fdc436f65
monitoring/commands: Add `TransportException'
...
`TransportException' should be thrown if a command was not sent.
refs #6593
2014-08-29 15:14:53 +02:00
Eric Lippmann
249099348e
monitoring/commands: Replace `SecureShell' with `RemoteCommandFile'
...
`RemoteCommandFile' is configured via property setters instead of the too general `setEndpoint' function.
The ssh command to be executed only has the option 'BatchMode' set to 'yes' as this is enough to disable
interactive authentication methods. Further, all arguments become espaced.
refs #6593
2014-08-29 15:08:58 +02:00
Eric Lippmann
ec46b368df
monitoring/commands: Replace `LocalPipe' with `LocalCommandFile'
...
`LocalCommandFile' is configured via property setters instead of the too general `setEndpoint' function.
refs #6593
2014-08-29 15:04:48 +02:00
Eric Lippmann
2ac4a8503c
monitoring/commands: Remove the `Transport' interface
...
The `Transport' interface is superseded by the `CommandTransportInterface'.
refs #6593
2014-08-29 14:44:49 +02:00
Eric Lippmann
e7eae87f16
monitoring/commands: Replace `Command' with `IcingaCommand'
...
Since there's already a `Cli\Command', `Command' is now named `IcingaCommand'.
All concrete Icinga commands should extend `IcingaCommand' which handles
command encoding. All other "features" of the `Command' object have been removed
because theses "features" should be handled by upcoming concrete command classes.
refs #6593
2014-08-29 14:38:52 +02:00
Eric Lippmann
0e2e1bc005
monitoring/commands: Add `CommandTransportInterface'
...
All concrete Icinga command transport classes should implement the `CommandTransportInterface' .
refs #6593
2014-08-29 14:34:16 +02:00
Eric Lippmann
4ca1eaa7ce
Merge branch 'bugfix/rebuild-form-builder-5525' into bugfix/commands-6593
...
Conflicts:
library/Icinga/Web/Form.php
modules/monitoring/application/forms/Config/SecurityForm.php
2014-08-28 13:58:02 +02:00
Marius Hein
c4c5bcdd48
ContactQuery: Change timeperiod joins to joinLeft()
...
refs #7020
2014-08-28 13:39:49 +02:00
Marius Hein
436a4d2965
ResourceConfig: Chance createResouce to create
...
Not useful everywhere. Changed on the best suitable places.
refs #5514
2014-08-28 12:14:55 +02:00
Marius Hein
5e84ff4ac4
Show/Contact: Add notification history to view
...
refs #4804
2014-08-27 16:38:29 +02:00
Marius Hein
9465c3ffb6
Show/Contact: Add commands to view
...
Create a new command query and join contact information into.
refs #4804
2014-08-27 16:38:29 +02:00
Alexander Klimov
8b0df6c9f7
UnsupportedBackendException: extend IcingaException
...
refs #6931
2014-08-27 16:29:56 +02:00
Alexander Klimov
45638b218c
Throw IcingaException rather than Exception
...
fixes #7014
2014-08-27 16:03:15 +02:00
Alexander Klimov
7ff51caed0
Remove leading backslashes from the targets of use statements
...
- use \Exception;
+ use Exception;
2014-08-27 15:51:49 +02:00
Eric Lippmann
1dea19504f
Revert "Remove leading backslashes from the targets of use statements"
...
This reverts commit 87a5967501
.
At least 'modules/doc/run.php' issues a warning about "The use statement with non-compound name 'Zend_Controller_Router_Route' has no effect"
2014-08-27 12:24:11 +02:00
Marius Hein
88698cb05d
Hook/TopBar: Rework interface for monitoring top bar
...
refs #6929
2014-08-27 11:31:48 +02:00
Alexander Klimov
87a5967501
Remove leading backslashes from the targets of use statements
...
- use \Exception;
+ use Exception;
2014-08-27 11:16:44 +02:00
Eric Lippmann
6b88f1c98e
Move Commandpipe/* classes from Icinga Web 2's library to the monitoring module
...
refs #6593
2014-08-26 16:35:30 +02:00
Marius Hein
376e9aa160
Rename hook base classes
...
Adding suffix "Hook" to every base class. This simplifies development
because you don't need to alias bases classes in your concrete
hook classes
refs #6928
2014-08-26 14:29:55 +02:00
Alexander Klimov
febb2d1ae2
ProgrammingError: extend IcingaException
...
refs #6931
2014-08-26 11:15:19 +02:00
Alexander Klimov
9c5878cbbe
ConfigurationError: extend IcingaException
...
refs #6931
2014-08-22 11:46:11 +02:00
Johannes Meyer
11063495b2
Merge branch 'master' into bugfix/rebuild-form-builder-5525
...
Conflicts:
modules/monitoring/application/controllers/ConfigController.php
2014-08-21 10:22:16 +02:00
Thomas Gelf
a8d33d90e2
Monitoring\Object: fix a couple of cv-related issues
...
* Don't throw exceptions with no config
* Provide a secure default if not configured
* Improve code readability
2014-08-20 13:36:03 +02:00
Johannes Meyer
bb7972aa39
Merge branch 'master' into bugfix/rebuild-form-builder-5525
...
Conflicts:
application/controllers/AuthenticationController.php
application/controllers/ConfigController.php
application/forms/Authentication/LoginForm.php
application/forms/Preference/GeneralForm.php
modules/monitoring/application/controllers/ChartController.php
2014-08-20 13:13:50 +02:00
Alexander Klimov
bb65fb396a
Merge branch 'bugfix/sensitive-custom-vars-6641'
...
fixes #6641
2014-08-20 12:29:45 +02:00
Alexander Klimov
071937910b
Monitoring/Object: filter protected customvars
...
Move the responsibility from the viewscript to Monitoring/Object
refs #6641
2014-08-19 18:46:37 +02:00
Johannes Meyer
3573908071
Let downtime view look more list-like and fix downtime end calculation
...
refs #6637
2014-08-19 17:03:35 +02:00
Johannes Meyer
54461f9319
Treat hard states more severe than soft states
...
fixes #6571
2014-08-15 12:40:56 +02:00
Johannes Meyer
7311ab964e
Do not set the full url from the request as action with form parameters
...
Setting an url with parameters named like form elements in a form with
method POST causes Zend to ignore any POST data because GET will be
processed with higher priority.
fixes #6806
2014-08-13 14:50:21 +02:00
Thomas Gelf
51484ebf88
monitoring/Perfdata: ignore invalid min/max
...
key=23;0;0;0;0 and key=23;;;; lead to division by zero exceptions
This should fix this by ignoring empty strings for min/max (formerly
it got "converted" to float(0)) and also ignores min == max.
fixes #6828
2014-07-31 16:52:34 +02:00
Johannes Meyer
f1d7cd8b50
Remove forgotten coding standards annotation
2014-07-16 13:59:43 +02:00