Commit Graph

629 Commits

Author SHA1 Message Date
Thomas Gelf 10ec0446e0 Livestatus\DowntimeQuery: first basic version 2014-11-16 18:55:48 +01:00
Thomas Gelf 8bd9a966e1 Livestatus\ServicegroupQuery: initial commit 2014-11-16 18:54:08 +01:00
Thomas Gelf 92c059a0d7 Livestatus\HostgroupQuery: initial commit 2014-11-16 18:53:41 +01:00
Thomas Gelf 42efbf0892 Livestatus\StatusSummaryQuery: initial implementation 2014-11-16 17:12:25 +01:00
Thomas Gelf 7eb960ea0b Livestatus\StatusQuery: a couple of munge methods 2014-11-16 16:40:15 +01:00
Thomas Gelf b494476ebc Livestatus\StatusQuery: make use of new filter flags
NIIIIICEEEE!!
2014-11-16 16:39:41 +01:00
Thomas Gelf b6b78e4fcd Livestatus\StatusQuery: add LOTS of columns...
...still a little bit ugly, I'm in a hurry right now
2014-11-16 16:39:01 +01:00
Thomas Gelf 1a4bf609a2 Livestatus\StatusQuery: remove obsolete method 2014-11-16 16:37:33 +01:00
Thomas Gelf 6d362b0606 Livestatus\StatusQuery: should know about it's table 2014-11-16 16:36:47 +01:00
Thomas Gelf 7b73215868 Livestatus\StatusQuery: add terribly setMode method 2014-11-16 15:18:10 +01:00
Thomas Gelf fa20ced0c2 LiveStatus\StatusQuery: should be a Livestatus\Query 2014-11-16 15:05:36 +01:00
Thomas Gelf e89d4642e3 Merge remote-tracking branch 'origin/master' into feature/livestatus-playground-4787 2014-11-16 10:12:34 +01:00
Thomas Gelf da47c7fc7e Merge remote-tracking branch 'origin/master' into feature/redesign-7144 2014-11-14 21:32:57 +01:00
Alexander Fuhr 038964a325 Add tinystatesummary for hosts overview 2014-11-14 16:50:34 +01:00
Johannes Meyer 3166c518e1 Rename Icinga\Module\Monitoring\Form to Icinga\Module\Moni...\Forms
refs #7553
2014-11-14 11:17:22 +01:00
Johannes Meyer d64ec0aa3c Rename Icinga\Module\Setup\Form to Icinga\Module\Setup\Forms
refs #7553
2014-11-14 11:01:16 +01:00
Bernd Erk 903219b302 Merge branch 'master' into feature/redesign-7144
Conflicts:
	library/Icinga/Web/Menu.php
	public/css/icinga/menu.less
