4242 Commits

Author SHA1 Message Date
Johannes Meyer
124f64ad89 Merge branch 'master' into bugfix/drop-zend-config-7147 2014-11-07 14:07:15 +01:00
Johannes Meyer
7b99b74ae1 Prefer Icinga\Application\Config instead of Zend_Config
refs #7147
2014-11-07 13:53:03 +01:00
Johannes Meyer
268569114c Fix that an error is thrown when reading INI files without trailing newlines 2014-11-07 13:38:35 +01:00
Johannes Meyer
4537b2932e Fix that current(), key(), etc does not work with Config objects 2014-11-07 13:37:09 +01:00
Bernd Erk
84c0bc0a8e Fixed login button 2014-11-07 13:29:59 +01:00
Marius Hein
8583be040c Setup/Webserver: Fix nginx static file resolve issue
refs #6738
2014-11-07 12:02:48 +01:00
Bernd Erk
049c9edb67 modified forms 2014-11-07 11:38:32 +01:00
Marius Hein
f07cbcc107 Setup/Webserver: Consolidate apache config
Add configDir to replace tokens.

refs #6120
2014-11-07 10:34:53 +01:00
Marius Hein
ddf6bb4472 Setup/Webserver: Change template generation to nowdoc
refs #6120
2014-11-07 09:18:16 +01:00
Marius Hein
162b35566c Setup/Webserver: Change namespace
refs #6120
2014-11-07 09:09:02 +01:00
Bernd Erk
acd6e91757 Fixed font-family in search field 2014-11-07 00:56:18 +01:00
Bernd Erk
fb0fe3f46e fixed tactical overview layout 2014-11-07 00:50:17 +01:00
Bernd Erk
3c5d46ee71 redesigned login screen and image appearance 2014-11-07 00:40:32 +01:00
Bernd Erk
48a4403d6f Design Timeline 2014-11-06 23:40:57 +01:00
Bernd Erk
7aef0581f3 Changed to color codes using less 2014-11-06 22:55:17 +01:00
Bernd Erk
f300c121cd Redesign tactical overview 2014-11-06 22:38:06 +01:00
Bernd Erk
c885544a6b fixed hostgroup and servicegroup design 2014-11-06 22:03:03 +01:00
Matthias Jentsch
54eda31633 Allow connect to hosts with no anonymous access
Do not throw exceptions on failed ldap connects during capability discovery

fixes #7325
2014-11-06 17:04:56 +01:00
Matthias Jentsch
d0706a55ea Chain exceptions in LdapUserBackend instead of printing the message 2014-11-06 16:32:43 +01:00
Thomas Gelf
74e60ec0f6 MonitoredObject: decode structured customvars
fixes #7569
2014-11-06 16:15:16 +01:00
Thomas Gelf
816c309193 Ido\CustomvarQuery: add is_json
This has to be done in a backward compatible way, we check for IDO
>= 1.12.0.

refs #7569
2014-11-06 16:14:03 +01:00
Thomas Gelf
2782b0a744 Dataview\Customvar: add new is_json column
refs #7569
2014-11-06 16:13:17 +01:00
Thomas Gelf
abf267b0b9 monitoring/css: style structured custom vars
refs #7569
2014-11-06 16:12:07 +01:00
Thomas Gelf
da20926a97 Customvars: use new helper
refs #7569
2014-11-06 16:11:29 +01:00
Thomas Gelf
a8326350d1 Customvar view helper: show structured data
refs #7569
2014-11-06 16:10:52 +01:00
Bernd Erk
548058650a Fixed Plugin output and box-border 2014-11-06 15:49:26 +01:00
Johannes Meyer
83f386f92a Do not extend Zend_Config in Icinga\Application\Config
refs #7147
fixes #7580
2014-11-06 15:41:31 +01:00
Bernd Erk
71cbf83766 Reduced menu size 2014-11-06 13:25:52 +01:00
Marius Hein
cd9e3693e4 Downtime: Add filter editor and preview
resolves #7445
2014-11-06 13:22:38 +01:00
Marius Hein
52c452c044 Monitoring/Backens: Add resource configuration link
resolves: #7493
2014-11-06 12:59:31 +01:00
Marius Hein
92f8f9f7da Bug7043Test: Fix declaration error
ConfigWithSetModuleConfig::setModuleConfig must be compatible with
Icinga\Application\Config::setModuleConfig.
2014-11-06 12:14:35 +01:00
Marius Hein
c0f84a945c Setup/Webserver: Add nginx sub path configuration
refs #6738
2014-11-06 11:24:41 +01:00
Marius Hein
f49c8c02db Setup/Webserver: Add nginx configuration
refs #6738
2014-11-06 11:06:55 +01:00
Marius Hein
8e28fff524 Setup/Webserver: Adapt class names to filename
refs #6120
2014-11-06 10:50:54 +01:00
Johannes Meyer
f8724c504b Use a subclass of Icinga\Application\Config to preset a module config
Implementing methods for just tests is discouraged
2014-11-06 10:07:57 +01:00
Bernd Erk
c49bcebcb3 Fixed headlines and badges in monitoring module 2014-11-06 01:47:22 +01:00
Bernd Erk
699be20db0 completed header tabs 2014-11-06 01:29:19 +01:00
Bernd Erk
bc5f296e60 Fixed badges in menu 2014-11-06 00:40:44 +01:00
Bernd Erk
f9e8cc84b9 Design: headline and main menu 2014-11-06 00:09:14 +01:00
Marius Hein
bb7f465c0e Generate apache2 and apache 2.4 configuration
refs #6120
2014-11-05 15:32:09 +01:00
Alexander Fuhr
2e24c53224 Merge branch 'master' into feature/localization-form-6073
Conflicts:
	application/forms/Config/GeneralForm.php
	application/forms/Preference/GeneralForm.php
	library/Icinga/Application/Web.php
2014-11-05 13:27:45 +01:00
Gunnar Beutner
f6595267d6 Use arrays in the Icinga 2 example config 2014-11-05 09:49:59 +01:00
Johannes Meyer
7569c55796 Fix how password hashes are stored and retrieved in DbUserBackend 2014-11-04 15:52:09 +01:00
Johannes Meyer
0db658b7f3 Fix that pgsql privileges were tested in case of mysql
refs #7163
2014-11-04 15:51:11 +01:00
Johannes Meyer
69b38768cf Fix "Icinga\Logger\Logger not found"
The class was moved to Icinga\Application\Logger.
2014-11-04 15:50:34 +01:00
Johannes Meyer
5a169ee656 Fix "PreservingIniWriter not found"
The class was renamed a few commits ago to "IniWriter"
2014-11-04 14:35:57 +01:00
Johannes Meyer
170ded6510 Merge branch 'master' into feature/setup-wizard-7163
Conflicts:
	library/Icinga/Authentication/Backend/LdapUserBackend.php
	library/Icinga/File/Ini/IniWriter.php
2014-11-04 14:22:53 +01:00
Johannes Meyer
581935c26f Fix database setup and add support for the new schema
refs #7163
2014-11-04 13:51:15 +01:00
Johannes Meyer
0c8aa6502b Add `prefix' option when creating the resource config for web2's database
refs #7163
2014-11-04 13:49:01 +01:00
Johannes Meyer
ab5df7d2ba Show notification bar in the wizard as well
refs #7163
2014-11-04 13:48:09 +01:00