Commit Graph

1575 Commits

Author SHA1 Message Date
Eric Lippmann c547f4c17f Fix error in the contact detail view introduced by changes to the notification queries 2016-09-15 14:07:19 +02:00
Eric Lippmann fd6ae75803 IDO: Improve notification view performance 2016-09-14 16:18:41 +02:00
Eric Lippmann 1ed2ebc191 IDO: Add config option to use the customvariables table for fetching custom vars
Icinga 1.x has the option to not dump the icinga_customvariablestatus table:

dump_customvar_status=0

With this setting applied, Web 2 will never show custom variables because Web 2 relies on the customvariablestatus table.
This commit introduces a config option to use the customvariables table instead:

/etc/icingaweb2/modules/monitoring/config.ini

[ido]
use_customvar_status_table = 0
2016-09-12 15:52:07 +02:00
Eric Lippmann 65d7c18c31 Merge branch 'bugfix/contact-service-filter-12019'
fixes #12019
2016-09-12 12:30:34 +02:00
Eric Lippmann 01bee4641d Fix missing comment and downtime name in the object detail views 2016-09-08 15:03:45 +02:00
Eric Lippmann 9402c1ffa6 Add debug info to commands sent over Icinga 2's API 2016-09-08 09:23:49 +02:00
Eric Lippmann 8c079d1db8 Merge branch 'feature/api-command-transport-11398'
resolves #11398
2016-09-01 10:50:50 +02:00
Eric Lippmann 440a3f5fdd Respect API transport in the command transport factory
refs #11398
2016-09-01 10:49:08 +02:00
Eric Lippmann db41024c89 Add ApiCommandTransport class
refs #11398
2016-09-01 10:47:27 +02:00
Eric Lippmann cfc0f60042 Add RestRequest class
refs #11398
2016-09-01 10:47:06 +02:00
Eric Lippmann ad658b049c Add IcingaApiCommandRenderer class
refs #11398
2016-09-01 10:45:28 +02:00
Eric Lippmann 0f4fa2d492 Add IcingaApiCommand class
refs #11398
2016-09-01 10:44:59 +02:00
Alexander A. Klimov 13085776d8 Performance data: handle negative values
fixes #11915
2016-08-31 15:46:22 +02:00
Eric Lippmann 62f2f92ae8 Add name property to the delete downtime command
refs #11398
2016-08-31 15:21:27 +02:00
Eric Lippmann b8df909ad5 Add name property to the delete comment command
refs #11398
2016-08-31 15:06:38 +02:00
Eric Lippmann c55c5a9e64 IDO: Provide downtime name column
The Icinga 2 API requires the downtimes's name when removing the downtime.

refs #11398
2016-08-31 14:05:01 +02:00
Eric Lippmann 0e307c6482 IDO: Provide comment name column
The Icinga 2 API requires the comment's name when removing the comment.

refs #11398
2016-08-31 12:57:50 +02:00
Michael Friedrich f127611969 Fix contact service filters for 'Downtime'
refs #12019
2016-06-22 13:32:26 +02:00
Eric Lippmann 1bbe1b3620 RemoteCommandFile: Don't close stdin to support transmitting multiple commands 2016-06-09 16:43:06 +02:00
Thomas Gelf 3a00923116 RemoteCommandFile: Replace exec with proc_open 2016-06-06 15:08:45 +02:00
Eric Lippmann 97451dae86 Merge branch 'bugfix/remove-large-add-to-menu-tab-11850'
fixes #11850
2016-06-02 17:57:51 +02:00
Eric Lippmann e92aa3de42 Merge branch 'bugfix/sorting-no-longer-works-as-expected-11729'
fixes #11729
2016-06-02 17:57:50 +02:00
Eric Lippmann ba5fe61fa9 monitoring: Make timeline colors accessible
fixes #11871
2016-06-01 14:40:55 +02:00
Alexander A. Klimov 3fed5e920f list/contactgroups: show empty usergroups, too
refs #11744
2016-05-31 17:55:52 +02:00
Alexander A. Klimov ecfc8b0f0a Don't provide the "Add to menu" action for command forms
refs #11850
2016-05-31 14:56:42 +02:00
Johannes Meyer b759ab6f5a DbResourceForm: Don't show SSL form elements by default
Addded additionally a check for PHP 5.4 so that these elements
are not shown for earlier versions.

