Commit Graph

451 Commits

Author SHA1 Message Date
Eric Lippmann 051c9691a9 Remove "WTF" comment 2014-09-23 22:18:06 -07:00
Alexander Fuhr 07a4b25560 Merge branch 'master' into bug/history-notification-time-format-6980 2014-09-23 11:38:24 +02:00
Alexander Fuhr e784aa34b6 Implement DateTimeRenderer and fix history time format
refs #6980
2014-09-23 11:36:09 +02:00
Matthias Jentsch 6c8f324dd4 Add filter widget to StateHistorySummary and fix some minor bugs
fixes #6979
2014-09-19 17:41:44 +02:00
Matthias Jentsch 7385be06ea Move SelectBoxes into form 2014-09-19 17:41:44 +02:00
Matthias Jentsch 65203fddcf Add additional state history filters for time interval and event type 2014-09-19 17:41:44 +02:00
Eric Lippmann 274f2e7410 monitoring/commands: Fix remove commands in the list comments and list downtimes views
refs #6593
2014-09-19 14:34:42 +02:00
Eric Lippmann 8afdc3db1a monitoring: Replace show partials calls to getHost() and getService() with getName() 2014-09-17 09:48:30 +02:00
Eric Lippmann 5cdcf36243 monitoring: Add HostController's show action view script 2014-09-17 09:46:42 +02:00
Eric Lippmann 0e6e37199a monitoring/commands: Add 'command-form' partial
refs #6593
2014-09-16 17:28:00 +02:00
Eric Lippmann 8bf66425d1 Merge branch 'master' into bugfix/commands-6593 2014-09-15 09:27:56 +02:00
Eric Lippmann 9e0d6657b7 Merge branch 'bugfix/rebuild-form-builder-5525' into bugfix/commands-6593
Conflicts:
	application/forms/Preference/GeneralForm.php
