Commit Graph

2165 Commits

Author SHA1 Message Date
Eric Lippmann 361afdcf13 Use ! empty in favor of count > 0 in the MonitoredObjectController
refs #8614
2015-03-11 14:08:43 +01:00
Eric Lippmann 2286ab1846 Merge branch 'master' into bugfix/unnecessary-joins-8614 2015-03-11 13:38:07 +01:00
Eric Lippmann 0286641369 Don't fetch comments and downtimes twice in an object's detail view
The controller counts comments and downtimes on the object, which will automatically fetch comments and downtimes.
After that came a call to MonitoredObject::populate() which again fetched comments and downtimes.
Now the object is populated before counting comments and dowtimes.

refs #8614
2015-03-11 13:32:54 +01:00
Eric Lippmann b501fef62b Rearrange columns in the Host object
refs #8614
2015-03-11 13:10:55 +01:00
Eric Lippmann ef4970c0c1 Don't select host_process_performance_data twice in the host detail view
refs #8614
2015-03-11 13:08:53 +01:00
Eric Lippmann 84f56f4e51 Don't select host_problem in the host detail view
The column host_problem is not used in the host detail view.

refs #8614
2015-03-11 13:08:11 +01:00
Eric Lippmann 37d09511c6 Don't select host_modified_host_attributes in the host detail view
The column host_modified_host_attributes is not used in the host detail view.

refs #8614
2015-03-11 13:07:33 +01:00
Eric Lippmann e72670cb75 Use default sorting for an object's event history
refs #8614
2015-03-11 13:01:14 +01:00
Eric Lippmann ea32d3dfb3 Add PHPDoc to the EventHistory query
refs #8614
2015-03-11 13:01:14 +01:00
Eric Lippmann c69a46d005 Add PHPDoc to the Downtime query
refs #8614
2015-03-11 13:01:14 +01:00
Eric Lippmann 132ae9e44c Use {@inheritdoc} in the Comment data view ...
... instead of duplicating method documentation.

refs #8614
2015-03-11 12:57:43 +01:00
Johannes Meyer 39a74c4f3d LDAP-Auth backend config: Add support for custom LDAP filter rules
refs #8365
2015-03-11 09:52:14 +01:00
Johannes Meyer e4e6c1cb28 Wizard: Fix that the wrong form element is used in case a user already exists
fixes #8678
2015-03-11 07:59:04 +01:00
Eric Lippmann 5ed6838f50 Don't select host_display_name twice in the service detail view
refs #8614
2015-03-10 14:18:08 +01:00
Eric Lippmann e6949eaab4 Reorder columns to select in the Service object
refs #8614
2015-03-10 14:17:09 +01:00
Eric Lippmann fcb94af93c Don't select service_process_performance_data twice in the service detail view
refs #8614
2015-03-10 14:11:50 +01:00
Eric Lippmann e0acebf474 Don't select service_host_name in the service detail view
We already select the host_name.

refs #8614
2015-03-10 14:09:53 +01:00
Eric Lippmann 62f0f5b6a4 Don't select service_modified_service_attributes in the service detail view
The column service_modified_service_attributes is not used in the service detail view.

refs #8614
2015-03-10 14:00:17 +01:00
Eric Lippmann 87e5bdfa4c Do not select columns for check attempt twice in the service detail view
The column service_attempt is used in favor of service_current_check_attempt and service_max_check_attempts.

refs #8614
2015-03-10 13:47:20 +01:00
Eric Lippmann 0cc6b5d0c2 Don't select service_last_time_* in the service detail view
The columns service_last_time_ ok, warning, critical and unknown are not used in the service detail view.

refs #8614
2015-03-10 13:46:09 +01:00
Eric Lippmann 70ef6263b2 Don't select service_last_hard_state* in the service detail view
The columns service_last_hard_state and service_last_hard_state_change are not used in the service detail view.

refs #8614
2015-03-10 13:45:20 +01:00
Eric Lippmann 88dce0c1f4 Don't select host and service columns in the service detail view
The columns host and service are not used in the service detail view.

refs #8614
2015-03-10 13:42:53 +01:00
Eric Lippmann 3bbd68dc95 Don't select service_problem in the service detail view
The column service_problem is not used in the service detail view.

refs #8614
2015-03-10 13:38:12 +01:00
Eric Lippmann 4e308016bf Don't select service_hard_state in the service detail view
The column service_hard_state is not used in the service detail view.

