Commit Graph

295 Commits

Author SHA1 Message Date
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
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 7b58134378 show/history: sorry, typo 2014-05-27 22:16:45 +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
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 04cab7e0f8 Fix action target for downtime removal 2014-03-25 08:45:51 +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 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
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 88859cb838 The next fat package: downtimes, everywhere 2014-03-09 21:58:01 +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 7202e13837 Link to filtered contact group list unless we have show/contactgroup 2014-03-09 11:26:57 +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
Thomas Gelf b4aff8f39b Small HTML fix 2014-03-08 19:48:47 +01:00
Thomas Gelf 07f76a631a AVP table should not influence perfdata table sitting there 2014-03-08 19:48:07 +01:00
Thomas Gelf e2955c5af2 Remove obsolete files 2014-03-08 18:55:09 +01:00
Thomas Gelf 740df4ccac Cleaning up object downtimes. What a mess... :( 2014-03-08 18:28:19 +01:00
Thomas Gelf 8e44c66850 Style comment removal. Did it ever work? It doesn't... 2014-03-08 17:16:42 +01:00
Thomas Gelf dc865df3c4 Restyle "Check now" 2014-03-08 17:02:14 +01:00
Thomas Gelf 79fe20a95c No (row) links back in object history, as we are already there 2014-03-08 12:38:31 +01:00
Thomas Gelf 3e09931f2c Restyle object flags 2014-03-08 08:23:48 +00:00
Thomas Gelf d234a87e84 Introduce new detail section headers fitting the rest of the layout 2014-03-08 00:17:42 +00:00
Thomas Gelf d53573ede2 Host services view 2014-03-08 00:00:21 +00:00
Thomas Gelf 30c03b5f23 Host base target should fit service base target 2014-03-07 23:19:27 +00:00
Alexander Klimov 75096dd65b PHTML hotfix 2014-03-07 11:30:23 +01:00
Alexander Klimov a4ed32d357 Using new PHP icon helper 2014-03-07 10:54:39 +01:00
Thomas Gelf 717d80807e Remove flapping icons, that's already handled 2014-03-06 19:51:03 +00:00
Thomas Gelf f929b15651 Object comment snippet now fits the other components 2014-03-06 19:06:14 +00:00
Thomas Gelf ef71f22b7f Reorder detail view components, use new snippets - still unfinished 2014-03-06 19:03:21 +00:00
Thomas Gelf edafcc5f68 Start fading out components/status.phtml in favour of dedicated snippets 2014-03-06 19:02:36 +00:00
Thomas Gelf ddf834d922 Single host services tabs now fit the layout 2014-03-06 19:01:40 +00:00
Thomas Gelf 8b40413406 Object history cleanup, fix timestamp and others glitches 2014-03-06 19:00:53 +00:00
Thomas Gelf da5f3c191c statusIcons cleanup, this file will probably fade out 2014-03-06 19:00:10 +00:00
Thomas Gelf 3da5c3f064 Temporarily add icon overview to detail header 2014-03-06 18:59:37 +00:00
Thomas Gelf 4961bbd8d1 Object detail component cleanup, less HTML 2014-03-06 18:57:21 +00:00
Thomas Gelf 25f1034c15 New object detail snippets 2014-03-06 18:36:26 +00:00
Thomas Gelf d1026c240b Unify detail header, fit new layout 2014-03-06 13:20:34 +00:00
Thomas Gelf b74e4cb3fd One less partial 2014-02-21 14:05:28 +00:00
Thomas Gelf 0942a94958 HTML changes in the monitoring module 2014-02-21 14:03:49 +00:00
Johannes Meyer 4aed7468b7 Add view helper to resolve host-/servicemacros as well as customvars
refs #4490
2014-01-31 15:57:53 +01:00
Matthias Jentsch e19a6ace75 Add missing tooltips and fix typos
fixes #4921 #4920
2013-10-23 11:33:15 +02:00
Jannis Moßhammer 16124989dd Various style fixes, changed icon size, fixed show/service 2013-10-22 15:58:24 +02:00
Eric Lippmann 46569bad32 Monitoring: Fix group and state summaries for IDO and Stadusdat 2013-10-22 15:11:07 +02:00
Eric Lippmann c5bed8ad00 Monitoring: Add host and service unhandled column; remove s from host- and servicegroups 2013-10-22 15:11:07 +02:00
Jannis Moßhammer f350011028 Add Status.dat backend
refs #3801
2013-10-20 15:16:44 +02:00
Marius Hein 5a1a738ce7 Add form to configure objects
refs #4924
2013-10-20 13:15:11 +02:00
Eric Lippmann 652df9fd66 Monitoring/Downtimes: Wrap information in a two column view 2013-10-19 17:24:28 +02:00
Matthias Jentsch 9cba03b017 Add actual links and buttons to the multi-views
refs #3788
2013-10-18 16:44:03 +02:00