refs #11115
2016-05-27 15:45:22 +02:00
Lee Clemens 87e774cb88 Add SSL Support to MySQL resources
Signed-off-by: Johannes Meyer <johannes.meyer@netways.de>
2016-05-27 13:15:48 +02:00
Alexander A. Klimov 1be8e14772 Servicegroups list: show how many services are unknown and handled
fixes #11708
2016-05-20 17:05:51 +02:00
Alexander A. Klimov af2cee0942 Make host and service severities independend of whether the state is soft or hard
refs #11729
2016-05-20 14:41:02 +02:00
Eric Lippmann f66daa622c Fix unwanted change of ContactgroupQuery::$groupBase
Oops!

fixes #11598
2016-04-18 01:01:26 +02:00
Eric Lippmann 4d488ab354 Merge branch 'master' into feature/restrict-custom-variables-10965 2016-04-13 15:44:12 +02:00
Alexander A. Klimov 589da9bcd1 monitoring: Apply custom variable restrictions
refs #10965
2016-04-13 15:43:42 +02:00
Eric Lippmann 275d9bd411 Add CSS class for state badge groups 2016-04-13 12:28:38 +02:00
Eric Lippmann 4cc4657ee9 Add host_is_reachable column to the host status data view
refs #11404
2016-04-11 10:29:26 +02:00
Eric Lippmann 750b8950b2 lib: Reorder columns in Hoststatus 2016-04-11 10:29:08 +02:00
Eric Lippmann a824637c0e Add service_is_reachable column to the service status data view
refs #11404
2016-04-11 10:28:12 +02:00
Eric Lippmann aced4f3b6e lib: Reorder columns in Servicestatus 2016-04-11 10:27:28 +02:00
Eric Lippmann a2ff8c9778 monitoring: No longer provide contact columns in the contact group query
Contacts query w/ filter for contact group should be used instead.
2016-03-31 10:26:27 +02:00
Alexander A. Klimov 66a7bdfc84 MonitoredObject: implement hideBlacklistedProperties()
refs #10965
2016-03-22 18:21:20 +01:00
Marius Hein c831bc5232 Add host_alias to search columns if backend is icinga 1 2016-02-29 22:34:54 +01:00
Eric Lippmann 02eea2ad11 Disable persistent comment checkbox if backend is Icinga 2
refs #11100
2016-02-25 17:51:02 +01:00
Eric Lippmann 47b3019940 Add MonitoringBackend::isIcinga2()
This function is for the many places where we have to distinguish between Icinga 1.x and Icinga 2.x.

