Commit Graph

228 Commits

Author SHA1 Message Date
Thomas Gelf 140b246974 Livestatus\Connection: remove obsolete constant
TCPNODELAY is available in PHP >= 5.3
2014-11-16 17:58:56 +01:00
Thomas Gelf 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
Thomas Gelf 628597d6cb Livestatus\Query: some more filter-related stuff 2014-11-16 16:32:53 +01:00
Thomas Gelf 46b047b013 Livestatus\Query: add customvar support 2014-11-16 16:31:09 +01:00
Thomas Gelf 7d02107803 Livestatus\Query: fix limit, add some notes 2014-11-16 16:29:40 +01:00
Thomas Gelf d7141392a5 Livestatus\Query: return available columns 2014-11-16 16:28:52 +01:00
Thomas Gelf 7b6b9b8574 LivestatusConnection: separator constant 2014-11-16 16:27:21 +01:00
Thomas Gelf e0143bf572 Livestatus\Connection: add missing use statements 2014-11-16 16:26:28 +01:00
Thomas Gelf fd55ffe47e Livestatus\Connection: switch to new fetch methods 2014-11-16 16:25:47 +01:00
Thomas Gelf efd395e12a Livestatus\ResponseRow: initial dummy implementation 2014-11-16 16:22:10 +01:00
Thomas Gelf 17c8453c1c Livestatus\Connection: line splitting implementation
Will need some more work to get SplFixedArray handling safe
2014-11-16 16:02:50 +01:00
Thomas Gelf e1cdd30c93 Livestatus\Connection: fetch row from socket...
...basically just calling readLine, but splitting columns
2014-11-16 16:00:03 +01:00
Thomas Gelf e755b37af3 Livestatus\Connection: discover column headers...
...in case the query doesn't know about
2014-11-16 15:56:58 +01:00
Thomas Gelf 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
Thomas Gelf a027efc9e7 Livestatus\Connection: make use of socketError 2014-11-16 15:55:20 +01:00
Thomas Gelf d66c95a725 Livestatus\Connection: implement socketError method 2014-11-16 15:54:32 +01:00
Thomas Gelf be8120bd39 Livestatus\Connection: document hardcoded count 2014-11-16 15:53:19 +01:00
Thomas Gelf d6b9f56a2c Livestatus\Connection: throw "better" exceptions
Removed outdated method
2014-11-16 15:51:26 +01:00
Thomas Gelf 578873f695 Livestatus\Query: start using new filter methods 2014-11-16 15:48:59 +01:00
Thomas Gelf 3b1b38a353 Livestatus\Query: attempt to separate column handling 2014-11-16 15:47:06 +01:00
Thomas Gelf 4b5b5f4ae3 Livestatus\Query: use trigger_error in __toString 2014-11-16 15:37:52 +01:00
Thomas Gelf 510e1e66d6 Livestatus\Connection: add fetchRow / fetchPairs
Temporary ugly and slow implementation
2014-11-16 15:33:17 +01:00
Thomas Gelf 4cbe8da26f Livestatus\Query: add a lot of filter voodoo 2014-11-16 15:30:10 +01:00
Thomas Gelf 14cdcc8ce2 Livestatus\Query: fetch csv, not json 2014-11-16 15:28:17 +01:00
Thomas Gelf 23546a4224 Livestatus\Query: parse an array structure 2014-11-16 15:22:54 +01:00
Thomas Gelf 1b8449009c Livestatus\Connection: temporarily hardcode count 2014-11-16 15:20:12 +01:00
Thomas Gelf 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
Thomas Gelf 38fec33849 Livestatus\Query: temporarily disable count cache 2014-11-16 15:12:13 +01:00
Thomas Gelf 48dfb1bb70 Livestatus\Query: remove obsolete properties 2014-11-16 15:11:31 +01:00
Thomas Gelf 39a995cc6f Livestatus\Query: remove SimpleQuery tasks 2014-11-16 15:09:33 +01:00
Thomas Gelf 6de98dcf97 Livestatus\Query: extend SimpleQuery, not abstract 2014-11-16 15:06:58 +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
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
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
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
Eric Lippmann 16352fc10c Move Logger to the Application namespace
fixes #7148
2014-10-31 10:27:17 +01:00
Matthias Jentsch 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
Eric Lippmann 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
Alexander Klimov 051128b967 Icinga\Protocol\File\FileReader: don't use Icinga\Util\Enumerate 2014-10-02 13:59:53 +02:00
Alexander Klimov e192b939c2 Icinga\Protocol\File\FileIterator: extend EnumeratingFilterIterator 2014-10-02 13:59:52 +02:00
Eric Lippmann 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
Alexander Klimov 52c1d98beb Icinga\Protocol\File\FileReader: use Icinga\Util\Enumerate 2014-09-05 13:49:28 +02:00
Alexander Klimov 70146c43e7 Icinga\Protocol\File\FileReader: implement Icinga\Data\Selectable, and Countable 2014-09-04 16:59:37 +02:00
Alexander Klimov 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
Alexander Klimov 876b94cccf Icinga\Protocol\File\FileReader: implement Icinga\Data\Selectable, ...\Fetchable and Countable 2014-09-04 16:54:14 +02:00
Alexander Klimov f0969e0b2e Split Icinga\Protocol\File\FileReader into ...\FileReader and ...\FileIterator 2014-09-04 16:37:26 +02:00
Alexander Klimov fcd12073f8 Rename Icinga\Protocol\File\Query to ...\File\FileQuery 2014-09-04 16:37:25 +02:00
Alexander Klimov 36a3c36c1b Rename Icinga\Protocol\File\Reader to ...\File\FileReader 2014-09-04 16:37:24 +02:00
Eric Lippmann c3c0043307 Merge branch 'master' into bugfix/commands-6593 2014-09-03 23:23:20 +02:00
Alexander Klimov 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
Alexander Klimov e45f50408a Icinga\Protocol\File\Reader::fetchPairs(): rename variables
$skipLines -> $skip
$readLines -> $read

