Commit Graph

136 Commits

Author SHA1 Message Date
Eric Lippmann f097299534 Merge branch 'master' into feature/remove-autotools-files-7505 2014-11-13 10:52:40 +01:00
Johannes Meyer 9d292269b1 Merge branch 'master' into feature/setup-wizard-7163
Conflicts:
	application/forms/Config/Resource/LdapResourceForm.php
	test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
2014-11-11 09:44:11 +01:00
Gunnar Beutner f6595267d6 Use arrays in the Icinga 2 example config 2014-11-05 09:49:59 +01:00
Eric Lippmann cf7e768f39 Do not spread .gitattributes over multiple files 2014-10-30 13:21:16 +01:00
Johannes Meyer 8f787e649c Update documentation and fix vagrant manifest due to moved schema files 2014-10-08 08:52:04 +02:00
Alexander Fuhr 3a85a45ef2 Fix preferences directory dependency in vagrant provision manifests default.pp 2014-08-26 12:08:55 +02:00
Alexander Fuhr c8643ab02e Add preferences directory to vagrant provision default.pp 2014-08-26 11:48:27 +02:00
Alexander Fuhr 7d25efb93c Remove dashboard.ini related parts
refs #6639
2014-08-26 10:34:33 +02:00
Alexander Fuhr 1e891c2510 Delete unnecessary menu.ini's and update puppet manifests
refs #6639
2014-08-22 10:58:28 +02:00
Alexander Fuhr 36a275371f Delete unnecessary configurations files from .vagrant-puppet
fixes #5749
2014-08-20 16:26:52 +02:00
Alexander Fuhr e0b9730f17 Update configurations source paths in puppet default.pp
refs #5749
2014-08-20 16:01:08 +02:00
Alexander Fuhr bef639ecb8 Update deprecated output variable in puppet files 2014-08-20 15:16:42 +02:00
Alexander Klimov bb65fb396a Merge branch 'bugfix/sensitive-custom-vars-6641'
fixes #6641
2014-08-20 12:29:45 +02:00
Johannes Meyer 09dfcca0bc Merge branch 'master' into bugfix/styled-history-views-6637 2014-08-20 11:39:03 +02:00
Johannes Meyer 4eaf94cdf1 Show only acknowledgement and user comments by default 2014-08-20 11:33:22 +02:00
Alexander Klimov c6d4ab4c44 Vagrant/Puppet: add file '/etc/icingaweb/modules/monitoring/config.ini'
refs #6641
2014-08-19 15:04:43 +02:00
Eric Lippmann 1c74fd7028 Merge branch 'master' into feature/display-documentation-4820
Conflicts:
	modules/doc/library/Doc/DocParser.php
2014-08-19 13:39:48 +02:00
Alexander Fuhr c69af6c5d2 Move "modules" to "System" menu
resolves #6934
2014-08-19 11:14:18 +02:00
Alexander Fuhr aec0591001 Add monitoring-plugins Puppet module and drop direct download of the
plugins

fixes #6953
2014-08-18 16:52:59 +02:00
Alexander Klimov 59c5b70f71 Correct path to icinga2-ido-mysql's schema file 2014-08-18 13:51:06 +02:00
Michael Friedrich 3e4944c60a Vagrant: Update monitoring-plugins/livestatus
Move all hardcoded versions to the header too.

fixes #6818
2014-07-30 14:04:57 +02:00
Michael Friedrich 0b1aee8a35 Vagrant: Fix Icinga 2 MySQL creation
refs #6741
2014-07-29 13:04:20 +02:00
Eric Lippmann a0867ce33a doc module/Vagrant: Add menu.ini
refs #4820
2014-07-28 19:26:39 +02:00
Eric Lippmann ce4fa1fd3d Vagrant/doc module: Add menu link to the documentation module
refs #4820
2014-07-28 19:14:50 +02:00
Johannes Meyer 3105c2059e Remove license headers from all files
refs #6309
2014-07-15 13:43:52 +02:00
Johannes Meyer b046023623 Ensure that our menu inis are in sync and up2date
The menu configurations for vagrant missed the entries for the timeline,
applicationlog and contacts-view.

fixes #6512
2014-07-11 08:49:58 +02:00
Johannes Meyer d4a4cf90ad Fix vagrant provisioning for icinga1.x access 2014-07-02 08:39:49 +02:00
Thomas Gelf 79cdd8c94a servicematrix: show only problems per default
a) because it makes sense
b) because there seems to be a bug with unfiltered matrix