2014-11-13 21:11:36 +01:00
Bernd Erk 20be45e8da Enable icon font 2014-11-13 20:08:58 +01:00
Matthias Jentsch 022d89254f Fix tab, navigation and menu names 2014-11-13 18:38:42 +01:00
Johannes Meyer 7aae291f69 Merge branch 'master' into feature/setup-wizard-7163 2014-11-12 10:08:28 +01:00
Johannes Meyer 4992140326 Hardcode the access mode to use when creating files
refs #7163
2014-11-12 09:39:18 +01:00
Johannes Meyer ca66480ba7 Hardcode the access mode to use when creating directories
refs #7163
2014-11-12 09:18:19 +01:00
Thomas Gelf f24b0e2a4e MonitoringBackend: a few more places, doesn't hurt 2014-11-12 00:20:37 +01:00
Thomas Gelf 4876854893 Monitoring\ObjectList: expect a MonitoringObject 2014-11-12 00:16:07 +01:00
Thomas Gelf e96ecc5271 LivestatusBackend: just an empty backend 2014-11-11 18:06:50 +01:00
Thomas Gelf 1ca83c001f MonitoringBackend: just a few comments
fixes #7635
2014-11-11 17:33:31 +01:00
Thomas Gelf 78fd5109ac MonitoringBackend: fix variable name in exception
refs #7635
2014-11-11 17:23:49 +01:00
Thomas Gelf 9431a3432f MonitoringBackend: remove comment for SOLID fanboys 2014-11-11 17:21:32 +01:00
Thomas Gelf 8faf81dad5 MonitoringBackend: add clearInstances()
refs #7635
2014-11-11 16:57:34 +01:00
Thomas Gelf 6c0aa8dcc5 MonitoringBackend: handle null name in a nice way
When we get null as a backend name, we load the default one. While we
want to cache that null backend, it should still know about it's real
name.
2014-11-11 16:49:56 +01:00
Thomas Gelf 3f4110d33d MonitoredObject: use MonitoringBackend::instance
refs #7635
2014-11-11 16:43:51 +01:00
Thomas Gelf 6627b5ae6e Monitoring\Object: use MonitoringBackend
refs #7635
2014-11-11 16:29:07 +01:00
Thomas Gelf 1557410b72 DataView: query instantiation is up to the backend
refs #7635
2014-11-11 15:49:27 +01:00
Thomas Gelf 11f587aa09 Monitoring\Backend: reduce to compat facade
This is a facade for Monitoring\Backend right now. To be removed as soon
as it got replaced everywhere.

refs #7635
2014-11-11 15:46:17 +01:00
Thomas Gelf 50b0ef45ff IdoBackend: concrete backend implementation
Nothing special to be found here. Not yet.

refs #7635
2014-11-11 15:44:39 +01:00
Thomas Gelf 19ab8237d4 Backend\MonitoringBackend: base class for backends
refs #7635
2014-11-11 15:40:38 +01:00
Johannes Meyer 4974f582d3 Add page titles
refs #7163
2014-11-11 15:27:14 +01:00
Johannes Meyer af99f62843 Prefer Icinga\Application\Config over Zend_Config
refs #7163
2014-11-11 12:11:14 +01:00
Johannes Meyer 9d292269b1 Merge branch 'master' into feature/setup-wizard-7163
Conflicts:
	application/forms/Config/Resource/LdapResourceForm.php
	test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
2014-11-11 09:44:11 +01:00
Johannes Meyer 6b2f434f32 Do not use Installer anywhere. ²
"It's setup."

refs #7163
2014-11-10 16:53:28 +01:00
Johannes Meyer 21ed823da7 Adjust namespace declarations
refs #7163
2014-11-10 16:31:40 +01:00
Johannes Meyer 79493592bb Do not use Installer anywhere.
"It's setup."

refs #7163
2014-11-10 10:30:52 +01:00
Johannes Meyer f1b6a82387 Make it optional to define protected custom variables
fixes #7590
2014-11-07 15:05:08 +01:00
Johannes Meyer 124f64ad89 Merge branch 'master' into bugfix/drop-zend-config-7147 2014-11-07 14:07:15 +01:00
Johannes Meyer 7b99b74ae1 Prefer Icinga\Application\Config instead of Zend_Config
refs #7147
2014-11-07 13:53:03 +01:00
Thomas Gelf 74e60ec0f6 MonitoredObject: decode structured customvars
fixes #7569
2014-11-06 16:15:16 +01:00
Thomas Gelf 816c309193 Ido\CustomvarQuery: add is_json
This has to be done in a backward compatible way, we check for IDO
>= 1.12.0.

refs #7569
2014-11-06 16:14:03 +01:00
Thomas Gelf 2782b0a744 Dataview\Customvar: add new is_json column
refs #7569
2014-11-06 16:13:17 +01:00
Marius Hein cd9e3693e4 Downtime: Add filter editor and preview
resolves #7445
2014-11-06 13:22:38 +01:00
Johannes Meyer 5a169ee656 Fix "PreservingIniWriter not found"
The class was renamed a few commits ago to "IniWriter"
2014-11-04 14:35:57 +01:00
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