]> granicus.if.org Git - icinga2/commitdiff
Move PerfdataValue() class into base library 5265/head
authorMichael Friedrich <michael.friedrich@icinga.com>
Mon, 15 May 2017 13:51:39 +0000 (15:51 +0200)
committerMichael Friedrich <michael.friedrich@icinga.com>
Mon, 15 May 2017 14:32:29 +0000 (16:32 +0200)
This is required for libremote and ApiListener stats in #5133

26 files changed:
lib/base/CMakeLists.txt
lib/base/perfdatavalue.cpp [moved from lib/icinga/perfdatavalue.cpp with 98% similarity]
lib/base/perfdatavalue.hpp [moved from lib/icinga/perfdatavalue.hpp with 91% similarity]
lib/base/perfdatavalue.ti [moved from lib/icinga/perfdatavalue.ti with 96% similarity]
lib/checker/checkercomponent.cpp
lib/db_ido/idochecktask.cpp
lib/db_ido_mysql/idomysqlconnection.cpp
lib/db_ido_pgsql/idopgsqlconnection.cpp
lib/icinga/CMakeLists.txt
lib/icinga/cib.cpp
lib/icinga/clusterevents.cpp
lib/icinga/pluginutility.cpp
lib/livestatus/livestatuslistener.cpp
lib/methods/clusterzonechecktask.cpp
lib/methods/icingachecktask.cpp
lib/methods/nullchecktask.cpp
lib/methods/randomchecktask.cpp
lib/perfdata/gelfwriter.cpp
lib/perfdata/graphitewriter.cpp
lib/perfdata/influxdbwriter.cpp
lib/perfdata/logstashwriter.cpp
lib/perfdata/opentsdbwriter.cpp
test/base-json.cpp
test/base-serialize.cpp
test/base-type.cpp
test/icinga-perfdata.cpp

index 420e3204ca9c481030c4fce95a4e3b32e9d767cd..b80a7bc2b4b38669b3780d79498a150df4884da6 100644 (file)
@@ -21,6 +21,7 @@ mkclass_target(datetime.ti datetime.tcpp datetime.thpp)
 mkclass_target(filelogger.ti filelogger.tcpp filelogger.thpp)
 mkclass_target(function.ti function.tcpp function.thpp)
 mkclass_target(logger.ti logger.tcpp logger.thpp)
+mkclass_target(perfdatavalue.ti perfdatavalue.tcpp perfdatavalue.thpp)
 mkclass_target(streamlogger.ti streamlogger.tcpp streamlogger.thpp)
 mkclass_target(sysloglogger.ti sysloglogger.tcpp sysloglogger.thpp)
 
