Commit Graph

5123 Commits

Author SHA1 Message Date
Alexander A. Klimov d9ff921934 RedisWriter: publish the current config dump state via icinga:dump
refs #53
2019-11-02 14:00:24 +01:00
Alexander A. Klimov 1d3109458d RedisConnection: merge write queues
refs #50
2019-11-02 14:00:24 +01:00
Alexander A. Klimov 3b61b3d37a RedisConnection: log messages
refs #50
2019-11-02 14:00:24 +01:00
Alexander A. Klimov 430c769371 RedisConnection: handle errors as expected
refs #50
2019-11-02 14:00:24 +01:00
Alexander A. Klimov 06d88477bd RedisConnection: forward I/O errors to async-ly waiting requestors
refs #50
2019-11-02 14:00:24 +01:00
Alexander A. Klimov fa5c9ac985 RedisConnection: don't read the response before the request has been written
refs #50
2019-11-02 14:00:24 +01:00
Alexander A. Klimov 132b2dcb77 Get rid of hiredis 2019-11-02 14:00:24 +01:00
Alexander A. Klimov a5971df039 RedisConnection: I/O the Redis protocol by itself (PoC) 2019-11-02 14:00:24 +01:00
Alexander A. Klimov 752c5998df Prefer vector#emplace_back over #push_back 2019-11-02 14:00:24 +01:00
Alexander A. Klimov e60ca9bca9 RedisWriter#InsertObjectDependencies(): don't change config objects' attributes in-place
refs #52
2019-11-02 14:00:24 +01:00
Noah Hilverling d5d3f3e60c Remove unused function CollectScalarVars() 2019-11-02 14:00:24 +01:00
Alexander A. Klimov 53d04cc4e8 RedisWriter#RedisGet(): std::move() query
refs #49
2019-11-02 14:00:24 +01:00
Alexander A. Klimov fb98d3edef RedisConnection#ExecuteQuer{y,ies}(): std::move() queries
refs #49
2019-11-02 14:00:24 +01:00
Alexander A. Klimov bb333b535b RedisConnection#ExecuteQueries(): fire all queries at once
refs #49
2019-11-02 14:00:23 +01:00
Alexander A. Klimov 74eccf60f2 Fix memory leak 2019-11-02 14:00:23 +01:00
Noah Hilverling 11d5415193 RedisWriter: Add depth attribute to zone 2019-11-02 14:00:23 +01:00
Noah Hilverling 8421a98a2c Fix command arguments and envvars 2019-11-02 14:00:23 +01:00
Noah Hilverling 9308acfcd5 RedisWriter: Json encode command field command 2019-11-02 14:00:23 +01:00
Noah Hilverling e41bcbc81c Do not store timeperiod range in separate key (timerange) 2019-11-02 14:00:23 +01:00
Noah Hilverling 74b6839704 Add JsonEncode to customvar value 2019-11-02 14:00:23 +01:00
Noah Hilverling fc718d99a7 Rename :overwrite: keys to :override: 2019-11-02 14:00:23 +01:00
Noah Hilverling 0bfdaccc7a Split up redis arrays into single entries 2019-11-02 14:00:23 +01:00
Alexander A. Klimov 6fd6f74b0f Fix missing ( ) 2019-11-02 14:00:23 +01:00
Alexander A. Klimov 07823c4b90 RedisWriter#CreateConfigUpdate(): don't require prepared commands 2019-11-02 14:00:23 +01:00
Alexander A. Klimov 1d126b66e9 RedisWriter#InsertObjectDependencies(): reduce memory allocations 2019-11-02 14:00:23 +01:00
Alexander A. Klimov def3c7df32 RedisWriter#CreateConfigUpdate(): reduce memory allocations 2019-11-02 14:00:23 +01:00
Alexander A. Klimov c24092a64e RedisWriter#GenerateHmsetStatements(): reduce memory allocations 2019-11-02 14:00:23 +01:00
Alexander A. Klimov 23448b0322 Make RedisWriter#ChunkObjects()'s result type more explicit 2019-11-02 14:00:23 +01:00
Alexander A. Klimov 0534141aaf Remove redundand vector#reserve() 2019-11-02 14:00:23 +01:00
Alexander A. Klimov 7d0fc91c1b RedisWriter#GetTypeObjectKeys(): move() the result 2019-11-02 14:00:23 +01:00
Noah Hilverling 13295acb72 RedisWriter: Write objects of same type in parallel 2019-11-02 14:00:23 +01:00
Noah Hilverling 68c88b3edf Implement new Redis schema
WIP


