Commit Graph

826 Commits

Author SHA1 Message Date
Johannes Meyer dc8181cdc5 Escape linefeeds and carriage returns in commands and show them as html
fixes #6088
2014-08-14 10:23:04 +02:00
Johannes Meyer b5d6481c12 Make it possible to translate the process info view
refs #6610
2014-08-13 15:52:33 +02:00
Johannes Meyer fe63ce664f Make use if 'ignore´ instead of explicitly unsetting array keys
refs #5525
2014-08-12 13:57:28 +02:00
Johannes Meyer f23bf912eb Remove obsolete use statements 2014-08-12 09:49:52 +02:00
Johannes Meyer be14844fa8 Merge EditInstanceForm with CreateInstanceForm and rename it
As with the backend form, a user might like to change the name of an
instance. The new form and its actions are also adjusted to suit the new form interface.

refs #5525
2014-08-11 14:49:42 +02:00
Thomas Gelf 96925487bd CLI/monitoring/list: fix DataView-related exception
This uses the renamed DataView serviceStatus instead of the former
status and fixes the problem that CLI still assumed to have fetch
and count function on the DataView.

fixes #6777
2014-07-31 17:24:56 +02:00
Johannes Meyer 5a738112ea Remove isExistingBackend/-Instance
It is more efficient to access configuration files only once instead of
accessing them multiple times in different locations.

refs #5525
2014-07-25 16:02:13 +02:00
Johannes Meyer d7ed6bd249 Adjust removebackend-action to suit the new backend form interface
Drops additionally the ConfirmRemovalForm of the monitoring module
as there is already one in icingaweb2's form-set.

refs #5525
2014-07-25 16:00:38 +02:00
Johannes Meyer a78d11345b Adjust createbackend-action to suit the new backend form interface
refs #5525
2014-07-25 15:58:44 +02:00
Johannes Meyer b743cf8143 Adjust editbackend-action to suit the new backend-form interface
refs #5525
2014-07-25 14:55:36 +02:00
Johannes Meyer 488ea4633d Merge EditBackendForm with CreateBackendForm and rename it
It is not necessary to distinct between whether a backend is created or
edited as a user perhaps likes to change the name of a backend directly
instead of the need to remove and recreate it.

refs #5525
2014-07-25 14:50:53 +02:00
Johannes Meyer af5a3262be Revert backslash removal in front of namespace-less use statement 2014-07-25 09:12:12 +02:00
Johannes Meyer 26d42da635 Re-add getResourcesByType as simplified version
refs #5525
2014-07-25 08:58:50 +02:00
Johannes Meyer a6bd802e3e Remove unnecessary properties and its getters/setters
refs #5525
2014-07-25 08:58:11 +02:00
Johannes Meyer 5f7652133e Fix code-style and documentation 2014-07-25 08:39:27 +02:00
Alexander Klimov a4b7204e23 Contactgroups view: correct links to contacts detail pages
fixes #6514
2014-07-23 13:10:09 +02:00
Alexander Klimov a2809552f2 Do not use htmlspecialchars in view scripts
fixes #6759
2014-07-23 12:41:05 +02:00
Eric Lippmann 9269a0cbd5 Revert "Do not use htmlspecialchars in view scripts"
This reverts commit 607aa9b203.

`Perfdata::escape()' does not exist. But `Perfdata::view::escape()' does.
2014-07-23 12:29:27 +02:00
Alexander Klimov 607aa9b203 Do not use htmlspecialchars in view scripts
fixes #6759
2014-07-23 12:12:49 +02:00
Matthias Jentsch cb27a3d0f1 Do not use height and width in bar charts, to avoid layout errors 2014-07-22 17:57:40 +02:00
Matthias Jentsch 0a500efd8a Determine the max value in LinearUnit dynamically
The range between min and max should always be divisable by the amount of
ticks, to ensure that the vertical lines are always at a full discrete value.

fixes #6769
2014-07-21 17:21:54 +02:00
Matthias Jentsch 53c9292b41 Fix BarChart padding in Dashboard
Use max-width instead of width in the chart layout to make better use of the available space, but prevent the charts from growing too big. Use a bigger weight and height in the default dashboard configuration.

fixes #6744
2014-07-21 13:06:35 +02:00
Alexander Klimov f9a274d079 Add contact detail view
refs #4804
refs #6514
2014-07-18 17:35:24 +02:00
Alexander Klimov 96d3406446 Prefer style="clear: both;" rather than Bootstrap's class="clearfix" 2014-07-17 17:46:28 +02:00
Alexander Klimov 882699201d Contacts: replace foreach loop with hardcoded HTML and move the styles to a CSS file 2014-07-17 17:33:45 +02:00
Alexander Klimov eca0d50bae Don't use printf format strings as array keys
An array with printf format strings as keys looks pretty ugly
2014-07-17 11:26:18 +02:00
Johannes Meyer 4d199180b3 We do not want to access $_POST directly if it is possible to avoid it 2014-07-17 09:28:10 +02:00
Johannes Meyer b7f5c8a84d Fix that the default sort order of a view is not being applied
fixes #6644
2014-07-17 09:28:10 +02:00
Alexander Klimov b23e36aa1a Swap array keys and values
Non-hardcoded keys may be not unique
2014-07-16 17:54:06 +02:00
Alexander Klimov 62da942159 Don't close and re-open php tags, remove unneeded spaces
To close and re-open php tags makes no sense if there's nothing between them
2014-07-16 17:54:06 +02:00
Alexander Klimov 1ad263170e Revert "Small fixes"
This reverts commit 8086292b1b.