refs #11100
2016-02-25 17:45:51 +01:00
Eric Lippmann c834e66b9a Show useful error message if a command transport failed
fixes #10173
2016-02-25 10:36:10 +01:00
Eric Lippmann 7f358ed88d Don't sort a data view on dump when the data view is already sorted 2016-02-23 15:40:40 +01:00
Eric Lippmann bb8478a219 Merge branch 'bugfix/passwords-not-hidden-by-icinga-web-2-10640'
fixes #10640
2016-02-23 15:40:27 +01:00
Eric Lippmann acd2ef709e monitoring: Fix PHPDoc of MonitoredObject::obfuscateCustomVars()
refs #10640
2016-02-23 10:54:47 +01:00
Alexander A. Klimov 474803fee4 Change all license headers to only reflect a file's year of creation
refs #11000
2016-02-08 15:41:00 +01:00
Eric Lippmann 4df7fdea88 monitoring: Add obsessing to ObjectList::getFeatureStatus() 2016-01-28 14:45:22 +01:00
Eric Lippmann 32f87284ad PHP7: Fix MySQL and PostgreSQL PDO extension checks
refs #10251
2016-01-28 13:52:31 +01:00
Eric Lippmann 6ad40b5123 monitoring: Introduce ObjectList::getFeatureStatus()
refs #8963
2016-01-27 17:37:34 +01:00
Eric Lippmann 027aaacff8 monitoring: Prepare feature command form for multi-select
refs #8963
2016-01-27 17:37:15 +01:00
Eric Lippmann 7fd575080e PHP7: Rename String to StringHelper
refs #10251
2016-01-27 16:46:55 +01:00
Eric Lippmann 2e1e0bb89f Setup/Monitoring: Remove obsolete sockets requirement
fixes #10805
2016-01-25 07:32:18 +01:00
Alexander A. Klimov 7bc489ba4d MonitoredObject: obfuscate custom variables recursively
refs #10640
2016-01-22 18:37:27 +01:00
Thomas Gelf 9f035dd61a Monitoring\Hook: fix service actions 2016-01-12 12:27:21 +01:00
Johannes Meyer 1fe1f23031 monitoring: Use class Navigation for hook actions 2016-01-11 17:03:46 +01:00
Eric Lippmann 44dd4653ec monitoring: Remove applying restrictions in the detail area when not necessary 2015-12-22 13:00:25 +01:00
Eric Lippmann c5804eebb7 Merge branch 'bugfix/sort-hosts-and-services-by-last-state-change-9957'
fixes #9957
2015-12-21 10:34:20 +01:00
Eric Lippmann d7eaa41ab4 Move sort services by last state change up in the sort by list
refs #9957
2015-12-21 10:33:21 +01:00
Eric Lippmann 11e7d1050f Merge branch 'bugfix/line-breaks-in-comments-10603'
fixes #10603
2015-12-21 09:39:12 +01:00
Alexander A. Klimov 2624c7f328 Sort hosts and services descending by last state change
refs #9957
2015-12-18 15:50:57 +01:00
Alexander A. Klimov aad7baa5c4 Perfdata::getPercentage(): prevent division by integer 0
fixes #10331
2015-12-15 17:32:45 +01:00
Johannes Meyer 7c6471da86 Action: Return the new url if it has been resolved
This was already part of the 2.0 release, but was working however. Got
revealed by a restructuring commit a few weeks ago.

fixes #10702
2015-11-23 10:34:46 +01:00
Eric Lippmann 7858343605 monitoring: Select comment_is_persistent for comments in the detail area 2015-11-20 15:47:04 +01:00
Thomas Gelf b643c97fb0 IdoQuery: pass ourselves to hook, not back to us 2015-11-13 18:01:39 +01:00
Thomas Gelf fd7165329a IdoQuery: provide ourselves to the hook 2015-11-13 17:37:03 +01:00
Thomas Gelf cd16206c7e IdoQuery: fix typo 2015-11-13 17:37:03 +01:00
Thomas Gelf 2589fbcf04 IdoQuery::joinHookedVirtualTable: missing method 2015-11-13 17:37:03 +01:00
Thomas Gelf b7352105d2 IdoQueryExtensionHook: "just a new hook" 2015-11-13 17:37:03 +01:00
Thomas Gelf 6394cec933 DataviewExtensionHook: return fetched columns 2015-11-13 17:37:03 +01:00
Thomas Gelf 0e709d5469 DataViewHost/Servicestatus: use hooked columns 2015-11-13 17:37:02 +01:00
Thomas Gelf ff2c96e553 DataviewExtensionHook: we always want an array
This way implementors do not need to care
2015-11-13 17:37:02 +01:00
Thomas Gelf 35d3342b05 DataviewExtensionHook: just a new hook 2015-11-13 17:37:02 +01:00
Thomas Gelf f3cb1f915d Monitoring/DataView: allow to hook in columns 2015-11-13 17:37:02 +01:00
Thomas Gelf dc3c787446 Compat Hooks: fix c&p error 2015-11-13 17:37:02 +01:00
Thomas Gelf e6903b3834 Monitoring\Hook: moved from Monitoring\Web\Hook
refs #10613
2015-11-13 17:37:02 +01:00
Johannes Meyer d321b2de79 Merge branch 'master' into bugfix/hot-all-hostgroups-are-shown-10316 2015-11-13 15:37:53 +01:00
Eric Lippmann d5fe0c9610 Merge branch 'feature/dope-layout-5543#2' 2015-11-13 15:21:07 +01:00
Johannes Meyer 26e6acf9af ListController: Fix servicegrid grouping when applying group restrictions #2
PostgreSQL had still issues with it. Quickfix only, again.