refs #8614
2015-03-10 13:37:40 +01:00
Eric Lippmann d65aa39ebd Don't select host_modified_host_attributes in the service detail view
The column host_modified_host_attributes is not used in the service detail view.

refs #8614
2015-03-10 13:33:17 +01:00
Eric Lippmann 34ad174f89 Don't select host_last_time_* in the service detail view
The columns host_last_time_ up, down and unreachable are not used in the service detail view.

refs #8614
2015-03-10 13:32:28 +01:00
Eric Lippmann 2cbeab55da Don't select host_last_hard_state* in the service detail view
The columns host_last_hard_state and host_last_hard_state_change are not used in the service detail view.

refs #8614
2015-03-10 13:31:32 +01:00
Eric Lippmann 232b3d3a9f Don't select host_perfdata in the service detail view
The column host_perfdata is not used in the service detail view.

refs #8614
2015-03-10 13:30:03 +01:00
Eric Lippmann e1dbe0b9a7 Don't select host_severity in the service detail view
The column host_severity is not used in the service detail view.

refs #8614
2015-03-10 13:29:39 +01:00
Eric Lippmann 9146a62573 Don't select host_ipv4 in the service detail view
The column host_ipv4 is not used in the service detail view.

refs #8614
2015-03-10 13:28:44 +01:00
Eric Lippmann 5f57e290c7 Don't select host_notes_url in the service detail view
The column host_notes_url is not used in the service detail view.

refs #8614
2015-03-10 13:27:07 +01:00
Eric Lippmann 0f65f83374 Don't select host_action_url in the service detail view
The column host_action_url is not used in the service detail view.

refs #8614
2015-03-10 13:26:47 +01:00
Eric Lippmann b9ec2844f5 Don't select host_unhandled_services in the service detail view
The column host_unhandled_services is not used in the service detail view.

refs #8614
2015-03-10 13:25:25 +01:00
Johannes Meyer f87a43b9d3 Catch errors occuring on ldap discoveries
fixes #8656
2015-03-10 13:24:54 +01:00
Eric Lippmann 4102ee290b Don't select host_last_check in the service detail view
The column host_last_check is not used in the service detail view.

refs #8614
2015-03-10 13:22:28 +01:00
Eric Lippmann 151d87f38c Don't select host_is_flapping in the service detail view
The column host_is_flapping is not used in the service detail view.

refs #8614
2015-03-10 13:19:37 +01:00
Eric Lippmann da7f959db5 Don't select host_long_output in the service detail view
The column host_long_output is not used in the service detail view.

refs #8614
2015-03-10 13:09:59 +01:00
Eric Lippmann 9dc6e65e5f Don't select host_output column in the service detail view
The column host_output is not used in the service detail view

refs #8614
2015-03-10 13:05:54 +01:00
Eric Lippmann 6d78ab69ef Don't select service_severity column in the service detail view
The column service_severity is not used in the service detail view.

refs #8614
2015-03-10 13:03:55 +01:00
Eric Lippmann 2ba5e8eb0c Don't select service_unhandled column in the service detail view
The column service_unhandled is not used in the service detail view.

refs #8614
2015-03-10 13:02:57 +01:00
Eric Lippmann b2bb5af0a7 Don't select host_problem in the service detail view
The column host_problem is not used in the service detail view.

refs #8614
2015-03-10 13:01:41 +01:00
Johannes Meyer f4446cbade Add todo to the MonitoringWizard related to the livestatus backend type
The requirement should be added to the OR-set that has currently both
ido requirement sets so that livestatus may the only choice again.

refs #8254
2015-03-10 11:00:51 +01:00
Johannes Meyer 59f43a0f5e Show module requirements as a separate table
refs #8508
2015-03-10 10:56:05 +01:00
Eric Lippmann af4bce3557 Do not select icon_image columns in the service detail view
The columns host_icon_image and service_icon_image are not used in the service detail view.

refs #8665
refs #8614
2015-03-10 10:00:07 +01:00
Eric Lippmann 330b575c7c Remove duplicate service_last_check column from the service detail view select
refs #8614
2015-03-10 09:58:36 +01:00
Eric Lippmann 2d3fec9a42 Do not select host_state_type in the service detail view
The column host_state_type is not used in the service detail view.