The commit included too many changes.
2014-07-16 15:30:20 +02:00
Alexander Klimov cb04c42bab Use htmlspecialchars to prevent attacks 2014-07-16 13:10:28 +02:00
Alexander Klimov 8086292b1b Small fixes 2014-07-15 18:00:52 +02:00
Alexander Klimov 4c415aac5c Make contacts' view look more like contactgroups' view 2014-07-15 16:17:02 +02:00
Johannes Meyer 3105c2059e Remove license headers from all files
refs #6309
2014-07-15 13:43:52 +02:00
Alexander Klimov d021ddebee Make contacts' view work like the downtimes' one
fixes #6513
2014-07-15 10:47:12 +02:00
Johannes Meyer bacea36ad9 Improve piechart limitation and show non-piechart perfdata as well
The perfdata helper did an improper limitation as it might have skipped
valid values due to applying the limit before the filter. When not in compact
view the helper now also shows non-piechart values by using their raw
representation.

refs #6515
2014-07-14 13:48:30 +02:00
Johannes Meyer 5908e9fc70 Do not show pie charts for perfdata values when no percentage is available
refs #6515
2014-07-11 16:32:05 +02:00
Johannes Meyer ec2d1daa6b Perfdata plugin should also have a knowledge about labels
Prior to this change the PerfdataSet only knew the labels of a performance
data value which prevented the Perfdata object from being used
individually.

refs #6515
2014-07-11 16:31:00 +02:00
Johannes Meyer b4dc0f38b3 Fix monitoring backend configuration not showing resource selection fields
fixes #6448
2014-07-10 15:50:52 +02:00
Johannes Meyer 53f3d74103 Fix word wrapping in perfdata labels and values
fixes #6377
2014-07-10 14:54:53 +02:00
Matthias Jentsch b85ac3ab45 Translate labels in the ChartController 2014-07-09 18:13:40 +02:00
Matthias Jentsch 8d697a3d8e Fix coding style 2014-07-09 18:13:40 +02:00
Thomas Gelf 2b05aa9504 monitoring/list: do not apply empty filter
Fixes problems with the servicematrix when no filter is applied.
I'm not yet happy with this, calls to where() should automagically
handle existing empty filters.

fixes #6543
2014-07-08 16:36:05 +02:00
Thomas Gelf 9a6821c860 monitoring/list/hosts: restore page behaviour
The problem here was that an accidentally removed closing div tag in
15325949 caused the application to missbehave badly. Host details where
rendered below the list in some scenarios and the whole multicolumn
thingy started to feel broken.
2014-07-08 15:17:00 +02:00
Johannes Meyer 1950c09478 Remove encoding suffix from locale identifiers
We do not need those as the encoding of a gettext-catalog is already
mentioned in its header.

refs #6602
2014-07-07 09:09:22 +02:00
Thomas Gelf e3b2f15863 list/hosts: show unhandled services righthand
This way we automagically fix the problem with the wrong row links.
I guess we should re-introduce the "row-action" class allowing "precedence"
rules, so also a link not being the first one in a row could act as "row-link".

Changed formatting / text output a little bit, IMO even more cure is needed.

fixes #6645
2014-07-04 18:13:44 +02:00
Matthias Jentsch d2098be625 Only display header when not in compact mode
fixes #6508
2014-07-04 12:45:17 +02:00
Johannes Meyer 7eb0f3c472 Remove @codingStandardsIgnoreStart/-Stop annotations
refs #6091
2014-06-30 13:59:58 +02:00
Matthias Jentsch 9a1b7179e1 Fix violations of coding guidelines 2014-06-30 12:33:51 +02:00
Matthias Jentsch 7fe056d03a Display note when host and service is not found
When the show/host and show/service views do not find a host or service,
don't show a non-working view, but display a error message

fixes #6469
2014-06-30 12:33:51 +02:00
Matthias Jentsch a2fa5c055c Display a message when a list view is empty
fixes #6469
2014-06-30 12:33:51 +02:00
Alexander Klimov 1532594948 Deduplicate code: lists/hosts.phtml VS lists/hosts-compact.phtml
fixes #6541
2014-06-27 11:53:08 +02:00
Thomas Gelf a4fc6dedea monitoring/list: fix limit=0 check
This used to be fixed, but got accidentally re-broken by last commit
this night.
2014-06-26 16:34:37 +02:00
Thomas Gelf a91bbd3a75 monitoring/list: add stateType parameter
This allows one to show only hard states, useful for support dashboards.
2014-06-26 00:42:38 +02:00
Thomas Gelf c85a0ac11e list/limits: special treatment for 0 only, not null 2014-06-26 00:39:10 +02:00
Thomas Gelf d44f89f287 list/hosts: fix downtime icon
I re-enabled host list icons, they have been missing for a while. The
downtime icon logic used to be inverted, this fixes it. Also showing
acknowledgements now even if object is in downtime.
2014-06-25 21:46:03 +02:00
Thomas Gelf ff9c29472e monitoring/status: re-introduce comments, problems
This re-introduces expensive columns been disabled time ago and adds
even more to it. We are now showing last comment, last ack comment and
service problem count on hosts in list views.

