Johannes Meyer
170ded6510
Merge branch 'master' into feature/setup-wizard-7163
...
Conflicts:
library/Icinga/Authentication/Backend/LdapUserBackend.php
library/Icinga/File/Ini/IniWriter.php
2014-11-04 14:22:53 +01:00
Thomas Gelf
18bd49e636
Monitoring/Object: re-add process_perfdata
...
We would live better with unique column names on hosts and services
* Got introduced in 6095e440
and removed in c0e34473
* This might be a canditate for a regression test, as only graphers (PNP) are using this columns right now
* It makes IMO absolutely no sense to keep all those long column names in that object classes
2014-11-01 01:47:55 +01:00
Alexander Fuhr
f095489017
Fix multiple contacts display in service and host detail pane
...
fixes #7329
2014-10-31 11:34:48 +01:00
Eric Lippmann
16352fc10c
Move Logger to the Application namespace
...
fixes #7148
2014-10-31 10:27:17 +01:00
Johannes Meyer
c1bff9a26e
Merge branch 'master' into feature/setup-wizard-7163
2014-10-30 10:38:21 +01:00
Eric Lippmann
0bf6dc24a8
monitoring: Use command transports constants in the command transport factory
2014-10-30 09:53:55 +01:00
Johannes Meyer
3fc07496bc
Remove RequirementPage from the monitoring module wizard
...
refs #7163
2014-10-29 16:26:09 +01:00
Johannes Meyer
2f05ed3d49
Add monitoring module wizard
...
refs #7163
2014-10-29 15:40:34 +01:00
Eric Lippmann
eb9fe0966b
monitoring: Remove unnecessary break after throwing an exception
2014-10-29 13:37:20 +01:00
Eric Lippmann
d9194c2696
monitoring: Rewrite Service::getStateText() to get the optional translated textual representation of a service state
2014-10-29 13:36:24 +01:00
Eric Lippmann
8ee52f8737
monitoring: throw meaningful logic exceptions in the command file classes
2014-10-29 11:36:00 +01:00
Eric Lippmann
e7ef1826b7
monitoring: Don't translate exception messages in the remote command file
2014-10-29 10:00:59 +01:00
Eric Lippmann
1cc1521607
monitoring: Don't translate exception messages in the local command file
2014-10-29 10:00:29 +01:00
Eric Lippmann
12cadb52ca
Command transport: Show helpful exception messages
...
refs #7437
2014-10-24 11:45:58 +02:00
Alexander Klimov
ba12d7b46c
Use mt() in the monitoring module instead of just t()
...
fixes #7330
2014-10-21 17:22:16 +02:00
Johannes Meyer
9f127be1dc
Merge branch 'master' into feature/setup-wizard-7163
...
Conflicts:
application/forms/Config/General/LoggingConfigForm.php
2014-10-17 13:04:59 +02:00
Eric Lippmann
d475ccd569
IcingaCommand: Fix strict standards violation: Only variables should be passed by reference
2014-10-16 15:37:07 +02:00
Johannes Meyer
437b41c6c1
Merge branch 'master' into feature/setup-wizard-7163
2014-10-13 08:18:43 +02:00
Johannes Meyer
1cbe2451a8
Merge branch 'master' into feature/setup-wizard-7163
...
Conflicts:
application/forms/Config/Resource/StatusdatResourceForm.php
2014-10-08 16:34:31 +02:00
Marius Hein
0825b2f071
AlertSummary: Add healing chart
...
refs #4076
2014-10-08 15:30:53 +02:00
Alexander Fuhr
4c23d98575
Merge branch 'master' into bugfix/monitoring-list-dup-entries-7057
2014-10-08 12:45:14 +02:00
Alexander Fuhr
afc97b1cac
Fix the duplicate entries in monitoring list shows
...
refs #7057
refs #7344
fixes #7057
2014-10-08 12:30:08 +02:00
Alexander Fuhr
fcc56c9809
monitoring: Fix some of `DataView's PHPDoc
2014-10-07 16:09:19 +02:00
Alexander Fuhr
a9ae75b6b0
monitoring: Fix that sorting a data view is not possible if its sort
...
rules are empty
2014-10-07 16:05:20 +02:00
Eric Lippmann
1b23fd7fbe
monitoring: Don't support status.dat as backend
...
Icinga Web 2 will not support status.dat for now and maybe forever.
2014-10-07 13:22:07 +02:00
Eric Lippmann
2126b8c341
monitoring: Fix link to an object's contact in the detail views
2014-10-07 13:21:28 +02:00
Alexander Fuhr
a0122763a6
Fix Queries: Summaries, Host, Service
2014-10-06 11:37:33 +02:00
Alexander Fuhr
e96065e065
Implement validation for filter and sort columns
2014-10-06 11:32:15 +02:00
Alexander Fuhr
e6c674e221
MonitoredObject: Implement awesome __isset()
2014-09-30 14:47:17 +02:00
Johannes Meyer
cbadaa78d6
Merge branch 'master' into feature/setup-wizard-7163
2014-09-29 15:35:52 +02:00
Thomas Gelf
d7f8a7823f
GroupsummaryQuery: adjust queries to fix ZF woes
...
Some less brackets also here. Dropping COALESCE as the subquery will
never return NULL
fixes #7303
2014-09-24 19:50:43 +02:00
Thomas Gelf
98fa84bd17
StatusSummaryQuery: one more quickfix
...
Tactical overview works again right now
refs #7303
2014-09-24 19:47:02 +02:00
Thomas Gelf
45fc768813
StatusSummaryQuery: workaround for silly ZF fix
...
This brings the tiny summaries back. Host- and servicegroups and TO are
still broken.
refs #7303
2014-09-24 19:33:05 +02:00
Johannes Meyer
c00dbf9f46
Write session on response
...
There should not be any necessity to write the session once changes are
being made to it. We now track whether changes were made and write
the session when responding to the user's request if so.
2014-09-24 10:46:35 +02:00
Johannes Meyer
032437cdeb
The *group dataview classes are not in camelCase
...
Developing on case-insensitive filesystems for mainly
case-sensitive ones is bad habit ;P
2014-09-24 10:21:19 +02:00
Eric Lippmann
cde3ec6bc8
Merge branch 'master' into bugfix/commands-6593
...
Conflicts:
modules/monitoring/application/controllers/TimelineController.php
2014-09-23 22:54:17 -07:00
Eric Lippmann
3229e5e587
monitoring: Add new multiselection controllers
2014-09-23 22:47:26 -07:00
Eric Lippmann
e847770135
monitoring/commands: Remove false property from the schedule service check command
...
refs #6593
2014-09-23 22:19:35 -07:00
Eric Lippmann
df18eab69b
monitoring: Provide service stats on both the host and the service object
2014-09-23 22:17:22 -07:00
Eric Lippmann
6625e8d391
monitoring: Add tabs to the host and service controller
2014-09-23 22:16:33 -07:00
Eric Lippmann
70500be5f7
monitoring/commands: Fix the delete comment and delete downtime commands
...
They included the involved object's name which is wrong.
refs #6593
2014-09-23 17:40:13 -07:00
Matthias Jentsch
44e5fe7e12
Join Host and Servicegroups for extended filtering
2014-09-19 17:41:44 +02:00
Matthias Jentsch
dc05b2e933
Transform TimelineIntervalBox into a generic ListBox
...
Add options to control the changed url parameter and the displayed label to make it usable in generic cases.
2014-09-19 17:41:43 +02:00
Eric Lippmann
2dd81d12ba
monitoring: Add `DataView::count()'
2014-09-19 15:42:13 +02:00
Eric Lippmann
274f2e7410
monitoring/commands: Fix remove commands in the list comments and list downtimes views
...
refs #6593
2014-09-19 14:34:42 +02:00
Eric Lippmann
4b7096bbbf
monitoring: Support host and service filters for downtimes
...
refs #7278
2014-09-19 14:28:23 +02:00
Eric Lippmann
05776651b4
modules/commands: Fix `IcingaCommandFileCommandRenderer's `getHost()' and `getService()' calls
...
refs #6593
2014-09-16 18:45:31 +02:00
Eric Lippmann
cc2d06e582
monitoring/`Service': Add `getStateText()', let `getHost()' return the host object
...
refs #6593
2014-09-16 18:44:44 +02:00
Eric Lippmann
88b3b5d690
monitoring/`Host': Add `fetchServices', `fetchStats' and `getStateText'
2014-09-16 18:39:13 +02:00
Eric Lippmann
c04768ee8f
monitoring/`MonitoredObject': Use `host_name' and `service_description' for filtering
2014-09-16 18:38:03 +02:00
Eric Lippmann
92d855e035
monitoring/lib: Add `MonitoredObjectController'
...
The `MonitoredObjectController' should be the base class for the host and service controller.
2014-09-16 17:29:29 +02:00
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
Johannes Meyer
3105c2059e
Remove license headers from all files
...
refs #6309
2014-07-15 13:43:52 +02:00
Johannes Meyer
bacea36ad9
Improve piechart limitation and show non-piechart perfdata as well
...
The perfdata helper did an improper limitation as it might have skipped
valid values due to applying the limit before the filter. When not in compact
view the helper now also shows non-piechart values by using their raw
representation.
refs #6515
2014-07-14 13:48:30 +02:00
Johannes Meyer
ec2d1daa6b
Perfdata plugin should also have a knowledge about labels
...
Prior to this change the PerfdataSet only knew the labels of a performance
data value which prevented the Perfdata object from being used
individually.
refs #6515
2014-07-11 16:31:00 +02:00
Johannes Meyer
0d92efc1b0
Consider is_active column when fetching host and service statistics
...
fixes #6157
2014-07-09 11:49:22 +02:00
Johannes Meyer
7eb0f3c472
Remove @codingStandardsIgnoreStart/-Stop annotations
...
refs #6091
2014-06-30 13:59:58 +02:00
Thomas Gelf
ff9c29472e
monitoring/status: re-introduce comments, problems
...
This re-introduces expensive columns been disabled time ago and adds
even more to it. We are now showing last comment, last ack comment and
service problem count on hosts in list views.
It still costs performance, but seems that we can stand it. I'd like
to add more like this to the host view.
2014-06-25 21:42:24 +02:00
Thomas Gelf
d634889acb
DataView: ignore case on sort dir
...
fixes #6573
2014-06-25 21:34:05 +02:00
Thomas Gelf
11ce302be0
Ido\StatusQuery: fine-tune query filters
...
This is still experimental. We normalize a lot of columns, this allows
us to sort in a convenient way while having nice "showable" columns.
When used as filters (same goes for ordering) however, functions and
operations on table columns often hinder the db from using indexes.
The new filter implementation allows us to override query creating per
single column, that's what this first sample is trying to show. We still
need to fix alias handling, so unfortunately I have to deal with "real
columns" in the case construct.
Performance gain in large environments is impressive, more to come.
2014-06-25 21:12:44 +02:00
Thomas Gelf
32572ae653
Monitoring\Object\Service: don't load host comment
...
I'd like to reintroduce those columns, showing last object comment
and so one. Those joins are costly, we can fetch host comments way
easier directly from host object once we are here. But I guess we
don't even need it.
2014-06-25 20:21:19 +02:00
Matthias Jentsch
85aed364b7
Fix typing error in 'threshold'
2014-06-25 15:02:04 +02:00
Matthias Jentsch
35a5431512
Revert "Refractor InlinePie and Perfdata helper"
...
This reverts commit f003c38abd
.
2014-06-25 14:29:17 +02:00
Matthias Jentsch
f003c38abd
Refractor InlinePie and Perfdata helper
...
Refractor InlinePie methods for better usability, fix several coding guideline
issues and fix some typos
2014-06-25 12:41:17 +02:00
Thomas Gelf
b7fc0b67a8
Web/controllers: use own Request/Response objects
...
* introduces Icinga\Web\Response
* uses ModuleActionController where necessary
* no module translationDomain voodoo in base ActionController
2014-06-22 13:49:21 +02:00
Thomas Gelf
57ad88c38c
monitoring/process: was broken, fix it
...
Stumbled across two issues here:
* It's currently not possible to fetch all (*) columns from a DataView
* Backends are not able to tell their names
Worked around the first issue by naming all columns and implemented a
quick & dirty solution for the second one.
2014-06-21 04:25:02 +02:00
Thomas Gelf
7b5d7bdbcf
monitoring/statehistorysummary: filter fixes
...
Slightly adjusted filter string to fit new filters, fixed an issue
with 'object_type' column in virtual eventhistory table.
2014-06-21 03:18:00 +02:00
Thomas Gelf
b3cdeee35d
monitoring/timeline: should benefit from new filter
...
Different changes have been applied:
* Allow integer unix timestamps as parameters for timestamp columns
* Remove alias-rewriting from Url class
* Remove all traces of raw_timestamp
* Use new filters
2014-06-21 03:09:40 +02:00
Thomas Gelf
e2f7a1054e
CSV/JSON export: work with new query interfaces
...
NB: I do not like the fact that we have to do as follows:
DataView->getQuery()->fetchWhatever();
Guess this is worth a few more proxy functions.
2014-06-21 00:09:11 +02:00
Thomas Gelf
a904ff51aa
monitoring/eventhistory: improve query performance
...
This takes care of timestamp columns, modifies queries in a way not
depending on db functions, filters are passed through to subqueries
for better performance.
2014-06-20 19:14:34 +02:00
Thomas Gelf
ccb01aa152
Monitoring\Controller: add $url to all views
...
There are too many view scripts fiddling with namespaces. There is
still the url helper, not sure why it's not going to be used. I may
roll this back one far day...
2014-06-20 12:26:00 +02:00
Thomas Gelf
ecf84077e5
Ido\CommentQuery: add host/service shortcut column
2014-06-20 12:23:23 +02:00
Thomas Gelf
8185f8b8a9
Ido\EventHistoryQuery: fix it to fit new filters
...
Works for single objects, still some work required for "generic"
history.
2014-06-17 14:02:54 +00:00
Thomas Gelf
e3e6826d9d
Icinga\Filter: remove
2014-06-17 13:26:57 +00:00
Thomas Gelf
75a9640563
Monitoring\Object\Service: add check performance
...
Service object was missing latency and check properties
2014-06-17 13:14:00 +00:00
Thomas Gelf
0e09a1c7ba
Monitoring\Object\Host: explicit WHERE
...
Related to the former commit, no more auto-voodoo
2014-06-17 13:12:36 +00:00
Thomas Gelf
3ccfe347f3
Monitoring\Object: replace fromRequest with params
...
This is only a temporary solution, the Monitoring\Object should be
fetched from the backend created in our front controller.
2014-06-17 13:10:54 +00:00
Thomas Gelf
468b290277
Monitoring\Controller: provide $this->backend
...
Every monitoring controller needs $backend, so why declaring it over
and over again. Created "moduleInit" dummy function in our base action
controller to allow such implementations without polluting init().
2014-06-17 12:55:43 +00:00
Thomas Gelf
660f84b22f
DataView\EventHistory: default sort by timestamp
...
It doesn't make much sense to sort history by "hostname" hardcoded to
service-only host columns. Default is now timestamp DESC, internally
this is mapped to raw_timestamp.
2014-06-17 12:51:13 +00:00
Thomas Gelf
dd595a2ad3
Ido/EventHistoryQuery: obsolete raw_timestamp
...
This was never thought to be used in frontends. Frontend code ALWAYS
needs to work with unix timestamps, raw timestamps are used internally
(e.g. between View and Query) to achieve better search and sort
performance.
2014-06-17 12:47:02 +00:00
Thomas Gelf
93e2f36fc8
DataView: remove duplicate case handling
2014-06-17 12:46:41 +00:00
Thomas Gelf
dab90d6c4a
GroupsummaryQuery: distinct columns/desiredColumns
...
I guess this needs some more investigation, desiredColumns are the
ones the user asked for ([alias => ]column), with column being once
again an alias in the "real" query. Alias resolution used to work
better long time ago, we should reflect on this.
2014-06-17 12:42:50 +00:00
Thomas Gelf
027ef6ede3
Ido\Query\*historyQuery: subqueries join objects
...
Each of our history subqueries should be able to join main object
tables on their own for performance reasons.
2014-06-17 12:36:32 +00:00
Thomas Gelf
7cd696b31b
Data/queries: adjust to fit new filters
...
Slight changes to get our queries working with new filter implementation.
2014-06-17 12:34:02 +00:00
Thomas Gelf
4c76f5ab02
Ido/Query: small fixes
...
Replaced baseQuery in ContactGroupQuery, added short host/service
columns to CustomvarQuery.
2014-06-13 10:44:03 +00:00
Thomas Gelf
e1421c0d7e
Ido\StatusQuery: make sure performance killers...
...
...can no longer be reached. Column-ignorant uses still stumbled over
this. Left the code there as we should take a decision on how to approach
this.
2014-06-06 07:10:52 +00:00
Thomas Gelf
4f3596fcaf
Monitoring\Object: fit new Query classes
...
refs #6418
2014-06-06 07:09:15 +00:00
Thomas Gelf
c77e178bc7
Monitoring\DataView: small changes
...
Nothing interesting here
2014-06-06 07:07:07 +00:00
Thomas Gelf
1677193571
Monitoring: adjust Backend and DataView
...
Made them use the new filters and interfaces.
refs #6418
2014-06-06 07:05:21 +00:00
Thomas Gelf
1c3ab74e80
IdoQuery: fit new DbQuery implementation
...
Just a bunch of small changes, more to come. Fixes customvar handling
and is now able to handle the new Filter implementation.
refs #6418
2014-06-06 06:57:28 +00:00
Thomas Gelf
f1e73c5fc5
Data\Db\DbQuery: forgot to rename once
...
refs #6418
2014-06-06 06:52:48 +00:00
Thomas Gelf
3adf7752c4
Data\Db\DbQuery: rename also in monitoring module
...
refs #6418
2014-06-06 06:51:11 +00:00
Thomas Gelf
bfe6a1593a
Merge remote-tracking branch 'origin/master' into feature/query-interfaces-6018
2014-06-06 05:32:54 +00:00
Thomas Gelf
7a0173e2fb
monitoring/IdoQuery:
...
IDO version is cached in a session namespace. This fails where you
are using multiple IDO backends with different versions. We still have
no backend-specific base class where we could handle this, so for now
I continue to do so in the IdoQuery.
This patch creates one namespace per Host/dbname combination.
2014-05-28 09:39:38 +00:00
Thomas Gelf
12b57c6d95
Merge remote-tracking branch 'origin/master' into feature/query-interfaces-6018
...
Conflicts:
modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
modules/monitoring/library/Monitoring/Controller.php
2014-05-20 23:15:11 +00:00
Thomas Gelf
8b28bdc82a
Monitoring\Object: small fix for strange private's
2014-05-20 22:22:48 +00:00
Thomas Gelf
a7b8e0023d
Monitoring\Object: explictely define columns
...
Define the colums we use instead of fetching "everything" status view
provides. Without this performance degrades with every new feature.
2014-05-20 22:19:26 +00:00
Thomas Gelf
76c1aa73c8
Monitoring\Controller: remove obsolete namespaces
2014-05-20 22:13:39 +00:00
Thomas Gelf
31fa794440
monitoring/ido: implement IDO version support
...
We want to make use of new IDO features without breaking compatibility.
This is a quickfix as otherwise we would currently break everything
below 1.10. Code contains a few TODOs as this needs improvement.
2014-05-20 20:36:39 +00:00
Michael Friedrich
9fbdb65a4b
Add check source to host/service details
...
refs #5814
2014-05-20 20:07:09 +02:00
Thomas Gelf
e6d80ae1f6
IDO Queries: performance quickfixes
...
Will be obsoleted by the new filter implementation, but for now it
helps a little bit
2014-05-20 13:27:58 +00:00