Commit Graph

1297 Commits

Author SHA1 Message Date
Thomas Gelf a8326350d1 Customvar view helper: show structured data
refs #7569
2014-11-06 16:10:52 +01:00
Bernd Erk 548058650a Fixed Plugin output and box-border 2014-11-06 15:49:26 +01:00
Marius Hein cd9e3693e4 Downtime: Add filter editor and preview
resolves #7445
2014-11-06 13:22:38 +01:00
Marius Hein 52c452c044 Monitoring/Backens: Add resource configuration link
resolves: #7493
2014-11-06 12:59:31 +01:00
Marius Hein 92f8f9f7da Bug7043Test: Fix declaration error
ConfigWithSetModuleConfig::setModuleConfig must be compatible with
Icinga\Application\Config::setModuleConfig.
2014-11-06 12:14:35 +01:00
Johannes Meyer f8724c504b Use a subclass of Icinga\Application\Config to preset a module config
Implementing methods for just tests is discouraged
2014-11-06 10:07:57 +01:00
Bernd Erk c49bcebcb3 Fixed headlines and badges in monitoring module 2014-11-06 01:47:22 +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 5fc1f85b76 monitoring: Write transport directive to instances INI configuration
Further I replaced if-elseif blocks w/ switch when branching based on the value of a single parameter,
which would have to be implied otherwise by looking at all the conditions.
2014-10-29 13:36:09 +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 319c5e7833 monitoring: indent php blocks in config/index.phtml properly 2014-10-29 11:33:31 +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 6973492b0d monitoring: Translate headings in the config overview 2014-10-28 14:01:00 +01:00
Eric Lippmann 71e25f268a monitoring: Rename label of the path to the local Icinga command file
Rename 'Local filepath' to 'Command file' because the remote instance form is using 'Command file' too.
2014-10-28 13:52:10 +01:00
Eric Lippmann d04eceaeb2 monitoring: Remove 'Remote' prefix from the remote instance form elements' labels
The 'Remote' prefix of the remote instance form elements' labels is superfluous because the
instance's type already tells that it's remote.
2014-10-28 13:50:42 +01:00
Johannes Meyer 2f83976f50 Add ModulePage
refs #7163
2014-10-24 17:10:17 +02:00
Eric Lippmann 12cadb52ca Command transport: Show helpful exception messages
refs #7437
2014-10-24 11:45:58 +02:00
Alexander Klimov 38220afd11 PHP: avoid short tags <? 2014-10-23 10:44:54 +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
Marius Hein 92b4f4fbec AlertSummary: Avoid division by zero 2014-10-16 09:50:15 +02:00
Johannes Meyer 64940198be Fix AlertSummary report cannot find EventHistory dataview
We should start to think about how to prevent such issues ;)
2014-10-15 11:18:16 +02:00
Matthias Jentsch 937dbe2c15 Add missing close buttons to views without tabs 2014-10-14 17:54:52 +02:00
Johannes Meyer 437b41c6c1 Merge branch 'master' into feature/setup-wizard-7163 2014-10-13 08:18:43 +02:00
Marius Hein c67e7c3ef0 AlertSummary: Format trend change percent value 2014-10-09 09:31:03 +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 6622042539 AlertSummary: Controller clean up
refs #4074
2014-10-08 16:32:50 +02:00
Marius Hein 8f26f0dbf6 AlertSummary: Basic styling
refs #4074
2014-10-08 16:17:43 +02:00
Marius Hein 0825b2f071 AlertSummary: Add healing chart
refs #4076
2014-10-08 15:30:53 +02:00
Marius Hein c48c7f41b7 AlertSummary: Decouple components and use partials
refs #4078
2014-10-08 15:30:53 +02:00
Marius Hein 87a87656d5 Prototyping alert history
refs #4074
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
Eric Lippmann f954e8ce48 monitoring: Remove obsolete helper `ResolveComments' 2014-10-07 11:47:24 +02:00
Eric Lippmann 8a8ce49f73 monitoring: Call `hasBetterUrl()' in every list action
fixes #6679
2014-10-06 17:08:27 +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
Eric Lippmann 531448eee4 monitoring: Fix setting a resource on a backend
The resources were indexed by integers instead of the resource names.
2014-10-01 14:17:29 +02:00
Matthias Jentsch f188bf6b9c Make "hosts" and "services" views responsive 2014-10-01 09:24:52 +02:00
Alexander Fuhr e6c674e221 MonitoredObject: Implement awesome __isset() 2014-09-30 14:47:17 +02:00
Matthias Jentsch ac2aeca9e6 Conform StatehistoryForm to new Form implementation 2014-09-30 11:34:04 +02:00
Eric Lippmann 23c1097577 Fix showing a contact throwing an exception 2014-09-30 10:11:40 +02:00
Johannes Meyer cbadaa78d6 Merge branch 'master' into feature/setup-wizard-7163 2014-09-29 15:35:52 +02:00
Alexander Fuhr f7b7e0283a Translation: another bunch of translatable strings 2014-09-29 15:20:19 +02:00
Alexander Fuhr 31609ecb34 Remove typo in RemoteInstaceForm
refs #7307
2014-09-26 17:14:13 +02:00
Alexander Fuhr 285d10ef22 Replace Zend Note Element through Icingas Note Element
fixes #7318
fixes #7309
fixes #7307
2014-09-26 16:32:07 +02:00
Alexander Fuhr c73b291cf4 Add a better time format for downtime 2014-09-26 15:57:00 +02:00
Alexander Fuhr cf997e998f Fix eventhistory sort oder
fixes #7267
2014-09-26 14:59:06 +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 c4d13a7850 monitoring: Fix `$this' usage in a closure 2014-09-23 23:00:19 -07: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 1710a50d5c Fix form CSS 2014-09-23 22:43:33 -07:00
Eric Lippmann 0b723bb57d monitoring: Deprecate the host and service action of the `ShowController'
There are the `HostController' and the `ServiceController' now instead.
2014-09-23 22:37:14 -07:00
Eric Lippmann 3034ac5257 monitoring/commands: Show affected objects in command forms
refs #6593
2014-09-23 22:34:19 -07:00
Eric Lippmann c8f00be75b monitoring/commands: Fix that removing a comment from the comment list opens and closes the detail area
This extends to removing a downtime from the downtime list.