It still costs performance, but seems that we can stand it. I'd like
to add more like this to the host view.
2014-06-25 21:42:24 +02:00
Thomas Gelf 86f70e0a4f list/services: don't count with no limit
This is a performance evaluation right now, we might delegate such
logic to paginator later on. Cuts load time for lists and/or dashlets
with complicated filters by 50% - only for those with limit=0 of course.
2014-06-25 20:45:08 +02:00
Matthias Jentsch ae99dd39fd Fix intendation in MultiController
Use spaces instead of tabs
2014-06-25 15:25:54 +02:00
Matthias Jentsch 7b19bd1d99 Improve interface of InlinePie
Method setLabel can also accept a simple string and title is mandatory in constructor
2014-06-25 15:21:12 +02:00
Matthias Jentsch ae4aa9c182 Fix violations of coding guidelines 2014-06-25 15:07:39 +02:00
Matthias Jentsch 85aed364b7 Fix typing error in 'threshold' 2014-06-25 15:02:04 +02:00
Matthias Jentsch 35a5431512 Revert "Refractor InlinePie and Perfdata helper"
This reverts commit f003c38abd.
2014-06-25 14:29:17 +02:00
Matthias Jentsch f003c38abd Refractor InlinePie and Perfdata helper
Refractor InlinePie methods for better usability, fix several coding guideline
issues and fix some typos
2014-06-25 12:41:17 +02:00
Thomas Gelf 4591297e56 SortBox: use POST instead of GET
This avoids trouble with complex filter URLs

fixes #6556
2014-06-25 11:00:10 +02:00
Thomas Gelf b40d0f6a1e FilterWidget: POST instead of GET
Might have been a JS issue, but instead of messing with the URL just
POSTing is easier here - and works. Filters from the search box are
now added flawlessly to the filter tree.
2014-06-25 10:34:09 +02:00
Thomas Gelf 2746b5ff9f ConfigController: switch over to new config tabs
Module configuration now takes place in module detail view and does no
longer pollute our config tabs. Modules are now able to provide a bunch
of own config tabs, we don't really care what they use them for.
2014-06-24 21:31:59 +02:00
Thomas Gelf ccdf1ca354 monitoring/ConfigController: use notifications 2014-06-24 21:28:01 +02:00
Thomas Gelf 2b2901524c ConfigController: useless use of render 2014-06-24 21:24:40 +02:00
Thomas Gelf 532ab60b36 monitoring/show/history: fix html on empty list
This view script used to render broken HTML on empty result
2014-06-24 21:23:51 +02:00
Thomas Gelf f75a4430a6 monitoring/config: make use of Config()
Thee helper function supports lazy loading, requires less code and is
easier to read.
2014-06-24 21:22:38 +02:00
Thomas Gelf d5d3f5548f monitoring/list/hosts: support addcolumns parameter
At least it doesn't fail right now, this only works for services so far.
View script still needs to be adjusted, will probably be done with #6541.
2014-06-24 21:12:55 +02:00
Thomas Gelf 51c57520ad iconSubmitForm: replace with labelSubmitForm
There is no way in ZF to have an input[type=submit] with an unescaped
label ( = value). I temporarily replaced all iconSubmitForms with
inputs labelled with "X" - as all we used them for were delete
operations.
2014-06-23 14:42:26 +02:00
Matthias Jentsch 010466f8f9 Replace sizeof with count
Do not use sizeof to get the length of an array, as the function name 'sizeof'
is misleading
2014-06-23 14:19:55 +02:00
Thomas Gelf d199a8b036 CommandForm: input[type=submit] instead of button
No need for a "button" here. As they have been broken in ZF for
a long while we should better stay with input[type=submit]

fixes #5978
2014-06-23 14:10:15 +02:00
Thomas Gelf 4d42b4d2c4 ScheduleDowntimeForm: replace obsolete ::fromRequest
A serious fix would involve passing the current backend to our
command forms.
2014-06-23 13:35:58 +02:00
Matthias Jentsch bde6e29c61 Display a message instead of empty service matrix
refs #6535
2014-06-23 12:24:27 +02:00
Thomas Gelf 0efd44e1b0 CommandForm: don't clear class
autosubmit class got cleared for no reason after enabling autosubmission.
Please note that the fact that their submission leads to a new form is
another issue.

fixes #6540
2014-06-23 11:27:06 +02:00
Thomas Gelf 23ed744747 params/_render: replace it everywhere
Cleaning up controllers and JS, using headers only and respecting
history.
2014-06-22 20:07:44 +02:00
Thomas Gelf 216f0f3f55 isIframe: clean up, load less html and js
We use isIframe only when we have no JS, therefore it makes no sense
to load JS files in an iFrame. Also removed sidebar.
2014-06-22 16:30:06 +02:00
Thomas Gelf 3b84078b2f Params/_render: get rid of it, start with iframe 2014-06-22 16:18:23 +02:00
Thomas Gelf 2a0e72273a ChartController: use correct ActionController
...and some code cleanup
2014-06-22 14:08:04 +02:00
Thomas Gelf ef5e1b54fd Web\Window: fix it's usage, add helper function
Improved window handling, fixed controllers using it.
2014-06-22 13:21:21 +02:00
Thomas Gelf b03307196a monitoring/list/services: hardcode margin once again 2014-06-21 05:27:10 +02:00
Thomas Gelf 57ad88c38c monitoring/process: was broken, fix it
Stumbled across two issues here:

* It's currently not possible to fetch all (*) columns from a DataView
* Backends are not able to tell their names

Worked around the first issue by naming all columns and implemented a
quick & dirty solution for the second one.
2014-06-21 04:25:02 +02:00
Thomas Gelf 7f53ba11cf Hook\Grapher: use it in monitoring/show 2014-06-21 04:13:14 +02:00
Thomas Gelf 2ab75e1433 SelectionToolbar: temporarily disabled
Doesn't work as multiselect doesn't understand all filters
2014-06-21 03:33:16 +02:00
Thomas Gelf 7b5d7bdbcf monitoring/statehistorysummary: filter fixes
Slightly adjusted filter string to fit new filters, fixed an issue
with 'object_type' column in virtual eventhistory table.
2014-06-21 03:18:00 +02:00
Thomas Gelf b3cdeee35d monitoring/timeline: should benefit from new filter
Different changes have been applied:

* Allow integer unix timestamps as parameters for timestamp columns
* Remove alias-rewriting from Url class
* Remove all traces of raw_timestamp
* Use new filters
2014-06-21 03:09:40 +02:00
Thomas Gelf 66f68f4990 monitoring/config: tab doesn't get focus
Fixes this. Tab handling is rather strange right now and module tabs
will not scale. We need a better solution for the future.

fixes #6320
2014-06-20 23:22:07 +02:00
Thomas Gelf c0c7a815f8 Merge remote-tracking branch 'origin/master' into feature/query-interfaces-6018 2014-06-20 19:18:38 +02:00
Thomas Gelf 6d7a1cfe08 list/services: remove hardcoded margin 2014-06-20 19:12:46 +02:00
Thomas Gelf 127b728a4c list/notifications: fix query, select columns, style 2014-06-20 19:12:10 +02:00
Thomas Gelf e170c889d2 monitoring/CommandForm: remove obsolete classes 2014-06-20 14:24:32 +02:00
Thomas Gelf fb18de1f42 monitoring\CommandController: use new filters 2014-06-20 14:22:48 +02:00
Thomas Gelf f80b951cec monitoring/ShowController: remove obsolete function 2014-06-20 14:21:29 +02:00
Thomas Gelf a8bde7cc14 monitoring/show/services: do not limit result
Still a little bit hackish, we will replace this once we have a request
object fully aware of our new UrlParams parser.

fixes #6511
2014-06-20 14:16:36 +02:00
Thomas Gelf 4821c6e3e5 monitoring/show/history: use limiter, nicer output 2014-06-20 14:02:03 +02:00
Thomas Gelf 65db5c4acc list/services: move filterEditor to content
As it may occupy quite some space it is better having it scrollable
2014-06-20 13:50:25 +02:00
Thomas Gelf 1bddcd7282 list/hosts,services: use limiter widget 2014-06-20 13:49:50 +02:00
Thomas Gelf f4b7075293 monitoring/multi: view script cleanup
They now play fine with new filters, tried to improve usability
2014-06-20 13:46:09 +02:00
Thomas Gelf f2c67ea047 MultiControllers: use new filters
This makes things easier, no more nested lists - just filters easy
to read and understand
2014-06-20 13:38:58 +02:00
Thomas Gelf 255accb215 monitoring/MultiController: use correct controller 2014-06-20 13:35:25 +02:00
Thomas Gelf 371b66bd8b monitoring\ListController: handle filter editing
Handle filter modifications in one place. We still should try to
abstract this on step farther.
2014-06-20 13:26:10 +02:00
Thomas Gelf 0642c9d33c monitoring/list/hosts: filter-related cleanup 2014-06-20 13:24:32 +02:00
Thomas Gelf 5dfd4aedac monitoring/downtime: add missing ticket hook
We used to have this when showing comments, but not for downtimes.
2014-06-20 12:37:09 +02:00
Matthias Jentsch aae49ce0c0 Do not show tooltips for piechart areas that indicate empty or free areas
refs #6117
2014-06-18 17:38:25 +02:00
Matthias Jentsch 6555d347a7 Escape InlinePie html and adjust chart size
fixes #6117
2014-06-18 14:43:14 +02:00
Matthias Jentsch be0c5d4b23 Add more meaningful tooltip labels to InlinePies
Show current title, a well-formated value and a label for each area in a
tooltip and add the ability to customize tooltip labels of InlinePies