refs #10316
2015-11-13 14:42:28 +01:00
Johannes Meyer 5e37f7758b ServicecommenthistoryQuery: Add missing group origin "servicegroups"
refs #10316
2015-11-13 12:55:06 +01:00
Johannes Meyer 005ec27cea IdoQuery: Fix method isTimestamp() not handling customvars properly
refs #10316
2015-11-13 12:13:02 +01:00
Johannes Meyer cc37ca37d9 ListController: Fix servicegrid grouping when applying group restrictions
Quickfix only.

refs #10316
2015-11-13 11:40:51 +01:00
Johannes Meyer 140e288c0b IdoQuery: Fix incorrect GROUP BY for MySQL SELECTs with joined columns
refs #10316
2015-11-12 16:02:41 +01:00
Eric Lippmann a12cc9ab30 monitoring/CSS: Don't set class sparkline-perfdata
Class not in use.

refs #5543
2015-11-12 09:45:35 +01:00
Johannes Meyer 89d8126226 Revert "Fix grouping of host- and servicegroup queries"
This reverts commit 35c7ed81a7.
2015-11-12 09:26:11 +01:00
Johannes Meyer 689cae8701 Merge branch 'master' into bugfix/hot-all-hostgroups-are-shown-10316 2015-11-12 09:23:49 +01:00
Johannes Meyer 651ce0bd04 Merge branch 'master' into bugfix/pgsql-queries-apply-lower-on-select-columns-10364 2015-11-12 09:18:06 +01:00
Thomas Gelf cbd1629176 DataView/Host|ServiceStatus: allow hard_state cols 2015-11-11 17:13:41 +01:00
Johannes Meyer 39f4d869b7 IdoQuery: Fix that PostgreSQL queries do not apply LOWER() on order cols
refs #10364
refs #9955
2015-11-11 15:25:40 +01:00
Johannes Meyer 0b2b1c5d1e IdoQuery: Fix that PostgreSQL queries use LOWER() on non-CI columns
refs #10364
refs #9954
2015-11-11 14:33:00 +01:00
Johannes Meyer 3d735693db IdoQuery: Fix method isCaseInsensitive() returning true for .. everything ..
..with a PostgreSQL backend.

refs #10364
2015-11-10 16:05:05 +01:00
Johannes Meyer 52606eb2e7 Revert "monitoring: Fix handling of collated columns w/ PostgreSQL"
This reverts commit f5ffa8047c.

refs #10364
refs #9954
refs #9955
2015-11-10 15:59:16 +01:00
Johannes Meyer ad5a43ce7b HostserviceproblemsummaryQuery: Group by "so.name1"
fixes #10589
refs #10490
2015-11-10 15:04:00 +01:00
Eric Lippmann 1da70a1270 monitoring: Remove icons for object tabs
We don't have icons somewhere else. We may introduce icons for all tabs later.

refs #5543
2015-11-10 09:45:26 +01:00
Eric Lippmann ba55ad7c5a monitoring: Fix unhandled service counter in the hosts overview
Group by was wrong.

fixes #10490
2015-11-09 09:55:17 +01:00
Thomas Gelf a2667dd551 Ido: remove test query objects from erraneous commit 2015-11-04 18:37:32 +01:00
Thomas Gelf 0c72b697e0 Classes: rename listing-table to common-table 2015-11-04 15:16:45 +01:00
Eric Lippmann 55f0863649 monitoring: Fix host and service detail history style
fixes #10317
2015-11-03 10:37:34 +01:00
Eric Lippmann c0c9f3b5eb monitoring: Select host_state_type and host_attempt in the service detail view for displaying soft states
refs #5543
2015-10-28 12:08:04 +01:00
Johannes Meyer 35c7ed81a7 Fix grouping of host- and servicegroup queries
It's a rather quick fix but fixes the problem. We should take another look whether
a more sophisticated solution can be found.

refs #10316
2015-10-10 20:04:04 +02:00
Johannes Meyer 6a68d25bc3 MonitoredObject: Deprecate method matches()
It's now possible to achieve the same by passing the object directly to a
filter.

