tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,488 Commits 121 Branches 71 Tags 80 MiB
Commit Graph

206 Commits

Author SHA1 Message Date
Eric Lippmann f1bb064020 monitoring: Use the Servicedowntime data view in the ServiceList 
refs #9009
 2015-05-29 15:10:00 +02:00
Matthias Jentsch a66949162b Resolve macros when accessing getters on MonitoredObjects 
refs #6392
 2015-05-28 15:01:10 +02:00
Matthias Jentsch 37f58e55d8 Move macro resolcing functionality into separate class 
Make macro resolving functionality available to all code, instead of depending on a view

resf #6392
 2015-05-28 14:44:16 +02:00
Matthias Jentsch 6c44f6a11a Deduplicate url-attribute parsing code 
Use function to fetch all host links in MonitoredObject instead.
 2015-05-28 10:47:44 +02:00
Eric Lippmann 0c1df335fc monitoring: Fix select columns for downtimes, again 
refs #9009
refs #9319
 2015-05-26 17:15:03 +02:00
Matthias Jentsch 4ac7557c2f Show host and service notes in the host and service detail view 
refs #8235
 2015-05-26 16:40:32 +02:00
Matthias Jentsch 598ef1e8f4 Add alt-text to icon_images 
Print alt-text as title and alt-attribute in the helper class and add the alt-column to the backend query.

refs #9300
 2015-05-21 14:59:12 +02:00
Matthias Jentsch c0cf6e4918 Display icon_images in all host and service detail views 
refs #8665
 2015-05-19 18:08:26 +02:00
Matthias Jentsch c3129890aa Improve multi-view tabs 
Display the current object count next to the tab title, to clarify that those views display a summary of multiple items. Only display the current tab for hosts or services, to avoid confusion.

refs #8565
 2015-05-18 15:25:12 +02:00
Matthias Jentsch 00bbb762a1 Integrate comments and downtimes into MonitoredObjectsController 
Add option to list all related commends and downtimes into the specific hosts and serivces views.

refs #8565
 2015-05-18 14:03:10 +02:00
Matthias Jentsch 25f397042b Merge branch 'master' into feature/improve-multi-select-view-8565 
Conflicts:
	modules/monitoring/application/controllers/HostsController.php
	modules/monitoring/application/controllers/ServicesController.php
	modules/monitoring/application/views/scripts/hosts/show.phtml
	modules/monitoring/application/views/scripts/list/hosts.phtml
	modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
	modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
	modules/monitoring/application/views/scripts/services/show.phtml
	modules/monitoring/public/css/module.less
	public/js/icinga/behavior/tooltip.js
 2015-05-11 13:28:43 +02:00
Johannes Meyer f11ea04557 Revert "Require `host_name' instead of `host' to show or list particular objects" 
This reverts commit b93d18a0fc.
 2015-04-20 16:11:22 +02:00
Johannes Meyer 96fb0370a4 Revert "Require `service_description' instead of `service' to show a particular service" 
This reverts commit 09ab601942.
 2015-04-20 16:09:14 +02:00
Johannes Meyer 1c32d8ebe5 DowntimeQuery: Add _name suffix to the query column `downtime_author' 
...to indicate that it's a case-sensitive column.

refs #8613
 2015-04-10 14:23:05 +02:00
Johannes Meyer 0fe59aa519 Revert "ContactQuery: Provide ci query columns for aliases and email addresses" 
This reverts commit f00adc2138.

Conflicts:
	modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
 2015-04-10 12:23:35 +02:00
Johannes Meyer f00adc2138 ContactQuery: Provide ci query columns for aliases and email addresses 
refs #8613
 2015-04-10 09:45:23 +02:00
Johannes Meyer 5372dfb7f1 Fetch a comment's author using `comment_author_name' 
refs #8613
 2015-04-09 13:07:50 +02:00
Matthias Jentsch 878ef05896 Fix "show all downtimes" links 
refs #8565
 2015-04-09 11:19:13 +02:00