refs #6117
2014-06-18 14:43:14 +02:00
Thomas Gelf 21febddad2 Widget\Filter*: rudimentary filter widgets
Initial implementation, more to come
2014-06-17 14:00:38 +00:00
Thomas Gelf a53f589a6b monitoring/controllers: filter-related cleanup 2014-06-17 13:48:26 +00:00
Thomas Gelf 1a91f0369e list/servicematrix: adjust URLs to fit new filters 2014-06-17 13:37:29 +00:00
Thomas Gelf ef4403f204 monitoring/show/history: make it look better
Supporting newly implemented history states (comment removal...),
prepare for translation, better styling.
2014-06-17 13:32:12 +00:00
Thomas Gelf 517894d86f show/header.phtml: try to look like other states 2014-06-17 13:22:52 +00:00
Thomas Gelf a42b66ab14 monitoring/show/services: QUERY_STRING voodoo
Looks less ugly than before, still ugly nonetheless. Will be better
once we care about request routing by ourselves.
2014-06-17 13:17:13 +00:00
Thomas Gelf 304c7d146b monitoring/show/history: pagination count
Fixes it as it didn't work, raised default row count to 50
2014-06-17 13:14:58 +00:00
Thomas Gelf 3ccfe347f3 Monitoring\Object: replace fromRequest with params
This is only a temporary solution, the Monitoring\Object should be
fetched from the backend created in our front controller.
2014-06-17 13:10:54 +00:00
Thomas Gelf 0ecd527e8c monitoring/list: make use of new params
This brings our lists back to life and makes our filters work again.
2014-06-17 13:05:18 +00:00
Thomas Gelf 58d4ddcb4c monitoring/list: no need to declare $this->backend
This happens in the monitoring base controller right now
2014-06-17 13:03:05 +00:00
Thomas Gelf d2ccc68214 Merge remote-tracking branch 'origin/master' into feature/query-interfaces-6018
Conflicts:
	modules/monitoring/application/controllers/ListController.php
2014-06-17 09:47:14 +00:00
Thomas Gelf 97c55d8dad monitoring/list: clean up and fit new filters
refs #6418
2014-06-06 07:37:37 +00:00
Marius Hein defa02a609 Debug: Remove garbage statement for debug purposes 2014-06-06 09:28:46 +02:00
Thomas Gelf 3adf7752c4 Data\Db\DbQuery: rename also in monitoring module
refs #6418
2014-06-06 06:51:11 +00:00
Thomas Gelf bfe6a1593a Merge remote-tracking branch 'origin/master' into feature/query-interfaces-6018 2014-06-06 05:32:54 +00:00
Thomas Gelf c592236258 vendorlibs: library/vendor to libary/IcingaVendor
This doesn't make it much better but allows to build a package
libicinga-vendor-php placing those files to /usr/share/php/IcingaVendor
or similar.

refs #4075
2014-06-05 00:10:49 +00:00
Carlos Cesario 76a9e67e35 Added initial pt_BR translation
fixes #6395

Signed-off-by: Thomas Gelf <thomas@gelf.net>
2014-06-04 22:08:13 +00:00
Thomas Gelf d66055bce2 CLI/monitoring/list: fix formatting-related error
Small fix, this got broken by language-related changes in a66a1a47.
2014-06-04 21:25:26 +00:00
Marius Hein 29f593a357 Authentication: Add backend to handle external authentication
Drop external auth configuration from config.ini and move
implementation into a single backend provider named
'autologin'. This provider can strip realm names from
username with a custom regexp.

fixes #6081
2014-06-03 17:59:22 +02:00
Gunnar Beutner a66a1a4729 Refactor the timeSincePrefix and timeUntilPrefix functions
Instead of having two separate functions to get the prefix
and the formatted time interval the new functions return
both the prefix and the time interval.

refs #5981
2014-05-29 13:03:10 +02:00
Gunnar Beutner 7b0a48bef5 Rename timeUnless to timeUntil
refs #5981
2014-05-29 12:38:59 +02:00
Gunnar Beutner d01a98b7e6 Fix some of the time-related grammar mistakes
This updates some of the messages to use "For"
instead of "Since" where appropriate.

fixes #5981
2014-05-29 11:30:08 +02:00
Thomas Gelf f790e0c323 Translation: keep translation domain with partial
We should try to avoid partial and pass translation domain where forced
to use it.

refs #6338
2014-05-27 22:20:21 +00:00
Thomas Gelf 7b58134378 show/history: sorry, typo 2014-05-27 22:16:45 +00:00
Thomas Gelf 3ae4f762d8 Translation: initial German translation
refs #6340
2014-05-27 21:50:16 +00:00
Thomas Gelf cfa0251dbf Translation: another bunch of translatable strings
refs #6339
2014-05-27 21:47:13 +00:00
Thomas Gelf b47cec3e02 Translation: use translation for monitoring/views
Just a bunch of translation-helper calls

refs #6339
2014-05-27 21:44:02 +00:00
Thomas Gelf 40e45a2a39 monitoring/lists: Don't render unexistant controls
Even PHP code in HTML comments will be executed. As the filter object
sometimes failes, this can result in an invisible "breaking" exception.

refs #6031
2014-05-26 14:57:18 +00:00
Thomas Gelf 12b57c6d95 Merge remote-tracking branch 'origin/master' into feature/query-interfaces-6018
Conflicts:
	modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php
	modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
	modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
	modules/monitoring/library/Monitoring/Controller.php