WIP
2019-11-02 14:00:23 +01:00
Alexander A. Klimov 1dcec6e77a RedisConnection#SendMessageInternal(): lock only while actually using shared objects 2019-11-02 14:00:23 +01:00
Alexander A. Klimov 50594ec1c8 Replace std::bind() with lambdas
refs #48
2019-11-02 14:00:23 +01:00
Noah Hilverling a6ec60a992 RedisWriter: Use IcingaApplication environment 2019-11-02 14:00:23 +01:00
Noah Hilverling c5b0884e44 RedisWriter: Heartbeat should occur every second 2019-11-02 14:00:23 +01:00
Alexander A. Klimov f601ba51e0 Revert "Eventqueue: Remove unused code"
This reverts commit a7873da89d.
2019-11-02 14:00:23 +01:00
Jean Flach 23099904c0 Publish when config_dump_in progress 2019-11-02 14:00:23 +01:00
Jean Flach 7890c37357 Revert "Merge branch 'bugfix/execute-quieries' into 'feature/redis'"
This reverts commit f6c1fc3b43b1895eb87c1657f3e3355bfe9ddaac, reversing
changes made to ad1d448bcdead76a2bd45171a6efcd700b1c23d0.
2019-11-02 14:00:23 +01:00
Jean Flach 0ad008f465 Handle transaction vectors better 2019-11-02 14:00:23 +01:00
Jean Flach b95e39952e Use transaction for config dump
This wraps the config dump HMSETs into a transaction.
2019-11-02 14:00:23 +01:00
Jean Flach d2dc0047a3 Lock before queueing multiple queries 2019-11-02 14:00:23 +01:00
Jean Flach 03a61347cd Fix Service's name 2019-11-02 14:00:23 +01:00
Jean Flach 037357aea5 Add severity 2019-11-02 14:00:23 +01:00
Jean Flach 57b9fc94c3 Remove is_active_check 2019-11-02 14:00:23 +01:00
Jean Flach 6705158d31 Remove unused variable 2019-11-02 14:00:23 +01:00
Jean Flach accadb5dfb Only dump relevant object types 2019-11-02 14:00:23 +01:00
Jean Flach dc5dc46364 Use ReflectionType instead of dynamic casts 2019-11-02 14:00:23 +01:00
Jean Flach 5cfd3c1ab0 Rewrite config dump 2019-11-02 14:00:23 +01:00
Jean Flach e90fb43b91 Fix empty perf data strings 2019-11-02 14:00:23 +01:00
Jean Flach 446796dadb Fix output and longOutput 2019-11-02 14:00:23 +01:00
Jean Flach 50aa0eb1d3 Fix command line string 2019-11-02 14:00:23 +01:00
Jean Flach 553f6f6ba9 Change commandline and performancedata 2019-11-02 14:00:23 +01:00
Noah Hilverling 3439ea755f Fix that state does not get synced on acknowledgement removal 2019-11-02 14:00:23 +01:00
Noah Hilverling 992727707d Redis: Encode check command 2019-11-02 14:00:23 +01:00
Jean Flach 08bfbbc070 Encode perfdata 2019-11-02 14:00:23 +01:00
Jean Flach 933de15c36 Remove TODO 2019-11-02 14:00:23 +01:00
Noah Hilverling 3fb3e8bb6d Remove dev debug log 2019-11-02 14:00:23 +01:00
Noah Hilverling 2202bde56c Add downtime handlers to state sync 2019-11-02 14:00:23 +01:00
Jean Flach af05a354fa Stop json-encoding everything 2019-11-02 14:00:23 +01:00
Jean Flach d104eb4ac1 Fix timeout 2019-11-02 14:00:23 +01:00
Jean Flach 6ce4612cd7 Export last hard/soft state dummies 2019-11-02 14:00:23 +01:00
Jean Flach e2caa47f18 Fix is_handled 2019-11-02 14:00:23 +01:00
Noah Hilverling 328adf1fc4 Add host/service state sync to acknowledgement 2019-11-02 14:00:23 +01:00
Jean Flach 916bfd20fb Update state sync 2019-11-02 14:00:23 +01:00
Noah Hilverling 9aec47efb3 Use OnStateChange instead of OnStateChanged 2019-11-02 14:00:23 +01:00
Jean Flach 02ecc3e445 Add additional fields 2019-11-02 14:00:23 +01:00
Jean Flach a7e615fbc0 Fix one unchecked checkresult access 2019-11-02 14:00:23 +01:00
Jean Flach 9b9cf6d5b0 Update sate sync
fix a crash, possibly two
2019-11-02 14:00:23 +01:00
Jean Flach d8737b238a Update state sync 2019-11-02 14:00:23 +01:00
Jean Flach 223ca6c6a0 Clean up code 2019-11-02 14:00:23 +01:00
Jean Flach f68ad634b2 Rename state stream keys 2019-11-02 14:00:23 +01:00
Jean Flach 3def496b62 Update state sync
Makes state serialization its own function to be used also when writing
out the initial state
2019-11-02 14:00:23 +01:00
Jean Flach fcb3752973 Remove debug log message 2019-11-02 14:00:23 +01:00
Jean Flach 3da4cef1e6 Update state sync 2019-11-02 14:00:23 +01:00
Jean Flach 2215e9e16f Implement minimal state sync 2019-11-02 14:00:23 +01:00
Jean Flach c825a3f4b5 Remove unnecessary parameter 2019-11-02 14:00:23 +01:00
Jean Flach 5f64d809d7 Check if RedisConnection exists before checking connection 2019-11-02 14:00:23 +01:00
Jean Flach a056e14834 Fix another RedisWriter crash
Same as the other fix, this makes us lose events
2019-11-02 14:00:23 +01:00
Jean Flach eec1928a0b Fix segfault on startup 2019-11-02 14:00:23 +01:00
Jean Flach 67208c4f07 Handle runtime config updates
fixes #37
2019-11-02 14:00:23 +01:00
Noah Hilverling f4145579ca Add missing include 2019-11-02 14:00:23 +01:00
Jean Flach 47905a25e8 Improve event payload
Adds host/service_id Acknowledgement events. AcknowledgementSet events also send the comment_id.