Johannes Meyer 09ab601942 Require `service_description' instead of `service' to show a particular service 
`service' implies that it is possible to provide case-less identifiers which is
*not* possible.

refs #8613
 2015-04-08 16:49:52 +02:00
Johannes Meyer b93d18a0fc Require `host_name' instead of `host' to show or list particular objects 
`host' implies that it is possible to provide case-less identifiers which is
*not* possible.

refs #8613
 2015-04-08 16:25:29 +02:00
Matthias Jentsch 9ac89edb86 Add filter to summary links 
Add the multiselection filter as a base filter to the state summary, to ensure that the summary links only selected services.

refs #8565
 2015-04-07 18:00:36 +02:00
Matthias Jentsch 46da404452 Add docstrings to ObjectList and coding style 2015-04-07 16:34:20 +02:00
Matthias Jentsch 1c5a091584 Generate filter in host and service lists 
refs #8565
 2015-04-07 16:29:10 +02:00
Matthias Jentsch 5619ac960c Add inline pies to host and service back to multi-select views 
Add old inline pie code and visualize handled/unhandled state.

refs #8565
 2015-04-02 16:25:20 +02:00
Matthias Jentsch b0b0ae157c Turn prepareStateName into more generic string utility function 
refs #8565
 2015-03-31 16:45:21 +02:00
Eric Lippmann 1c8c49e732 Select service_is_reachable in the service detail view 
refs #6875
 2015-03-13 00:26:02 +01:00
Eric Lippmann 37823f0415 Select host_is_reachable in the host detail view 
refs #6875
 2015-03-13 00:25:44 +01:00
Eric Lippmann 53626ccfeb Merge branch 'master' into bugfix/unnecessary-joins-8614 2015-03-12 16:40:16 +01:00
Eric Lippmann 7156bd7dfb Fetch object comments by host_name and service_description 
refs #8614
 2015-03-12 16:39:20 +01:00
Eric Lippmann 8563d5ed3f PHPDoc: Use @var instead of @type 
Becasue of too many kittens PSR-5 backed off of deprecating @var.
So that's the way we go too.
 2015-03-12 16:08:47 +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 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
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
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
Matthias Jentsch 266e781a93 Deduplicate Hosts and Services-Controller 
Create functions in abstract class for filtering hosts and services, instead of reimplementing it in the controller.
 2015-03-06 17:52:06 +01:00
Matthias Jentsch 1cfcb934b0 Deduplicate state summary 
Use existing partials for rendering the state summary instead of a new one.

refs #8565
 2015-03-06 17:30:59 +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 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 6bae2e0a53 Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL 2015-02-04 10:52:27 +01:00
Eric Lippmann 5b4fab0750 Add license header 
This time without syntax errors hopefully :)
 2015-02-03 16:27:59 +01:00
Eric Lippmann 5fa2e3cfdc Revert "Add license header" 
This reverts commit 338d067aba.
 2015-02-03 16:16:26 +01:00
Eric Lippmann 338d067aba Add license header 
fixes #7788
 2015-02-03 15:51:04 +01:00
Eric Lippmann 7bf6bd39e9 monitoring: Implement Filterable in MonitoredObject 2015-01-27 14:54:21 +01:00
Johannes Meyer 6845480b5f Fix that strtoupper can't handle non ascii chars 
Fixed by not using strtoupper or by using it prior
to the translation of the corresponding string.

fixes #8163
 2015-01-22 14:37:07 +01:00
Eric Lippmann 1aa91f0228 monitoring: Select host and service display_name for an object's history 
refs #7843
 2015-01-22 10:57:15 +01:00
Eric Lippmann 4539462bc7 monitoring: Select host_display_name in the host and service object 
refs #7843
 2015-01-22 10:34:35 +01:00
Eric Lippmann 680b7e4eba monitoring: Prever 'Hostname' over 'Host name' in PHPDoc 2015-01-20 16:11:41 +01:00
Eric Lippmann e376bd6285 monitoring: Fix that exporting a object's history throws an exception 
fixes #6586
 2014-12-29 17:54:09 +01:00
Johannes Meyer 7621f6642d Adjust usages of Icinga\Application\Config 
refs #7147
 2014-11-18 13:11:52 +01:00
Thomas Gelf a8a7da4ade Object\Host: not-so-nice workaround, LS contancts 2014-11-16 19:28:08 +01:00
Thomas Gelf 7f22afbc21 MonitoredObject: temporary livestatus workaround 2014-11-16 19:24:37 +01:00
Thomas Gelf 4876854893 Monitoring\ObjectList: expect a MonitoringObject 2014-11-12 00:16:07 +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 74e60ec0f6 MonitoredObject: decode structured customvars 
fixes #7569
 2014-11-06 16:15:16 +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 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
Alexander Fuhr a0122763a6 Fix Queries: Summaries, Host, Service 2014-10-06 11:37:33 +02:00
Alexander Fuhr e6c674e221 MonitoredObject: Implement awesome __isset() 2014-09-30 14:47:17 +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 3229e5e587 monitoring: Add new multiselection controllers 2014-09-23 22:47:26 -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 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 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