refs #10304
2015-10-05 14:04:40 +02:00
Johannes Meyer 07e5664fbe MonitoredObject: Allow to access a set-value by name
$object->contact|contactgroup|hostgroup|servicegroup + _name
is now allowed and returns an array of strings

refs #10304
2015-10-05 13:59:57 +02:00
Johannes Meyer 499a7d628f Macro: Resolve prefixed custom vars and object attributes
refs #10304
2015-10-05 13:18:10 +02:00
Johannes Meyer 0ed6e08175 MonitoredObject: Allow to access custom variables by property
refs #10304
2015-10-05 13:16:41 +02:00
Johannes Meyer 996959b65e MonitoredObject: Fix object_type condition in method fetchHostVariables
refs #10304
2015-10-05 12:54:30 +02:00
Johannes Meyer 7419c9e87c MonitoredObject: Allow to fetch a host's customvariables for services
refs #10304
2015-10-05 11:57:31 +02:00
Eric Lippmann 54bb99a96d Merge branch 'feature/dope-layout-5543'
refs #5543
2015-10-02 11:16:35 +02:00
Eric Lippmann 61357da35c Merge branch 'bugfix/group-by-9956'
fixes #9956
2015-10-01 23:05:27 +02:00
Thomas Gelf 9ca81320ac Search: re-add object names, allow for addresses
It's now possible do search for IP (and IPv6) addresses. Object names
are once again allowed

fixes #9591
fixes #10163
2015-10-01 18:48:36 +02:00
Eric Lippmann 231c63b703 Merge branch 'master' into feature/dope-layout-5543 2015-09-30 18:52:52 +02:00
Matthias Jentsch 7e81b00a96 Fix multi-view badge filters
Allow providing a base URL for StateBadges to display hosts and services based on a filter.

