Commit Graph

295 Commits

Author SHA1 Message Date
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
Jannis Moßhammer 44be5e85da Refactoring and Query and IDO code,
the Monitoring/View code was completly dropped in favor of
the DataView implementations, as new Backends otherwise
would require to implement two seperate query logics

refs #3801
2013-10-17 19:54:58 +02:00
Eric Lippmann 676f9e5f72 Monitoring/History: Show icons and color for state changes
refs #4765
2013-10-17 16:18:34 +02:00
Eric Lippmann bb8cad2a85 Add event history list view (WIP)
refs #4765
2013-10-17 16:18:34 +02:00
Marius Hein 7a406b313f Adjusted buttons and a tags
refs #4869
2013-10-15 18:10:36 +02:00
Marius Hein 6f51f40fc0 Add real command button to detail panel
refs #4869
2013-10-15 18:10:36 +02:00
Marius Hein d6fd3350e0 Apply style to detail
refs #4869
2013-10-15 18:10:36 +02:00
Marius Hein a69c7498ec Style comments, cowntimes, properties, flags in detail pane [WIP]
refs #4869
2013-10-15 18:10:36 +02:00
Marius Hein 31555fdb6b Detail pane [WIP]
refs #4824
2013-10-14 13:30:01 +02:00
Marius Hein c02c18b23f Add logo and remove old struct survivors
refs #4824
2013-10-14 13:28:16 +02:00
Marius Hein 15f0f1aa59 Status view and icons
refs #4824
2013-10-14 13:27:43 +02:00
Eric Lippmann 408f369e45 Host/Detail: List properties explicitly, not with view helper
refs #4823
2013-10-14 12:57:26 +02:00
Eric Lippmann 9120cb3d99 Add show services view script
refs #4823
2013-10-14 12:57:26 +02:00
Eric Lippmann 907b7f24cc Monitoring/Show actions: Readd tabs
refs #4823
2013-10-14 12:57:26 +02:00
Eric Lippmann a42668edb8 Fix tests
refs #4663
2013-10-09 09:20:17 +02:00
Eric Lippmann 5d0eaa5cd3 List host event history when showing a host
refs #4663
2013-10-09 09:20:17 +02:00
Eric Lippmann 18bd1c3221 List service event history when showing a service
refs #4663
2013-10-09 09:20:17 +02:00
Eric Lippmann 61bfcd495b Add more information to host and service list 2013-10-09 09:20:17 +02:00
Eric Lippmann b89d61add3 Monitoring: Refactor data views (WIP)
refs #4663
2013-10-09 09:20:16 +02:00
Jannis Moßhammer 376dc8cd0f Document form and container behaviour and simplify
Now the whole page gets refreshed on container changes, if
we encounter issues with that we can improve it afterwards
or roll back some cahnges already made in previous commits

refs #4611
2013-09-23 13:56:59 +02:00
Jannis Moßhammer 6d26240d6d Add Main detail state to url, renderhelper, container tests
-   The ActionController is now able to render a seperate detail view
-   All list scripts select the currently active row from the detail view with
    the 'active' class