refs #6593
2014-09-23 22:23:56 -07:00
Eric Lippmann 4258b13d45 monitoring/commands: Remove `MonitoringCommands' view helper
The helper is not used anywhere.

refs #6593
2014-09-23 22:21:23 -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 051c9691a9 Remove "WTF" comment 2014-09-23 22:18:06 -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
Eric Lippmann 9601942116 monitoring/commands: Default 'schedule downtime for all services on the hosts' to false
refs #6593
2014-09-23 17:39:32 -07:00
Eric Lippmann b10737017d monitoring/commands: Default 'reschedule all service checks on the hosts' to false
refs #6593
2014-09-23 17:36:15 -07:00
Alexander Fuhr 07a4b25560 Merge branch 'master' into bug/history-notification-time-format-6980 2014-09-23 11:38:24 +02:00
Alexander Fuhr e784aa34b6 Implement DateTimeRenderer and fix history time format
refs #6980
2014-09-23 11:36:09 +02:00
Matthias Jentsch 6c8f324dd4 Add filter widget to StateHistorySummary and fix some minor bugs
fixes #6979
2014-09-19 17:41:44 +02:00
Matthias Jentsch dc6562b97e Add missing StateHistoryForm 2014-09-19 17:41:44 +02:00
Matthias Jentsch 44e5fe7e12 Join Host and Servicegroups for extended filtering 2014-09-19 17:41:44 +02:00
Matthias Jentsch 7385be06ea Move SelectBoxes into form 2014-09-19 17:41:44 +02:00
Matthias Jentsch 65203fddcf Add additional state history filters for time interval and event type 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 27650be481 monitoring/commands: Add missing `ListController' change from the last commit
refs #6593
2014-09-19 14:41:51 +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 72a9a53201 monitoring/commands: Use translate plurar in the object command forms
refs #6593
2014-09-19 14:25:49 +02:00
Eric Lippmann 8afdc3db1a monitoring: Replace show partials calls to getHost() and getService() with getName() 2014-09-17 09:48:30 +02:00
Eric Lippmann 5cdcf36243 monitoring: Add HostController's show action view script 2014-09-17 09:46:42 +02:00
Eric Lippmann 71ffd0ed74 monitoring/commands: Add schedule host check command form
refs #6593
2014-09-16 18:48:36 +02:00
Eric Lippmann 4d8b6dddf1 monitoring/commands: Add schedule host downtime command form
refs #6593
2014-09-16 18:48:07 +02:00
Eric Lippmann a2a645892d monitoring: Add `HostController' 2014-09-16 18:46:58 +02:00
Eric Lippmann 0084fed2c3 monitoring/`ServiceController': Extend `MonitoredObjectController' 2014-09-16 18:46:27 +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 0a81aeefa2 monitoring: Deprecate `MonitoringState' view helper 2014-09-16 18:21:41 +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 0e6e37199a monitoring/commands: Add 'command-form' partial
refs #6593
2014-09-16 17:28:00 +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 6bfab25009 monitoring/commands: Remove the `CommandForm' view helper
All command forms will be renderered using their real classes.