I'll investigate this, in the meantime it works like this - and is
more useful than it used to be.
2014-06-21 05:03:23 +02:00
Thomas Gelf f9b18828c1 menu/monitoring: get rid of raw_timestamp
We use this only internally, raw_timestamp should not be accessible
2014-06-20 19:07:43 +02:00
Marius Hein 89ae3713cd Vagrant/finalize: Do not remount /vagrant/var/log
If you do multiple provisioning calls mount point
/vagrant/var/log is mounted multiple times.
2014-06-06 11:01:20 +02:00
Marius Hein e3cd50ef16 Puppet: Remove stuff from manifest we do not need again 2014-06-06 10:50:58 +02:00
Marius Hein 58b509b8ee Puppet: Use /vagrant directory to deliver web files
Apache uses now /vagrant/public instead of /var/www/html
symlinks.

fixes #6421
2014-06-06 10:48:22 +02:00
Thomas Gelf 72a2ec41ba Vagrant: FollowSymlinks instead of ...IfOwnerMatch
Dirty like the rest of that setup :p
2014-06-05 15:07:41 +00:00
Thomas Gelf 176588c87d installation: get rid of .htaccess, less automake
Trying to remove a bunch of autoconf and .htaccess-related stuff.
This commit is the last one from a series now finally allowing to run
icingaweb directly from a git checkout.

refs #4075
2014-06-05 14:54:00 +00:00
Michael Friedrich 8fe804bbd4 Enable icinga snapshot repository and fetch latest icinga2 packages
Furthermore get rid of multiple 'exec' calls and use 'package' instead.
Additional refactoring for icinga 2 features.

fixes #6405
2014-06-04 16:09:50 +02:00
Marius Hein 29f593a357 Authentication: Add backend to handle external authentication
Drop external auth configuration from config.ini and move
implementation into a single backend provider named
'autologin'. This provider can strip realm names from
username with a custom regexp.

fixes #6081
2014-06-03 17:59:22 +02:00
Marius Hein 9b5c704da8 Puppet/Icinga2: Fix installation for Icinga2-2.0.0beta2 2014-06-03 14:44:13 +02:00
Eric Lippmann 274fc58d0f Vagrant: Fix file permissions of mount.vboxsf
refs #5982
2014-06-03 13:17:07 +02:00
Eric Lippmann 02007cf9fb Vagrant: No longer remount the config/ directory
The virtual machine uses its own config files beneath /etc/icingaweb.
2014-06-03 13:11:28 +02:00
Eric Lippmann 473d986dfb Revert "Vagrant/finalize.sh: Remove dmode and fmode options from mount.vboxsf"
This reverts commit 3a25f019c5.

The "wrong" permissions do of course come from fmode=775 rather than dmode=775. I'm just blind.

refs #5982
2014-06-02 18:15:19 +02:00
Eric Lippmann 3a25f019c5 Vagrant/finalize.sh: Remove dmode and fmode options from mount.vboxsf
The dmode and fmode options seem to set the execute bit even when the mode is 775.

refs #5982
2014-06-02 10:47:44 +02:00
Michael Friedrich 9a8965510a Install icingacli and bash completion in Vagrant VM
fixes #6264
refs #5803
2014-05-23 15:26:46 +02:00
Gunnar Beutner 4a5fa5f17b Update Icinga 2 version in the Puppet manifest
fixes #6219
2014-05-16 13:33:30 +02:00
Gunnar Beutner be6844c458 Fix problems with the Puppet manifest when PostgreSQL's default encoding isn't UTF-8
fixes #6211
2014-05-15 13:44:21 +02:00
Michael Friedrich f6d42944f7 Update Vagrant Icinga 2 test config
refs #6127
2014-05-14 17:45:40 +02:00
Gunnar Beutner 87054c8121 Make sure line-endings for Puppet manifests are LFs only.
fixes #6181
2014-05-10 09:34:21 +02:00
Marius Hein d681031b7b Vagrant/Icinga2: Add dependencies for test config
refs #6127
2014-05-09 18:40:46 +02:00
Marius Hein 8d42914a84 Vagrant/Icinga2: Upgrade to snapshots and optimize configuration
refs #6127
2014-05-09 18:36:35 +02:00
Marius Hein fb44940dea Vagrant/Icinga2: Optimize test configuration 2014-05-09 18:36:34 +02:00
Marius Hein 5dd85a7ee1 Vagrant: Add Icinga2 and test configuration
refs #6127
2014-05-09 18:36:34 +02:00