bb7972aa39
Merge branch 'master' into bugfix/rebuild-form-builder-5525
...
Conflicts:
application/controllers/AuthenticationController.php
application/controllers/ConfigController.php
application/forms/Authentication/LoginForm.php
application/forms/Preference/GeneralForm.php
modules/monitoring/application/controllers/ChartController.php
2014-08-20 13:13:50 +02:00
bb65fb396a
Merge branch 'bugfix/sensitive-custom-vars-6641'
...
fixes #6641
2014-08-20 12:29:45 +02:00
4ceecf1146
Let comment view look more standardized and add limit control
...
refs #6637
2014-08-20 11:34:24 +02:00
071937910b
Monitoring/Object: filter protected customvars
...
Move the responsibility from the viewscript to Monitoring/Object
refs #6641
2014-08-19 18:46:37 +02:00
ea0248ecf4
Remove '{{SAVE_ICON}}', tiny design fixes
...
refs #6641
2014-08-19 17:54:22 +02:00
3573908071
Let downtime view look more list-like and fix downtime end calculation
...
refs #6637
2014-08-19 17:03:35 +02:00
65473ac8ee
Monitoring config: use SecurityForm
...
refs #6641
2014-08-19 14:04:00 +02:00
0464099764
Monitoring: implement "Security" config tab
2014-08-19 11:19:30 +02:00
332be22f7e
Fix object history dates make output look similar to the event history
...
refs #6637
2014-08-18 15:32:12 +02:00
bbddb9ed87
Add limit-control and fix indentation of the eventhistory view
...
refs #6637
2014-08-18 15:30:59 +02:00
043688e514
Make event history view more fancier
...
refs #6637
2014-08-15 17:03:03 +02:00
cae84a5d7f
Fix float formatting of timeline circle margins and widths
...
fixes #6926
2014-08-15 13:39:02 +02:00
dc8181cdc5
Escape linefeeds and carriage returns in commands and show them as html
...
fixes #6088
2014-08-14 10:23:04 +02:00
b5d6481c12
Make it possible to translate the process info view
...
refs #6610
2014-08-13 15:52:33 +02:00
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
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
a78d11345b
Adjust createbackend-action to suit the new backend form interface
...
refs #5525
2014-07-25 15:58:44 +02:00
b743cf8143
Adjust editbackend-action to suit the new backend-form interface
...
refs #5525
2014-07-25 14:55:36 +02:00
a4b7204e23
Contactgroups view: correct links to contacts detail pages
...
fixes #6514
2014-07-23 13:10:09 +02:00
a2809552f2
Do not use htmlspecialchars in view scripts
...
fixes #6759
2014-07-23 12:41:05 +02:00
9269a0cbd5
Revert "Do not use htmlspecialchars in view scripts"
...
This reverts commit 607aa9b203
2014-07-23 12:29:27 +02:00
607aa9b203
Do not use htmlspecialchars in view scripts
...
fixes #6759
2014-07-23 12:12:49 +02:00
cb27a3d0f1
Do not use height and width in bar charts, to avoid layout errors
2014-07-22 17:57:40 +02:00
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
f9a274d079
Add contact detail view
...
refs #4804
refs #6514
2014-07-18 17:35:24 +02:00
882699201d
Contacts: replace foreach loop with hardcoded HTML and move the styles to a CSS file
2014-07-17 17:33:45 +02:00
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
b23e36aa1a
Swap array keys and values
...
Non-hardcoded keys may be not unique
2014-07-16 17:54:06 +02:00
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
1ad263170e
Revert "Small fixes"
...
This reverts commit 8086292b1b
2014-07-16 15:30:20 +02:00
cb04c42bab
Use htmlspecialchars to prevent attacks
2014-07-16 13:10:28 +02:00
8086292b1b
Small fixes
2014-07-15 18:00:52 +02:00
4c415aac5c
Make contacts' view look more like contactgroups' view
2014-07-15 16:17:02 +02:00
3105c2059e
Remove license headers from all files
...
refs #6309
2014-07-15 13:43:52 +02:00
d021ddebee
Make contacts' view work like the downtimes' one
...
fixes #6513
2014-07-15 10:47:12 +02:00
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
5908e9fc70
Do not show pie charts for perfdata values when no percentage is available
...
refs #6515
2014-07-11 16:32:05 +02:00
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
53f3d74103
Fix word wrapping in perfdata labels and values
...
fixes #6377
2014-07-10 14:54:53 +02:00
9a6821c860
monitoring/list/hosts: restore page behaviour
...
The problem here was that an accidentally removed closing div tag in
15325949
2014-07-08 15:17:00 +02:00
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
d2098be625
Only display header when not in compact mode
...
fixes #6508
2014-07-04 12:45:17 +02:00
7eb0f3c472
Remove @codingStandardsIgnoreStart/-Stop annotations
...
refs #6091
2014-06-30 13:59:58 +02:00
9a1b7179e1
Fix violations of coding guidelines
2014-06-30 12:33:51 +02:00
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
a2fa5c055c
Display a message when a list view is empty
...
fixes #6469
2014-06-30 12:33:51 +02:00
1532594948
Deduplicate code: lists/hosts.phtml VS lists/hosts-compact.phtml
...
fixes #6541
2014-06-27 11:53:08 +02:00
c85a0ac11e
list/limits: special treatment for 0 only, not null
2014-06-26 00:39:10 +02:00
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
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
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
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
ae4aa9c182
Fix violations of coding guidelines
2014-06-25 15:07:39 +02:00
85aed364b7
Fix typing error in 'threshold'
2014-06-25 15:02:04 +02:00
35a5431512
Revert "Refractor InlinePie and Perfdata helper"
...
This reverts commit f003c38abd
2014-06-25 14:29:17 +02:00
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
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
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
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
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
bde6e29c61
Display a message instead of empty service matrix
...
refs #6535
2014-06-23 12:24:27 +02:00
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
b03307196a
monitoring/list/services: hardcode margin once again
2014-06-21 05:27:10 +02:00
7f53ba11cf
Hook\Grapher: use it in monitoring/show
2014-06-21 04:13:14 +02:00
2ab75e1433
SelectionToolbar: temporarily disabled
...
Doesn't work as multiselect doesn't understand all filters
2014-06-21 03:33:16 +02:00
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
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
c0c7a815f8
Merge remote-tracking branch 'origin/master' into feature/query-interfaces-6018
2014-06-20 19:18:38 +02:00
6d7a1cfe08
list/services: remove hardcoded margin
2014-06-20 19:12:46 +02:00
127b728a4c
list/notifications: fix query, select columns, style
2014-06-20 19:12:10 +02:00
e170c889d2
monitoring/CommandForm: remove obsolete classes
2014-06-20 14:24:32 +02:00
4821c6e3e5
monitoring/show/history: use limiter, nicer output
2014-06-20 14:02:03 +02:00
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
1bddcd7282
list/hosts,services: use limiter widget
2014-06-20 13:49:50 +02:00
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
0642c9d33c
monitoring/list/hosts: filter-related cleanup
2014-06-20 13:24:32 +02:00
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
aae49ce0c0
Do not show tooltips for piechart areas that indicate empty or free areas
...
refs #6117
2014-06-18 17:38:25 +02:00
6555d347a7
Escape InlinePie html and adjust chart size
...
fixes #6117
2014-06-18 14:43:14 +02:00
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
21febddad2
Widget\Filter*: rudimentary filter widgets
...
Initial implementation, more to come
2014-06-17 14:00:38 +00:00
1a91f0369e
list/servicematrix: adjust URLs to fit new filters
2014-06-17 13:37:29 +00:00
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
517894d86f
show/header.phtml: try to look like other states
2014-06-17 13:22:52 +00:00
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
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
7b0a48bef5
Rename timeUnless to timeUntil
...
refs #5981
2014-05-29 12:38:59 +02:00
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
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
7b58134378
show/history: sorry, typo
2014-05-27 22:16:45 +00:00
b47cec3e02
Translation: use translation for monitoring/views
...
Just a bunch of translation-helper calls
refs #6339
2014-05-27 21:44:02 +00:00
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
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
d155c7a3fc
Fix checks for empty check source attribute
...
refs ##5814
2014-05-20 23:46:33 +02:00
ef2ac077c8
Fix typo in flapping note
2014-05-20 23:45:48 +02:00
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
9fbdb65a4b
Add check source to host/service details
...
refs #5814
2014-05-20 20:07:09 +02:00
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
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
d93c060e6a
Upgrade htmlpurifier to 4.6.0
...
refs #6165
2014-05-09 10:41:20 +00:00
Johannes Meyer
Alexander Klimov
Eric Lippmann
Matthias Jentsch
Thomas Gelf
Matthias Jentsch
Gunnar Beutner
Michael Friedrich