refs #8614
2015-03-10 09:57:51 +01:00
Johannes Meyer c44d5d2a73 Use a custom RecursiveIteratorIterator to render a RequirementSet
refs #8508
2015-03-10 09:31:57 +01:00
Johannes Meyer bc450c573d Refactor and fix requirement evaluation
refs #8508
2015-03-10 09:12:06 +01:00
Johannes Meyer e80786d63d Rename Requirements to RequirementSet
refs #8508
2015-03-09 09:05:56 +01:00
Johannes Meyer 4badbc660b Merge branch 'master' into feature/conditional-requirements-8508 2015-03-09 08:51:03 +01:00
Louis Sautier 003a9be43d Fix external authentication with nginx
fixes #8634

Signed-off-by: Gunnar Beutner <gunnar@beutner.name>
2015-03-08 15:32:34 +01:00
Louis Sautier 083c1a9e6b Fix some spelling errors in comments and messages
fixes #8633

Signed-off-by: Gunnar Beutner <gunnar@beutner.name>
2015-03-08 15:32:22 +01:00
Johannes Meyer cddcde9494 Setup: Automatically check the respective admin account type selection
resolves #8603
2015-03-06 15:41:25 +01:00
Eric Lippmann cbf39a2d99 Use host_name and service_description columns in the downtime overview
refs #8614
2015-03-06 13:14:56 +01:00
Eric Lippmann 7317aa7158 Do not join hosts when fetching a service's downtimes
refs #8614
2015-03-06 13:14:20 +01:00
Eric Lippmann db99c323cc Add host and service name columns to the Downtime data view
refs #8614
2015-03-06 13:13:48 +01:00
Eric Lippmann 6d43673754 Do not always join host and service status in the DowntimeQuery
Now the hoststatus and servicestatus tables are only joined if necessary.

refs #8614
2015-03-06 13:13:02 +01:00
Eric Lippmann 64d1d12c73 Do not join icinga_hosts when fetching a service's contact groups
refs #8614
2015-03-06 10:02:20 +01:00
Eric Lippmann 2b91ec7f2c Comment out unused query in the ContactgroupQuery
refs #8614
2015-03-06 09:54:12 +01:00
Eric Lippmann fc403e693b Fix array indentation in the ContactQuery
refs #8614
2015-03-06 09:46:47 +01:00
Eric Lippmann dc223128bb Remove host_- and service_object_id from ContactQuery's columnMap
We do not use these columns.

refs #8614
2015-03-05 17:18:52 +01:00
Johannes Meyer 31560c9249 Wizard: Explain that the webserver user must be in the group "icingaweb2"
resolves #8491
2015-03-05 10:30:06 +01:00
Johannes Meyer 507e5b43cc Show a form based autosubmit warning when toggling object features
refs #7935
2015-03-03 14:52:45 +01:00
Johannes Meyer d9fdcf036b Show a form based autosubmit warning when toggling instance features
refs #7935
2015-03-03 14:34:08 +01:00
Johannes Meyer 642fa44fce Move a form's title into the markup of its form 2015-03-03 09:53:25 +01:00
Johannes Meyer 53e73161d8 Fix that the AcknowledgeCommandForm is opened in a new column 2015-03-02 18:45:38 +01:00
Johannes Meyer b9ac42b54d Drop CommandForm::getHelp() as being obsolete 2015-03-02 18:40:47 +01:00
Johannes Meyer a2f88dc60f Commands: Use native form title and description support where appropriate
refs #7947
refs #7976
2015-03-02 18:40:47 +01:00
Johannes Meyer 4ba281e7e8 Config: Use native form title and description support where appropriate
refs #7947
refs #7976
2015-03-02 18:40:47 +01:00
Johannes Meyer 2af83e7d72 Installation: Use native form title and description support where appropriate
refs #7947
refs #7976
2015-03-02 18:40:47 +01:00
Johannes Meyer d3f9bd633c Installation: Hide the required cue when choosing the preference backend
refs #7934
2015-03-02 18:40:46 +01:00
Johannes Meyer ea7b77eb72 Remove the required cue when disabling notifications globally
refs #7934
2015-03-02 18:40:46 +01:00
Johannes Meyer d714c4323c Installation: Remove required cue from the token input
refs #7934
2015-03-02 18:40:46 +01:00
Johannes Meyer e9bae08a6e Fix that one can't advance the wizard when skipping the ldap discovery
fixes #8506
2015-03-02 18:40:46 +01:00
Matthias Jentsch 0f3c27f812 Fix event grid for dashboard 2015-03-02 12:27:27 +01:00
Johannes Meyer 7bb78330a9 Replace cancel icon with the trash icon...
...where the link's purpose is to remove something
2015-02-27 14:47:46 +01:00
Johannes Meyer f2259557c8 Fix missing tab labels
fixes #8518
2015-02-27 09:32:44 +01:00
Johannes Meyer d0a8dd8973 Requirements: Do not implement ArrayIterator but RecursiveIterator
refs #8508
2015-02-26 10:52:39 +01:00
Johannes Meyer 551207b5b8 Add grouped database dependencies to the monitoring wizard
refs #8508
2015-02-26 10:50:45 +01:00
Johannes Meyer 87fe9bd2ff Adjust the web wizard so that all database dependencies are grouped
refs #8508
2015-02-26 10:50:05 +01:00
Johannes Meyer 8ed4a943f7 Add support for nested requirement sets
This allows now to link requirements by an OR condition as well and to nest
such grouped requirements in other sets of type AND, and vice versa.

