Commit Graph

353 Commits

Author SHA1 Message Date
Matthias Jentsch b314c074cc Fix downtime and comment form redirects
refs #8624
2015-05-07 16:20:59 +02:00
Matthias Jentsch b35dd4ddfe Separate forms for deleting single and multiple comments
refs #8624
2015-05-07 14:03:09 +02:00
Matthias Jentsch a46dece136 Provie link to detail view in downtime partial
refs #8902
2015-05-07 10:34:06 +02:00
Alexander A. Klimov a976d777b3 Show custom variables visually separated in the host and service detail views
resolves #8966
2015-04-23 13:31:02 +02:00
Johannes Meyer f11ea04557 Revert "Require `host_name' instead of `host' to show or list particular objects"
This reverts commit b93d18a0fc.
2015-04-20 16:11:22 +02:00
Johannes Meyer 894457a1c1 Revert "Adjust command links so that they'll use `host_name' instead of `host'"
This reverts commit b9aee47d1f.

Conflicts:
	modules/monitoring/application/views/scripts/list/comments.phtml
	modules/monitoring/application/views/scripts/list/downtimes.phtml
2015-04-20 16:11:08 +02:00
Johannes Meyer 96fb0370a4 Revert "Require `service_description' instead of `service' to show a particular service"
This reverts commit 09ab601942.
2015-04-20 16:09:14 +02:00
Johannes Meyer 9bbb23ae7d Revert "Adjust command links so that they'll use `service_description'"
This reverts commit cee189a5fc.

Conflicts:
	modules/monitoring/application/views/scripts/list/comments.phtml
	modules/monitoring/application/views/scripts/list/downtimes.phtml
2015-04-20 16:08:51 +02:00
Johannes Meyer 0997eaf459 Host detail view: Fix that the list of services is missing all tabs
refs #7876
2015-04-20 14:56:30 +02:00
Johannes Meyer 3f092ffb2d show/contact: Ensure dashboard compliance
refs #7876
2015-04-17 16:10:49 +02:00
Johannes Meyer 9388944283 show/history: Ensure dashboard compliance
refs #7876
2015-04-17 16:10:21 +02:00
Eric Lippmann 796cbffbd7 Merge branch 'master' into bugfix/time-formatting-6778
Conflicts:
	modules/monitoring/application/views/scripts/show/components/notifications.phtml
2015-04-15 15:43:39 +02:00
Eric Lippmann 229e266daf Add new line between comment author and creation time in the detail views
refs #6778
2015-04-15 15:40:40 +02:00
Eric Lippmann e500715bda Use timeAgo() when displaying comments in the detail views
refs #6778
2015-04-15 15:33:44 +02:00
Johannes Meyer 675d070b86 Set the view property `compact' exactly once
refs #7876
2015-04-15 15:33:00 +02:00
Johannes Meyer 9ef414c9ed Add separator when listing downtimes in the detail view
fixes #9046
2015-04-14 09:20:43 +02:00
Johannes Meyer 1c32d8ebe5 DowntimeQuery: Add _name suffix to the query column `downtime_author'
...to indicate that it's a case-sensitive column.

refs #8613
2015-04-10 14:23:05 +02:00
Johannes Meyer 0fe59aa519 Revert "ContactQuery: Provide ci query columns for aliases and email addresses"
This reverts commit f00adc2138.

Conflicts:
	modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactQuery.php