2014-09-15 09:27:07 +02:00
Eric Lippmann 9b5c1f06d0 monitoring/commands: Let detail snippets use the new command forms
refs #6593
2014-09-12 16:52:45 +02:00
Eric Lippmann 17e04e9937 monitoring: Point service's detail to the new `ServiceController' in the services list view
refs #6593
2014-09-12 16:51:18 +02:00
Eric Lippmann 5d07b04f82 monitoring/commands: Introduce `ServiceController'
refs #6593
2014-09-12 16:50:42 +02:00
Eric Lippmann 5f13db73ce monitoring/commands: Use the toggle instance features command form in the process controller
refs #6593
2014-09-12 16:46:07 +02:00
Alexander Fuhr 3615b96093 Fix Incorrect plural form in host overview
fixes #7172
2014-09-11 15:46:23 +02:00
Johannes Meyer 83772c6684 Merge branch 'master' into bugfix/rebuild-form-builder-5525 2014-09-09 16:03:22 +02:00
Eric Lippmann 0e7ca591ec Merge branch 'master' into bugfix/commands-6593
Conflicts:
	application/forms/Preference/GeneralForm.php
	application/views/helpers/FormDateTime.php
	modules/monitoring/application/forms/Command/CommandForm.php
2014-09-08 10:16:05 +02:00
Matthias Jentsch e39dd64a1b Fix layout of HistoryColorGrid
Use actual color for critical hosts and only display the first two letters of the weekday
2014-09-08 09:52:28 +02:00
Gunnar Beutner 7d623fdfe3 Fix spelling mistake: Unandled -> Unhandled 2014-09-05 23:42:49 +02:00
Thomas Gelf adab58e769 list/statehistorysummary: fix filter links 2014-09-05 18:38:56 +02:00
Thomas Gelf 22b3b0e46a list/hosts: no time for pending, state on dashboard 2014-09-05 18:36:56 +02:00
Thomas Gelf d1dae46fae show/history: link notification contacts, show state 2014-09-05 18:20:35 +02:00
Thomas Gelf fe6a1b1f0f list/notifications: don't show contact...
...when showing notifications for a single contact, other cleanup.

refs #7104
2014-09-05 18:16:59 +02:00
Thomas Gelf 48f49c56b2 show/contact: first attempt to restyle them
refs #7104
2014-09-05 18:16:59 +02:00
Thomas Gelf 6689fabb1e show/services: use new services summary
refs #6993
2014-09-05 18:01:34 +02:00
Thomas Gelf 66dba8b98d show/host: use new host services summary
refs #6993
2014-09-05 18:00:26 +02:00
Thomas Gelf 4da3f55cd9 component/hostservicesummary: initial commit
refs #6993
2014-09-05 17:58:48 +02:00
Thomas Gelf 315c2a6e51 list/comments: fix PHP warning 2014-09-05 17:54:09 +02:00
Thomas Gelf d4d3c776a5 list/services: use new snippet, cleanup HTML
refs #6993
2014-09-05 17:43:13 +02:00
Thomas Gelf 65b2a25fd6 list/components/servicesummary: show state summary
refs #6993
2014-09-05 17:41:53 +02:00
Johannes Meyer 439d1895a7 Adjust Monitoring\BackendForm to use handleRequest() & Co.
refs #5525
2014-09-04 11:25:47 +02:00
Johannes Meyer 9d66cc9023 Adjust Monitoring\InstanceForm to use handleRequest() & Co.
refs #5525
2014-09-04 08:47:16 +02:00
Johannes Meyer fb5685bac3 Merge branch 'master' into bugfix/rebuild-form-builder-5525
Conflicts:
	application/forms/Config/Authentication/BaseBackendForm.php
	application/forms/Config/Authentication/DbBackendForm.php
	application/forms/Config/Authentication/LdapBackendForm.php
	application/forms/Config/Authentication/ReorderForm.php
	application/forms/Config/LoggingForm.php
	application/forms/Config/ResourceForm.php
	application/forms/Preference/GeneralForm.php
	library/Icinga/Application/Config.php
	library/Icinga/Web/Form.php
	modules/monitoring/application/controllers/ConfigController.php
	modules/monitoring/application/forms/Config/Backend/CreateBackendForm.php
	modules/monitoring/application/forms/Config/Instance/CreateInstanceForm.php
	modules/monitoring/application/forms/Config/Instance/EditInstanceForm.php
	modules/monitoring/application/forms/Config/SecurityForm.php
2014-08-29 16:05:56 +02:00
Matthias Jentsch e799d65d3f Only apply SVG responsiveness when not rendered in compact mode
Don't let SVGs grow vertically in when displayed in the dashboard, to avoid wasted space
2014-08-28 16:52:02 +02:00
Marius Hein 0a2b504db8 Gracatar: Pre sized with 60px because of display latency
refs #7020
2014-08-28 13:41:21 +02:00
Marius Hein c4c5bcdd48 ContactQuery: Change timeperiod joins to joinLeft()
refs #7020
2014-08-28 13:39:49 +02:00
Matthias Jentsch 947cd0c5d3 Merge branch 'master' of git.icinga.org:icingaweb2
fixes #7006
2014-08-27 17:22:09 +02:00
Matthias Jentsch 6a32c3a8ab Make charts responsive
Let pie and grid charts of the chart controller automatically adapt to changing viewport sizes.
2014-08-27 17:21:55 +02:00
Marius Hein 5e84ff4ac4 Show/Contact: Add notification history to view
refs #4804
2014-08-27 16:38:29 +02:00
Marius Hein 9465c3ffb6 Show/Contact: Add commands to view
Create a new command query and join contact information into.

refs #4804
2014-08-27 16:38:29 +02:00
Thomas Gelf 70fe22dfad monitoring/tactical: fix missing translations 2014-08-22 18:08:20 +02:00
Thomas Gelf 49cd55eddd list/hosts: cleanup, should look like list/services
Quite some changes here:

* Compact view should show icons too
* Ignore host icons with legacy HTML hacks
* Remove duplicate code
* Reduce HTML
* Reduce intendation for better readability
* Show attempts on soft states only, even in compact view
* Use the same HTML tags and styles as in list/services
* Fixes nesting error on compact view
2014-08-22 11:06:45 +02:00
Johannes Meyer 11063495b2 Merge branch 'master' into bugfix/rebuild-form-builder-5525
Conflicts:
	modules/monitoring/application/controllers/ConfigController.php
2014-08-21 10:22:16 +02:00
Johannes Meyer 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
Alexander Klimov bb65fb396a Merge branch 'bugfix/sensitive-custom-vars-6641'
fixes #6641
2014-08-20 12:29:45 +02:00
Johannes Meyer 4ceecf1146 Let comment view look more standardized and add limit control
refs #6637
2014-08-20 11:34:24 +02:00
Alexander Klimov 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
Alexander Klimov ea0248ecf4 Remove '{{SAVE_ICON}}', tiny design fixes
refs #6641
2014-08-19 17:54:22 +02:00
Johannes Meyer 3573908071 Let downtime view look more list-like and fix downtime end calculation
refs #6637
2014-08-19 17:03:35 +02:00
Alexander Klimov 65473ac8ee Monitoring config: use SecurityForm
refs #6641
2014-08-19 14:04:00 +02:00
Alexander Klimov 0464099764 Monitoring: implement "Security" config tab 2014-08-19 11:19:30 +02:00
Johannes Meyer 332be22f7e Fix object history dates make output look similar to the event history
refs #6637
2014-08-18 15:32:12 +02:00
Johannes Meyer bbddb9ed87 Add limit-control and fix indentation of the eventhistory view
refs #6637
2014-08-18 15:30:59 +02:00
Johannes Meyer 043688e514 Make event history view more fancier
refs #6637
2014-08-15 17:03:03 +02:00
Johannes Meyer cae84a5d7f Fix float formatting of timeline circle margins and widths
fixes #6926
2014-08-15 13:39:02 +02:00
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 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
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
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 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 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
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
Alexander Klimov d021ddebee Make contacts' view work like the downtimes' one
fixes #6513
2014-07-15 10:47:12 +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
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
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 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 ae4aa9c182 Fix violations of coding guidelines 2014-06-25 15:07:39 +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 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 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
Matthias Jentsch bde6e29c61 Display a message instead of empty service matrix
refs #6535
2014-06-23 12:24:27 +02:00
Thomas Gelf b03307196a monitoring/list/services: hardcode margin once again 2014-06-21 05:27:10 +02:00
Thomas Gelf 7f53ba11cf Hook\Grapher: use it in monitoring/show 2014-06-21 04:13:14 +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