refs #5543
2015-09-30 16:58:42 +02:00
Johannes Meyer 415690134b Add tab extension to add the current container url as new menu entry 2015-09-30 14:47:42 +02:00
Johannes Meyer 62d96a154e monitoring: Normalize custom variable names not until they're displayed 2015-09-30 13:23:54 +02:00
Eric Lippmann 527b146054 monitoring: Remove unnecessary columns in the GROUP BY list for MySQL
refs #9956
2015-09-30 09:45:52 +02:00
Eric Lippmann bcbe7640e7 monitoring: Fix typos in queries after removing ::getGroup()
refs #9956
2015-09-30 09:45:18 +02:00
Eric Lippmann 0f622fe10b monitoring: Fix renamed index in the ServicedowntimeendhistoryQuery
refs #9956
2015-09-30 09:33:53 +02:00
Eric Lippmann c4ac3cbc1a monitoring: Rearrange code in the ServicedowntimestarthistoryQuery
refs #9956
2015-09-30 09:33:10 +02:00
Eric Lippmann aa76925f69 monitoring: Remove ServicedowntimestarthistoryQuery::getGroup()
refs #9956
2015-09-30 09:32:36 +02:00
Eric Lippmann bd4216907e monitoring: Rearrange code in the ServicedowntimeQuery
refs #9956
2015-09-30 09:30:04 +02:00
Eric Lippmann f4e4dbe069 monitoring: Remove ServicedowntimeQuery::getGroup()
refs #9956
2015-09-30 09:29:34 +02:00
Eric Lippmann 690fc89d62 monitoring: Rearrange code in the ServicestatushistoryQuery
refs #9956
2015-09-30 09:28:27 +02:00
Eric Lippmann e96d0c26e3 monitoring: Remove ServicestatehistoryQuery::getGroup()
refs #9956
2015-09-30 09:27:58 +02:00
Eric Lippmann bbd59d4fbc monitoring: Rearrange code in the HoststatehistoryQuery
refs #9956
2015-09-30 09:25:44 +02:00
Eric Lippmann 178ebd215d monitoring; Remove HoststatehistoryQuery::getGroup()
refs #9956
2015-09-30 09:25:12 +02:00
Eric Lippmann 2f79c2f911 monitoring: Fix renamed index in the ServicecommentdeletionhistoryQuery, part 2
refs #9956
2015-09-30 09:06:51 +02:00
Eric Lippmann 58c630b7ef monitoring: Fix renamed index in the HostdowntimeendhistoryQuery
refs #9956
2015-09-29 23:04:47 +02:00
Eric Lippmann 185c0b43be monitoring: Rearrange code in the HostdowntimestarthistoryQuery
refs #9956
2015-09-29 23:04:01 +02:00
Eric Lippmann 956c86dcdb monitoring: Remove HostdowntimestarthistoryQuery::getGroup()
refs #9956
2015-09-29 23:03:13 +02:00
Eric Lippmann df69755056 monitoring: Rearrange code in the ServicegroupQuery
refs #9956
2015-09-29 22:54:45 +02:00
Eric Lippmann e22dd1d0b4 monitoring: Remove ServicegroupQuery::getGroup()
refs #9956
2015-09-29 22:54:08 +02:00
Eric Lippmann d18d606ad6 monitoring: Handle joined virtual table serviceobjects in IdoQuery::getGroup()
refs #9956
2015-09-29 22:53:41 +02:00
Eric Lippmann 944129d1e6 monitoring: Handle joined virtual table hostobjects in IdoQuery::getGroup()
refs #9956
2015-09-29 22:51:06 +02:00
Eric Lippmann 73152e9244 monitoring: Rearrange code in the HostgroupQuery
refs #9956
2015-09-29 22:50:49 +02:00
Eric Lippmann 6519b25ec1 monitoring: Remove HostgroupQuery::getGroup()
refs #9956
2015-09-29 22:50:12 +02:00
Eric Lippmann 844f80d2df monitoring: Rearrange code in the ServicestatusQuery
refs #9956
2015-09-29 22:47:07 +02:00
Eric Lippmann 6307af9e10 monitoring: Remove ServicestatusQuery::getGroup()
refs #9956
2015-09-29 22:46:02 +02:00
Eric Lippmann d0f11e10f6 monitoring: Rearrange code in the HoststatusQuery
refs #9956
2015-09-29 22:44:12 +02:00
Eric Lippmann 02eee7a603 monitoring: Remove HoststatusQuery::getGroup()
refs #9956
2015-09-29 22:43:09 +02:00
Eric Lippmann 70717169c2 monitoring: Rearrange code in the ServicecommentQuery
refs #9956
2015-09-29 22:42:44 +02:00
Eric Lippmann d2d960d072 monitoring: Remove ServicecommentQuery::getGroup()
refs #9956
2015-09-29 22:42:00 +02:00
Eric Lippmann 92778ec0eb monitoring: Remove HostdowntimeQuery::getGroup()
refs #9956
2015-09-29 22:41:16 +02:00
Eric Lippmann 08965898e9 monitoring: Rearrange code in the HostdowntimeQuery
refs #9956
2015-09-29 22:39:01 +02:00
Eric Lippmann e4e0ad7c18 monitoring: Rearrange columns in the HostcommenthistoryQuery
refs #9956
2015-09-29 22:38:00 +02:00
Eric Lippmann 041c72bb6c monitoring: Rearrange code in the ServicecommenthistoryQuery
refs #9956
2015-09-29 22:37:26 +02:00
Eric Lippmann 1f040df1e9 monitoring: Fix renamed index in the ServicecommentdeletionhistoryQuery
refs #9956
2015-09-29 22:36:24 +02:00
Eric Lippmann e8ce410f08 monitoring: Remove ServicecommenthistoryQuery::getGroup()
refs #9956
2015-09-29 22:36:02 +02:00
Eric Lippmann a3b74fe6d0 monitoring: Fix renamed index in the HostcommentdeletionhistoryQuery
refs #9956
2015-09-29 22:26:05 +02:00
Eric Lippmann 3623cf5196 monitoring: Rearrange code in the HostcommenthistoryQuery
refs #9956
2015-09-29 22:25:45 +02:00
Eric Lippmann cd521891ae monitoring: Remove HostcommenthistoryQuery::getGroup()
refs #9956
2015-09-29 22:25:02 +02:00
Eric Lippmann b5561a8306 monitoring: Rearrange code in the HostcommentQuery
refs #9956
2015-09-29 22:23:16 +02:00