Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							11a006681b 
							
						 
					 
					
						
						
							
							Merge branch 'master' into bugfix/monitoring-remove-services-tab-7998  
						
						... 
						
						
						
						Conflicts:
	application/controllers/ConfigController.php
	library/Icinga/Web/Widget/FilterEditor.php
	modules/monitoring/application/controllers/HostsController.php 
						
						
					 
					
						2015-06-05 15:27:42 +02:00 
						 
				 
			
				
					
						
							
							
								Matthias Jentsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e7a875da26 
							
						 
					 
					
						
						
							
							Merge branch 'bugfix/perfdata-details-hidden-8334'  
						
						... 
						
						
						
						fixes  #8334  
					
						2015-06-02 17:51:57 +02:00 
						 
				 
			
				
					
						
							
							
								Matthias Jentsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a5c3782de7 
							
						 
					 
					
						
						
							
							Do not display columns that don't include any values  
						
						... 
						
						
						
						refs #8334  
						
						
					 
					
						2015-06-02 15:20:27 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							cd0c418854 
							
						 
					 
					
						
						
							
							Merge branch 'master' into feature/user-and-group-management-8826  
						
						
						
						
					 
					
						2015-06-02 10:44:13 +02:00 
						 
				 
			
				
					
						
							
							
								Matthias Jentsch 
							
						 
					 
					
						
						
						
						
							
						
						
							29cc92a3f3 
							
						 
					 
					
						
						
							
							Display acknowledgement action for all unacknowledged objects  
						
						... 
						
						
						
						Instead of displaying the ack for all unhandled problem host, make acknowledgement possible for all monitored objects in multi views.
fixes  #7931  
						
						
					 
					
						2015-06-01 12:24:29 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							9f155ea99d 
							
						 
					 
					
						
						
							
							monitoring: Don't show SSH command when transporting a command to a remote command file failed  
						
						... 
						
						
						
						refs #8006  
						
						
					 
					
						2015-05-28 16:33:35 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							a4a1a296d1 
							
						 
					 
					
						
						
							
							monitoring: Reduce error output when transporting a command to a local command file failed  
						
						... 
						
						
						
						refs #8006  
						
						
					 
					
						2015-05-28 16:13:35 +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 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							58d78f59f3 
							
						 
					 
					
						
						
							
							DbQuery: Initialize self::$select as early as possible  
						
						... 
						
						
						
						I'd like to use Zend's implementation instead of re-inventing the wheel just
because someone decided to only work with a copy of it in the frameworks
query but do exactly the opposite in the monitoring module's IDO query... 
						
						
					 
					
						2015-05-28 13:49:36 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							646cffd62d 
							
						 
					 
					
						
						
							
							monitoring: Remove the services tab when showing host or service details  
						
						... 
						
						
						
						refs #7998  
						
						
					 
					
						2015-05-28 12:22:57 +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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							59ff4221f6 
							
						 
					 
					
						
						
							
							CommandTransport: Make sure to reset the config before calling current()  
						
						
						
						
					 
					
						2015-05-22 14:01:11 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							265725447d 
							
						 
					 
					
						
						
							
							Merge branch 'master' into feature/user-and-group-management-8826  
						
						
						
						
					 
					
						2015-05-22 10:06:31 +02:00 
						 
				 
			
				
					
						
							
							
								Marius Hein 
							
						 
					 
					
						
						
						
						
							
						
						
							57abafd10b 
							
						 
					 
					
						
						
							
							Merge branch 'master' into bugfix/customvars-case-insensitive-8696  
						
						
						
						
					 
					
						2015-05-21 16:51:04 +02:00 
						 
				 
			
				
					
						
							
							
								Marius Hein 
							
						 
					 
					
						
						
						
						
							
						
						
							7c04664888 
							
						 
					 
					
						
						
							
							Make MySQL collation syntax default  
						
						... 
						
						
						
						Overwrite customVarsJoinTemplate for Postgres and Oracle.