-   Autosubmit is now again attached to the onchange attribute (to prevent issues
    when js can't load correctly)
-   Logout is now recognized and causes a page refresh (will be made more generic)
-   Add history mock for testing url changes
-   Update all grids to implement the app/mainDetailGrid component

refs #4611
2013-09-23 13:56:57 +02:00
Eric Lippmann 1b858cbdb4 Monitoring: Fix remaining usages of namespace Monitoring without Icinga\Module prefix
refs #4586
2013-09-04 11:21:12 +02:00
Marius Hein 2f610b70ac Fix icon identifer and capitalization
refs #4550
refs #4584
2013-08-23 10:58:58 +02:00
Jannis Moßhammer 015a914aab Fix template code style, use Bootstrap 3, remove icons
- Icons have now the {{XY_ICON}} format
- custom classes are removed
- A few typos are fixed
- Capitalization

refs #4550
refs #4621
refs #4584
2013-08-23 10:28:48 +02:00
Jannis Moßhammer d7358c65be Remove QUrl and QLink, add Href
refs #4516
2013-08-21 09:44:01 +02:00
Jannis Moßhammer 2a2966fc56 Fix Config.php relocation, fix header.phtml crashing due to old tab rendering
refs #4192
2013-08-07 17:51:52 +02:00
Jannis Moßhammer b3e0d5e8ce Remove AbstractWidget and make Widget an interface
As Widget's already denote an abstract concept, the name
'AbstractWidget' is redundant. Also this class didn't do anything except
fetching a view via a singleton (which is now injected into the render method)
and bypassing the PHP class properties by creating a 'properties' array which is
filled with magic getters and setters (which now are simply php class properties)

Further changes:
- toString is removed, as this incorporated a lot of
   application logic which would cause unrecoverable
   errors when throwing exceptions
- renderToHtml is now just render and the view dependency must be
   passed, as a widget shouldn't be responsible for getting
   view instance (this means that <?= $this->tabs ?> is now
   <?= $this->tabs->render($this); ?> in the templates
- Controllers don't have $this->widget anymore as Widgets are
   directly instanciated with their class, allowing better code completion
   and avoiding hidden dependencies, also Widget::create is now removed
   in favor of direct instanciation.

refs #4192
2013-08-07 17:41:43 +02:00
Jannis Mosshammer e8204f4755 Merge branch 'feature/service-detail-view-4181' of ssh://git.icinga.org/icinga2-web
Conflicts:
	library/Icinga/Application/Logger.php
	library/Icinga/Application/Web.php
	library/Icinga/Authentication/Backend/LdapUserBackend.php
	library/Icinga/Authentication/Credentials.php
	library/Icinga/Authentication/Manager.php
	library/Icinga/Authentication/PhpSession.php
	library/Icinga/Authentication/Session.php
	library/Icinga/Authentication/User.php
	library/Icinga/Authentication/UserBackend.php
	library/Icinga/Backend/AbstractBackend.php
	library/Icinga/Backend/DataView/ObjectRemappingView.php
	library/Icinga/Backend/Query.php
	library/Icinga/Backend/Statusdat/DataView/StatusdatHostView.php
	library/Icinga/Backend/Statusdat/HostgroupsummaryQuery.php
	library/Icinga/Backend/Statusdat/HostlistQuery.php
	library/Icinga/Backend/Statusdat/ServicegroupsummaryQuery.php
	library/Icinga/Backend/Statusdat/ServicelistQuery.php
	library/Icinga/Exception/ConfigurationError.php
	library/Icinga/Exception/MissingParameterException.php
	library/Icinga/Exception/NotImplementedError.php
	library/Icinga/Exception/ProgrammingError.php
	library/Icinga/Exception/SystemPermissionException.php
	library/Icinga/Protocol/AbstractQuery.php
	library/Icinga/Protocol/Commandpipe/Acknowledgement.php
	library/Icinga/Protocol/Commandpipe/CommandPipe.php
	library/Icinga/Protocol/Commandpipe/Comment.php
	library/Icinga/Protocol/Commandpipe/Downtime.php
	library/Icinga/Protocol/Commandpipe/Exception/InvalidCommandException.php
	library/Icinga/Protocol/Commandpipe/IComment.php
	library/Icinga/Protocol/Commandpipe/PropertyModifier.php
	library/Icinga/Protocol/Ldap/Connection.php
	library/Icinga/Protocol/Ldap/Exception.php
	library/Icinga/Protocol/Ldap/LdapUtils.php
	library/Icinga/Protocol/Ldap/Node.php
	library/Icinga/Protocol/Ldap/Query.php
	library/Icinga/Protocol/Ldap/Root.php
	library/Icinga/Protocol/Statusdat/Exception/ParsingException.php
	library/Icinga/Protocol/Statusdat/IReader.php
	library/Icinga/Protocol/Statusdat/ObjectContainer.php
	library/Icinga/Protocol/Statusdat/Parser.php
	library/Icinga/Protocol/Statusdat/Query.php
	library/Icinga/Protocol/Statusdat/Query/Expression.php
	library/Icinga/Protocol/Statusdat/Query/Group.php
	library/Icinga/Protocol/Statusdat/Query/IQueryPart.php
	library/Icinga/Protocol/Statusdat/Reader.php
	library/Icinga/Protocol/Statusdat/RuntimeStateContainer.php
	library/Icinga/Protocol/Statusdat/View/AccessorStrategy.php
	library/Icinga/Web/ActionController.php
	library/Icinga/Web/Form.php
	library/Icinga/Web/Hook/Configuration/ConfigurationTab.php
	library/Icinga/Web/Hook/Configuration/ConfigurationTabBuilder.php
	library/Icinga/Web/Hook/Configuration/ConfigurationTabInterface.php
	library/Icinga/Web/Hook/Grapher.php
	library/Icinga/Web/Hook/Toptray.php
	library/Icinga/Web/ModuleActionController.php
	library/Icinga/Web/Notification.php
	library/Icinga/Web/Paginator/Adapter/QueryAdapter.php
	library/Icinga/Web/Paginator/ScrollingStyle/SlidingWithBorder.php
	library/Icinga/Web/Widget.php
	modules/monitoring/application/views/helpers/MonitoringCommands.php
	modules/monitoring/application/views/helpers/MonitoringFlags.php
	modules/monitoring/application/views/helpers/MonitoringProperties.php
	modules/monitoring/application/views/scripts/show/components/comments.phtml
	modules/monitoring/application/views/scripts/show/components/downtime.phtml
	modules/monitoring/application/views/scripts/show/components/flags.phtml
	modules/monitoring/application/views/scripts/show/components/properties.phtml
	modules/monitoring/application/views/scripts/show/header.phtml
	modules/monitoring/application/views/scripts/show/host.phtml
	modules/monitoring/application/views/scripts/show/service.phtml
	modules/monitoring/library/Monitoring/Backend/AbstractBackend.php
	modules/monitoring/library/Monitoring/Backend/Ido/Query/DowntimeQuery.php
	modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
	modules/monitoring/library/Monitoring/Backend/Statusdat.php
	modules/monitoring/library/Monitoring/Backend/Statusdat/Criteria/Order.php
	modules/monitoring/library/Monitoring/Backend/Statusdat/DataView/StatusdatServiceView.php
	modules/monitoring/library/Monitoring/Backend/Statusdat/Query/GroupsummaryQuery.php
	modules/monitoring/library/Monitoring/Backend/Statusdat/Query/Query.php
	modules/monitoring/library/Monitoring/Command/Meta.php
	modules/monitoring/library/Monitoring/View/DowntimeView.php
	modules/monitoring/test/php/application/views/helpers/MonitoringCommandsTest.php
	modules/monitoring/test/php/application/views/helpers/MonitoringPropertiesTest.php
	modules/monitoring/test/php/library/Command/MetaTest.php
2013-07-23 16:33:07 +02:00
Marius Hein 1492245788 Service detail view: Template fixes
refs #4181
2013-07-23 14:03:32 +02:00
Marius Hein 8d3ff94696 Remove php strict errors
refs #4448
2013-07-23 12:18:27 +02:00
Jannis Moßhammer 4ededd5179 Add servicegroup and icon image to service overview
Add icon images for hosts and services, notes and action url
for hosts

refs #4181
2013-07-22 17:10:43 +02:00
Jannis Moßhammer a0839ea0da Add service detail view
refs #4181
2013-07-22 16:03:36 +02:00
Jannis Moßhammer c1860e7d5d Merge branch 'master' of ssh://git.icinga.org/icinga2-web into feature/host-overview--4179
Conflicts:
	modules/monitoring/application/controllers/ListController.php
	modules/monitoring/application/controllers/ShowController.php
	modules/monitoring/library/Monitoring/Backend/AbstractBackend.php
2013-07-15 13:52:26 +02:00
Marius Hein 6742696e09 Autoloader: Rename module namespace 2013-07-15 12:16:14 +02:00
Jannis Moßhammer b045650a19 Merge branch 'master' of ssh://git.icinga.org/icinga2-web into feature/host-overview--4179
Conflicts:
	application/layouts/scripts/layout.phtml
	modules/monitoring/application/controllers/ListController.php
	modules/monitoring/application/controllers/ShowController.php
	modules/monitoring/application/views/scripts/list/hosts.phtml
	modules/monitoring/application/views/scripts/show/components/comments.phtml
	modules/monitoring/application/views/scripts/show/components/contacts.phtml
	modules/monitoring/application/views/scripts/show/components/customvars.phtml
	modules/monitoring/application/views/scripts/show/host.phtml
	modules/monitoring/library/Monitoring/Backend/AbstractBackend.php
	modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
2013-07-12 15:55:31 +02:00
Jannis Moßhammer 30040eaa1b Add Host detail to hostoverview
This is merge to prevent the host-overview nad
host-detail branch from diverging too much

refs #4179

Conflicts:
	application/views/helpers/TimeSince.php
	modules/monitoring/application/controllers/ShowController.php
	modules/monitoring/application/views/scripts/show/components/comments.phtml
	modules/monitoring/application/views/scripts/show/header.phtml
	modules/monitoring/application/views/scripts/show/host.phtml
	modules/monitoring/library/Monitoring/Backend/AbstractBackend.php
	modules/monitoring/library/Monitoring/Backend/Ido/Query/StatusQuery.php
	public/css/base.less
	public/css/components/details.less
2013-07-12 15:12:26 +02:00
Eric Lippmann d871b3c287 Update the monitoring module 2013-07-12 14:33:17 +02:00
Marius Hein 1da7ea9c36 Host detail view: Add object properties
Add property component and helper which output all information
about an object (host or service).

refs #4182
2013-07-08 16:12:47 +02:00
Marius Hein e817b9b790 Host detail view
Add downtime sub component.

refs #4182
2013-07-08 16:12:47 +02:00
Marius Hein 6b37fcf24f Host detail view
Add commands to detail view

refs #4182
2013-07-08 16:12:47 +02:00
Marius Hein e05f46c587 Host detail view
Command widgets [WIP]

refs #4182
2013-07-08 16:12:47 +02:00
Marius Hein f455b32464 Host detail view
Add flags container to detail view

refs #4182
2013-07-08 16:12:47 +02:00
Marius Hein ffc1a2b43f Host detail view
Fix psr, adapt output for layouting, add fields to adapt original
views from icinga.

refs #4182
2013-07-08 16:12:47 +02:00
Marius Hein a0f96379a9 Host detail view
Fix psr, adapt output for layouting, add fields to adapt original
views from icinga.

refs #4182
2013-07-02 16:00:41 +02:00
Eric Lippmann df7a3a4cbe Fix PHP short open tags, DO NOT use <? ...
refs #4301
2013-06-28 09:13:08 +02:00
Eric Lippmann 1e9fa28433 Add the monitoring module from the incubator 2013-06-28 09:11:12 +02:00