c288a68ed5
Merge branch 'master' into bugfix/drop-zend-config-7147
...
Conflicts:
application/forms/LdapDiscoveryForm.php
2014-11-18 13:21:18 +01:00
7621f6642d
Adjust usages of Icinga\Application\Config
...
refs #7147
2014-11-18 13:11:52 +01:00
5f8fcf4005
Fix Ldap server discovery
...
Add a new connection member that stores whether settings were guessed or product of a discovery, move discovery methods into seperate class.
fixes #7691
2014-11-18 09:45:54 +01:00
b6464c5d83
Livestatus\Connection: one more comment
2014-11-16 18:43:11 +01:00
aaec1b84bf
Livestatus\Query: indentation
2014-11-16 18:42:10 +01:00
0ff9d57504
Livestatus\Connection: just a comment
2014-11-16 18:37:01 +01:00
195375f055
Livestatus\Query: use calculated column headers
2014-11-16 18:03:58 +01:00
d368df8211
Livestatus\Connection: check resource on disconnect
2014-11-16 18:01:07 +01:00
2c7373f385
Livestatus\Connection: benchmark, comments
2014-11-16 17:59:56 +01:00
140b246974
Livestatus\Connection: remove obsolete constant
...
TCPNODELAY is available in PHP >= 5.3
2014-11-16 17:58:56 +01:00
6bf0ca216a
Livestatus\Query: resultrow method - base for more
...
This is where query-based column fixup voodoo starts
2014-11-16 16:35:02 +01:00
628597d6cb
Livestatus\Query: some more filter-related stuff
2014-11-16 16:32:53 +01:00
46b047b013
Livestatus\Query: add customvar support
2014-11-16 16:31:09 +01:00
7d02107803
Livestatus\Query: fix limit, add some notes
2014-11-16 16:29:40 +01:00
d7141392a5
Livestatus\Query: return available columns
2014-11-16 16:28:52 +01:00
7b6b9b8574
LivestatusConnection: separator constant
2014-11-16 16:27:21 +01:00
e0143bf572
Livestatus\Connection: add missing use statements
2014-11-16 16:26:28 +01:00
fd55ffe47e
Livestatus\Connection: switch to new fetch methods
2014-11-16 16:25:47 +01:00
efd395e12a
Livestatus\ResponseRow: initial dummy implementation
2014-11-16 16:22:10 +01:00
17c8453c1c
Livestatus\Connection: line splitting implementation
...
Will need some more work to get SplFixedArray handling safe
2014-11-16 16:02:50 +01:00
e1cdd30c93
Livestatus\Connection: fetch row from socket...
...
...basically just calling readLine, but splitting columns
2014-11-16 16:00:03 +01:00
e755b37af3
Livestatus\Connection: discover column headers...
...
...in case the query doesn't know about
2014-11-16 15:56:58 +01:00
8ec8c153dd
Livestatus\Connection: implement readLineFromSocket
...
We want to stream data in the near future, so reading line by line is
essential
2014-11-16 15:55:53 +01:00
a027efc9e7
Livestatus\Connection: make use of socketError
2014-11-16 15:55:20 +01:00
d66c95a725
Livestatus\Connection: implement socketError method
2014-11-16 15:54:32 +01:00
be8120bd39
Livestatus\Connection: document hardcoded count
2014-11-16 15:53:19 +01:00
d6b9f56a2c
Livestatus\Connection: throw "better" exceptions
...
Removed outdated method
2014-11-16 15:51:26 +01:00
578873f695
Livestatus\Query: start using new filter methods
2014-11-16 15:48:59 +01:00
3b1b38a353
Livestatus\Query: attempt to separate column handling
2014-11-16 15:47:06 +01:00
4b5b5f4ae3
Livestatus\Query: use trigger_error in __toString
2014-11-16 15:37:52 +01:00
510e1e66d6
Livestatus\Connection: add fetchRow / fetchPairs
...
Temporary ugly and slow implementation
2014-11-16 15:33:17 +01:00
4cbe8da26f
Livestatus\Query: add a lot of filter voodoo
2014-11-16 15:30:10 +01:00
14cdcc8ce2
Livestatus\Query: fetch csv, not json
2014-11-16 15:28:17 +01:00
23546a4224
Livestatus\Query: parse an array structure
2014-11-16 15:22:54 +01:00
1b8449009c
Livestatus\Connection: temporarily hardcode count
2014-11-16 15:20:12 +01:00
0916f57ce8
Livestatus\Query: split string cast implementation
...
This way we can use an exception-throwing variant internally while not
breaking __toString
2014-11-16 15:13:07 +01:00
38fec33849
Livestatus\Query: temporarily disable count cache
2014-11-16 15:12:13 +01:00
48dfb1bb70
Livestatus\Query: remove obsolete properties
2014-11-16 15:11:31 +01:00
39a995cc6f
Livestatus\Query: remove SimpleQuery tasks
2014-11-16 15:09:33 +01:00
6de98dcf97
Livestatus\Query: extend SimpleQuery, not abstract
2014-11-16 15:06:58 +01:00
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
124f64ad89
Merge branch 'master' into bugfix/drop-zend-config-7147
2014-11-07 14:07:15 +01:00
7b99b74ae1
Prefer Icinga\Application\Config instead of Zend_Config
...
refs #7147
2014-11-07 13:53:03 +01:00
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
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
16352fc10c
Move Logger to the Application namespace
...
fixes #7148
2014-10-31 10:27:17 +01:00
df69fd2264
Make Dns::getSrvRecors being more generic
...
The `target' property of a returned service record is too specific and causes
other properties being ignored.
2014-10-09 10:19:21 +02:00
1b23fd7fbe
monitoring: Don't support status.dat as backend
...
Icinga Web 2 will not support status.dat for now and maybe forever.
2014-10-07 13:22:07 +02:00
051128b967
Icinga\Protocol\File\FileReader: don't use Icinga\Util\Enumerate
2014-10-02 13:59:53 +02:00
e192b939c2
Icinga\Protocol\File\FileIterator: extend EnumeratingFilterIterator
2014-10-02 13:59:52 +02:00
0e7ca591ec
Merge branch 'master' into bugfix/commands-6593
...
Conflicts:
application/forms/Preference/GeneralForm.php
application/views/helpers/FormDateTime.php
modules/monitoring/application/forms/Command/CommandForm.php
2014-09-08 10:16:05 +02:00
52c1d98beb
Icinga\Protocol\File\FileReader: use Icinga\Util\Enumerate
2014-09-05 13:49:28 +02:00
70146c43e7
Icinga\Protocol\File\FileReader: implement Icinga\Data\Selectable, and Countable
2014-09-04 16:59:37 +02:00
3c4a719feb
Revert "Icinga\Protocol\File\FileReader: implement Icinga\Data\Selectable, ...\Fetchable and Countable"
...
This reverts commit 7edbb8f27216e6faa0d0dc5a71b407748e9dd535.
2014-09-04 16:55:02 +02:00
876b94cccf
Icinga\Protocol\File\FileReader: implement Icinga\Data\Selectable, ...\Fetchable and Countable
2014-09-04 16:54:14 +02:00
f0969e0b2e
Split Icinga\Protocol\File\FileReader into ...\FileReader and ...\FileIterator
2014-09-04 16:37:26 +02:00
fcd12073f8
Rename Icinga\Protocol\File\Query to ...\File\FileQuery
2014-09-04 16:37:25 +02:00
36a3c36c1b
Rename Icinga\Protocol\File\Reader to ...\File\FileReader
2014-09-04 16:37:24 +02:00
c3c0043307
Merge branch 'master' into bugfix/commands-6593
2014-09-03 23:23:20 +02:00
ede5b8f0b9
Icinga\Protocol\File\Reader::fetchPairs(): increase $index manually as the iterator's one makes trouble
...
refs #7060
2014-09-03 18:36:59 +02:00
e45f50408a
Icinga\Protocol\File\Reader::fetchPairs(): rename variables
...
$skipLines -> $skip
$readLines -> $read
refs #7060
2014-09-03 16:14:14 +02:00
88dde47b7a
Foreach: add $value so that the value won't be assigned to $key
...
refs #7060
2014-09-03 15:39:25 +02:00
3ade6da44d
FileReaderException: extend IcingaException
2014-09-03 11:14:22 +02:00
ee6145a173
Ldap/Query: Remove __toString()
...
This is needed because of exception handling. Exceptions can now bubble
up for default handling. Method render() was renamed to create() because
the method create a query. Adjust the test for method create().
refs #5536
2014-09-02 10:17:01 +02:00
baf768040f
LdapQuery: Use Ldap/Exception for errors
...
refs #5536
2014-09-02 09:55:57 +02:00
a01ee00c27
Merge branch 'bugfix/rebuild-form-builder-5525' into bugfix/commands-6593
...
Conflicts:
library/Icinga/Protocol/Commandpipe/Transport/Transport.php
2014-08-29 17:24:44 +02:00
45638b218c
Throw IcingaException rather than Exception
...
fixes #7014
2014-08-27 16:03:15 +02:00
7ff51caed0
Remove leading backslashes from the targets of use statements
...
- use \Exception;
+ use Exception;
2014-08-27 15:51:49 +02:00
1dea19504f
Revert "Remove leading backslashes from the targets of use statements"
...
This reverts commit 87a5967501
2014-08-27 12:24:11 +02:00
87a5967501
Remove leading backslashes from the targets of use statements
...
- use \Exception;
+ use Exception;
2014-08-27 11:16:44 +02:00
6b88f1c98e
Move Commandpipe/* classes from Icinga Web 2's library to the monitoring module
...
refs #6593
2014-08-26 16:35:30 +02:00
1f7d4cb61b
Merge branch 'master' into bugfix/exceptions-with-printf-params-6931
2014-08-26 11:24:33 +02:00
febb2d1ae2
ProgrammingError: extend IcingaException
...
refs #6931
2014-08-26 11:15:19 +02:00
4ec6dbe3f0
Prefer single quotes ' rather than double quotes "
2014-08-26 10:41:17 +02:00
f754531e4d
Fix grammatical error
2014-08-26 10:22:14 +02:00
9c5878cbbe
ConfigurationError: extend IcingaException
...
refs #6931
2014-08-22 11:46:11 +02:00
dc8181cdc5
Escape linefeeds and carriage returns in commands and show them as html
...
fixes #6088
2014-08-14 10:23:04 +02:00
cebd71b2ff
Fix "Fatal error: Interface 'Icinga\Data\DatasourceInterface' not found in Icinga\Protocol\File\Reader"
...
fixes #6722
2014-07-21 14:14:13 +02:00
c5ecbf250d
lib: add FileReaderException for file reader specific errors
...
refs #6722
2014-07-21 14:11:08 +02:00
6df7be7ee5
File/Query: Fix `applyFilter' and `order' not matching SimpleQuery's interfaces
...
refs #6722
2014-07-21 14:09:40 +02:00
5ea02b41ea
Optimize variable names and positions, cast array direct to object
2014-07-18 17:35:24 +02:00
3105c2059e
Remove license headers from all files
...
refs #6309
2014-07-15 13:43:52 +02:00
22e13ce282
Replace DatasourceInterface with Selectable in Icinga/Protocol/Statusdat/Reader
...
refs #6542
2014-06-27 14:30:57 +02:00
c0b44c3248
Revert "Fix PHP Fatal error "Interface Icinga\Data\DatasourceInterface not found in /vagrant/library/Icinga/Protocol/Statusdat/Reader.php on line 41""
...
This reverts commit 35e12c2053685a6951765a007a0e3f8c7999734f.
2014-06-27 14:30:57 +02:00
b04f9b91be
Fix PHP Fatal error "Interface Icinga\Data\DatasourceInterface not found in /vagrant/library/Icinga/Protocol/Statusdat/Reader.php on line 41"
2014-06-27 14:30:57 +02:00
7f99be73fd
Adjust usages of Icinga\Util\File to suit the new interface introduced earlier
2014-06-26 15:57:14 +02:00
c18b6f26f0
Throw Ldap\Exception when something goes wrong in a Ldap connection
2014-06-25 12:41:17 +02:00
e7548b6fc7
Return null for empty DNS query results
2014-06-25 12:41:17 +02:00
9066a0c2fa
Fix deadlock when writing to the command pipe while noone is listening
2014-06-23 15:02:06 +02:00
010466f8f9
Replace sizeof with count
...
Do not use sizeof to get the length of an array, as the function name 'sizeof'
is misleading
2014-06-23 14:19:55 +02:00
77a9dd1e6e
Throw exception on fetchDN, when no row exists
...
Instead of fetchDN, authentication now uses hasUser to check if the user
exists before querying the password, to prevent the exception from messing
up the whole authentication process
2014-06-23 14:02:45 +02:00
c0c7a815f8
Merge remote-tracking branch 'origin/master' into feature/query-interfaces-6018
2014-06-20 19:18:38 +02:00
521cc0cac4
Refactor Ldap and Dns utility functions and conform to coding guidelines
...
refs #6507
2014-06-18 14:38:44 +02:00
e3e6826d9d
Icinga\Filter: remove
2014-06-17 13:26:57 +00:00
d2ccc68214
Merge remote-tracking branch 'origin/master' into feature/query-interfaces-6018
...
Conflicts:
modules/monitoring/application/controllers/ListController.php
2014-06-17 09:47:14 +00:00
bca166c644
Do not throw an exception when the username does not exist
...
refs #6457
2014-06-11 15:08:05 +02:00
305a025e7a
Detect ldap default naming context
...
Read the entries in the RootDTS of the given ldap server, to discover
its default naming context and capabilities
refs #6097
refs #6096
2014-06-06 18:18:58 +02:00
efe67377a8
Move dns discovery functions into separate class
...
Add functions to lookup and reverse-lookup domain names and move the ldap
discovery function into a separate class
refs #6093
2014-06-06 17:49:55 +02:00
953d22244a
Add host discovery to authentication page
...
Find all domains for a given hostname.
refs #6093
Conflicts:
application/forms/Install/AuthenticationPage.php
2014-06-06 17:49:55 +02:00
820b6b7a8d
Data\BaseQuery: rename to Data\SimpleQuery
...
BaseQuery should no longer be abstract but be usable as is as soon as
we stripped ResultSet-specific tasks. As "Base" suggests something that
must be extended, the name no longer fits. So this is SimpleQuery right
now.
2014-05-07 11:55:35 +00:00
6a1602a499
Exception messages should be single-line strings
...
fixes #6095
2014-05-02 11:19:35 +02:00
21b949758f
Refactor ResourceForm tests
...
refs #6011
2014-04-28 14:06:38 +02:00
6973b04211
Don't throw exception if logfile is not found
...
fixes #6035
2014-04-23 12:21:42 +02:00
070e608236
Read log file chunkwise
...
resolves #6021
2014-04-17 18:01:24 +02:00
cdf1a0b683
Write more class documentation
2014-04-02 13:47:02 +02:00
241fda1196
Small cleanup
2014-04-02 13:47:02 +02:00
2a10f6184a
Write class documentation
2014-04-02 13:47:02 +02:00
7c599e206e
Make it working
...
refs #4514
2014-04-02 13:47:01 +02:00
933a851f65
Initial commit
...
refs #4514
2014-04-02 13:47:01 +02:00
fea7e8993b
Allow LDAP queries without objectClass filter
2014-03-21 10:31:12 +00:00
aed6d74ecd
Add recursive delete support to LDAP Connection
2014-03-20 15:46:10 +00:00
12933ee706
Add children count to LDAP root node
2014-03-20 15:45:36 +00:00
292ce6e12b
Fix SSH CommandPipe transport. Did anyone ever test this?
2014-03-20 14:05:57 +00:00
462bb2e4d5
Fix obsolete Logger::warn in Ldap\Connection
2014-03-17 16:18:33 +00:00
07d04628cf
Merge branch 'feature/installation-and-configuration-cleanup-5638'
...
Conflicts:
config/config.ini.in
library/Icinga/Application/ApplicationBootstrap.php
library/Icinga/Application/Cli.php
library/Icinga/Application/EmbeddedWeb.php
library/Icinga/Application/Logger.php
library/Icinga/Application/Modules/Manager.php
library/Icinga/Application/Web.php
library/Icinga/Authentication/Backend/DbUserBackend.php
library/Icinga/Authentication/Manager.php
library/Icinga/User/Preferences/IniStore.php
test/php/library/Icinga/Application/LoggerTest.php
2014-03-03 19:03:39 +01:00
3555e66018
Make IcingaWeb using the new log wrapper
...
refs #5683
2014-02-26 11:19:52 +01:00
68357e9ca2
Fix coding style
2014-02-21 14:07:32 +01:00
971a87c608
Fixed executable flags on normal files.
...
Refs #5040
2014-02-18 09:42:13 +01:00
9647c37516
Fix LDAP DN concatenation, allow to define a search base
2014-02-14 14:38:52 +00:00
2288751aaf
Better error message in LDAP connection capability test
2014-01-22 12:30:02 +00:00
afbe8f0fcb
Implement move on LDAP Connection
...
refs #5202
Conflicts:
library/Icinga/Protocol/Ldap/Connection.php
2013-12-17 14:32:48 +01:00
bd38e998d7
Provide a cleaner interface for the Authentication Backends
...
refs #4786
2013-11-06 14:49:16 +01:00
2387380399
Statusdat: Set default cachepath to '/tmp'; disable caching when path is not writable
2013-10-28 12:46:19 +01:00
ca1d50ae53
Rename Icinga 2 Web to Icinga Web 2
2013-10-23 15:11:06 +02:00
439168ecfb
Fix ldap connection port setting
...
refs #4941
2013-10-22 17:50:21 +02:00
30b37aa1e5
Statusdat/Query::fetchRow: Fix strict standards violation
2013-10-22 15:11:07 +02:00
b6e7d5c4c1
NRPE Protocol: shorter timeout, fail-safe disconnect
2013-10-22 12:22:20 +00:00
c4f3e78c02
Fix filter behaviour, fix statusdat filter
...
refs #4469
2013-10-21 17:04:39 +02:00
278f975c48
Fix downtime query and schedule downtime
2013-10-20 16:00:56 +02:00
f3bbf09bae
Status.dat query fixes and documentation after rebase
...
refs #3801
2013-10-20 15:16:44 +02:00
f350011028
Add Status.dat backend
...
refs #3801
2013-10-20 15:16:44 +02:00
73e8d60060
Implement global commands
...
resolves #4142
2013-10-19 13:25:18 +02:00
c034a5eff8
Fix tests and a few member access issues
...
refs #3801
2013-10-17 19:55:00 +02:00
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
f76f5b1c1d
Command: Fix docstring for excludeHost
...
refs #4580
2013-09-16 14:59:45 +02:00
8baa2dec54
Command: Rename getParameters to getArguments
...
refs #4580
2013-09-16 14:46:18 +02:00
a47db3497e
Rename BaseCommand to Command
...
refs #4580
2013-09-16 14:44:59 +02:00
bf012fbd7e
Remove CommandType interface
...
Moved BaseCommand from the monitoring module to the application's library.
refs #4580
2013-09-16 14:39:14 +02:00
7045148f93
Adjust submitpassivecheckresult command handling
...
refs #4580
2013-09-16 13:14:29 +02:00
fef8370d5f
Adjust reschedulecheck command handling
...
refs #4580
2013-09-16 13:14:28 +02:00
e9dc895b37
Adjust delay notification handling
...
refs #4580
2013-09-16 13:14:28 +02:00
36424b508b
Adjust custom notification handling
...
refs #4580
2013-09-16 13:14:28 +02:00
ba7f455643
Adjust schedule downtime handling (WIP)
...
refs #4580
2013-09-16 13:14:28 +02:00
8022bf57af
Some doc fixes and other improvements
...
refs #4580
2013-09-16 13:14:28 +02:00
a5908c9553
CS: Replace multiple empty lines with one
...
find application/ library/Icinga/ test/ modules/ -name *.php | xargs sed -i '/^$/N;/^\n$/D'
2013-09-04 18:36:10 +02:00
35fd9fd391
CS: Remove whitespaces at end of line
...
find application/ library/ test/ modules/ -name *.php | xargs sed -i 's/\s\+$//'
2013-09-04 18:27:16 +02:00
7f4e1936f7
Fix trigger downtime default value issing, docstring fixes
...
refs #4580
2013-09-04 18:08:00 +02:00
b74e264f01
Refactor comment command handling
...
- Refactored Comment class
- Dropped IComment interface
- Added AddCommentCommand class
- Updated CommentForm
refs #4580
2013-09-04 18:08:00 +02:00
9a476f16f4
Re-refactor dispatch process of commands and acknowledgement handling
...
refs #4580
2013-09-04 18:08:00 +02:00
79eb6588c5
Restructure dispatch process of commands
...
refs #4580
2013-09-04 18:07:59 +02:00
Johannes Meyer
Matthias Jentsch
Thomas Gelf
Eric Lippmann
Alexander Klimov
Marius Hein
Markus Frosch
Thomas Gelf
Jannis Moßhammer