refs #8696  
						
						
					 
					
						2015-05-21 16:09:03 +02:00 
						 
				 
			
				
					
						
							
							
								Matthias Jentsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8ce9989243 
							
						 
					 
					
						
						
							
							Merge branch 'feature/support-icon-image-alt-9300'  
						
						... 
						
						
						
						resolves  #9300  
					
						2015-05-21 15:03:06 +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 
						 
				 
			
				
					
						
							
							
								Marius Hein 
							
						 
					 
					
						
						
						
						
							
						
						
							e8e3b940af 
							
						 
					 
					
						
						
							
							Use CustomVariable names case insensitive  
						
						... 
						
						
						
						refs #8696  
						
						
					 
					
						2015-05-21 14:42:09 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							47f21eebaa 
							
						 
					 
					
						
						
							
							Merge branch 'bugfix/Take-display_name-into-account-when-searching-for-host-and-service-names-8241'  
						
						... 
						
						
						
						fixes  #8241  
					
						2015-05-21 14:05:49 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							57328aa6ed 
							
						 
					 
					
						
						
							
							monitoring: Make host group and service group alias columns case insensitive  
						
						... 
						
						
						
						The alias columns should be case insenstive because we now support them when searching.
refs #8241  
						
						
					 
					
						2015-05-21 13:58:54 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							0c72686ba1 
							
						 
					 
					
						
						
							
							monitoring: Make display_name columns case insensitive  
						
						... 
						
						
						
						The display_name columns should be case insenstive because we now support them when searching.
refs #8241  
						
						
					 
					
						2015-05-21 12:46:47 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							ad5ab16b3f 
							
						 
					 
					
						
						
							
							monitoring: Drop the Groupsummary data view  
						
						... 
						
						
						
						We have Hostgroupsummary and Servicegroupsummary now.
refs #8241  
						
						
					 
					
						2015-05-21 12:43:27 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							1a1f93db23 
							
						 
					 
					
						
						
							
							monitoring: Add sort rules to the service group summary  
						
						... 
						
						
						
						refs #8241  
						
						
					 
					
						2015-05-21 12:41:29 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							e7396ea49c 
							
						 
					 
					
						
						
							
							monitoring: Add services_severity to the service group summary data view  
						
						... 
						
						
						
						refs #8241  
						
						
					 
					
						2015-05-21 12:38:58 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							73eb8cc805 
							
						 
					 
					
						
						
							
							monitoring: Add sort rule for total services to the host group summary  
						
						... 
						
						
						
						refs #8241  
						
						
					 
					
						2015-05-21 12:37:53 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							58b3192ce3 
							
						 
					 
					
						
						
							
							monitoring: Add sort rules to the host group summary  
						
						... 
						
						
						
						refs #8241  
						
						
					 
					
						2015-05-21 12:26:27 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							195275a716 
							
						 
					 
					
						
						
							
							monitoring: Don't hardcode sort direction of the severity columns  
						
						... 
						
						
						
						fixes  #9059  
					
						2015-05-21 12:20:18 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							82f9425b90 
							
						 
					 
					
						
						
							
							Revert "Make ascending sort by host or service severity initiatable"  
						
						... 
						
						
						
						This reverts commit 386d4db851aed056652d892d539de35b403c5062.
The commit introduced the bug that changing the sort direction no longer changed the sort direction :)
refs #9059  
						
						
					 
					
						2015-05-21 12:20:18 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							37abc724de 
							
						 
					 
					
						
						
							
							monitoring: Let the host group summary provide the column hosts_severity  
						
						... 
						
						
						
						refs #8241  
						
						
					 
					
						2015-05-21 11:24:31 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							bbed2cffae 
							
						 
					 
					
						
						
							
							monitoring: Add column hosts_severity to the group summary query  
						
						... 
						
						
						
						refs #8241  
						
						
					 
					
						2015-05-21 11:23:55 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							ce463d16ef 
							
						 
					 
					
						
						
							
							Reorder group summary query's columns by name  
						
						... 
						
						
						
						refs #8241  
						
						
					 
					
						2015-05-21 11:19:58 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							cfb819ec61 
							
						 
					 
					
						
						
							
							monitoring: Add missing column to the host group summary data view  
						
						... 
						
						
						
						refs #8241  
						
						
					 
					
						2015-05-20 17:03:23 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							b9a6e1042d 
							
						 
					 
					
						
						
							
							Merge branch 'master' into bugfix/Take-display_name-into-account-when-searching-for-host-and-service-names-8241  
						
						... 
						
						
						
						Conflicts:
	modules/monitoring/application/controllers/ListController.php 
						
						
					 
					
						2015-05-20 17:02:49 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							80b174f526 
							
						 
					 
					
						
						
							
							monitoring: Servicegroupsummary must not extend Groupsummary which is subject to remove  
						
						... 
						
						
						
						refs #8241  
						
						
					 
					
						2015-05-20 16:16:21 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							a9d6a94957 
							
						 
					 
					
						
						
							
							monitoring: Use the groupsummary query for the service group summary view  
						
						... 
						
						
						
						refs #8241  
						
						
					 
					
						2015-05-20 16:09:30 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							d379b27c24 
							
						 
					 
					
						
						
							
							monitoring: Hostgroupsummary must not extend Groupsummary which is subject to remove  
						
						... 
						
						
						
						refs #8241  
						
						
					 
					
						2015-05-20 15:50:19 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							41e72396ee 
							
						 
					 
					
						
						
							
							monitoring: Use the groupsummary query for the host group summary view  
						
						... 
						
						
						
						refs #8241  
						
						
					 
					
						2015-05-20 15:50:06 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							2493535ac7 
							
						 
					 
					
						
						
							
							Revert "Implement classes HostgroupsummaryQuery and ServicegroupsummaryQuery"  
						
						... 
						
						
						
						This reverts commit 9b4f08eb433879f520dc7f93a4e205ae9bc631b5.
