mirror of
https://github.com/Icinga/icinga2.git
synced 2025-07-25 14:44:32 +02:00
Rename redis to icingadb
This commit is contained in:
parent
f51454af65
commit
13ab7eb609
5
etc/icinga2/features-available/icingadb.conf
Normal file
5
etc/icinga2/features-available/icingadb.conf
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
object IcingaDB "icingadb" {
|
||||||
|
//host = "127.0.0.1"
|
||||||
|
//port = 6379
|
||||||
|
//password = "xxx"
|
||||||
|
}
|
@ -1,14 +0,0 @@
|
|||||||
/**
|
|
||||||
* The redis library implements functionality for putting Icinga
|
|
||||||
* event data into a redis database.
|
|
||||||
*
|
|
||||||
* NOTE: This is experimental and may change without further notice.
|
|
||||||
*/
|
|
||||||
|
|
||||||
library "redis"
|
|
||||||
|
|
||||||
object IcingaDB "redis" {
|
|
||||||
//host = "127.0.0.1"
|
|
||||||
//port = 6379
|
|
||||||
//password = "xxx"
|
|
||||||
}
|
|
@ -54,7 +54,7 @@ if(ICINGA2_WITH_PERFDATA)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(ICINGA2_WITH_REDIS)
|
if(ICINGA2_WITH_REDIS)
|
||||||
list(APPEND icinga_app_SOURCES $<TARGET_OBJECTS:redis>)
|
list(APPEND icinga_app_SOURCES $<TARGET_OBJECTS:icingadb>)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_executable(icinga-app
|
add_executable(icinga-app
|
||||||
|
@ -54,7 +54,7 @@ if(ICINGA2_WITH_PERFDATA)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(ICINGA2_WITH_REDIS)
|
if(ICINGA2_WITH_REDIS)
|
||||||
add_subdirectory(redis)
|
add_subdirectory(icingadb)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}" PARENT_SCOPE)
|
set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}" PARENT_SCOPE)
|
||||||
|
@ -15,29 +15,29 @@
|
|||||||
# along with this program; if not, write to the Free Software Foundation
|
# along with this program; if not, write to the Free Software Foundation
|
||||||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
|
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
||||||
mkclass_target(rediswriter.ti rediswriter-ti.cpp rediswriter-ti.hpp)
|
mkclass_target(icingadb.ti icingadb-ti.cpp icingadb-ti.hpp)
|
||||||
|
|
||||||
set(redis_SOURCES
|
set(icingadb_SOURCES
|
||||||
rediswriter.cpp rediswriter-objects.cpp rediswriter-stats.cpp rediswriter-utility.cpp redisconnection.cpp rediswriter-ti.hpp
|
icingadb.cpp icingadb-objects.cpp icingadb-stats.cpp icingadb-utility.cpp redisconnection.cpp icingadb-ti.hpp
|
||||||
)
|
)
|
||||||
|
|
||||||
if(ICINGA2_UNITY_BUILD)
|
if(ICINGA2_UNITY_BUILD)
|
||||||
mkunity_target(redis redis redis_SOURCES)
|
mkunity_target(icingadb icingadb icingadb_SOURCES)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_library(redis OBJECT ${redis_SOURCES})
|
add_library(icingadb OBJECT ${icingadb_SOURCES})
|
||||||
|
|
||||||
include_directories(${icinga2_SOURCE_DIR}/third-party)
|
include_directories(${icinga2_SOURCE_DIR}/third-party)
|
||||||
|
|
||||||
add_dependencies(redis base config icinga remote)
|
add_dependencies(icingadb base config icinga remote)
|
||||||
|
|
||||||
set_target_properties (
|
set_target_properties (
|
||||||
redis PROPERTIES
|
icingadb PROPERTIES
|
||||||
FOLDER Components
|
FOLDER Components
|
||||||
)
|
)
|
||||||
|
|
||||||
install_if_not_exists(
|
install_if_not_exists(
|
||||||
${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/redis.conf
|
${PROJECT_SOURCE_DIR}/etc/icinga2/features-available/icingadb.conf
|
||||||
${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available
|
${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available
|
||||||
)
|
)
|
||||||
|
|
@ -17,8 +17,8 @@
|
|||||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
|
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
|
|
||||||
#include "redis/rediswriter.hpp"
|
#include "icingadb/icingadb.hpp"
|
||||||
#include "redis/redisconnection.hpp"
|
#include "icingadb/redisconnection.hpp"
|
||||||
#include "icinga/command.hpp"
|
#include "icinga/command.hpp"
|
||||||
#include "icinga/compatutility.hpp"
|
#include "icinga/compatutility.hpp"
|
||||||
#include "base/configtype.hpp"
|
#include "base/configtype.hpp"
|
@ -17,7 +17,7 @@
|
|||||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
|
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
|
|
||||||
#include "redis/rediswriter.hpp"
|
#include "icingadb/icingadb.hpp"
|
||||||
#include "base/json.hpp"
|
#include "base/json.hpp"
|
||||||
#include "base/logger.hpp"
|
#include "base/logger.hpp"
|
||||||
#include "base/serializer.hpp"
|
#include "base/serializer.hpp"
|
@ -17,7 +17,7 @@
|
|||||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
|
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
|
|
||||||
#include "redis/rediswriter.hpp"
|
#include "icingadb/icingadb.hpp"
|
||||||
#include "icinga/customvarobject.hpp"
|
#include "icinga/customvarobject.hpp"
|
||||||
#include "icinga/checkcommand.hpp"
|
#include "icinga/checkcommand.hpp"
|
||||||
#include "icinga/notificationcommand.hpp"
|
#include "icinga/notificationcommand.hpp"
|
@ -17,9 +17,9 @@
|
|||||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
|
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
|
|
||||||
#include "redis/rediswriter.hpp"
|
#include "icingadb/icingadb.hpp"
|
||||||
#include "redis/rediswriter-ti.cpp"
|
#include "icingadb/icingadb-ti.cpp"
|
||||||
#include "redis/redisconnection.hpp"
|
#include "icingadb/redisconnection.hpp"
|
||||||
#include "remote/eventqueue.hpp"
|
#include "remote/eventqueue.hpp"
|
||||||
#include "base/json.hpp"
|
#include "base/json.hpp"
|
||||||
#include "icinga/checkable.hpp"
|
#include "icinga/checkable.hpp"
|
@ -20,12 +20,12 @@
|
|||||||
#ifndef REDISWRITER_H
|
#ifndef REDISWRITER_H
|
||||||
#define REDISWRITER_H
|
#define REDISWRITER_H
|
||||||
|
|
||||||
#include "redis/rediswriter-ti.hpp"
|
#include "icingadb/icingadb-ti.hpp"
|
||||||
#include "icinga/customvarobject.hpp"
|
#include "icinga/customvarobject.hpp"
|
||||||
#include "remote/messageorigin.hpp"
|
#include "remote/messageorigin.hpp"
|
||||||
#include "base/timer.hpp"
|
#include "base/timer.hpp"
|
||||||
#include "base/workqueue.hpp"
|
#include "base/workqueue.hpp"
|
||||||
#include "redis/redisconnection.hpp"
|
#include "icingadb/redisconnection.hpp"
|
||||||
#include "icinga/checkable.hpp"
|
#include "icinga/checkable.hpp"
|
||||||
#include "icinga/service.hpp"
|
#include "icinga/service.hpp"
|
||||||
#include "icinga/downtime.hpp"
|
#include "icinga/downtime.hpp"
|
||||||
@ -40,7 +40,7 @@ struct RedisSubscriptionInfo
|
|||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @ingroup redis
|
* @ingroup icingadb
|
||||||
*/
|
*/
|
||||||
class IcingaDB : public ObjectImpl<IcingaDB>
|
class IcingaDB : public ObjectImpl<IcingaDB>
|
||||||
{
|
{
|
@ -17,7 +17,7 @@
|
|||||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
|
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
|
|
||||||
#include "redis/redisconnection.hpp"
|
#include "icingadb/redisconnection.hpp"
|
||||||
#include "base/array.hpp"
|
#include "base/array.hpp"
|
||||||
#include "base/convert.hpp"
|
#include "base/convert.hpp"
|
||||||
#include "base/defer.hpp"
|
#include "base/defer.hpp"
|
@ -55,7 +55,7 @@ namespace icinga
|
|||||||
/**
|
/**
|
||||||
* An Async Redis connection.
|
* An Async Redis connection.
|
||||||
*
|
*
|
||||||
* @ingroup redis
|
* @ingroup icingadb
|
||||||
*/
|
*/
|
||||||
class RedisConnection final : public Object
|
class RedisConnection final : public Object
|
||||||
{
|
{
|
Loading…
x
Reference in New Issue
Block a user