fixes #29
2019-11-02 14:00:23 +01:00
Jean Flach e889de966e Publish dump event
fixes #34
2019-11-02 14:00:23 +01:00
Jean Flach 5e3e114a16 Handle icingadb- / icinga-type mismatches
fixes servicedowntimes being written to hostdowntimes (and vice versa)
2019-11-02 14:00:23 +01:00
Jean Flach 3c651b4c99 Fix icingadb specific type names 2019-11-02 14:00:23 +01:00
Jean Flach 77ce8f67bd Add downtimes sync 2019-11-02 14:00:23 +01:00
Jean Flach 36588ce31a Code formatting 2019-11-02 14:00:23 +01:00
Jean Flach 1d21626b30 Code style 2019-11-02 14:00:23 +01:00
Jean Flach 0634e27d6d Add new connection handling 2019-11-02 14:00:23 +01:00
Jean Flach f89e649871 Add recursive callback to manage auth and db select 2019-11-02 14:00:23 +01:00
Jean Flach b59189b8d3 Simplify vector usage
Also leak less memory ;)
2019-11-02 14:00:23 +01:00
Jean Flach 6aaa35a0a6 Rewrite the RedisWriter
There should be more atomic commits but the whole thing was a mess. This
commit changes the synchrounous Redis connection into an asynchronous
one in its own class RedisConnection.
The RedisConnection uses a Workqueue with commands to fire against the
Redis server. When a response is required a callback must be supplied,
refer to RedisWriter::RedisGet().

Known Issues:
- Authentication has no error handling and can break the connection
- Error handling in general is iffy due to the nature of the async redis
connection
- Getting a reply out of RedisConnection is not trivial
- HandleRW... sunt dracones
2019-11-02 14:00:23 +01:00
Jean Flach 64515b81e3 Add disconnect 2019-11-02 14:00:23 +01:00
Jean Flach d96dcf869e Add RedisConnection object
This works using an async Redis connection. Multiple connections are not
possible. The connection is fed from a workqueue filled with
RedisCommands in the way of a vector of strings.
2019-11-02 14:00:23 +01:00
Jean Flach 0456298c58 Reformat code
CLion is now pretty close at what we use with Icinga, other changes do
make sense to me.
2019-11-02 14:00:23 +01:00
Jean Flach 8f411c7475 Support comments for icingadb
This splits comments into Host and Service comments
2019-11-02 14:00:23 +01:00
Alexander A. Klimov ed3db5b491 Fix elephant oversight 2019-11-02 14:00:23 +01:00
Jean Flach 315e9ffad8 Stringify flat values 2019-11-02 14:00:23 +01:00
Alexander A. Klimov d0a45521a9 Unify schema structure
refs #15
2019-11-02 14:00:23 +01:00