2015-04-10 12:23:35 +02:00
Johannes Meyer 5ec4919aa6 Do not filter for `contactgroup' in case the concrete group name is known
refs #8613
2015-04-10 12:14:47 +02:00
Eric Lippmann df3caa61e9 Improve notifications view component for objects
The old view did not show a hyphen if the user lacked the permissions to send a notification and if viewing a host or service not currently in a problem state.
Further the tooltip for send notification was bad English and the view generated a superfluous <br>.
2015-04-10 10:46:19 +02:00
Eric Lippmann 5efc343f03 Add full stop to sentences in the notifications view component for objects
refs #6778
2015-04-10 10:28:17 +02:00
Eric Lippmann d6374d4770 Use timeAgo() instead of timeSince() for an object's last check
refs #6778
2015-04-10 10:27:57 +02:00
Eric Lippmann 613de61e6d Improve English for "The last one occured %s ago" in the notifications view component for objects
fixes #8950
2015-04-10 10:24:15 +02:00
Eric Lippmann 80ab64e2b4 Fix typos in the notifications view partial for objects 2015-04-10 10:21:54 +02:00
Eric Lippmann e6f070d068 Use timeAgo() instead of timeSince() when displaying object notifications
refs #6778
2015-04-10 10:20:10 +02:00
Johannes Meyer 8477859dc1 Fix that the user isn't being notified that no events were found for an object 2015-04-10 09:51:08 +02:00
Johannes Meyer f00adc2138 ContactQuery: Provide ci query columns for aliases and email addresses
refs #8613
2015-04-10 09:45:23 +02:00
Johannes Meyer 3c47ba11eb monitoring/show/contact: Require `contact_name' instead of `contact'
refs #8613
2015-04-10 09:39:39 +02:00
Johannes Meyer 1e6f292910 Use `servicegroup_name' instead of `servicegroup' to filter services
refs #8613
2015-04-09 11:43:51 +02:00
Johannes Meyer e5eca97169 Use `hostgroup_name' instead of `hostgroup' to filter hosts and services
refs #8613
2015-04-09 11:43:21 +02:00
Johannes Meyer cee189a5fc Adjust command links so that they'll use `service_description'
...instead of `service'

refs #8613
2015-04-09 10:28:34 +02:00
Johannes Meyer b9aee47d1f Adjust command links so that they'll use `host_name' instead of `host'
refs #8613
2015-04-09 10:27:41 +02:00
Johannes Meyer 09ab601942 Require `service_description' instead of `service' to show a particular service
`service' implies that it is possible to provide case-less identifiers which is
*not* possible.

refs #8613
2015-04-08 16:49:52 +02:00
Johannes Meyer b93d18a0fc Require `host_name' instead of `host' to show or list particular objects
`host' implies that it is possible to provide case-less identifiers which is
*not* possible.

refs #8613
2015-04-08 16:25:29 +02:00
Matthias Jentsch 5383999ef7 Add warning to links that open in a new window
Add warning on mouseover / focus as recommended by as recommended by WCAG20 G201

refs #7937
2015-03-19 10:49:28 +01:00
Thomas Gelf d82b73a2fe details - notifications: show a bell 2015-03-13 16:07:20 +01:00
Thomas Gelf 499b9b149a details - notifications: shorter link text 2015-03-13 16:06:19 +01:00
Johannes Meyer 44b1255bbc Do not open a new column when removing an acknowledgement 2015-03-13 14:13:09 +01:00
Johannes Meyer 99610bc1bd Avoid sub-tables when showing comments or downtimes in the detail view
fixes #8625
2015-03-13 08:32:50 +01:00
Eric Lippmann ce3c2507ef Show reachability in the host and service detail view
refs #6875
2015-03-13 00:26:45 +01:00
Marius Hein cb28f00c4d Merge branch 'master' into feature/custom-notification-command-8644 2015-03-12 16:45:57 +01:00
Eric Lippmann 8563d5ed3f PHPDoc: Use @var instead of @type
Becasue of too many kittens PSR-5 backed off of deprecating @var.
So that's the way we go too.
2015-03-12 16:08:47 +01:00
Marius Hein ddc8dd5d4c Add command send custom notification to monitoring module
refs #8644
2015-03-12 16:08:22 +01:00
Johannes Meyer 53e73161d8 Fix that the AcknowledgeCommandForm is opened in a new column 2015-03-02 18:45:38 +01:00
Johannes Meyer 8e8bab0795 Do only escape a qlink's label manually if necessary 2015-02-24 11:35:25 +01:00
Johannes Meyer 52c17805c9 Add proper titles to the history view
refs #8458
2015-02-23 17:30:51 +01:00
Johannes Meyer bb5799434c Add proper titles to the contact view
refs #8458
2015-02-23 17:30:37 +01:00
Johannes Meyer 18f6ff8702 Add proper titles to the servicegroups component view
refs #8458
2015-02-23 17:28:20 +01:00
Johannes Meyer 7247ea5191 Add proper titles to the hostgroups component view
refs #8458
2015-02-23 17:28:02 +01:00
Johannes Meyer 0d8bf462f5 Add proper titles to the downtime component view
refs #8458
2015-02-23 17:27:45 +01:00
Johannes Meyer 3a74ec3d09 Add proper titles to the contacts component view
refs #8458
2015-02-23 17:27:27 +01:00
Johannes Meyer 9793bd52c7 Add proper titles to the comments component view
refs #8458
2015-02-23 17:27:13 +01:00
Johannes Meyer 89ed498069 Add proper titles to the command component view
refs #8458
2015-02-23 17:26:56 +01:00
Johannes Meyer 25e2baa566 Add proper titles to the checkstatistics component view
refs #8458
2015-02-23 17:26:42 +01:00
Johannes Meyer 74360ee8e6 Add proper titles to the acknowledgements component view
refs #8458
2015-02-23 17:26:21 +01:00
Johannes Meyer 48286e0d59 Use View::translate() instead of mt() and t() ... 2015-02-23 16:42:25 +01:00
Johannes Meyer 5321c2f9e5 Mute icons properly using the new automatic mechanisms of our view helpers
refs #8360
2015-02-16 10:52:42 +01:00
Johannes Meyer 9232c5cf22 Add aria-hidden="true" to all icons that exist only for design reasons
refs #8360
2015-02-12 13:49:31 +01:00
Thomas Gelf b4c47c51e7 components/actions: show links if available
Now we show links regardless of whether we have host actions, there
might be hook-provided links only. Renamed "Foreign URLs" to "Actions"
and made it translatable.
2015-02-02 17:46:40 +01:00
Thomas Gelf 3038de5ad0 components/actions: show host action urls if given 2015-02-02 17:46:40 +01:00
Johannes Meyer 5382f73c53 Drop all old object- and command-view scripts 2015-02-02 16:31:25 +01:00
Johannes Meyer 2e99e476fe Use the new object-view scripts 2015-02-02 16:28:35 +01:00
Johannes Meyer c19ff289bf Open command forms in the same column where their link is located
refs #8279
2015-01-28 13:02:37 +01:00
Eric Lippmann 3cb2dd0e8b monitoring/security: Hide 'Acknowledge' link if user lacks the respective permission 2015-01-23 11:01:47 +01:00
Eric Lippmann 08e8d5d742 monitoring/security: Hide 'Process check result' link if user lacks the respective permission 2015-01-23 10:48:21 +01:00
Eric Lippmann 2535d802b1 monitoring: Add missing td closing tag 2015-01-23 10:45:10 +01:00
Eric Lippmann 27c1500295 monitoring: Do not translate brackets 2015-01-23 10:41:42 +01:00
Eric Lippmann a166234e6d monitoring/security: Hide 'Reschedule check' link if user lacks the respective permission 2015-01-23 10:40:48 +01:00
Eric Lippmann af2698b075 monitoring: Do not generate 'Schedule downtime' and 'Add comment' links if user lacks the respective permissions 2015-01-23 10:15:55 +01:00
Eric Lippmann d07e1329e8 monitoring: Use nl2br instead of str_replace for downtime comment and comment text 2015-01-23 09:45:43 +01:00
Eric Lippmann f47dae1092 monitoring/security: Hide 'Schedule downtime' link if user lacks the respective permission 2015-01-23 09:43:16 +01:00
Eric Lippmann 67be1b329b monitoring/security: Hide 'Add comment' link if user lacks the respective permission 2015-01-23 09:41:06 +01:00
Eric Lippmann 5967d5fe04 monitoring/security: Hide delete downtime action if user lacks the respective permission 2015-01-22 17:35:34 +01:00
Eric Lippmann a19c155d9f monitoring/security: Hide delete comment action if user lacks the respective permission 2015-01-22 17:33:20 +01:00
Eric Lippmann f46a587266 monitoring/security: Hide 'Remove Problem Acknowledgement' action if user lacks the respective permission 2015-01-22 17:25:30 +01:00
Eric Lippmann a09ba15859 monitoring/security: Hide 'Check Now' action if user lacks the respective permission 2015-01-22 17:13:35 +01:00
Johannes Meyer 6845480b5f Fix that strtoupper can't handle non ascii chars
Fixed by not using strtoupper or by using it prior
to the translation of the corresponding string.

fixes #8163
2015-01-22 14:37:07 +01:00
Eric Lippmann 4589621f58 monitoring: Use host and service display_name for displaying host and service names for an object's history
refs #7843
2015-01-22 10:57:44 +01:00
Eric Lippmann d1715c8ec6 monitoring: Escape event message in an object's event history 2015-01-22 10:45:14 +01:00
Eric Lippmann a1f4d124b4 monitoring: Prefer <br> over <br /> in components/header.phtml 2015-01-22 10:36:44 +01:00
Eric Lippmann 9e5d7f43ff monitoring: Show host_name in the detail area too if it's different from the display_name
refs #7843
2015-01-22 10:36:02 +01:00
Eric Lippmann 3d306c0a06 monitoring: Use display_name for displaying the host name in the detail area
refs #7843
2015-01-22 10:35:06 +01:00
Eric Lippmann e61edaaffb monitoring: Show service_description in the detail area too if it's different from the display_name
refs #7843
2015-01-22 10:30:55 +01:00
Eric Lippmann ed7dc1beb6 monitoring: Use display_name when displaying the service name in the detail area
refs #7843
2015-01-22 10:29:57 +01:00
Eric Lippmann 98acc9166a monitoring: Fix coding style in components/header.phtml 2015-01-22 10:24:44 +01:00
Eric Lippmann d064b0ac79 monitoring: Rename $showService to $isService in the header view script
Most views use $isService to set whether we are about to show a service.
2015-01-21 17:29:31 +01:00
Carlos Cesario 2f3667aa3d Use hosts link instead services link
Use hosts link instead services link to show hosts group.

refs #7259
2014-12-17 10:00:15 -02:00
Johannes Meyer 7987fb3f5a Use the Host and Service object class helpers instead of the Util view helper
This also ensures that all state names that are shown to the user are
properly translated.

refs #7996
2014-12-12 12:22:20 +01:00
Johannes Meyer 87664ffef9 Use the Host and Service object class helpers instead of MonitoringState
This also ensures that all state names that are shown to the user are
properly translated.

refs #7996
2014-12-12 10:38:21 +01:00
Johannes Meyer ddc121d1cc Add ProcessCheckResultCommandForm
refs #6854
2014-12-11 15:52:23 +01:00
Johannes Meyer 8779e80291 Add a link to a service's event when showing the host's history 2014-12-11 10:56:47 +01:00
Carlos Cesario 571df0a5ab Improve plural string translation
Improve plural translation for some statements

refs #8000
2014-12-05 10:45:10 -02:00
Eric Lippmann 2843490250 monitoring: Translate "Plugin Output" 2014-11-21 16:45:39 +01:00
Gunnar Beutner 59c2d27e4e Fix spelling for "Plugin Output" 2014-11-21 15:14:47 +01:00
Thomas Gelf 8d67437685 show/services: render service in _next container 2014-11-19 09:10:13 +01:00
Thomas Gelf a20fa3201d tinystatesummary: use h1, styling 2014-11-19 07:53:16 +01:00
Bernd Erk 07c0180b1c Merge branch 'master' into feature/redesign-7144 2014-11-18 16:36:19 +01:00
Alexander Fuhr 5ad1c0c928 Adjust vars to the coding guidelines 2014-11-18 10:29:47 +01:00
Alexander Fuhr cbcea2a3c3 Add check attempts information to object detail view
fixes #7686
2014-11-17 18:54:40 +01:00
Bernd Erk 66ecb2dc9f Fixes Pluginoutput 2014-11-17 18:02:16 +01:00
Bernd Erk f83bcbfd2b updates current font set and changes service and reporting icons 2014-11-17 17:08:08 +01:00
Bernd Erk e44086cb9f Fixes service and config icons 2014-11-17 17:08:08 +01:00
Alexander Fuhr e95e5f35d8 Add significant title if there are no services configured
refs #7687
fixes #7687
2014-11-17 16:27:22 +01:00
Bernd Erk 20be45e8da Enable icon font 2014-11-13 20:08:58 +01:00
Bernd Erk ef2ec0442c Merge branch 'master' into feature/redesign-7144 2014-11-13 14:40:26 +01:00
Alexander Fuhr d0651e9e7f Rename 'service current state' to 'service detail information' header 2014-11-13 14:04:23 +01:00
Eric Lippmann 8e3394fd55 Merge branch 'master' into feature/redesign-7144 2014-11-11 13:54:13 +01:00
Bernd Erk f300c121cd Redesign tactical overview 2014-11-06 22:38:06 +01:00
Thomas Gelf da20926a97 Customvars: use new helper
refs #7569
2014-11-06 16:11:29 +01:00
Alexander Klimov 38220afd11 PHP: avoid short tags <? 2014-10-23 10:44:54 +02:00
Alexander Klimov ba12d7b46c Use mt() in the monitoring module instead of just t()
fixes #7330
2014-10-21 17:22:16 +02:00
Matthias Jentsch 937dbe2c15 Add missing close buttons to views without tabs 2014-10-14 17:54:52 +02:00
Eric Lippmann 2126b8c341 monitoring: Fix link to an object's contact in the detail views 2014-10-07 13:21:28 +02:00
Alexander Fuhr f7b7e0283a Translation: another bunch of translatable strings 2014-09-29 15:20:19 +02:00
Eric Lippmann c4d13a7850 monitoring: Fix `$this' usage in a closure 2014-09-23 23:00:19 -07:00
Eric Lippmann 1710a50d5c Fix form CSS 2014-09-23 22:43:33 -07:00
Eric Lippmann 051c9691a9 Remove "WTF" comment 2014-09-23 22:18:06 -07: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 8bf66425d1 Merge branch 'master' into bugfix/commands-6593 2014-09-15 09:27:56 +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
Alexander Fuhr 3615b96093 Fix Incorrect plural form in host overview
fixes #7172
2014-09-11 15:46:23 +02:00
Gunnar Beutner 7d623fdfe3 Fix spelling mistake: Unandled -> Unhandled 2014-09-05 23:42:49 +02:00
Thomas Gelf d1dae46fae show/history: link notification contacts, show state 2014-09-05 18:20:35 +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
Marius Hein c4c5bcdd48 ContactQuery: Change timeperiod joins to joinLeft()
refs #7020
2014-08-28 13:39:49 +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
Alexander Klimov bb65fb396a Merge branch 'bugfix/sensitive-custom-vars-6641'
fixes #6641
2014-08-20 12:29:45 +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 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 dc8181cdc5 Escape linefeeds and carriage returns in commands and show them as html
fixes #6088
2014-08-14 10:23:04 +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
Alexander Klimov f9a274d079 Add contact detail view
refs #4804
refs #6514
2014-07-18 17:35:24 +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
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
Thomas Gelf 7f53ba11cf Hook\Grapher: use it in monitoring/show 2014-06-21 04:13:14 +02:00
Thomas Gelf 4821c6e3e5 monitoring/show/history: use limiter, nicer output 2014-06-20 14:02:03 +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
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
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