refs #7060
2014-09-03 16:14:14 +02:00
Alexander Klimov 88dde47b7a Foreach: add $value so that the value won't be assigned to $key
refs #7060
2014-09-03 15:39:25 +02:00
Alexander Klimov 3ade6da44d FileReaderException: extend IcingaException 2014-09-03 11:14:22 +02:00
Marius Hein 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
Marius Hein baf768040f LdapQuery: Use Ldap/Exception for errors
refs #5536
2014-09-02 09:55:57 +02:00
Eric Lippmann 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
Alexander Klimov 45638b218c Throw IcingaException rather than Exception
fixes #7014
2014-08-27 16:03:15 +02:00
Alexander Klimov 7ff51caed0 Remove leading backslashes from the targets of use statements
- use \Exception;
+ use Exception;
2014-08-27 15:51:49 +02:00
Eric Lippmann 1dea19504f Revert "Remove leading backslashes from the targets of use statements"
This reverts commit 87a5967501.

At least 'modules/doc/run.php' issues a warning about "The use statement with non-compound name 'Zend_Controller_Router_Route' has no effect"
2014-08-27 12:24:11 +02:00
Alexander Klimov 87a5967501 Remove leading backslashes from the targets of use statements
- use \Exception;
+ use Exception;
2014-08-27 11:16:44 +02:00
Eric Lippmann 6b88f1c98e Move Commandpipe/* classes from Icinga Web 2's library to the monitoring module
refs #6593
2014-08-26 16:35:30 +02:00
Alexander Klimov 1f7d4cb61b Merge branch 'master' into bugfix/exceptions-with-printf-params-6931 2014-08-26 11:24:33 +02:00
Alexander Klimov febb2d1ae2 ProgrammingError: extend IcingaException
refs #6931
2014-08-26 11:15:19 +02:00
Alexander Klimov 4ec6dbe3f0 Prefer single quotes ' rather than double quotes " 2014-08-26 10:41:17 +02:00
Alexander Klimov f754531e4d Fix grammatical error 2014-08-26 10:22:14 +02:00
Alexander Klimov 9c5878cbbe ConfigurationError: extend IcingaException
refs #6931
2014-08-22 11:46:11 +02:00
Johannes Meyer dc8181cdc5 Escape linefeeds and carriage returns in commands and show them as html
fixes #6088
2014-08-14 10:23:04 +02:00
Alexander Klimov 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
Alexander Klimov c5ecbf250d lib: add FileReaderException for file reader specific errors
refs #6722
2014-07-21 14:11:08 +02:00
Alexander Klimov 6df7be7ee5 File/Query: Fix `applyFilter' and `order' not matching SimpleQuery's interfaces
refs #6722
2014-07-21 14:09:40 +02:00
Alexander Klimov 5ea02b41ea Optimize variable names and positions, cast array direct to object 2014-07-18 17:35:24 +02:00
Johannes Meyer 3105c2059e Remove license headers from all files
refs #6309
2014-07-15 13:43:52 +02:00
Alexander Klimov 22e13ce282 Replace DatasourceInterface with Selectable in Icinga/Protocol/Statusdat/Reader
refs #6542
2014-06-27 14:30:57 +02:00
Alexander Klimov 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
Alexander Klimov 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
Johannes Meyer 7f99be73fd Adjust usages of Icinga\Util\File to suit the new interface introduced earlier 2014-06-26 15:57:14 +02:00
Matthias Jentsch c18b6f26f0 Throw Ldap\Exception when something goes wrong in a Ldap connection 2014-06-25 12:41:17 +02:00
Matthias Jentsch e7548b6fc7 Return null for empty DNS query results 2014-06-25 12:41:17 +02:00
Johannes Meyer 9066a0c2fa Fix deadlock when writing to the command pipe while noone is listening 2014-06-23 15:02:06 +02:00
Matthias Jentsch 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
Matthias Jentsch 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
Thomas Gelf c0c7a815f8 Merge remote-tracking branch 'origin/master' into feature/query-interfaces-6018 2014-06-20 19:18:38 +02:00
Matthias Jentsch 521cc0cac4 Refactor Ldap and Dns utility functions and conform to coding guidelines
refs #6507
2014-06-18 14:38:44 +02:00
Thomas Gelf e3e6826d9d Icinga\Filter: remove 2014-06-17 13:26:57 +00:00
Thomas Gelf 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
Matthias Jentsch bca166c644 Do not throw an exception when the username does not exist
refs #6457
2014-06-11 15:08:05 +02:00
Matthias Jentsch 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
Matthias Jentsch 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
Matthias Jentsch 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
Thomas Gelf 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
Thomas Gelf 6a1602a499 Exception messages should be single-line strings
fixes #6095
2014-05-02 11:19:35 +02:00
Johannes Meyer 21b949758f Refactor ResourceForm tests
refs #6011
2014-04-28 14:06:38 +02:00
Alexander Klimov 6973b04211 Don't throw exception if logfile is not found
fixes #6035
2014-04-23 12:21:42 +02:00
Alexander Klimov 070e608236 Read log file chunkwise
resolves #6021
2014-04-17 18:01:24 +02:00
Alexander Klimov cdf1a0b683 Write more class documentation 2014-04-02 13:47:02 +02:00
Alexander Klimov 241fda1196 Small cleanup 2014-04-02 13:47:02 +02:00
Alexander Klimov 2a10f6184a Write class documentation 2014-04-02 13:47:02 +02:00
Alexander Klimov 7c599e206e Make it working
refs #4514
2014-04-02 13:47:01 +02:00
Alexander Klimov 933a851f65 Initial commit
refs #4514
2014-04-02 13:47:01 +02:00