refs #8508
2015-02-26 10:49:03 +01:00
Matthias Jentsch 89451f3086 Ensure that form ids are unique
Add an unique prefix to each Form- or FormElement id, unless id protection is disabled explicitly, to prevent id collisions between different containers.

fixes #8460
2015-02-25 18:00:28 +01:00
Alexander Fuhr 797d37735d Add .spinner class to CheckNowCommandForm submit button
refs #7968
2015-02-25 14:16:35 +01:00
Johannes Meyer 04630a20be Implement all known requirements as object
refs #8508
2015-02-25 13:39:59 +01:00
Johannes Meyer 24d0999fa4 Register requirements as objects
This neutralizes the need for a unique name per requirement as
requirements are now compared based on their type and condition.
It also allows to implement a solution to add simple conditional
requirements.

refs #8508
2015-02-25 13:38:38 +01:00
Matthias Jentsch d4dc0177c0 Sort LDAP user list
fixes #7693
2015-02-24 12:50:57 +01:00
Johannes Meyer 8e8bab0795 Do only escape a qlink's label manually if necessary 2015-02-24 11:35:25 +01:00
Johannes Meyer 907134cee2 Ensure that all link-like form buttons got proper titles
refs #8458
2015-02-24 09:03:47 +01:00
Johannes Meyer 956efe5ef9 Merge branch 'master' into feature/link-labels-8458
Conflicts:
	application/views/scripts/config/application.phtml
	application/views/scripts/config/module.phtml
	application/views/scripts/config/modules.phtml
	library/Icinga/Web/Widget/Dashboard/Dashlet.php
	modules/monitoring/application/controllers/TimelineController.php
2015-02-24 08:42:36 +01:00
Johannes Meyer e6957967f9 Wizard: Add proper titles to the button-like links on the last page
refs #8458
2015-02-23 17:33:23 +01:00
Johannes Meyer 60a9d1f224 Wizard: Add proper title to the refresh button of the requirements page
refs #8458
2015-02-23 17:32:55 +01:00
Johannes Meyer cebaa47aa9 Hide the css-hidden link to extend the timeline from screen readers as well 2015-02-23 17:32:29 +01:00
Johannes Meyer be293f5e49 Add proper titles to the timeline
refs #8458
2015-02-23 17:31:24 +01:00
Johannes Meyer 52c17805c9 Add proper titles to the history view
refs #8458
2015-02-23 17:30:51 +01:00
Johannes Meyer bb5799434c Add proper titles to the contact view
refs #8458
2015-02-23 17:30:37 +01:00
Johannes Meyer 32e048693a Add proper titles to service multi selection view
refs #8458
2015-02-23 17:29:50 +01:00
Johannes Meyer 8991b7ed83 Add proper titles to the tactical overview
refs #8458
2015-02-23 17:29:22 +01:00
Johannes Meyer 18f6ff8702 Add proper titles to the servicegroups component view
refs #8458
2015-02-23 17:28:20 +01:00
Johannes Meyer 7247ea5191 Add proper titles to the hostgroups component view
refs #8458
2015-02-23 17:28:02 +01:00
Johannes Meyer 0d8bf462f5 Add proper titles to the downtime component view
refs #8458
2015-02-23 17:27:45 +01:00