2014-05-20 23:15:11 +00:00
Thomas Gelf 79f3b32474 monitoring/viewscripts: avoid errors in comments
PHP code may cause errors even if sitting in HTML comments. Also fixed a
HTML nesting error in list/servicematrix and reduced indentation.
2014-05-20 22:26:21 +00:00
Michael Friedrich d155c7a3fc Fix checks for empty check source attribute
refs ##5814
2014-05-20 23:46:33 +02:00
Michael Friedrich ef2ac077c8 Fix typo in flapping note 2014-05-20 23:45:48 +02:00
Thomas Gelf 941ff2a980 monitoring/show: remove CheckSource helper
It isn't doing anything but escape, so we can safely skip it.
2014-05-20 20:39:02 +00:00
Michael Friedrich 9fbdb65a4b Add check source to host/service details
refs #5814
2014-05-20 20:07:09 +02:00
Thomas Gelf cff577fb83 ShowController: don't show a random service
When you chose a host and clicked on "Services" the GUI used to show
a random (the first) service. Made no sense, should work as expected
right now.
2014-05-20 13:57:28 +00:00
Thomas Gelf 8f77ce607e show/services: don't navigate to the right
When using list/services for show/services (services for a single host)
we us an ugly PREG-based hack fixing the base link target. This got
broken by the multiselect feature, now it's working again. We need a
better solution for this.
2014-05-20 13:53:36 +00:00
Thomas Gelf 33e326a232 list/services: ignore broken service image hacks
People used to configure something like "dot.png'> <img ..." as their
service image icon. Those hacks will no longer work as we correctly
escape everything. This fix hinders Icingaweb from even trying to load
them.
2014-05-20 13:31:13 +00:00
Thomas Gelf 339460fee4 Merge remote-tracking branch 'origin/master' into feature/query-interfaces-6018 2014-05-09 16:29:54 +00:00
Thomas Gelf 6523af711c Monitoring_ListController: autorefresh matrix...
...and notification views