There's DataView::getQueryName() for this.
refs #8241  
						
						
					 
					
						2015-05-20 15:29:45 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							71fa736144 
							
						 
					 
					
						
						
							
							Merge branch 'master' into feature/user-and-group-management-8826  
						
						
						
						
					 
					
						2015-05-20 10:46:55 +02:00 
						 
				 
			
				
					
						
							
							
								Alexander A. Klimov 
							
						 
					 
					
						
						
						
						
							
						
						
							9b4f08eb43 
							
						 
					 
					
						
						
							
							Implement classes HostgroupsummaryQuery and ServicegroupsummaryQuery  
						
						... 
						
						
						
						Without this the Hostgroupsummary and Servicegroupsummary DataViews would not work
refs #8241  
						
						
					 
					
						2015-05-20 10:43:54 +02:00 
						 
				 
			
				
					
						
							
							
								Alexander A. Klimov 
							
						 
					 
					
						
						
						
						
							
						
						
							93db1d15cb 
							
						 
					 
					
						
						
							
							Override ::getSearchColumns()  
						
						... 
						
						
						
						refs #8241  
						
						
					 
					
						2015-05-19 18:17:40 +02:00 
						 
				 
			
				
					
						
							
							
								Alexander A. Klimov 
							
						 
					 
					
						
						
						
						
							
						
						
							6ba07b089d 
							
						 
					 
					
						
						
							
							Implement and use Hostgroupsummary and Servicegroupsummary  
						
						... 
						
						
						
						refs #8241  
						
						
					 
					
						2015-05-19 18:17:40 +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 
						 
				 
			
				
					
						
							
							
								Alexander A. Klimov 
							
						 
					 
					
						
						
						
						
							
						
						
							2ed1d6c66b 
							
						 
					 
					
						
						
							
							Implement ::getSearchColumns()  
						
						... 
						
						
						
						refs #8241  
						
						
					 
					
						2015-05-19 17:36:24 +02:00 
						 
				 
			
				
					
						
							
							
								Eric Lippmann 
							
						 
					 
					
						
						
						
						
							
						
						
							0a8c9ad195 
							
						 
					 
					
						
						
							
							Merge branch 'feature/list-number-of-hosts-in-host-groups-8054'  
						
						... 
						
						
						
						resolves  #8054  
					
						2015-05-19 15:10:20 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							fb07f0b94c 
							
						 
					 
					
						
						
							
							Merge branch 'master' into feature/user-and-group-management-8826  
						
						... 
						
						
						
						Conflicts:
	library/Icinga/Authentication/Backend/LdapUserBackend.php
	library/Icinga/Protocol/Ldap/Query.php 
						
						
					 
					
						2015-05-19 14:14:03 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							4cedfce07f 
							
						 
					 
					
						
						
							
							DataView: Fix that method getOffset() calls parent::hasOffset()  
						
						
						
						
					 
					
						2015-05-19 13:57:20 +02:00 
						 
				 
			
				
					
						
							
							
								Johannes Meyer 
							
						 
					 
					
						
						
						
						
							
						
						
							a629adb448 
							
						 
					 
					
						
						
							
							DataView: Remove method paginate()  
						
						
						
						
					 
					
						2015-05-19 13:57:20 +02:00