Commit Graph

575 Commits

Author SHA1 Message Date
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
Eric Lippmann 6eefa2bacb Use require_once instead of require in ConfigTest
refs #4354
2013-07-12 15:52:35 +02:00
Eric Lippmann 2fffb892d3 Enable registerMenuEntries for modules since this works now
refs #4354
2013-07-12 15:44:55 +02:00
Eric Lippmann 51755209b6 Adapt usage of config class
refs #4354
2013-07-12 15:43:23 +02:00
Eric Lippmann 8c6f2a07ae Remove magic retrieval of configuration files
This change leads to expected exceptions when bootstrapping the
application since the \Icinga\Application\Config class was
refactored but its usage not.

refs #4354
refs #4353
2013-07-12 15:41:35 +02:00
Jannis Moßhammer c10752a05a Add host_* prefix to fields for hostoverview
A few fields didn't have the host_ prefix (as in the host-detail branch).
This is fixed with this commit

refs #4179
2013-07-12 15:14:55 +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 297b621bf6 Add view helper url 2013-07-12 14:45:25 +02:00
Eric Lippmann ca09dc084d Add Icinga\Web\ViewStream.php 2013-07-12 14:35:14 +02:00
Eric Lippmann d871b3c287 Update the monitoring module 2013-07-12 14:33:17 +02:00
Jannis Moßhammer 7116cfd60a Host list markup and less changes (WIP)
Modified the host list markup to reflect host information.
Comments are currently missing as well as behaviour and final styling.
The styling part is not really part of the ticket, as we decided
not to style or add additional markup, but as the work
has been done in sprint 1.0-4 it makes no sense to
throw it away at this time

refs #4179
2013-07-12 14:14:32 +02:00
Eric Lippmann d51b00b508 Update Livestatus tests 2013-07-12 14:02:43 +02:00
Jannis Moßhammer 8598743cc1 Modified ListController hostfields
This is a preliminary change to get the required fields, although
the views and queries will heavily change during the sprint, so
it's work in progress

refs #4179
2013-07-12 14:01:31 +02:00
Eric Lippmann 2c6f8a8441 Add ImgAction to StaticController 2013-07-12 13:45:11 +02:00
Eric Lippmann be3193a0d7 Update LDAP and Livestatus protocol 2013-07-12 13:41:48 +02:00
Eric Lippmann e66d17dbf8 Use class Url in mixedPagination.phtml 2013-07-12 13:40:21 +02:00
Eric Lippmann df1e595604 Make retrieval of module config static 2013-07-12 12:11:59 +02:00
Eric Lippmann 78cbeadff2 Add remove and without functions to Url class
refs #4381
2013-07-12 12:06:30 +02:00
Eric Lippmann 7a075ca52a Add link to csv output to tabs
There is currently no controller implementing this output type
but the monitoring module will provide that.
2013-07-12 12:02:51 +02:00
Eric Lippmann 58ce815361 Rename Pdf/File to File/Pdf and adapt usage in the ActionController 2013-07-12 11:58:58 +02:00
Eric Lippmann 63a8854f40 Notification: Add todo that we do not want singleton usage of this class 2013-07-12 11:53:05 +02:00
Jannis Moßhammer 673f73b38a Fix history api URI encoding
The history API encoded components multiple times, e.g. causing a [ to
be converted to %5B in the first link, then to %255B on the second link,
%25255B on the third, etc.

refs #4408
2013-07-12 11:51:59 +02:00
Eric Lippmann 6d05361370 phtml: Use short_open_tags instead of <?php echo 2013-07-10 17:03:51 +02:00
Jannis Moßhammer a035473914 Add hint about graphviz prerequisite in doc/apidoc_creation
refs #4085
2013-07-10 13:51:35 +02:00
Marius Hein e1e6785ad4 phpDocumentator: Add runner to create apidocs
Update documentation, create runner script.

refs #4085
2013-07-10 13:51:35 +02:00
Marius Hein 5e39e7ebeb Add phpDocumentator to project
Create configuration to create api doc with cli.

refs #4085
2013-07-10 13:51:35 +02:00
Marius Hein 5ad4876386 Merge branch 'feature/proper-php-coverage-4313'
fixes #4313
2013-07-09 15:03:53 +02:00
Johannes Meyer 9f745505ce Adjust php testrunner so that a html coverage report is generated
Remove the --coverage-clover argument as the jenkins plugin cannot
properly read it and added --coverage-html instead.

refs #4313
2013-07-09 15:03:22 +02:00
Marius Hein b9711aecc2 Host detail view: Add tests for properties
Add tests for the property view helper.

refs #4182
2013-07-08 16:12:47 +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 051724a786 Host detail view
Fix small bugs in layout and js typo
2013-07-08 16:12:47 +02:00
Marius Hein a25853203e Merge branch 'feature/autoconf-install-4175'
fixes #4175
2013-07-08 16:10:14 +02:00
Marius Hein 1559e34cc0 Add modules to install web files
refs #4175
2013-07-08 16:08:15 +02:00
Marius Hein e24745a55c Fix for configure and make
Add makefile to gitignore and fixed format of
make target output

refs #4175
2013-07-08 16:04:36 +02:00
Eric Lippmann 1999dd1e1a Vagrant: Fix caching issues on vboxsf
Control httpd to not use the sendfile support from the kernel to
transmit file contents to the client because the sendfile syscall
is broken with the VirtualBox file system as of the time of writing.

refs #4384
2013-07-05 14:46:42 +02:00
Marius Hein 6be510b05e License writer
Update license headers

refs #4262
2013-07-03 14:17:49 +02:00
Marius Hein bb8b1944e3 License writer
Add license writer python script to handle source code
updates.

refs #4262
2013-07-03 14:17:48 +02:00
Jannis Moßhammer f080871020 Add Installation documentation and make update
Added documentation to the makefile and to docs
and an additional update command to the makefile, so configuration
dosn't get overwritten.

refs #4175
2013-07-03 14:07:55 +02:00
Jannis Moßhammer 42d579dd9e Add local install-sh
The last install-sh was accidentaly added as a link to
the git repository

refs #4175
2013-07-03 14:07:55 +02:00
Jannis Moßhammer 23c43420aa Add config files to .gitignore
refs #4175
2013-07-03 14:07:55 +02:00
Jannis Moßhammer 11c78dbf19 Add Autoconf based installation with most parameters
configure allows to set the authentication backend to internal (or ldap)
and to set connection details for authentication and data retrieval

refs #4175
2013-07-03 14:07:54 +02:00
Jannis Moßhammer bbea641875 ws-jmosshammer:icinga2-web moja$ git commit
Add autoconf parameter and authorisation configs

Add various autoconf directives for ldap and internal-db authenticaiton,
also additional checks whether the Zend DB Adapters are available and
whether the php setup fulfills the requirements

refs #4175
2013-07-03 14:07:30 +02:00
Jannis Moßhammer aefea8486e Add Autoconf based installation with most parameters
configure allows to set the authentication backend to internal (or ldap)
and to set connection details for authentication and data retrieval

refs #4175
2013-07-03 14:05:59 +02:00
Jannis Moßhammer edbca73291 ws-jmosshammer:icinga2-web moja$ git commit
Add autoconf parameter and authorisation configs

Add various autoconf directives for ldap and internal-db authenticaiton,
also additional checks whether the Zend DB Adapters are available and
whether the php setup fulfills the requirements

refs #4175
2013-07-03 14:05:59 +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