@@ -33,7 +34,8 @@ set(base_SOURCES
   json-script.cpp loader.cpp logger.cpp logger.thpp math-script.cpp
   netstring.cpp networkstream.cpp number.cpp number-script.cpp object.cpp
   object-script.cpp objecttype.cpp primitivetype.cpp process.cpp ringbuffer.cpp scriptframe.cpp
-  function.cpp function.thpp function-script.cpp functionwrapper.cpp scriptglobal.cpp
+  function.cpp function.thpp function-script.cpp functionwrapper.cpp
+  perfdatavalue.cpp perfdatavalue.thpp scriptglobal.cpp
   scriptutils.cpp serializer.cpp socket.cpp socketevents.cpp socketevents-epoll.cpp socketevents-poll.cpp stacktrace.cpp
   statsfunction.cpp stdiostream.cpp stream.cpp streamlogger.cpp streamlogger.thpp string.cpp string-script.cpp
   sysloglogger.cpp sysloglogger.thpp tcpsocket.cpp udpsocket.cpp threadpool.cpp timer.cpp
similarity index 98%
rename from lib/icinga/perfdatavalue.cpp
rename to lib/base/perfdatavalue.cpp
index d350260bfc988b00cd77459cfee7b3e23a2f02ac..71d5f4d0aa4ff114bca8c478b271a32ddb11fd2b 100644 (file)
@@ -17,8 +17,8 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/perfdatavalue.hpp"
-#include "icinga/perfdatavalue.tcpp"
+#include "base/perfdatavalue.hpp"
+#include "base/perfdatavalue.tcpp"
 #include "base/convert.hpp"
 #include "base/exception.hpp"
 #include "base/logger.hpp"
@@ -67,7 +67,7 @@ PerfdataValue::Ptr PerfdataValue::Parse(const String& perfdata)
                spq = perfdata.GetLength();
 
        String valueStr = perfdata.SubStr(eqp + 1, spq - eqp - 1);
-               
+
        size_t pos = valueStr.FindFirstNotOf("+-0123456789.e");
 
        double value = Convert::ToDouble(valueStr.SubStr(0, pos));
similarity index 91%
rename from lib/icinga/perfdatavalue.hpp
rename to lib/base/perfdatavalue.hpp
index 2f91cf7a2676e8faa72c47c84ec4ac3f2c2b1a4f..42439f0cc1d1f060ff46fe243f53af4088f5cb52 100644 (file)
 #ifndef PERFDATAVALUE_H
 #define PERFDATAVALUE_H
 
-#include "icinga/i2-icinga.hpp"
-#include "icinga/perfdatavalue.thpp"
+#include "base/i2-base.hpp"
+#include "base/perfdatavalue.thpp"
 
 namespace icinga
 {
 
-class I2_ICINGA_API PerfdataValue : public ObjectImpl<PerfdataValue>
+/**
+ * A performance data value.
+ *
+ * @ingroup base
+ */
+class I2_BASE_API PerfdataValue : public ObjectImpl<PerfdataValue>
 {
 public:
        DECLARE_OBJECT(PerfdataValue);
similarity index 96%
rename from lib/icinga/perfdatavalue.ti
rename to lib/base/perfdatavalue.ti
index c6c8472ff11c24b5349b81d1c9a484f0fc56b6ec..e372c9245e79da6b120cf50081a7189526b29907 100644 (file)
@@ -17,9 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/customvarobject.hpp"
-
-library icinga;
+library base;
 
 namespace icinga
 {
index 6e524d9ef11c621a5d6495b89fa37e4dfbb1ac3e..65098d6c36b6ca22b2c790df4098148352a249c3 100644 (file)
 #include "checker/checkercomponent.tcpp"
 #include "icinga/icingaapplication.hpp"
 #include "icinga/cib.hpp"
-#include "icinga/perfdatavalue.hpp"
 #include "remote/apilistener.hpp"
 #include "base/configtype.hpp"
 #include "base/objectlock.hpp"
 #include "base/utility.hpp"
+#include "base/perfdatavalue.hpp"
 #include "base/logger.hpp"
 #include "base/exception.hpp"
 #include "base/convert.hpp"
index c5766038bf6d01a77f71cd21a8c1ac2941fa618f..707b1ed3796cb300b609cef15071df1d5847dc1a 100644 (file)
 #include "icinga/host.hpp"
 #include "icinga/checkcommand.hpp"
 #include "icinga/macroprocessor.hpp"
-#include "icinga/perfdatavalue.hpp"
 #include "remote/apilistener.hpp"
 #include "remote/endpoint.hpp"
 #include "remote/zone.hpp"
 #include "base/function.hpp"
 #include "base/utility.hpp"
+#include "base/perfdatavalue.hpp"
 #include "base/configtype.hpp"
 #include "base/convert.hpp"
 
index 92d7f61a98a9203eceb82007ce577c3333ed06e8..b761d2b9023275f91004c9a38f03f80facec3342 100644 (file)
 
 #include "db_ido_mysql/idomysqlconnection.hpp"
 #include "db_ido_mysql/idomysqlconnection.tcpp"
-#include "icinga/perfdatavalue.hpp"
 #include "db_ido/dbtype.hpp"
 #include "db_ido/dbvalue.hpp"
 #include "base/logger.hpp"
 #include "base/objectlock.hpp"
 #include "base/convert.hpp"
 #include "base/utility.hpp"
+#include "base/perfdatavalue.hpp"
 #include "base/application.hpp"
 #include "base/configtype.hpp"
 #include "base/exception.hpp"
index 28eca8cb323d2172f8eeb2ff0f100bdcd7b0e96b..723767baeb9c4eb0b8357741880a32b7e854fb56 100644 (file)
 #include "db_ido_pgsql/idopgsqlconnection.tcpp"
 #include "db_ido/dbtype.hpp"
 #include "db_ido/dbvalue.hpp"
-#include "icinga/perfdatavalue.hpp"
 #include "base/logger.hpp"
 #include "base/objectlock.hpp"
 #include "base/convert.hpp"
 #include "base/utility.hpp"
+#include "base/perfdatavalue.hpp"
 #include "base/application.hpp"
 #include "base/configtype.hpp"
 #include "base/exception.hpp"
index d2abf4e50064b1e33c4ae7e310c92666e370b291..ca98b260b7200fa6efd8bbd06ab8f41802488f78 100644 (file)
@@ -29,7 +29,6 @@ mkclass_target(icingaapplication.ti icingaapplication.tcpp icingaapplication.thp
 mkclass_target(customvarobject.ti customvarobject.tcpp customvarobject.thpp)
 mkclass_target(notificationcommand.ti notificationcommand.tcpp notificationcommand.thpp)
 mkclass_target(notification.ti notification.tcpp notification.thpp)
-mkclass_target(perfdatavalue.ti perfdatavalue.tcpp perfdatavalue.thpp)
 mkclass_target(scheduleddowntime.ti scheduleddowntime.tcpp scheduleddowntime.thpp)
 mkclass_target(servicegroup.ti servicegroup.tcpp servicegroup.thpp)
 mkclass_target(service.ti service.tcpp service.thpp)
@@ -47,7 +46,7 @@ set(icinga_SOURCES
   externalcommandprocessor.cpp host.cpp host.thpp hostgroup.cpp hostgroup.thpp icingaapplication.cpp icingaapplication.thpp
   icinga-itl.cpp customvarobject.cpp customvarobject.thpp
   legacytimeperiod.cpp macroprocessor.cpp notificationcommand.cpp notificationcommand.thpp notification.cpp notification.thpp
-  notification-apply.cpp objectutils.cpp perfdatavalue.cpp perfdatavalue.thpp pluginutility.cpp scheduleddowntime.cpp scheduleddowntime.thpp
+  notification-apply.cpp objectutils.cpp pluginutility.cpp scheduleddowntime.cpp scheduleddowntime.thpp
   scheduleddowntime-apply.cpp service-apply.cpp checkable-check.cpp checkable-comment.cpp
   service.cpp service.thpp servicegroup.cpp servicegroup.thpp checkable-notification.cpp timeperiod.cpp timeperiod.thpp
   user.cpp user.thpp usergroup.cpp usergroup.thpp
index 50b390ccb2ca3000ed342fbebba5216e6b6ca52c..293701937318c461c14f8fcd850b5d4de6cafb0e 100644 (file)
@@ -20,9 +20,9 @@
 #include "icinga/cib.hpp"
 #include "icinga/host.hpp"
 #include "icinga/service.hpp"
-#include "icinga/perfdatavalue.hpp"
 #include "base/objectlock.hpp"
 #include "base/utility.hpp"
+#include "base/perfdatavalue.hpp"
 #include "base/configtype.hpp"
 #include "base/statsfunction.hpp"
 
index 7b13b2415073ab13a2d5373e35dff256daca7425..506971e6a7f1af881e985e7a3f3f5705fce56886 100644 (file)
@@ -19,7 +19,6 @@
 
 #include "icinga/clusterevents.hpp"
 #include "icinga/service.hpp"
-#include "icinga/perfdatavalue.hpp"
 #include "remote/apilistener.hpp"
 #include "remote/endpoint.hpp"
 #include "remote/messageorigin.hpp"
@@ -29,6 +28,7 @@
 #include "base/application.hpp"
 #include "base/configtype.hpp"
 #include "base/utility.hpp"
+#include "base/perfdatavalue.hpp"
 #include "base/exception.hpp"
 #include "base/initialize.hpp"
 #include "base/serializer.hpp"
index 8358547030474188d261c120b778a8bf952172f7..d59aac84516accdea23f80c619925de1d39ae6e9 100644 (file)
@@ -19,9 +19,9 @@
 
 #include "icinga/pluginutility.hpp"
 #include "icinga/macroprocessor.hpp"
-#include "icinga/perfdatavalue.hpp"
 #include "base/logger.hpp"
 #include "base/utility.hpp"
+#include "base/perfdatavalue.hpp"
 #include "base/convert.hpp"
 #include "base/process.hpp"
 #include "base/objectlock.hpp"
index 9c8f7701f352175e2fa9f9adeb4a57f6b39d34f3..d5e20140924c9b5cb914d21a039fed5527cd7e64 100644 (file)
@@ -19,8 +19,8 @@
 
 #include "livestatus/livestatuslistener.hpp"
 #include "livestatus/livestatuslistener.tcpp"
-#include "icinga/perfdatavalue.hpp"
 #include "base/utility.hpp"
+#include "base/perfdatavalue.hpp"
 #include "base/objectlock.hpp"
 #include "base/configtype.hpp"
 #include "base/logger.hpp"
index f91c5259c99c4dfa294d3b7533d544ee7a1a647d..919e7fbedca82bac1f5b117fa5ea4cf8f6f159a7 100644 (file)
 #include "methods/clusterzonechecktask.hpp"
 #include "icinga/checkcommand.hpp"
 #include "icinga/macroprocessor.hpp"
-#include "icinga/perfdatavalue.hpp"
 #include "remote/apilistener.hpp"
 #include "remote/endpoint.hpp"
 #include "remote/zone.hpp"
 #include "base/function.hpp"
 #include "base/utility.hpp"
+#include "base/perfdatavalue.hpp"
 
 using namespace icinga;
 
index 7b5c54ec3b37e4fdbcb64ba4668774202133de0e..7e589893671375a78c47123ecf635b0f063f605f 100644 (file)
 #include "icinga/cib.hpp"
 #include "icinga/service.hpp"
 #include "icinga/icingaapplication.hpp"
-#include "icinga/perfdatavalue.hpp"
 #include "base/application.hpp"
 #include "base/objectlock.hpp"
 #include "base/utility.hpp"
+#include "base/perfdatavalue.hpp"
 #include "base/function.hpp"
 #include "base/configtype.hpp"
 
index 564f3daf87599300cf0caec0c180b68830447273..09b060c2b52cecc1e1a848470325a59dbbfb8df2 100644 (file)
@@ -21,9 +21,9 @@
 #      include <stdlib.h>
 #endif /* _WIN32 */
 #include "methods/nullchecktask.hpp"
-#include "icinga/perfdatavalue.hpp"
 #include "icinga/icingaapplication.hpp"
 #include "base/utility.hpp"
+#include "base/perfdatavalue.hpp"
 #include "base/convert.hpp"
 #include "base/function.hpp"
 #include "base/logger.hpp"
index a0b90ccfe4d3fea8e87b4667cf5030dc92205df9..0d31e795aecf85c53be47ea6b3b9cbad35222456 100644 (file)
@@ -21,9 +21,9 @@
 #      include <stdlib.h>
 #endif /* _WIN32 */
 #include "methods/randomchecktask.hpp"
-#include "icinga/perfdatavalue.hpp"
 #include "icinga/icingaapplication.hpp"
 #include "base/utility.hpp"
+#include "base/perfdatavalue.hpp"
 #include "base/convert.hpp"
 #include "base/function.hpp"
 #include "base/logger.hpp"
index b8627b81bec049501c7b323ed26efd0675c1aba9..afc563c12b34bb934e04a49f22e8d48248173a4f 100644 (file)
 #include "icinga/notification.hpp"
 #include "icinga/macroprocessor.hpp"
 #include "icinga/compatutility.hpp"
-#include "icinga/perfdatavalue.hpp"
 #include "base/tcpsocket.hpp"
 #include "base/configtype.hpp"
 #include "base/objectlock.hpp"
 #include "base/logger.hpp"
 #include "base/utility.hpp"
+#include "base/perfdatavalue.hpp"
 #include "base/stream.hpp"
 #include "base/networkstream.hpp"
 #include "base/json.hpp"
index 649e3d2f0b3056a8e85a56a62015332d73be0ace..ee59a7363c9f7c852027676b8dc0baddf3822199 100644 (file)
 #include "icinga/macroprocessor.hpp"
 #include "icinga/icingaapplication.hpp"
 #include "icinga/compatutility.hpp"
-#include "icinga/perfdatavalue.hpp"
 #include "base/tcpsocket.hpp"
 #include "base/configtype.hpp"
 #include "base/objectlock.hpp"
 #include "base/logger.hpp"
 #include "base/convert.hpp"
 #include "base/utility.hpp"
+#include "base/perfdatavalue.hpp"
 #include "base/application.hpp"
 #include "base/stream.hpp"
 #include "base/networkstream.hpp"
index e1f99e1605d40d96c5f25379d9d9192850d6036c..bf17bbdb5fcea654bf96b0f0cab996a0f9a56523 100644 (file)
@@ -25,7 +25,6 @@
 #include "icinga/service.hpp"
 #include "icinga/macroprocessor.hpp"
 #include "icinga/icingaapplication.hpp"
-#include "icinga/perfdatavalue.hpp"
 #include "icinga/checkcommand.hpp"
 #include "base/tcpsocket.hpp"
 #include "base/configtype.hpp"
@@ -33,6 +32,7 @@
 #include "base/logger.hpp"
 #include "base/convert.hpp"
 #include "base/utility.hpp"
+#include "base/perfdatavalue.hpp"
 #include "base/stream.hpp"
 #include "base/json.hpp"
 #include "base/networkstream.hpp"
index 9c715298cb95b3421a79f44d6ed055c57dc65e18..dde0bd678969145ebfcff085646a279a9d7bd675 100644 (file)
 #include "icinga/service.hpp"
 #include "icinga/macroprocessor.hpp"
 #include "icinga/compatutility.hpp"
-#include "icinga/perfdatavalue.hpp"
 #include "icinga/notification.hpp"
 #include "base/configtype.hpp"
 #include "base/objectlock.hpp"
 #include "base/logger.hpp"
 #include "base/utility.hpp"
+#include "base/perfdatavalue.hpp"
 #include "base/stream.hpp"
 #include "base/networkstream.hpp"
 #include "base/json.hpp"
index 2e2f0fc7ddc50132401901acf973aff865a83ff6..328c5be7f973712070f07c3c632598582cccadf6 100644 (file)
 #include "icinga/macroprocessor.hpp"
 #include "icinga/icingaapplication.hpp"
 #include "icinga/compatutility.hpp"
-#include "icinga/perfdatavalue.hpp"
 #include "base/tcpsocket.hpp"
 #include "base/configtype.hpp"
 #include "base/objectlock.hpp"
 #include "base/logger.hpp"
 #include "base/convert.hpp"
 #include "base/utility.hpp"
+#include "base/perfdatavalue.hpp"
 #include "base/application.hpp"
 #include "base/stream.hpp"
 #include "base/networkstream.hpp"
index b9ba808af6da19cd0218aea0cfb4ba32d67993b0..48704f489eb578ced8d369ce362aa2101773c196 100644 (file)
@@ -17,7 +17,6 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/perfdatavalue.hpp"
 #include "base/dictionary.hpp"
 #include "base/objectlock.hpp"
 #include "base/json.hpp"
index 09033dae47174702f9e9e0d0434ad1414d26093b..4311e1f65dacfbc8577e635beb2dbd61f3222e8f 100644 (file)
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/perfdatavalue.hpp"
+#include "base/perfdatavalue.hpp"
 #include "base/dictionary.hpp"
 #include "base/objectlock.hpp"
 #include "base/serializer.hpp"
index 065bf4ab008de349bae7fcf8b48c6a9b87d91997..08cca02df19ea8ee3f84fba6ad21a21a35f8e8aa 100644 (file)
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/perfdatavalue.hpp"
+#include "base/perfdatavalue.hpp"
 #include "base/dictionary.hpp"
 #include "base/objectlock.hpp"
 #include "base/application.hpp"
index 631ca31cd59642781e6f9115e1bc86972b95c554..2d3d85379c8a5cbe72a4992960794e048581abd6 100644 (file)
@@ -17,7 +17,7 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#include "icinga/perfdatavalue.hpp"
+#include "base/perfdatavalue.hpp"
 #include "icinga/pluginutility.hpp"
 #include <BoostTestTargetConfig.h>