libchecker_la_SOURCES = \
checkercomponent.cpp \
checkercomponent.h \
- checker-type.cpp \
- i2-checker.h
+ checker-type.cpp
libchecker_la_CPPFLAGS = \
$(BOOST_CPPFLAGS) \
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-checker.h"
+#include "checker/checkercomponent.h"
+#include "remoting/endpointmanager.h"
#include "base/dynamictype.h"
#include "base/objectlock.h"
#include "base/logger_fwd.h"
#ifndef CHECKERCOMPONENT_H
#define CHECKERCOMPONENT_H
+#include "icinga/service.h"
+#include "remoting/endpoint.h"
#include "base/dynamicobject.h"
#include <boost/multi_index_container.hpp>
#include <boost/multi_index/ordered_index.hpp>
+++ /dev/null
-/******************************************************************************
- * Icinga 2 *
- * Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/) *
- * *
- * This program is free software; you can redistribute it and/or *
- * modify it under the terms of the GNU General Public License *
- * as published by the Free Software Foundation; either version 2 *
- * of the License, or (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the Free Software Foundation *
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
- ******************************************************************************/
-
-#ifndef I2CHECKER_H
-#define I2CHECKER_H
-
-/**
- * @defgroup checker Checker component
- *
- * The Checker component executes service checks.
- */
-
-#include "base/i2-base.h"
-#include "icinga/i2-icinga.h"
-
-#include "checker/checkercomponent.h"
-
-#endif /* I2CHECKER_H */
libcompat_la_SOURCES = \
compatcomponent.cpp \
compatcomponent.h \
- compat-type.cpp \
- i2-compat.h
+ compat-type.cpp
libcompat_la_CPPFLAGS = \
$(BOOST_CPPFLAGS) \
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-compat.h"
+#include "compat/compatcomponent.h"
+#include "icinga/externalcommandprocessor.h"
+#include "icinga/icingaapplication.h"
+#include "icinga/cib.h"
+#include "icinga/hostgroup.h"
+#include "icinga/servicegroup.h"
#include "base/dynamictype.h"
#include "base/objectlock.h"
#include "base/logger_fwd.h"
#include "base/exception.h"
+#include "base/application.h"
#include <boost/smart_ptr/make_shared.hpp>
#include <boost/foreach.hpp>
#include <boost/exception/diagnostic_information.hpp>
+#include <fstream>
using namespace icinga;
}
#endif /* _WIN32 */
-void CompatComponent::DumpComments(ostream& fp, const Service::Ptr& owner, CompatObjectType type)
+void CompatComponent::DumpComments(std::ostream& fp, const Service::Ptr& owner, CompatObjectType type)
{
Service::Ptr service;
Host::Ptr host;
}
}
-void CompatComponent::DumpDowntimes(ostream& fp, const Service::Ptr& owner, CompatObjectType type)
+void CompatComponent::DumpDowntimes(std::ostream& fp, const Service::Ptr& owner, CompatObjectType type)
{
Host::Ptr host = owner->GetHost();
}
}
-void CompatComponent::DumpHostStatus(ostream& fp, const Host::Ptr& host)
+void CompatComponent::DumpHostStatus(std::ostream& fp, const Host::Ptr& host)
{
fp << "hoststatus {" << "\n"
<< "\t" << "host_name=" << host->GetName() << "\n";
}
}
-void CompatComponent::DumpHostObject(ostream& fp, const Host::Ptr& host)
+void CompatComponent::DumpHostObject(std::ostream& fp, const Host::Ptr& host)
{
fp << "define host {" << "\n"
<< "\t" << "host_name" << "\t" << host->GetName() << "\n"
<< "\n";
}
-void CompatComponent::DumpServiceStatusAttrs(ostream& fp, const Service::Ptr& service, CompatObjectType type)
+void CompatComponent::DumpServiceStatusAttrs(std::ostream& fp, const Service::Ptr& service, CompatObjectType type)
{
ASSERT(service->OwnsLock());
<< "\t" << "last_notification=" << service->GetLastNotification() << "\n";
}
-void CompatComponent::DumpServiceStatus(ostream& fp, const Service::Ptr& service)
+void CompatComponent::DumpServiceStatus(std::ostream& fp, const Service::Ptr& service)
{
Host::Ptr host = service->GetHost();
DumpComments(fp, service, CompatTypeService);
}
-void CompatComponent::DumpServiceObject(ostream& fp, const Service::Ptr& service)
+void CompatComponent::DumpServiceObject(std::ostream& fp, const Service::Ptr& service)
{
Host::Ptr host = service->GetHost();
String statuspathtmp = statuspath + ".tmp"; /* XXX make this a global definition */
String objectspathtmp = objectspath + ".tmp";
- ofstream statusfp;
- statusfp.open(statuspathtmp.CStr(), ofstream::out | ofstream::trunc);
+ std::ofstream statusfp;
+ statusfp.open(statuspathtmp.CStr(), std::ofstream::out | std::ofstream::trunc);
statusfp << std::fixed;
<< "\t" << "}" << "\n"
<< "\n";
- ofstream objectfp;
- objectfp.open(objectspathtmp.CStr(), ofstream::out | ofstream::trunc);
+ std::ofstream objectfp;
+ objectfp.open(objectspathtmp.CStr(), std::ofstream::out | std::ofstream::trunc);
objectfp << std::fixed;
#ifndef COMPATCOMPONENT_H
#define COMPATCOMPONENT_H
+#include "icinga/host.h"
+#include "icinga/service.h"
+#include "base/dynamicobject.h"
#include "base/objectlock.h"
+#include <iostream>
namespace icinga
{
void DumpServiceStatusAttrs(std::ostream& fp, const Service::Ptr& service, CompatObjectType type);
template<typename T>
- void DumpNameList(ostream& fp, const T& list)
+ void DumpNameList(std::ostream& fp, const T& list)
{
typename T::const_iterator it;
bool first = true;
}
template<typename T>
- void DumpStringList(ostream& fp, const T& list)
+ void DumpStringList(std::ostream& fp, const T& list)
{
typename T::const_iterator it;
bool first = true;
+++ /dev/null
-/******************************************************************************
- * Icinga 2 *
- * Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/) *
- * *
- * This program is free software; you can redistribute it and/or *
- * modify it under the terms of the GNU General Public License *
- * as published by the Free Software Foundation; either version 2 *
- * of the License, or (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the Free Software Foundation *
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
- ******************************************************************************/
-
-#ifndef I2COMPAT_H
-#define I2COMPAT_H
-
-/**
- * @defgroup compat Compat component
- *
- * The compat component implements compatibility functionality for Icinga 1.x.
- */
-
-#include "base/i2-base.h"
-#include "remoting/i2-remoting.h"
-#include "icinga/i2-icinga.h"
-
-#include <fstream>
-
-using std::ofstream;
-using std::endl;
-
-#include "compatcomponent.h"
-
-#endif /* I2COMPAT_H */
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-delegation.h"
+#include "delegation/delegationcomponent.h"
+#include "remoting/endpointmanager.h"
#include "base/objectlock.h"
#include "base/logger_fwd.h"
#include <algorithm>
#ifndef DELEGATIONCOMPONENT_H
#define DELEGATIONCOMPONENT_H
+#include "icinga/service.h"
+#include "remoting/endpoint.h"
+#include "base/dynamicobject.h"
+
namespace icinga
{
+++ /dev/null
-/******************************************************************************
- * Icinga 2 *
- * Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/) *
- * *
- * This program is free software; you can redistribute it and/or *
- * modify it under the terms of the GNU General Public License *
- * as published by the Free Software Foundation; either version 2 *
- * of the License, or (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the Free Software Foundation *
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
- ******************************************************************************/
-
-#ifndef I2DELEGATION_H
-#define I2DELEGATION_H
-
-/**
- * @defgroup delegation Delegation component
- *
- * The Delegation component delegates service checks to the checker component.
- */
-
-#include "base/i2-base.h"
-#include "icinga/i2-icinga.h"
-
-#include "delegation/delegationcomponent.h"
-
-#endif /* I2DELEGATION_H */
libdemo_la_SOURCES = \
democomponent.cpp \
democomponent.h \
- demo-type.cpp \
- i2-demo.h
+ demo-type.cpp
libdemo_la_CPPFLAGS = \
$(BOOST_CPPFLAGS) \
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-demo.h"
+#include "demo/democomponent.h"
+#include "remoting/endpointmanager.h"
#include "base/dynamictype.h"
#include "base/logger_fwd.h"
#include <boost/smart_ptr/make_shared.hpp>
#ifndef DEMOCOMPONENT_H
#define DEMOCOMPONENT_H
+#include "remoting/endpoint.h"
+#include "base/dynamicobject.h"
+
namespace icinga
{
+++ /dev/null
-/******************************************************************************
- * Icinga 2 *
- * Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/) *
- * *
- * This program is free software; you can redistribute it and/or *
- * modify it under the terms of the GNU General Public License *
- * as published by the Free Software Foundation; either version 2 *
- * of the License, or (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the Free Software Foundation *
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
- ******************************************************************************/
-
-#ifndef I2DEMO_H
-#define I2DEMO_H
-
-/**
- * @defgroup demo Demo component
- *
- * The demo component periodically sends demo messages.
- */
-
-#include "base/i2-base.h"
-#include "remoting/i2-remoting.h"
-#include "icinga/i2-icinga.h"
-
-#include "demo/democomponent.h"
-
-#endif /* I2DEMO_H */
statustable.cpp \
statustable.h \
table.cpp \
- table.h \
- i2-livestatus.h
+ table.h
liblivestatus_la_CPPFLAGS = \
$(BOOST_CPPFLAGS) \
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-livestatus.h"
+#include "livestatus/andfilter.h"
#include <boost/foreach.hpp>
using namespace icinga;
#ifndef ANDFILTER_H
#define ANDFILTER_H
+#include "livestatus/combinerfilter.h"
+
+using namespace icinga;
+
namespace livestatus
{
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-livestatus.h"
+#include "livestatus/attributefilter.h"
#include "base/convert.h"
+#include "base/array.h"
#include <boost/foreach.hpp>
using namespace icinga;
#ifndef ATTRIBUTEFILTER_H
#define ATTRIBUTEFILTER_H
+#include "livestatus/filter.h"
+
+using namespace icinga;
+
namespace livestatus
{
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-livestatus.h"
+#include "livestatus/column.h"
using namespace icinga;
using namespace livestatus;
#ifndef COLUMN_H
#define COLUMN_H
+#include "base/value.h"
+#include <boost/function.hpp>
+
+using namespace icinga;
+
namespace livestatus
{
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-livestatus.h"
+#include "livestatus/combinerfilter.h"
using namespace icinga;
using namespace livestatus;
#ifndef COMBINERFILTER_H
#define COMBINERFILTER_H
+#include "livestatus/filter.h"
+
+using namespace icinga;
+
namespace livestatus
{
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-livestatus.h"
+#include "livestatus/commentstable.h"
+#include "icinga/service.h"
#include "base/dynamictype.h"
#include "base/objectlock.h"
#include <boost/tuple/tuple.hpp>
#ifndef COMMENTSTABLE_H
#define COMMENTSTABLE_H
+#include "livestatus/table.h"
+
+using namespace icinga;
+
namespace livestatus
{
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-livestatus.h"
+#include "livestatus/component.h"
#include "base/dynamictype.h"
#include "base/logger_fwd.h"
+#include "base/tcpsocket.h"
+#include "base/application.h"
#include <boost/smart_ptr/make_shared.hpp>
using namespace icinga;
#ifndef LIVESTATUSCOMPONENT_H
#define LIVESTATUSCOMPONENT_H
+#include "livestatus/connection.h"
+#include "base/dynamicobject.h"
+#include "base/socket.h"
+
+using namespace icinga;
+
namespace livestatus
{
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-livestatus.h"
+#include "livestatus/connection.h"
+#include "livestatus/query.h"
#include <boost/smart_ptr/make_shared.hpp>
using namespace icinga;
#ifndef LIVESTATUSCONNECTION_H
#define LIVESTATUSCONNECTION_H
+#include "base/connection.h"
+
+using namespace icinga;
+
namespace livestatus
{
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-livestatus.h"
+#include "livestatus/contactgroupstable.h"
+#include "icinga/usergroup.h"
#include "base/dynamictype.h"
#include <boost/foreach.hpp>
#ifndef CONTACTGROUPSTABLE_H
#define CONTACTGROUPSTABLE_H
+#include "livestatus/table.h"
+
+using namespace icinga;
+
namespace livestatus
{
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-livestatus.h"
+#include "livestatus/contactstable.h"
+#include "icinga/user.h"
#include "base/dynamictype.h"
#include <boost/foreach.hpp>
#ifndef CONTACTSTABLE_H
#define CONTACTSTABLE_H
+#include "livestatus/table.h"
+
+using namespace icinga;
+
namespace livestatus
{
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-livestatus.h"
+#include "livestatus/downtimestable.h"
+#include "icinga/service.h"
#include "base/dynamictype.h"
#include "base/objectlock.h"
#include <boost/tuple/tuple.hpp>
#ifndef DOWNTIMESTABLE_H
#define DOWNTIMESTABLE_H
+#include "livestatus/table.h"
+
+using namespace icinga;
+
namespace livestatus
{
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-livestatus.h"
+#include "livestatus/filter.h"
-using namespace icinga;
using namespace livestatus;
Filter::Filter(void)
#ifndef FILTER_H
#define FILTER_H
+#include "livestatus/table.h"
+
namespace livestatus
{
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-livestatus.h"
+#include "livestatus/hoststable.h"
+#include "icinga/host.h"
#include "base/dynamictype.h"
#include <boost/foreach.hpp>
#ifndef HOSTSTABLE_H
#define HOSTSTABLE_H
+#include "livestatus/table.h"
+
+using namespace icinga;
+
namespace livestatus
{
+++ /dev/null
-/******************************************************************************
- * Icinga 2 *
- * Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/) *
- * *
- * This program is free software; you can redistribute it and/or *
- * modify it under the terms of the GNU General Public License *
- * as published by the Free Software Foundation; either version 2 *
- * of the License, or (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the Free Software Foundation *
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
- ******************************************************************************/
-
-#ifndef I2LIVESTATUS_H
-#define I2LIVESTATUS_H
-
-/**
- * @defgroup livestatus Livestatus component
- *
- * The livestatus component implements livestatus queries.
- */
-
-#include "base/i2-base.h"
-#include "remoting/i2-remoting.h"
-#include "icinga/i2-icinga.h"
-
-using namespace icinga;
-
-#include "livestatus/connection.h"
-#include "livestatus/column.h"
-#include "livestatus/table.h"
-#include "livestatus/filter.h"
-#include "livestatus/combinerfilter.h"
-#include "livestatus/orfilter.h"
-#include "livestatus/andfilter.h"
-#include "livestatus/negatefilter.h"
-#include "livestatus/attributefilter.h"
-#include "livestatus/query.h"
-#include "livestatus/statustable.h"
-#include "livestatus/contactgroupstable.h"
-#include "livestatus/contactstable.h"
-#include "livestatus/hoststable.h"
-#include "livestatus/servicestable.h"
-#include "livestatus/commentstable.h"
-#include "livestatus/downtimestable.h"
-#include "livestatus/component.h"
-
-#endif /* I2LIVESTATUS_H */
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-livestatus.h"
+#include "livestatus/negatefilter.h"
using namespace icinga;
using namespace livestatus;
#ifndef NEGATEFILTER_H
#define NEGATEFILTER_H
+#include "livestatus/filter.h"
+
+using namespace icinga;
+
namespace livestatus
{
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-livestatus.h"
+#include "livestatus/orfilter.h"
#include <boost/foreach.hpp>
using namespace icinga;
#ifndef ORFILTER_H
#define ORFILTER_H
+#include "livestatus/combinerfilter.h"
+
+using namespace icinga;
+
namespace livestatus
{
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-livestatus.h"
+#include "livestatus/query.h"
+#include "livestatus/attributefilter.h"
+#include "livestatus/negatefilter.h"
+#include "livestatus/orfilter.h"
+#include "livestatus/andfilter.h"
+#include "icinga/externalcommandprocessor.h"
+#include "base/utility.h"
#include "base/convert.h"
#include "base/objectlock.h"
#include "base/logger_fwd.h"
m_Stats.swap(stats);
}
-void Query::PrintResultSet(ostream& fp, const std::vector<String>& columns, const Array::Ptr& rs)
+void Query::PrintResultSet(std::ostream& fp, const std::vector<String>& columns, const Array::Ptr& rs)
{
if (m_OutputFormat == "csv" && m_Columns.size() == 0 && m_ColumnHeaders) {
bool first = true;
#ifndef QUERY_H
#define QUERY_H
+#include "livestatus/filter.h"
+#include "base/object.h"
+#include "base/array.h"
+#include "base/stream.h"
+
+using namespace icinga;
+
namespace livestatus
{
int m_ErrorCode;
String m_ErrorMessage;
- void PrintResultSet(ostream& fp, const std::vector<String>& columns, const Array::Ptr& rs);
+ void PrintResultSet(std::ostream& fp, const std::vector<String>& columns, const Array::Ptr& rs);
void ExecuteGetHelper(const Stream::Ptr& stream);
void ExecuteCommandHelper(const Stream::Ptr& stream);
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-livestatus.h"
+#include "livestatus/servicestable.h"
+#include "livestatus/hoststable.h"
+#include "icinga/service.h"
#include "base/dynamictype.h"
#include <boost/foreach.hpp>
#ifndef SERVICESTABLE_H
#define SERVICESTABLE_H
+#include "livestatus/table.h"
+
+using namespace icinga;
+
namespace livestatus
{
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-livestatus.h"
+#include "livestatus/statustable.h"
#include <boost/smart_ptr/make_shared.hpp>
using namespace icinga;
#ifndef STATUSTABLE_H
#define STATUSTABLE_H
+#include "livestatus/table.h"
+
+using namespace icinga;
+
namespace livestatus
{
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-livestatus.h"
+#include "livestatus/table.h"
+#include "livestatus/statustable.h"
+#include "livestatus/contactgroupstable.h"
+#include "livestatus/contactstable.h"
+#include "livestatus/hoststable.h"
+#include "livestatus/servicestable.h"
+#include "livestatus/commentstable.h"
+#include "livestatus/downtimestable.h"
+#include "livestatus/filter.h"
+#include "base/array.h"
+#include "base/dictionary.h"
#include <boost/tuple/tuple.hpp>
#include <boost/smart_ptr/make_shared.hpp>
#include <boost/foreach.hpp>
+#include <boost/bind.hpp>
using namespace icinga;
using namespace livestatus;
#ifndef TABLE_H
#define TABLE_H
+#include "livestatus/column.h"
+#include "base/object.h"
+
namespace livestatus
{
+++ /dev/null
-/******************************************************************************
- * Icinga 2 *
- * Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/) *
- * *
- * This program is free software; you can redistribute it and/or *
- * modify it under the terms of the GNU General Public License *
- * as published by the Free Software Foundation; either version 2 *
- * of the License, or (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the Free Software Foundation *
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
- ******************************************************************************/
-
-#ifndef I2NOTIFICATION_H
-#define I2NOTIFICATION_H
-
-/**
- * @defgroup notification Notification component
- *
- * The notification component is in charge of sending downtime notifications.
- */
-
-#include "base/i2-base.h"
-#include "remoting/i2-remoting.h"
-#include "icinga/i2-icinga.h"
-
-#include "notification/notificationcomponent.h"
-
-#endif /* I2NOTIFICATION_H */
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-notification.h"
+#include "notification/notificationcomponent.h"
+#include "icinga/service.h"
#include "base/dynamictype.h"
#include "base/objectlock.h"
#include <boost/smart_ptr/make_shared.hpp>
#ifndef NOTIFICATIONCOMPONENT_H
#define NOTIFICATIONCOMPONENT_H
+#include "remoting/endpoint.h"
+#include "base/dynamicobject.h"
+
namespace icinga
{
+++ /dev/null
-/******************************************************************************
- * Icinga 2 *
- * Copyright (C) 2012 Icinga Development Team (http://www.icinga.org/) *
- * *
- * This program is free software; you can redistribute it and/or *
- * modify it under the terms of the GNU General Public License *
- * as published by the Free Software Foundation; either version 2 *
- * of the License, or (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the Free Software Foundation *
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
- ******************************************************************************/
-
-#ifndef I2REPLICATION_H
-#define I2REPLICATION_H
-
-/**
- * @defgroup replication Replication component
- *
- * Replicates Icinga 2 objects to remote instances.
- */
-
-#include "base/i2-base.h"
-#include "remoting/i2-remoting.h"
-#include "icinga/i2-icinga.h"
-
-#include "replication/replicationcomponent.h"
-
-#endif /* I2REPLICATION_H */
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-replication.h"
+#include "replication/replicationcomponent.h"
+#include "icinga/service.h"
+#include "icinga/checkresultmessage.h"
+#include "remoting/endpointmanager.h"
#include "base/dynamictype.h"
#include "base/objectlock.h"
#include "base/logger_fwd.h"
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#ifndef CIBSYNCCOMPONENT_H
-#define CIBSYNCCOMPONENT_H
+#ifndef REPLICATIONCOMPONENT_H
+#define REPLICATIONCOMPONENT_H
+
+#include "base/dynamicobject.h"
+#include "remoting/endpoint.h"
namespace icinga
{
}
-#endif /* CIBSYNCCOMPONENT_H */
+#endif /* REPLICATIONCOMPONENT_H */
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "base/i2-base.h"
-#include "config/i2-config.h"
+#include "config/configcompilercontext.h"
+#include "config/configcompiler.h"
#include "base/application.h"
#include "base/logger_fwd.h"
#include <boost/program_options.hpp>
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-config.h"
-#include "config_parser.h"
+#include "config/configcompiler.h"
+#include "config/expression.h"
+#include "config/typerule.h"
+#include "config/configcompilercontext.h"
+#include "config/config_parser.h"
#include <sstream>
using namespace icinga;
-#line 694 "config_lexer.cc"
+#line 697 "config_lexer.cc"
#define INITIAL 0
#define C_COMMENT 1
register int yy_act;
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-#line 92 "config_lexer.ll"
+#line 95 "config_lexer.ll"
lex_buf string_buf;
-#line 946 "config_lexer.cc"
+#line 949 "config_lexer.cc"
yylval = yylval_param;
case 1:
YY_RULE_SETUP
-#line 95 "config_lexer.ll"
+#line 98 "config_lexer.ll"
{ lb_init(&string_buf); BEGIN(STRING); }
YY_BREAK
case 2:
YY_RULE_SETUP
-#line 97 "config_lexer.ll"
+#line 100 "config_lexer.ll"
{
BEGIN(INITIAL);
case 3:
/* rule 3 can match eol */
YY_RULE_SETUP
-#line 107 "config_lexer.ll"
+#line 110 "config_lexer.ll"
{
std::ostringstream msgbuf;
msgbuf << "Unterminated string found: " << *yylloc;
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 114 "config_lexer.ll"
+#line 117 "config_lexer.ll"
{
/* octal escape sequence */
int result;
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 130 "config_lexer.ll"
+#line 133 "config_lexer.ll"
{
/* generate error - bad escape sequence; something
* like '\48' or '\0777777'
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 139 "config_lexer.ll"
+#line 142 "config_lexer.ll"
{ lb_append_char(&string_buf, '\n'); }
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 140 "config_lexer.ll"
+#line 143 "config_lexer.ll"
{ lb_append_char(&string_buf, '\t'); }
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 141 "config_lexer.ll"
+#line 144 "config_lexer.ll"
{ lb_append_char(&string_buf, '\r'); }
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 142 "config_lexer.ll"
+#line 145 "config_lexer.ll"
{ lb_append_char(&string_buf, '\b'); }
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 143 "config_lexer.ll"
+#line 146 "config_lexer.ll"
{ lb_append_char(&string_buf, '\f'); }
YY_BREAK
case 11:
/* rule 11 can match eol */
YY_RULE_SETUP
-#line 144 "config_lexer.ll"
+#line 147 "config_lexer.ll"
{ lb_append_char(&string_buf, yytext[1]); }
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 146 "config_lexer.ll"
+#line 149 "config_lexer.ll"
{
char *yptr = yytext;
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 153 "config_lexer.ll"
+#line 156 "config_lexer.ll"
{ lb_init(&string_buf); BEGIN(HEREDOC); }
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 155 "config_lexer.ll"
+#line 158 "config_lexer.ll"
{
BEGIN(INITIAL);
case 15:
/* rule 15 can match eol */
YY_RULE_SETUP
-#line 165 "config_lexer.ll"
+#line 168 "config_lexer.ll"
{ lb_append_char(&string_buf, yytext[0]); }
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 168 "config_lexer.ll"
+#line 171 "config_lexer.ll"
BEGIN(C_COMMENT);
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 172 "config_lexer.ll"
+#line 175 "config_lexer.ll"
BEGIN(INITIAL);
YY_BREAK
case 18:
/* rule 18 can match eol */
YY_RULE_SETUP
-#line 173 "config_lexer.ll"
+#line 176 "config_lexer.ll"
/* ignore comment */
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 174 "config_lexer.ll"
+#line 177 "config_lexer.ll"
/* ignore star */
YY_BREAK
case 20:
YY_RULE_SETUP
-#line 177 "config_lexer.ll"
+#line 180 "config_lexer.ll"
/* ignore C++-style comments */
YY_BREAK
case 21:
/* rule 21 can match eol */
YY_RULE_SETUP
-#line 178 "config_lexer.ll"
+#line 181 "config_lexer.ll"
/* ignore whitespace */
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 181 "config_lexer.ll"
+#line 184 "config_lexer.ll"
return T_TYPE;
YY_BREAK
case 23:
YY_RULE_SETUP
-#line 182 "config_lexer.ll"
+#line 185 "config_lexer.ll"
{ yylval->type = TypeDictionary; return T_TYPE_DICTIONARY; }
YY_BREAK
case 24:
YY_RULE_SETUP
-#line 183 "config_lexer.ll"
+#line 186 "config_lexer.ll"
{ yylval->type = TypeArray; return T_TYPE_ARRAY; }
YY_BREAK
case 25:
YY_RULE_SETUP
-#line 184 "config_lexer.ll"
+#line 187 "config_lexer.ll"
{ yylval->type = TypeNumber; return T_TYPE_NUMBER; }
YY_BREAK
case 26:
YY_RULE_SETUP
-#line 185 "config_lexer.ll"
+#line 188 "config_lexer.ll"
{ yylval->type = TypeString; return T_TYPE_STRING; }
YY_BREAK
case 27:
YY_RULE_SETUP
-#line 186 "config_lexer.ll"
+#line 189 "config_lexer.ll"
{ yylval->type = TypeScalar; return T_TYPE_SCALAR; }
YY_BREAK
case 28:
YY_RULE_SETUP
-#line 187 "config_lexer.ll"
+#line 190 "config_lexer.ll"
{ yylval->type = TypeAny; return T_TYPE_ANY; }
YY_BREAK
case 29:
YY_RULE_SETUP
-#line 188 "config_lexer.ll"
+#line 191 "config_lexer.ll"
{ return T_VALIDATOR; }
YY_BREAK
case 30:
YY_RULE_SETUP
-#line 189 "config_lexer.ll"
+#line 192 "config_lexer.ll"
{ return T_REQUIRE; }
YY_BREAK
case 31:
YY_RULE_SETUP
-#line 190 "config_lexer.ll"
+#line 193 "config_lexer.ll"
{ return T_ATTRIBUTE; }
YY_BREAK
case 32:
YY_RULE_SETUP
-#line 191 "config_lexer.ll"
+#line 194 "config_lexer.ll"
return T_ABSTRACT;
YY_BREAK
case 33:
YY_RULE_SETUP
-#line 192 "config_lexer.ll"
+#line 195 "config_lexer.ll"
return T_LOCAL;
YY_BREAK
case 34:
YY_RULE_SETUP
-#line 193 "config_lexer.ll"
+#line 196 "config_lexer.ll"
return T_OBJECT;
YY_BREAK
case 35:
YY_RULE_SETUP
-#line 194 "config_lexer.ll"
+#line 197 "config_lexer.ll"
return T_TEMPLATE;
YY_BREAK
case 36:
YY_RULE_SETUP
-#line 195 "config_lexer.ll"
+#line 198 "config_lexer.ll"
return T_INCLUDE;
YY_BREAK
case 37:
YY_RULE_SETUP
-#line 196 "config_lexer.ll"
+#line 199 "config_lexer.ll"
return T_LIBRARY;
YY_BREAK
case 38:
YY_RULE_SETUP
-#line 197 "config_lexer.ll"
+#line 200 "config_lexer.ll"
return T_INHERITS;
YY_BREAK
case 39:
YY_RULE_SETUP
-#line 198 "config_lexer.ll"
+#line 201 "config_lexer.ll"
return T_NULL;
YY_BREAK
case 40:
YY_RULE_SETUP
-#line 199 "config_lexer.ll"
+#line 202 "config_lexer.ll"
return T_PARTIAL;
YY_BREAK
case 41:
YY_RULE_SETUP
-#line 200 "config_lexer.ll"
+#line 203 "config_lexer.ll"
{ yylval->num = 1; return T_NUMBER; }
YY_BREAK
case 42:
YY_RULE_SETUP
-#line 201 "config_lexer.ll"
+#line 204 "config_lexer.ll"
{ yylval->num = 0; return T_NUMBER; }
YY_BREAK
case 43:
YY_RULE_SETUP
-#line 202 "config_lexer.ll"
+#line 205 "config_lexer.ll"
{ yylval->text = strdup(yytext); return T_IDENTIFIER; }
YY_BREAK
case 44:
/* rule 44 can match eol */
YY_RULE_SETUP
-#line 203 "config_lexer.ll"
+#line 206 "config_lexer.ll"
{ yytext[yyleng-1] = '\0'; yylval->text = strdup(yytext + 1); return T_STRING_ANGLE; }
YY_BREAK
case 45:
YY_RULE_SETUP
-#line 204 "config_lexer.ll"
+#line 207 "config_lexer.ll"
{ yylval->num = strtod(yytext, NULL) / 1000; return T_NUMBER; }
YY_BREAK
case 46:
YY_RULE_SETUP
-#line 205 "config_lexer.ll"
+#line 208 "config_lexer.ll"
{ yylval->num = strtod(yytext, NULL) * 60 * 60; return T_NUMBER; }
YY_BREAK
case 47:
YY_RULE_SETUP
-#line 206 "config_lexer.ll"
+#line 209 "config_lexer.ll"
{ yylval->num = strtod(yytext, NULL) * 60; return T_NUMBER; }
YY_BREAK
case 48:
YY_RULE_SETUP
-#line 207 "config_lexer.ll"
+#line 210 "config_lexer.ll"
{ yylval->num = strtod(yytext, NULL); return T_NUMBER; }
YY_BREAK
case 49:
YY_RULE_SETUP
-#line 208 "config_lexer.ll"
+#line 211 "config_lexer.ll"
{ yylval->num = strtod(yytext, NULL); return T_NUMBER; }
YY_BREAK
case 50:
YY_RULE_SETUP
-#line 209 "config_lexer.ll"
+#line 212 "config_lexer.ll"
{ yylval->op = OperatorSet; return T_EQUAL; }
YY_BREAK
case 51:
YY_RULE_SETUP
-#line 210 "config_lexer.ll"
+#line 213 "config_lexer.ll"
{ yylval->op = OperatorPlus; return T_PLUS_EQUAL; }
YY_BREAK
case 52:
YY_RULE_SETUP
-#line 211 "config_lexer.ll"
+#line 214 "config_lexer.ll"
{ yylval->op = OperatorMinus; return T_MINUS_EQUAL; }
YY_BREAK
case 53:
YY_RULE_SETUP
-#line 212 "config_lexer.ll"
+#line 215 "config_lexer.ll"
{ yylval->op = OperatorMultiply; return T_MULTIPLY_EQUAL; }
YY_BREAK
case 54:
YY_RULE_SETUP
-#line 213 "config_lexer.ll"
+#line 216 "config_lexer.ll"
{ yylval->op = OperatorDivide; return T_DIVIDE_EQUAL; }
YY_BREAK
case 55:
YY_RULE_SETUP
-#line 216 "config_lexer.ll"
+#line 219 "config_lexer.ll"
return yytext[0];
YY_BREAK
case 56:
YY_RULE_SETUP
-#line 218 "config_lexer.ll"
+#line 221 "config_lexer.ll"
ECHO;
YY_BREAK
-#line 1380 "config_lexer.cc"
+#line 1383 "config_lexer.cc"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(C_COMMENT):
case YY_STATE_EOF(STRING):
#define YYTABLES_NAME "yytables"
-#line 218 "config_lexer.ll"
+#line 221 "config_lexer.ll"
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-config.h"
-#include "config_parser.h"
+#include "config/configcompiler.h"
+#include "config/expression.h"
+#include "config/typerule.h"
+#include "config/configcompilercontext.h"
+#include "config/config_parser.h"
#include <sstream>
using namespace icinga;
******************************************************************************/
#include "i2-config.h"
+#include "config/expression.h"
+#include "config/expressionlist.h"
+#include "config/configitembuilder.h"
+#include "config/configcompiler.h"
+#include "config/configcompilercontext.h"
+#include "config/typerule.h"
+#include "config/typerulelist.h"
+#include "base/value.h"
+#include "base/array.h"
#include <sstream>
#include <stack>
#include <boost/smart_ptr/make_shared.hpp>
using namespace icinga;
-#define YYLTYPE DebugInfo
+#define YYLTYPE icinga::DebugInfo
/* Line 387 of yacc.c */
-#line 132 "config_parser.cc"
+#line 141 "config_parser.cc"
/* Tokens. */
#ifndef YYTOKENTYPE
typedef union YYSTYPE
{
/* Line 387 of yacc.c */
-#line 41 "config_parser.yy"
+#line 50 "config_parser.yy"
char *text;
double num;
/* Line 387 of yacc.c */
-#line 216 "config_parser.cc"
+#line 225 "config_parser.cc"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
/* Copy the second part of user declarations. */
/* Line 390 of yacc.c */
-#line 88 "config_parser.yy"
+#line 97 "config_parser.yy"
int yylex(YYSTYPE *lvalp, YYLTYPE *llocp, void *scanner);
/* Line 390 of yacc.c */
-#line 293 "config_parser.cc"
+#line 302 "config_parser.cc"
#ifdef short
# undef short
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 126, 126, 127, 130, 130, 130, 130, 133, 138,
- 144, 150, 151, 159, 158, 188, 191, 198, 197, 209,
- 210, 212, 213, 214, 217, 222, 227, 234, 243, 244,
- 251, 252, 253, 254, 255, 256, 263, 268, 263, 293,
- 294, 299, 300, 303, 307, 313, 314, 317, 324, 325,
- 329, 328, 340, 341, 343, 344, 345, 348, 356, 372,
- 373, 374, 375, 376, 383, 382, 394, 395, 397, 398,
- 402, 408, 413, 417, 421, 427, 428
+ 0, 135, 135, 136, 139, 139, 139, 139, 142, 147,
+ 153, 159, 160, 168, 167, 197, 200, 207, 206, 218,
+ 219, 221, 222, 223, 226, 231, 236, 243, 252, 253,
+ 260, 261, 262, 263, 264, 265, 272, 277, 272, 302,
+ 303, 308, 309, 312, 316, 322, 323, 326, 333, 334,
+ 338, 337, 349, 350, 352, 353, 354, 357, 365, 381,
+ 382, 383, 384, 385, 392, 391, 403, 404, 406, 407,
+ 411, 417, 422, 426, 430, 436, 437
};
#endif
{
case 8:
/* Line 1792 of yacc.c */
-#line 134 "config_parser.yy"
+#line 143 "config_parser.yy"
{
context->HandleInclude((yyvsp[(2) - (2)].text), false, yylloc);
free((yyvsp[(2) - (2)].text));
case 9:
/* Line 1792 of yacc.c */
-#line 139 "config_parser.yy"
+#line 148 "config_parser.yy"
{
context->HandleInclude((yyvsp[(2) - (2)].text), true, yylloc);
free((yyvsp[(2) - (2)].text));
case 10:
/* Line 1792 of yacc.c */
-#line 145 "config_parser.yy"
+#line 154 "config_parser.yy"
{
context->HandleLibrary((yyvsp[(2) - (2)].text));
free((yyvsp[(2) - (2)].text));
case 12:
/* Line 1792 of yacc.c */
-#line 152 "config_parser.yy"
+#line 161 "config_parser.yy"
{
(yyval.text) = (yyvsp[(1) - (1)].text);
free((yyvsp[(1) - (1)].text));
case 13:
/* Line 1792 of yacc.c */
-#line 159 "config_parser.yy"
+#line 168 "config_parser.yy"
{
String name = String((yyvsp[(3) - (3)].text));
free((yyvsp[(3) - (3)].text));
case 14:
/* Line 1792 of yacc.c */
-#line 174 "config_parser.yy"
+#line 183 "config_parser.yy"
{
TypeRuleList::Ptr ruleList = *(yyvsp[(6) - (6)].variant);
m_Type->GetRuleList()->AddRules(ruleList);
case 15:
/* Line 1792 of yacc.c */
-#line 188 "config_parser.yy"
+#line 197 "config_parser.yy"
{
(yyval.num) = 0;
}
case 16:
/* Line 1792 of yacc.c */
-#line 192 "config_parser.yy"
+#line 201 "config_parser.yy"
{
(yyval.num) = 1;
}
case 17:
/* Line 1792 of yacc.c */
-#line 198 "config_parser.yy"
+#line 207 "config_parser.yy"
{
m_RuleLists.push(boost::make_shared<TypeRuleList>());
}
case 18:
/* Line 1792 of yacc.c */
-#line 203 "config_parser.yy"
+#line 212 "config_parser.yy"
{
(yyval.variant) = new Value(m_RuleLists.top());
m_RuleLists.pop();
case 24:
/* Line 1792 of yacc.c */
-#line 218 "config_parser.yy"
+#line 227 "config_parser.yy"
{
m_RuleLists.top()->AddRequire((yyvsp[(2) - (2)].text));
free((yyvsp[(2) - (2)].text));
case 25:
/* Line 1792 of yacc.c */
-#line 223 "config_parser.yy"
+#line 232 "config_parser.yy"
{
m_RuleLists.top()->SetValidator((yyvsp[(2) - (2)].text));
free((yyvsp[(2) - (2)].text));
case 26:
/* Line 1792 of yacc.c */
-#line 228 "config_parser.yy"
+#line 237 "config_parser.yy"
{
TypeRule rule((yyvsp[(2) - (3)].type), (yyvsp[(3) - (3)].text), TypeRuleList::Ptr(), yylloc);
free((yyvsp[(3) - (3)].text));
case 27:
/* Line 1792 of yacc.c */
-#line 235 "config_parser.yy"
+#line 244 "config_parser.yy"
{
TypeRule rule((yyvsp[(2) - (4)].type), (yyvsp[(3) - (4)].text), *(yyvsp[(4) - (4)].variant), yylloc);
free((yyvsp[(3) - (4)].text));
case 29:
/* Line 1792 of yacc.c */
-#line 245 "config_parser.yy"
+#line 254 "config_parser.yy"
{
m_Type->SetParent((yyvsp[(2) - (2)].text));
free((yyvsp[(2) - (2)].text));
case 35:
/* Line 1792 of yacc.c */
-#line 257 "config_parser.yy"
+#line 266 "config_parser.yy"
{
(yyval.type) = (yyvsp[(1) - (1)].type);
}
case 36:
/* Line 1792 of yacc.c */
-#line 263 "config_parser.yy"
+#line 272 "config_parser.yy"
{
m_Abstract = false;
m_Local = false;
case 37:
/* Line 1792 of yacc.c */
-#line 268 "config_parser.yy"
+#line 277 "config_parser.yy"
{
m_Item = boost::make_shared<ConfigItemBuilder>(yylloc);
case 38:
/* Line 1792 of yacc.c */
-#line 280 "config_parser.yy"
+#line 289 "config_parser.yy"
{
ExpressionList::Ptr exprl = *(yyvsp[(7) - (7)].variant);
delete (yyvsp[(7) - (7)].variant);
case 40:
/* Line 1792 of yacc.c */
-#line 295 "config_parser.yy"
+#line 304 "config_parser.yy"
{
m_Abstract = true;
}
case 43:
/* Line 1792 of yacc.c */
-#line 304 "config_parser.yy"
+#line 313 "config_parser.yy"
{
m_Abstract = true;
}
case 44:
/* Line 1792 of yacc.c */
-#line 308 "config_parser.yy"
+#line 317 "config_parser.yy"
{
m_Local = true;
}
case 47:
/* Line 1792 of yacc.c */
-#line 318 "config_parser.yy"
+#line 327 "config_parser.yy"
{
m_Item->AddParent((yyvsp[(1) - (1)].text));
free((yyvsp[(1) - (1)].text));
case 50:
/* Line 1792 of yacc.c */
-#line 329 "config_parser.yy"
+#line 338 "config_parser.yy"
{
m_ExpressionLists.push(boost::make_shared<ExpressionList>());
}
case 51:
/* Line 1792 of yacc.c */
-#line 334 "config_parser.yy"
+#line 343 "config_parser.yy"
{
(yyval.variant) = new Value(m_ExpressionLists.top());
m_ExpressionLists.pop();
case 57:
/* Line 1792 of yacc.c */
-#line 349 "config_parser.yy"
+#line 358 "config_parser.yy"
{
Expression expr((yyvsp[(1) - (3)].text), (yyvsp[(2) - (3)].op), *(yyvsp[(3) - (3)].variant), yylloc);
free((yyvsp[(1) - (3)].text));
case 58:
/* Line 1792 of yacc.c */
-#line 357 "config_parser.yy"
+#line 366 "config_parser.yy"
{
Expression subexpr((yyvsp[(3) - (6)].text), (yyvsp[(5) - (6)].op), *(yyvsp[(6) - (6)].variant), yylloc);
free((yyvsp[(3) - (6)].text));
case 63:
/* Line 1792 of yacc.c */
-#line 377 "config_parser.yy"
+#line 386 "config_parser.yy"
{
(yyval.op) = (yyvsp[(1) - (1)].op);
}
case 64:
/* Line 1792 of yacc.c */
-#line 383 "config_parser.yy"
+#line 392 "config_parser.yy"
{
m_Arrays.push(boost::make_shared<Array>());
}
case 65:
/* Line 1792 of yacc.c */
-#line 388 "config_parser.yy"
+#line 397 "config_parser.yy"
{
(yyval.variant) = new Value(m_Arrays.top());
m_Arrays.pop();
case 69:
/* Line 1792 of yacc.c */
-#line 399 "config_parser.yy"
+#line 408 "config_parser.yy"
{
m_Arrays.top()->Add(*(yyvsp[(1) - (1)].variant));
}
case 70:
/* Line 1792 of yacc.c */
-#line 403 "config_parser.yy"
+#line 412 "config_parser.yy"
{
m_Arrays.top()->Add(*(yyvsp[(3) - (3)].variant));
}
case 71:
/* Line 1792 of yacc.c */
-#line 409 "config_parser.yy"
+#line 418 "config_parser.yy"
{
(yyval.variant) = new Value((yyvsp[(1) - (1)].text));
free((yyvsp[(1) - (1)].text));
case 72:
/* Line 1792 of yacc.c */
-#line 414 "config_parser.yy"
+#line 423 "config_parser.yy"
{
(yyval.variant) = new Value((yyvsp[(1) - (1)].num));
}
case 73:
/* Line 1792 of yacc.c */
-#line 418 "config_parser.yy"
+#line 427 "config_parser.yy"
{
(yyval.variant) = new Value();
}
case 74:
/* Line 1792 of yacc.c */
-#line 422 "config_parser.yy"
+#line 431 "config_parser.yy"
{
(yyval.variant) = (yyvsp[(1) - (1)].variant);
}
case 76:
/* Line 1792 of yacc.c */
-#line 429 "config_parser.yy"
+#line 438 "config_parser.yy"
{
(yyval.variant) = (yyvsp[(1) - (1)].variant);
}
/* Line 1792 of yacc.c */
-#line 2077 "config_parser.cc"
+#line 2086 "config_parser.cc"
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
/* Line 2055 of yacc.c */
-#line 433 "config_parser.yy"
+#line 442 "config_parser.yy"
******************************************************************************/
#include "i2-config.h"
+#include "config/expression.h"
+#include "config/expressionlist.h"
+#include "config/configitembuilder.h"
+#include "config/configcompiler.h"
+#include "config/configcompilercontext.h"
+#include "config/typerule.h"
+#include "config/typerulelist.h"
+#include "base/value.h"
+#include "base/array.h"
#include <sstream>
#include <stack>
#include <boost/smart_ptr/make_shared.hpp>
using namespace icinga;
-#define YYLTYPE DebugInfo
+#define YYLTYPE icinga::DebugInfo
}
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-config.h"
+#include "config/configcompiler.h"
+#include "config/configitem.h"
#include "base/logger_fwd.h"
+#include "base/utility.h"
#include <sstream>
#include <fstream>
#include <boost/foreach.hpp>
#ifndef CONFIGCOMPILER_H
#define CONFIGCOMPILER_H
+#include "config/i2-config.h"
+#include "config/debuginfo.h"
#include "base/registry.h"
#include <iostream>
+#include <boost/function.hpp>
namespace icinga
{
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-config.h"
+#include "config/configcompilercontext.h"
+#include "base/utility.h"
#include "base/logger_fwd.h"
#include <boost/foreach.hpp>
#ifndef CONFIGCOMPILERCONTEXT_H
#define CONFIGCOMPILERCONTEXT_H
+#include "config/i2-config.h"
+#include "config/configitem.h"
+#include "config/configtype.h"
+
namespace icinga
{
int m_Flags;
- std::vector<shared_ptr<ConfigItem> > m_Items;
- std::map<std::pair<String, String>, shared_ptr<ConfigItem> > m_ItemsMap;
+ std::vector<ConfigItem::Ptr> m_Items;
+ std::map<std::pair<String, String>, ConfigItem::Ptr> m_ItemsMap;
std::map<String, shared_ptr<ConfigType> > m_Types;
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-config.h"
+#include "config/configitem.h"
+#include "config/configcompilercontext.h"
#include "base/dynamictype.h"
#include "base/objectlock.h"
#include "base/logger_fwd.h"
#ifndef CONFIGITEM_H
#define CONFIGITEM_H
+#include "config/i2-config.h"
+#include "config/expressionlist.h"
#include "base/dynamicobject.h"
namespace icinga
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-config.h"
+#include "config/configitembuilder.h"
+#include "config/configcompilercontext.h"
#include "base/dynamictype.h"
#include <boost/smart_ptr/make_shared.hpp>
#include <sstream>
#ifndef CONFIGITEMBUILDER_H
#define CONFIGITEMBUILDER_H
+#include "config/debuginfo.h"
+#include "config/expression.h"
+#include "config/expressionlist.h"
+#include "config/configitem.h"
+#include "base/object.h"
+
namespace icinga
{
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-config.h"
+#include "config/configtype.h"
+#include "config/configcompilercontext.h"
#include "base/objectlock.h"
#include "base/convert.h"
#include <boost/tuple/tuple.hpp>
#ifndef CONFIGTYPE_H\r
#define CONFIGTYPE_H\r
\r
+#include "config/i2-config.h"\r
+#include "config/typerule.h"\r
+#include "config/typerulelist.h"\r
+#include "config/configitem.h"\r
#include "base/array.h"\r
\r
namespace icinga\r
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-config.h"
+#include "config/expression.h"
+#include "config/expressionlist.h"
#include "base/objectlock.h"
#include <sstream>
#include <boost/tuple/tuple.hpp>
#ifndef EXPRESSION_H
#define EXPRESSION_H
+#include "config/i2-config.h"
+#include "config/debuginfo.h"
#include "base/dictionary.h"
+#include <iostream>
namespace icinga
{
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-config.h"
+#include "config/expressionlist.h"
#include <boost/foreach.hpp>
using namespace icinga;
#ifndef EXPRESSIONLIST_H
#define EXPRESSIONLIST_H
+#include "config/i2-config.h"
+#include "config/expression.h"
#include "base/dictionary.h"
+#include <vector>
namespace icinga
{
* at runtime.
*/
-//#include "base/i2-base.h"
+#include "base/i2-base.h"
#ifdef I2_CONFIG_BUILD
# define I2_CONFIG_API I2_EXPORT
# define I2_CONFIG_API I2_IMPORT
#endif /* I2_CONFIG_BUILD */
-/*#include "debuginfo.h"
-#include "typerulelist.h"
-#include "typerule.h"
-#include "expression.h"
-#include "expressionlist.h"
-#include "configitem.h"
-#include "configtype.h"
-#include "configitembuilder.h"
-#include "configcompiler.h"
-#include "configcompilercontext.h"*/
-
#endif /* I2CONFIG_H */
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-config.h"
+#include "config/typerule.h"
#include "base/convert.h"
+#include "base/utility.h"
+#include "base/dictionary.h"
+#include "base/array.h"
using namespace icinga;
#ifndef TYPERULE_H\r
#define TYPERULE_H\r
\r
+#include "config/i2-config.h"\r
+#include "config/typerulelist.h"\r
+#include "config/debuginfo.h"\r
+\r
namespace icinga\r
{\r
\r
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *\r
******************************************************************************/\r
\r
-#include "i2-config.h"\r
+#include "config/typerulelist.h"\r
+#include "config/typerule.h"\r
#include <boost/foreach.hpp>\r
\r
using namespace icinga;\r
#ifndef TYPERULELIST_H\r
#define TYPERULELIST_H\r
\r
+#include "config/i2-config.h"\r
#include "base/value.h"\r
\r
namespace icinga\r
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-icinga.h"
+#include "icinga/api.h"
+#include "base/scriptfunction.h"
#include "base/logger_fwd.h"
using namespace icinga;
#ifndef API_H
#define API_H
+#include "icinga/i2-icinga.h"
+#include "base/scripttask.h"
+
namespace icinga
{
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-icinga.h"
+#include "icinga/checkresultmessage.h"
using namespace icinga;
#ifndef CHECKRESULTMESSAGE_H
#define CHECKRESULTMESSAGE_H
+#include "icinga/i2-icinga.h"
+#include "remoting/messagepart.h"
+
namespace icinga
{
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-icinga.h"
+#include "icinga/cib.h"
using namespace icinga;
#ifndef CIB_H
#define CIB_H
+#include "icinga/i2-icinga.h"
#include "base/ringbuffer.h"
namespace icinga
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-icinga.h"
+#include "icinga/externalcommandprocessor.h"
+#include "icinga/host.h"
+#include "icinga/service.h"
+#include "icinga/user.h"
+#include "icinga/hostgroup.h"
+#include "icinga/servicegroup.h"
+#include "icinga/pluginchecktask.h"
#include "base/convert.h"
#include "base/logger_fwd.h"
#include "base/objectlock.h"
+#include "base/application.h"
+#include <fstream>
#include <boost/algorithm/string/classification.hpp>
#include <boost/foreach.hpp>
#include <boost/exception/diagnostic_information.hpp>
#ifndef EXTERNALCOMMANDPROCESSOR_H
#define EXTERNALCOMMANDPROCESSOR_H
+#include "icinga/i2-icinga.h"
+#include "base/qstring.h"
+#include <vector>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/once.hpp>
+
namespace icinga
{
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-icinga.h"
+#include "icinga/host.h"
+#include "icinga/service.h"
+#include "icinga/hostgroup.h"
#include "base/dynamictype.h"
#include "base/objectlock.h"
#include "base/logger_fwd.h"
+#include "config/configitembuilder.h"
+#include "config/configcompilercontext.h"
#include <boost/tuple/tuple.hpp>
#include <boost/smart_ptr/make_shared.hpp>
#include <boost/foreach.hpp>
#ifndef HOST_H
#define HOST_H
+#include "icinga/i2-icinga.h"
+#include "base/array.h"
+#include "base/dynamicobject.h"
+#include "base/dictionary.h"
+
namespace icinga
{
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-icinga.h"
+#include "icinga/hostgroup.h"
#include "base/dynamictype.h"
#include "base/logger_fwd.h"
#include "base/objectlock.h"
#ifndef HOSTGROUP_H
#define HOSTGROUP_H
+#include "icinga/i2-icinga.h"
+#include "icinga/host.h"
+#include "base/dynamicobject.h"
+#include <set>
+
namespace icinga
{
*/
#include "base/i2-base.h"
-#include "config/i2-config.h"
-#include "remoting/i2-remoting.h"
#ifdef I2_ICINGA_BUILD
# define I2_ICINGA_API I2_EXPORT
# define I2_ICINGA_API I2_IMPORT
#endif /* I2_ICINGA_BUILD */
-#include "externalcommandprocessor.h"
-
-#include "icingaapplication.h"
-
-#include "timeperiod.h"
-
-#include "user.h"
-#include "usergroup.h"
-
-#include "notification.h"
-#include "notificationrequestmessage.h"
-
-#include "host.h"
-#include "hostgroup.h"
-#include "service.h"
-#include "servicegroup.h"
-
-#include "macroprocessor.h"
-#include "pluginchecktask.h"
-#include "nullchecktask.h"
-
-#include "pluginnotificationtask.h"
-
-#include "checkresultmessage.h"
-
-#include "cib.h"
-
-#include "api.h"
-
-#include "perfdatawriter.h"
-
#endif /* I2ICINGA_H */
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-icinga.h"
+#include "icinga/icingaapplication.h"
+#include "remoting/endpointmanager.h"
#include "base/dynamictype.h"
#include "base/logger_fwd.h"
#include "base/objectlock.h"
#ifndef ICINGAAPPLICATION_H
#define ICINGAAPPLICATION_H
+#include "icinga/i2-icinga.h"
#include "base/application.h"
namespace icinga
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-icinga.h"
+#include "icinga/macroprocessor.h"
+#include "base/utility.h"
+#include "base/array.h"
#include "base/objectlock.h"
#include <boost/tuple/tuple.hpp>
#include <boost/smart_ptr/make_shared.hpp>
#ifndef MACROPROCESSOR_H
#define MACROPROCESSOR_H
+#include "icinga/i2-icinga.h"
+#include "base/dictionary.h"
+#include <vector>
+
namespace icinga
{
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-icinga.h"
+#include "icinga/notification.h"
+#include "icinga/macroprocessor.h"
+#include "icinga/service.h"
#include "base/dynamictype.h"
#include "base/objectlock.h"
#include "base/logger_fwd.h"
#ifndef NOTIFICATION_H
#define NOTIFICATION_H
+#include "icinga/i2-icinga.h"
+#include "icinga/user.h"
+#include "icinga/usergroup.h"
+#include "base/array.h"
+
namespace icinga
{
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-icinga.h"
+#include "icinga/notificationrequestmessage.h"
using namespace icinga;
#ifndef NOTIFICATIONREQUESTMESSAGE_H
#define NOTIFICATIONREQUESTMESSAGE_H
+#include "icinga/i2-icinga.h"
+#include "icinga/notification.h"
+#include "remoting/messagepart.h"
+
namespace icinga
{
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-icinga.h"
+#include "icinga/nullchecktask.h"
+#include "icinga/service.h"
+#include "base/dictionary.h"
#include <boost/smart_ptr/make_shared.hpp>
using namespace icinga;
#ifndef NULLCHECKTASK_H
#define NULLCHECKTASK_H
+#include "icinga/i2-icinga.h"
#include "base/scripttask.h"
namespace icinga
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-icinga.h"
+#include "icinga/perfdatawriter.h"
+#include "icinga/checkresultmessage.h"
+#include "icinga/service.h"
+#include "icinga/macroprocessor.h"
#include "base/dynamictype.h"
#include "base/objectlock.h"
#include "base/logger_fwd.h"
#include "base/convert.h"
+#include "base/application.h"
#include <boost/smart_ptr/make_shared.hpp>
using namespace icinga;
#ifndef PERFDATAWRITER_H
#define PERFDATAWRITER_H
+#include "icinga/i2-icinga.h"
+#include "remoting/endpoint.h"
#include "base/dynamicobject.h"
#include <fstream>
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-icinga.h"
+#include "icinga/pluginchecktask.h"
+#include "icinga/macroprocessor.h"
+#include "base/dynamictype.h"
#include <boost/algorithm/string/classification.hpp>
#include <boost/smart_ptr/make_shared.hpp>
#include <boost/foreach.hpp>
#ifndef PLUGINCHECKTASK_H
#define PLUGINCHECKTASK_H
+#include "icinga/i2-icinga.h"
+#include "icinga/service.h"
#include "base/scripttask.h"
#include "base/process.h"
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-icinga.h"
+#include "icinga/pluginnotificationtask.h"
+#include "icinga/notification.h"
+#include "icinga/service.h"
+#include "icinga/macroprocessor.h"
+#include "base/scriptfunction.h"
#include "base/logger_fwd.h"
#include <boost/smart_ptr/make_shared.hpp>
#ifndef PLUGINNOTIFICATIONTASK_H
#define PLUGINNOTIFICATIONTASK_H
+#include "icinga/i2-icinga.h"
#include "base/scripttask.h"
#include "base/process.h"
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-icinga.h"
#include "icinga/service.h"
+#include "icinga/icingaapplication.h"
+#include "icinga/checkresultmessage.h"
+#include "icinga/cib.h"
+#include "remoting/endpointmanager.h"
#include "base/dynamictype.h"
#include "base/objectlock.h"
#include "base/logger_fwd.h"
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-icinga.h"
#include "icinga/service.h"
#include "base/dynamictype.h"
#include "base/objectlock.h"
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-icinga.h"
#include "icinga/service.h"
#include "base/dynamictype.h"
#include "base/objectlock.h"
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-icinga.h"
#include "icinga/service.h"
+#include "icinga/notificationrequestmessage.h"
+#include "remoting/endpointmanager.h"
+#include "base/dynamictype.h"
#include "base/objectlock.h"
#include "base/logger_fwd.h"
+#include "config/configitembuilder.h"
#include <boost/tuple/tuple.hpp>
#include <boost/smart_ptr/make_shared.hpp>
#include <boost/foreach.hpp>
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-icinga.h"
#include "icinga/service.h"
+#include "icinga/servicegroup.h"
+#include "icinga/icingaapplication.h"
+#include "icinga/macroprocessor.h"
#include "base/dynamictype.h"
#include "base/objectlock.h"
+#include "config/configitembuilder.h"
#include <boost/smart_ptr/make_shared.hpp>
#include <boost/foreach.hpp>
#ifndef SERVICE_H
#define SERVICE_H
-#include "base/dynamictype.h"
+#include "icinga/i2-icinga.h"
+#include "icinga/host.h"
+#include "icinga/timeperiod.h"
+#include "icinga/notification.h"
+#include "base/dynamicobject.h"
+#include "base/array.h"
#include <boost/signals2.hpp>
namespace icinga
#ifndef SERVICEGROUP_H
#define SERVICEGROUP_H
+#include "icinga/i2-icinga.h"
+#include "icinga/service.h"
#include "base/dynamictype.h"
+#include <set>
namespace icinga
{
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-icinga.h"
+#include "icinga/timeperiod.h"
#include "base/dynamictype.h"
#include "base/scriptfunction.h"
#include "base/objectlock.h"
#include "base/logger_fwd.h"
+#include "config/configitem.h"
#include <boost/smart_ptr/make_shared.hpp>
#include <boost/foreach.hpp>
{
ASSERT(OwnsLock());
- if (m_ValidBegin.IsEmpty() || begin < m_ValidBegin)
+ if (m_ValidBegin.IsEmpty() || begin < m_ValidBegin) {
m_ValidBegin = begin;
+ Touch("valid_begin");
+ }
- if (m_ValidEnd.IsEmpty() || end > m_ValidEnd)
+ if (m_ValidEnd.IsEmpty() || end > m_ValidEnd) {
m_ValidEnd = end;
+ Touch("valid_end");
+ }
Array::Ptr segments = m_Segments;
{
ASSERT(OwnsLock());
- if (m_ValidBegin.IsEmpty() || begin < m_ValidBegin)
+ if (m_ValidBegin.IsEmpty() || begin < m_ValidBegin) {
m_ValidBegin = begin;
+ Touch("valid_begin");
+ }
- if (m_ValidEnd.IsEmpty() || end > m_ValidEnd)
+ if (m_ValidEnd.IsEmpty() || end > m_ValidEnd) {
m_ValidEnd = end;
+ Touch("valid_end");
+ }
Array::Ptr segments = m_Segments;
return;
m_ValidBegin = end;
+ Touch("valid_begin");
Array::Ptr segments = m_Segments;
if (!ConfigItem::GetObject("TimePeriod", tp->GetName()))
continue;
+ double valid_end;
+
{
ObjectLock olock(tp);
tp->PurgeSegments(now - 3600);
+
+ valid_end = tp->m_ValidEnd;
}
- if (tp->m_ValidEnd < now + 3 * 3600)
- tp->UpdateRegion(tp->m_ValidEnd, tp->m_ValidEnd + 24 * 3600);
+ if (valid_end < now + 3 * 3600)
+ tp->UpdateRegion(valid_end, now + 24 * 3600);
}
}
#ifndef TIMEPERIOD_H
#define TIMEPERIOD_H
+#include "icinga/i2-icinga.h"
+#include "base/dynamicobject.h"
+#include "base/array.h"
+
namespace icinga
{
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-icinga.h"
+#include "icinga/user.h"
+#include "icinga/usergroup.h"
#include "base/dynamictype.h"
#include <boost/smart_ptr/make_shared.hpp>
#ifndef USER_H
#define USER_H
+#include "icinga/i2-icinga.h"
+#include "base/dynamicobject.h"
+#include "base/array.h"
+
namespace icinga
{
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-icinga.h"
+#include "icinga/usergroup.h"
#include "base/dynamictype.h"
#include "base/objectlock.h"
#include "base/logger_fwd.h"
#ifndef USERGROUP_H
#define USERGROUP_H
+#include "icinga/i2-icinga.h"
+#include "icinga/user.h"
#include "base/dynamicobject.h"
namespace icinga
#include <Python.h>
#include <i2-base.h>
-#include <i2-config.h>
-#include <i2-remoting.h>
#ifdef I2_PYTHON_BUILD
# define I2_PYTHON_API I2_EXPORT
# define I2_PYTHON_API I2_IMPORT
#endif /* I2_PYTHON_BUILD */
-#include "pythonlanguage.h"
-#include "pythoninterpreter.h"
-
#endif /* I2PYTHON_H */
.conf.cpp: $(top_builddir)/tools/mkembedconfig.c
$(top_builddir)/tools/mkembedconfig $< $@
+EXTRA_DIST = \
+ i2-remoting.cpp
+
libremoting_la_SOURCES = \
endpoint.cpp \
endpoint.h \
endpointmanager.cpp \
endpointmanager.h \
- i2-remoting.cpp \
i2-remoting.h \
jsonrpcconnection.cpp \
jsonrpcconnection.h \
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-remoting.h"
+#include "remoting/endpoint.h"
+#include "remoting/endpointmanager.h"
#include "base/application.h"
#include "base/dynamictype.h"
#include "base/objectlock.h"
#include "base/logger_fwd.h"
+#include "config/configitembuilder.h"
#include <boost/smart_ptr/make_shared.hpp>
using namespace icinga;
#ifndef ENDPOINT_H
#define ENDPOINT_H
+#include "remoting/i2-remoting.h"
+#include "remoting/requestmessage.h"
+#include "remoting/responsemessage.h"
+#include "remoting/jsonrpcconnection.h"
#include "base/dynamicobject.h"
#include <boost/signals2.hpp>
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-remoting.h"
+#include "remoting/endpointmanager.h"
#include "base/dynamictype.h"
#include "base/objectlock.h"
#include "base/logger_fwd.h"
#ifndef ENDPOINTMANAGER_H
#define ENDPOINTMANAGER_H
+#include "remoting/i2-remoting.h"
+#include "remoting/endpoint.h"
#include "base/tcpsocket.h"
#include "base/tlsstream.h"
#include <boost/signals2.hpp>
*/
#include "base/i2-base.h"
-#include "config/i2-config.h"
#ifdef I2_REMOTING_BUILD
# define I2_REMOTING_API I2_EXPORT
# define I2_REMOTING_API I2_IMPORT
#endif /* I2_REMOTING_BUILD */
-#include "messagepart.h"
-#include "requestmessage.h"
-#include "responsemessage.h"
-#include "jsonrpcconnection.h"
-#include "endpoint.h"
-#include "endpointmanager.h"
-
#endif /* I2REMOTING_H */
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-remoting.h"
+#include "remoting/jsonrpcconnection.h"
#include "base/netstring.h"
#include "base/objectlock.h"
#include "base/logger_fwd.h"
#ifndef JSONRPCCONNECTION_H
#define JSONRPCCONNECTION_H
+#include "remoting/i2-remoting.h"
+#include "remoting/messagepart.h"
#include "base/connection.h"
#include <boost/signals2.hpp>
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-remoting.h"
+#include "remoting/messagepart.h"
#include <boost/smart_ptr/make_shared.hpp>
using namespace icinga;
#ifndef MESSAGEPART_H
#define MESSAGEPART_H
+#include "remoting/i2-remoting.h"
+#include "base/dictionary.h"
+
struct cJSON;
namespace icinga
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-remoting.h"
+#include "remoting/requestmessage.h"
using namespace icinga;
#ifndef REQUESTMESSAGE_H
#define REQUESTMESSAGE_H
+#include "remoting/i2-remoting.h"
+#include "remoting/messagepart.h"
+
namespace icinga
{
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/
-#include "i2-remoting.h"
+#include "remoting/responsemessage.h"
using namespace icinga;
#ifndef RESPONSEMESSAGE_H
#define RESPONSEMESSAGE_H
+#include "remoting/i2-remoting.h"
+#include "remoting/messagepart.h"
+
namespace icinga
{
projects / icinga2 / commitdiff