refs #6593
2014-09-13 20:33:45 +02:00
Eric Lippmann 33e0fbb7d9 monitoring/commands: Fix code compliance
refs #6593
2014-09-12 16:53:48 +02:00
Eric Lippmann 9b5c1f06d0 monitoring/commands: Let detail snippets use the new command forms
refs #6593
2014-09-12 16:52:45 +02:00
Eric Lippmann 17e04e9937 monitoring: Point service's detail to the new `ServiceController' in the services list view
refs #6593
2014-09-12 16:51:18 +02:00
Eric Lippmann 5d07b04f82 monitoring/commands: Introduce `ServiceController'
refs #6593
2014-09-12 16:50:42 +02:00
Eric Lippmann 5f13db73ce monitoring/commands: Use the toggle instance features command form in the process controller
refs #6593
2014-09-12 16:46:07 +02:00
Eric Lippmann 3a9774e6e5 monitoring/commands: Support toggling instance features
refs #6593
2014-09-12 16:43:18 +02:00
Eric Lippmann 4d784c6097 monitoring/commands: Re-add the changed identifier to object features
refs #6593
2014-09-12 16:42:00 +02:00
Eric Lippmann 442f956945 monitoring/commands: Fix object command forms code compliance
refs #6593
2014-09-12 15:03:03 +02:00
Eric Lippmann e5e806a3a1 monitoring/commands: Fix instance command forms code compliance
refs #6593
2014-09-12 15:02:31 +02:00
Eric Lippmann 16bc0e5d5a monitoring/commands: Add icon to the check now command form
refs #6593
2014-09-12 13:29:23 +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 b4faa0142b monitoring/commands: Add object command forms
refs #6593
2014-09-11 17:20:20 +02:00
Eric Lippmann 746e75e5ed monitroing/commands: Remove method `CommandForm::inline()'
Inline forms will set themselves as inline.

refs #6593
2014-09-11 17:19:00 +02:00
Eric Lippmann 3845301dfb monitoring/commands: Add object command classes
refs #6593
2014-09-11 17:18:07 +02:00
Eric Lippmann 92571599df monitoring/commands: Move toggle instance feature command forms into a single form
refs #6593
2014-09-11 17:16:13 +02:00
Eric Lippmann 22771e6f6f monitoring/commands: Rename `DisableNotificationsCommandForm' to `DisableNotificationsExpireCommandForm'
The associated command also has 'Expired' in its name.

refs #6593
2014-09-11 17:13:57 +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
Alexander Fuhr 3615b96093 Fix Incorrect plural form in host overview
fixes #7172
2014-09-11 15:46:23 +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
Johannes Meyer ceeb3a9ff8 Fix createElements() not returning self where applicable
refs #5525
2014-09-09 13:24:39 +02:00
Johannes Meyer c8bdb70d06 Remove command form tests
refs #5525
2014-09-09 09:27:04 +02:00
Matthias Jentsch 40611659ed Fix disappearing tooltips on SVG reload
Use a unified linebreak in the chart controller, so the tooltip handling will recognize the titles as identical
2014-09-08 16:23:14 +02:00
Johannes Meyer f53519c54d Rename ConfigForm::setConfig() to ConfigForm::setIniConfig()
We do not want to override Zend_Form::setConfig() so this renaming is
required. set*Ini*Config() because ConfigForm::save() utilizes an ini-writer
to persist the configuration to disk.

refs #5525
2014-09-08 13:31:25 +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