fixes #6152
2014-05-09 16:01:47 +00:00
Thomas Gelf d93c060e6a Upgrade htmlpurifier to 4.6.0
refs #6165
2014-05-09 10:41:20 +00:00
Thomas Gelf e04ca8c29a Merge remote-tracking branch 'origin/master' into feature/query-interfaces-6018 2014-05-07 15:53:48 +00:00
Matthias Jentsch d0c56126b8 Fix inline pie reload.
refs #6124
2014-05-07 17:03:27 +02:00
Thomas Gelf 820b6b7a8d Data\BaseQuery: rename to Data\SimpleQuery
BaseQuery should no longer be abstract but be usable as is as soon as
we stripped ResultSet-specific tasks. As "Base" suggests something that
must be extended, the name no longer fits. So this is SimpleQuery right
now.
2014-05-07 11:55:35 +00:00
Eric Lippmann bc4783099a Monitoring/ListController: Sort `hostStatus' view from request params
The `hostAction()' lacked ordering because the action no longer uses `HostStatusView::fromRequest()'.
2014-05-07 10:25:48 +02:00
Eric Lippmann 068e07109b Monitoring/ListController: Operate on the `hostStatus' view instead of the query
The monitoring module's ListController should only operate on data views instead of queries.
Thus the applyRestrictions() method now expects a data view instead of a query. Further since
filters are subject to change the applyRestrictions() method now does nothing.

The `hostsAction()' no longer uses `DataView::fromRequest()' but selects the data view from
a monitoring backend. `DataView::fromRequest()' orders the underlying query which must be reworked
in the current scenario.
2014-05-07 09:40:23 +02:00
Eric Lippmann cfdb695c94 Monitoring/ListController: Remove variable activeRowHref from view
The variable grapher activeRowHref is not being used anywhere.
2014-05-07 09:29:58 +02:00
Eric Lippmann 3afcf277bd Monitoring/ListController: Remove variable grapher from view
The variable grapher retrieved as first available grapher hook is not being
used anywhere.
2014-05-07 09:27:42 +02:00
Johannes Meyer 0627d954ac Fix usages of Icinga\Module\Monitoring\Plugin\*
refs #5973
2014-05-05 16:16:45 +02:00
Gunnar Beutner b7f4fa4a29 Fix deprecation warning in Perfdata.php
fixes #6076
2014-04-29 12:00:34 +02:00
Johannes Meyer e2ba172a8e Make dashboard components using the ini writer class
fixes #5524
2014-04-29 11:30:53 +02:00
Johannes Meyer 290fe9eeb5 Rewrite test for Icinga\Web\Hook
refs #6011
2014-04-28 14:06:40 +02:00
Johannes Meyer 1db9b1ede4 Move non-factory functions from DateTimeFactory to Icinga\Util\Format 2014-04-28 14:06:39 +02:00
Matthias Jentsch c641988233 Preserve multiselection during refresh
refs #5765
2014-04-28 09:48:06 +02:00
Matthias Jentsch b791883fa8 Fix configuration checkboxes and colors in piecharts
refs #5765
2014-04-28 09:48:06 +02:00
Matthias Jentsch b16c6efa05 Add PieChart to display hosts and services, improve layout and fix flag
checkboxes

refs #5765
2014-04-28 09:48:06 +02:00
Matthias Jentsch 081b5072a6 Fix layout of MultiController views
refs #5765
2014-04-28 09:48:06 +02:00
Matthias Jentsch cb630d45ad Fix issues issues with javascript multiselection
refs #5765
2014-04-28 09:48:05 +02:00
Matthias Jentsch 3b2bb3c4fc Move functions to perform single, multi and range-selection into the ui module
refs #5765
2014-04-28 09:48:05 +02:00
Matthias Jentsch 6d303f1c42 Add abillity for multi and range-selection to events.js
Add the abillity to select multiple rows, with a multi-selection using the
CTRL-key or a range-selection using the shift-key. Also fix several issues in
the Multi-Controller of the Backend.

refs #5765
2014-04-28 09:48:05 +02:00
Johannes Meyer 139023571f Fix exception on 404 in monitoring/show/ 2014-04-09 08:44:51 +02:00
Johannes Meyer ae2d61682f Fix how the timeline processes dates
refs #4190
2014-04-02 10:53:39 +02:00
Johannes Meyer 21b9c1f4af Fix that filters are not preserved on timeline element urls
refs #4190
2014-04-01 14:26:10 +02:00
Johannes Meyer 2049e42988 Show a horizontal line when the timeline switches its context
refs #4190
2014-04-01 11:46:44 +02:00
Johannes Meyer 80b4e3bf33 Add infinite scrolling to the timeline
refs #4190
2014-04-01 11:46:44 +02:00
Johannes Meyer 14ed3b6fe2 Fix that the timeline does not accept timestamps as start and end
refs #4190
2014-04-01 11:46:44 +02:00
Johannes Meyer c94cd40b92 Center timeframe elements vertically
refs #4190
2014-04-01 11:46:44 +02:00
Johannes Meyer e3be5dd255 Restructure timeline layout and styles
refs #4190
2014-04-01 11:46:44 +02:00
Johannes Meyer 8e7d1dd8f6 Improve timeline style
refs #4190
2014-04-01 11:46:44 +02:00
Johannes Meyer 3d658a664c Do not use logarithm base from session if the timeline is not being extended
refs #4190
2014-04-01 11:46:43 +02:00
Johannes Meyer f7c6cd3c2a Make it possible to set a minimum circle width
refs #4190
2014-04-01 11:46:43 +02:00
Johannes Meyer f5e4331d71 Add timeline view script and styles
refs #4190
2014-04-01 11:46:43 +02:00
Johannes Meyer 66c3dd26e5 Be window aware when calculating circle widths
refs #4190
2014-04-01 11:44:25 +02:00
Johannes Meyer 5d86eab8c4 Do not register context switch on first load
refs #4190
2014-04-01 11:44:25 +02:00
Johannes Meyer 18b5f715c5 Refactor timeline components
refs #4190
2014-04-01 11:44:25 +02:00
Johannes Meyer b22f3f6b47 The timeline object is NOT a form
refs #4190
2014-04-01 11:44:24 +02:00
Johannes Meyer 5e945e3194 Make interval selection being a widget
refs #4190
2014-04-01 11:44:24 +02:00
Johannes Meyer aade2ab7f6 Move timeline classes into the monitoring module
refs #4190
2014-04-01 11:44:24 +02:00
Johannes Meyer 0a146b4bb4 Clientside scrolling implementation [WIP]
refs #4190
2014-04-01 11:44:24 +02:00
Johannes Meyer 25f4b50ce7 Implement timeline rendering
refs #4190
2014-04-01 11:44:24 +02:00
Johannes Meyer 8e65fc7281 Fix some bugs in the TimelineController
refs #4190
2014-04-01 11:44:24 +02:00
Johannes Meyer 40f70eb572 Fix license header
refs #4190
2014-04-01 11:44:24 +02:00
Johannes Meyer a589460de3 Make TimeEntry creation more flexible
TimeEntry objects are now created with the fromArray
constructor instead of the default one.

refs #4190
2014-04-01 11:44:23 +02:00
Johannes Meyer f93d67dfa3 Add timeline controller
refs #4190
2014-04-01 11:44:23 +02:00
Thomas Gelf 41617e8119 Change forgotten title 2014-03-27 11:16:43 +00:00
Thomas Gelf 8d29620350 Rename state history links 2014-03-27 09:47:52 +00:00
Matthias Jentsch 15723f088b Include SVG piecharts in perfData helpers
When no JavaScript is available, SVG piecharts will be shown instead of the
jQuery sparklines.

fixes #5865
2014-03-26 14:56:35 +01:00
Thomas Gelf 04cab7e0f8 Fix action target for downtime removal 2014-03-25 08:45:51 +00:00
Thomas Gelf 842c29e0d0 Fix form area widths 2014-03-25 08:05:53 +00:00
Thomas Gelf 851bea0725 One more _self-targetting form 2014-03-25 08:03:12 +00:00
Thomas Gelf d4ccc68eab Remove sample graphite preview, should not have been pushed to master 2014-03-25 07:21:46 +00:00
Thomas Gelf b5b4d276d1 Add more structure to host and service details 2014-03-21 18:56:55 +00:00
Thomas Gelf f24e5eaa8a Stay on the same column when switching between services of the same host 2014-03-21 10:30:12 +00:00
Thomas Gelf 8a7ac587d9 Get rid of hardcoded target for action-tables 2014-03-21 10:27:46 +00:00
Thomas Gelf 4378282e9f Show additional custom columns in services list 2014-03-21 10:25:48 +00:00
Thomas Gelf 99041d0f15 Prepare support for custom additional columns 2014-03-21 10:24:17 +00:00
Thomas Gelf 122f39eed9 Improve command submission notification messages 2014-03-20 16:34:35 +00:00
Thomas Gelf 9517824b41 Better form target settings for more comfort 2014-03-20 16:33:06 +00:00
Thomas Gelf 3be2834af7 "Check now" should stay in the same container 2014-03-20 15:42:24 +00:00
Johannes Meyer bf717654f0 Add more consistency to the servicematrix when switching pages 2014-03-20 11:30:55 +01:00
Johannes Meyer aa6d6b1d41 Make servicematrix x-axis header titles linking to filtered servicelist 2014-03-20 09:41:41 +01:00
Johannes Meyer 44950ea570 Fix servicematrix styling issues in firefox and ie 2014-03-20 09:22:29 +01:00
Michael Friedrich 4ce7ea503f Rename help and documentation to icingacli.
Refs #5802
2014-03-19 17:25:53 +01:00
Johannes Meyer e9ec87b0e3 Refine styling of the servicematrix
refs #4180
2014-03-19 09:11:25 +01:00
Johannes Meyer 0227c6a49d Fix hosts without services being displayed in the servicematrix
refs #4180
2014-03-19 09:11:25 +01:00
Johannes Meyer c73928d7a8 Add pagination control to the servicematrix
refs #4180
2014-03-19 09:11:25 +01:00
Johannes Meyer 617b6822d7 Add pagination support to the servicematrix
refs #4180
2014-03-19 09:11:24 +01:00
Johannes Meyer 13b509bf4b Do not display hosts without any services in the servicematrix
refs #4180
2014-03-19 09:11:24 +01:00
Johannes Meyer 0a5c2c5bd7 Make filtering/sorting of the servicematrix work
refs #4180
2014-03-19 09:11:24 +01:00
Johannes Meyer 71f4b6960b Add servicematrix view
refs #4180
2014-03-19 09:11:24 +01:00
Thomas Gelf 5dd06d8132 Host detail view should also point to _next 2014-03-17 16:36:38 +00:00
Thomas Gelf e0c93d6ca7 JS cleanup
* Precedence rules: skip autorefresh if click is pending
* Clean up the attr VS data mess
* More steps towards a column-count-ignorant GUI
2014-03-17 17:10:03 +01:00
Thomas Gelf 47eff0e365 Removing luckily unused output-buffering trim helper 2014-03-17 16:26:52 +01:00
Alexander Klimov 5c3df3db15 Handle not readable monitoring config files more intelligent 2014-03-13 15:54:27 +01:00
Alexander Klimov fbd354fa55 Small view changes 2014-03-12 11:22:20 +01:00
Alexander Klimov 5c0441bc06 Re-design configuration interface 2014-03-11 17:13:42 +01:00
Alexander Klimov f1dcc4c15e Merge branch 'master' of git.icinga.org:icingaweb2 2014-03-11 15:44:08 +01:00
Alexander Klimov 7d08636af4 Handle missing config files more intelligent 2014-03-11 15:43:41 +01:00
Johannes Meyer e291974e55 Refine tactical overview style 2014-03-10 15:09:53 +01:00
Thomas Gelf 448d7c1a8d Fix PDF output wherever it works, disable dead filter control 2014-03-10 01:24:45 +01:00
Thomas Gelf e3fbacfc4a Add missing command notifications 2014-03-10 00:56:55 +01:00
Thomas Gelf e54c91c2f7 Restyle process info and shorten performance info 2014-03-10 00:49:21 +01:00
Thomas Gelf 5962fd71d0 Fix erranous table row title 2014-03-10 00:48:23 +01:00
Thomas Gelf 62ff31d4ee Downtimes could look better, HTML still missing 2014-03-09 22:59:49 +01:00
Thomas Gelf ad432217b2 Fix downtime scheduled start/end sort error 2014-03-09 22:35:33 +01:00
Thomas Gelf bf66271e49 Still downtimes 2014-03-09 22:32:40 +01:00
Thomas Gelf 88859cb838 The next fat package: downtimes, everywhere 2014-03-09 21:58:01 +01:00
Thomas Gelf 2f8c6a37d3 Spacing, quick and dirty 2014-03-09 20:09:26 +01:00
Thomas Gelf 2f61075260 More comment query cleanup and fix a typo 2014-03-09 20:05:59 +01:00
Thomas Gelf 2c3da5969a Great, sortControl is not alias-aware. Fix comment sort options 2014-03-09 19:39:32 +01:00
Thomas Gelf a270eb2270 Autorefresh commments list 2014-03-09 19:31:59 +01:00
Thomas Gelf 63fd074a4f Comments are still messy, clean up and fix adding / removing them 2014-03-09 19:29:23 +01:00
Thomas Gelf c7d3b38739 Comment list style 2014-03-09 18:02:12 +01:00
Michael Friedrich e947b4363b System->Performance: Add RuntimeVariables view helper for 'average_{,scheduled_}services_per_host' calculation. 2014-03-09 16:38:55 +01:00
Thomas Gelf 54162d9538 Fine-tune commment list 2014-03-09 13:41:31 +01:00
Thomas Gelf 6bea9e8b43 Style comment list 2014-03-09 12:10:05 +01:00
Thomas Gelf 7202e13837 Link to filtered contact group list unless we have show/contactgroup 2014-03-09 11:26:57 +01:00
Thomas Gelf 4d48f4fb0e Filter form restyle dirty preview 2014-03-09 02:03:06 +01:00
Thomas Gelf e6fc6375b5 Refactor acknowledgements, finally get rid of status component 2014-03-08 21:28:32 +01:00
Thomas Gelf a87925bbf6 Refactored notifications for object detail view 2014-03-08 21:02:22 +01:00
Thomas Gelf c41160405d Dedicated view script for object actions 2014-03-08 19:49:57 +01:00