Icinga · Al2Klimov · Nov 24, 2022 · Nov 24, 2022 · Nov 24, 2022 · Nov 24, 2022
diff --git a/etc/CMakeLists.txt b/etc/CMakeLists.txt
@@ -55,7 +55,12 @@ endif()
 
 if(NOT WIN32)
   install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${ICINGA2_FULL_CONFIGDIR}/features-enabled\")")
-  install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink ../features-available/mainlog.conf \"\$ENV{DESTDIR}${ICINGA2_FULL_CONFIGDIR}/features-enabled/mainlog.conf\")")
+
+  if(HAVE_SYSTEMD)
+    install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink ../features-available/journald.conf \"\$ENV{DESTDIR}${ICINGA2_FULL_CONFIGDIR}/features-enabled/journald.conf\")")
+  else()
+    install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink ../features-available/mainlog.conf \"\$ENV{DESTDIR}${ICINGA2_FULL_CONFIGDIR}/features-enabled/mainlog.conf\")")
+  endif()
 
   install(FILES bash_completion.d/icinga2 DESTINATION ${BASHCOMPLETION_DIR})
 else()

diff --git a/etc/icinga2/features-available/journald.conf b/etc/icinga2/features-available/journald.conf
@@ -3,5 +3,5 @@
  */
 
 object JournaldLogger "journald" {
-    severity = "warning"
+    severity = "information"
 }
diff --git a/lib/base/workqueue.cpp b/lib/base/workqueue.cpp
@@ -14,9 +14,9 @@ using namespace icinga;
 std::atomic<int> WorkQueue::m_NextID(1);
 boost::thread_specific_ptr<WorkQueue *> l_ThreadWorkQueue;
 
-WorkQueue::WorkQueue(size_t maxItems, int threadCount, LogSeverity statsLogLevel)
+WorkQueue::WorkQueue(size_t maxItems, int threadCount)
 	: m_ID(m_NextID++), m_ThreadCount(threadCount), m_MaxItems(maxItems),
-	m_TaskStats(15 * 60), m_StatsLogLevel(statsLogLevel)
+	m_TaskStats(15 * 60)
 {
 	/* Initialize logger. */
 	m_StatusTimerTimeout = Utility::GetTime();
@@ -216,7 +216,7 @@ void WorkQueue::StatusTimerHandler()
 
 	/* Log if there are pending items, or 5 minute timeout is reached. */
 	if (pending > 0 || m_StatusTimerTimeout < now) {
-		Log(m_StatsLogLevel, "WorkQueue")
+		Log(LogNotice, "WorkQueue")
 			<< "#" << m_ID << " (" << m_Name << ") "
 			<< "items: " << pending << ", "
 			<< "rate: " << std::setw(2) << GetTaskCount(60) / 60.0 << "/s "

diff --git a/lib/base/workqueue.hpp b/lib/base/workqueue.hpp
@@ -6,7 +6,6 @@
 #include "base/i2-base.hpp"
 #include "base/timer.hpp"
 #include "base/ringbuffer.hpp"
-#include "base/logger.hpp"
 #include <boost/thread/thread.hpp>
 #include <boost/exception_ptr.hpp>
 #include <condition_variable>
@@ -53,7 +52,7 @@ class WorkQueue
 public:
 	typedef std::function<void (boost::exception_ptr)> ExceptionCallback;
 
-	WorkQueue(size_t maxItems = 0, int threadCount = 1, LogSeverity statsLogLevel = LogInformation);
+	WorkQueue(size_t maxItems = 0, int threadCount = 1);
 	~WorkQueue();
 
 	void SetName(const String& name);
@@ -137,7 +136,6 @@ class WorkQueue
 	std::vector<boost::exception_ptr> m_Exceptions;
 	Timer::Ptr m_StatusTimer;
 	double m_StatusTimerTimeout;
-	LogSeverity m_StatsLogLevel;
 
 	RingBuffer m_TaskStats;
 	size_t m_PendingTasks{0};

diff --git a/lib/db_ido/dbconnection.hpp b/lib/db_ido/dbconnection.hpp
@@ -96,7 +96,7 @@ class DbConnection : public ObjectImpl<DbConnection>
 	void IncreasePendingQueries(int count);
 	void DecreasePendingQueries(int count);
 
-	WorkQueue m_QueryQueue{10000000, 1, LogNotice};
+	WorkQueue m_QueryQueue{10000000};
 
 private:
 	bool m_IDCacheValid{false};

diff --git a/lib/icinga/checkable-notification.cpp b/lib/icinga/checkable-notification.cpp
@@ -59,7 +59,7 @@ void Checkable::SendNotifications(NotificationType type, const CheckResult::Ptr&
 		return;
 	}
 
-	Log(LogInformation, "Checkable")
+	Log(LogNotice, "Checkable")
 		<< "Checkable '" << checkableName << "' has " << notifications.size()
 		<< " notification(s). Checking filters for type '" << notificationTypeName << "', sends will be logged.";
 

diff --git a/lib/icinga/checkable.ti b/lib/icinga/checkable.ti
@@ -73,6 +73,8 @@ abstract class Checkable : CustomVarObject
 		default {{{ return true; }}}
 	};
 
+	[no_user_view, no_user_modify] bool logged_invalid_perfdata;
+
 	[config] array(String) flapping_ignore_states;
 	[no_user_view, no_user_modify] int flapping_ignore_states_filter_real (FlappingIgnoreStatesFilter);
 

diff --git a/lib/icinga/notification.cpp b/lib/icinga/notification.cpp
@@ -439,7 +439,7 @@ void Notification::BeginExecuteNotification(NotificationType type, const CheckRe
 			}
 		}
 
-		Log(LogInformation, "Notification")
+		Log(LogNotice, "Notification")
 			<< "Sending " << (reminder ? "reminder " : "") << "'" << NotificationTypeToString(type) << "' notification '"
 			<< notificationName << "' for user '" << userName << "'";
 
@@ -562,7 +562,7 @@ void Notification::ExecuteNotificationHelper(NotificationType type, const User::
 		/* required by compatlogger */
 		Service::OnNotificationSentToUser(this, GetCheckable(), user, type, cr, author, text, commandName, nullptr);
 
-		Log(LogInformation, "Notification")
+		Log(LogNotice, "Notification")
 			<< "Completed sending '" << NotificationTypeToString(type)
 			<< "' notification '" << notificationName
 			<< "' for checkable '" << checkableName

diff --git a/lib/icingadb/icingadb-objects.cpp b/lib/icingadb/icingadb-objects.cpp
@@ -184,7 +184,7 @@ void IcingaDB::UpdateAllConfigObjects()
 	});
 
 	// Use a Workqueue to pack objects in parallel
-	WorkQueue upq(25000, Configuration::Concurrency, LogNotice);
+	WorkQueue upq(25000, Configuration::Concurrency);
 	upq.SetName("IcingaDB:ConfigDump");
 
 	std::vector<Type::Ptr> types = GetTypes();
@@ -228,7 +228,7 @@ void IcingaDB::UpdateAllConfigObjects()
 		std::vector<String> keys = GetTypeOverwriteKeys(lcType);
 		DeleteKeys(rcon, keys, Prio::Config);
 
-		WorkQueue upqObjectType(25000, Configuration::Concurrency, LogNotice);
+		WorkQueue upqObjectType(25000, Configuration::Concurrency);
 		upqObjectType.SetName("IcingaDB:ConfigDump:" + lcType);
 
 		std::map<String, String> redisCheckSums;

diff --git a/lib/icingadb/icingadb.hpp b/lib/icingadb/icingadb.hpp
@@ -205,7 +205,7 @@ class IcingaDB : public ObjectImpl<IcingaDB>
 	static void PersistEnvironmentId();
 
 	Timer::Ptr m_StatsTimer;
-	WorkQueue m_WorkQueue{0, 1, LogNotice};
+	WorkQueue m_WorkQueue;
 
 	std::future<void> m_HistoryThread;
 	Bulker<RedisConnection::Query> m_HistoryBulker {4096, std::chrono::milliseconds(250)};

diff --git a/lib/perfdata/elasticsearchwriter.cpp b/lib/perfdata/elasticsearchwriter.cpp
@@ -156,6 +156,7 @@ void ElasticsearchWriter::AddCheckResult(const Dictionary::Ptr& fields, const Ch
 	CheckCommand::Ptr checkCommand = checkable->GetCheckCommand();
 
 	if (perfdata) {
+		bool hasInvalidPerfdata = false;
 		ObjectLock olock(perfdata);
 		for (const Value& val : perfdata) {
 			PerfdataValue::Ptr pdv;
@@ -166,10 +167,13 @@ void ElasticsearchWriter::AddCheckResult(const Dictionary::Ptr& fields, const Ch
 				try {
 					pdv = PerfdataValue::Parse(val);
 				} catch (const std::exception&) {
-					Log(LogWarning, "ElasticsearchWriter")
+					Log(checkable->GetLoggedInvalidPerfdata() ? LogNotice : LogWarning, "ElasticsearchWriter")
 						<< "Ignoring invalid perfdata for checkable '"
 						<< checkable->GetName() << "' and command '"
 						<< checkCommand->GetName() << "' with value: " << val;
+
+					checkable->SetLoggedInvalidPerfdata(true);
+					hasInvalidPerfdata = true;
 					continue;
 				}
 			}
@@ -196,6 +200,10 @@ void ElasticsearchWriter::AddCheckResult(const Dictionary::Ptr& fields, const Ch
 			if (!pdv->GetUnit().IsEmpty())
 				fields->Set(perfdataPrefix + ".unit", pdv->GetUnit());
 		}
+
+		if (!hasInvalidPerfdata && perfdata->GetLength()) {
+			checkable->SetLoggedInvalidPerfdata(false);
+		}
 	}
 }
 

diff --git a/lib/perfdata/gelfwriter.cpp b/lib/perfdata/gelfwriter.cpp
@@ -326,6 +326,7 @@ void GelfWriter::CheckResultHandlerInternal(const Checkable::Ptr& checkable, con
 		Array::Ptr perfdata = cr->GetPerformanceData();
 
 		if (perfdata) {
+			bool hasInvalidPerfdata = false;
 			ObjectLock olock(perfdata);
 			for (const Value& val : perfdata) {
 				PerfdataValue::Ptr pdv;
@@ -336,10 +337,13 @@ void GelfWriter::CheckResultHandlerInternal(const Checkable::Ptr& checkable, con
 					try {
 						pdv = PerfdataValue::Parse(val);
 					} catch (const std::exception&) {
-						Log(LogWarning, "GelfWriter")
+						Log(checkable->GetLoggedInvalidPerfdata() ? LogNotice : LogWarning, "GelfWriter")
 							<< "Ignoring invalid perfdata for checkable '"
 							<< checkable->GetName() << "' and command '"
 							<< checkCommand->GetName() << "' with value: " << val;
+
+						checkable->SetLoggedInvalidPerfdata(true);
+						hasInvalidPerfdata = true;
 						continue;
 					}
 				}
@@ -364,6 +368,10 @@ void GelfWriter::CheckResultHandlerInternal(const Checkable::Ptr& checkable, con
 				if (!pdv->GetUnit().IsEmpty())
 					fields->Set("_" + escaped_key + "_unit", pdv->GetUnit());
 			}
+
+			if (!hasInvalidPerfdata && perfdata->GetLength()) {
+				checkable->SetLoggedInvalidPerfdata(false);
+			}
 		}
 	}
 

diff --git a/lib/perfdata/graphitewriter.cpp b/lib/perfdata/graphitewriter.cpp
@@ -349,6 +349,7 @@ void GraphiteWriter::SendPerfdata(const Checkable::Ptr& checkable, const String&
 
 	CheckCommand::Ptr checkCommand = checkable->GetCheckCommand();
 
+	bool hasInvalidPerfdata = false;
 	ObjectLock olock(perfdata);
 	for (const Value& val : perfdata) {
 		PerfdataValue::Ptr pdv;
@@ -359,10 +360,13 @@ void GraphiteWriter::SendPerfdata(const Checkable::Ptr& checkable, const String&
 			try {
 				pdv = PerfdataValue::Parse(val);
 			} catch (const std::exception&) {
-				Log(LogWarning, "GraphiteWriter")
+				Log(checkable->GetLoggedInvalidPerfdata() ? LogNotice : LogWarning, "GraphiteWriter")
 					<< "Ignoring invalid perfdata for checkable '"
 					<< checkable->GetName() << "' and command '"
 					<< checkCommand->GetName() << "' with value: " << val;
+
+				checkable->SetLoggedInvalidPerfdata(true);
+				hasInvalidPerfdata = true;
 				continue;
 			}
 		}
@@ -382,6 +386,10 @@ void GraphiteWriter::SendPerfdata(const Checkable::Ptr& checkable, const String&
 				SendMetric(checkable, prefix, escapedKey + ".max", pdv->GetMax(), ts);
 		}
 	}
+
+	if (!hasInvalidPerfdata && perfdata->GetLength()) {
+		checkable->SetLoggedInvalidPerfdata(false);
+	}
 }
 
 /**

diff --git a/lib/perfdata/influxdbcommonwriter.cpp b/lib/perfdata/influxdbcommonwriter.cpp
@@ -258,7 +258,9 @@ void InfluxdbCommonWriter::CheckResultHandlerWQ(const Checkable::Ptr& checkable,
 	Array::Ptr perfdata = cr->GetPerformanceData();
 
 	if (perfdata) {
+		bool hasInvalidPerfdata = false;
 		ObjectLock olock(perfdata);
+
 		for (const Value& val : perfdata) {
 			PerfdataValue::Ptr pdv;
 
@@ -268,10 +270,13 @@ void InfluxdbCommonWriter::CheckResultHandlerWQ(const Checkable::Ptr& checkable,
 				try {
 					pdv = PerfdataValue::Parse(val);
 				} catch (const std::exception&) {
-					Log(LogWarning, GetReflectionType()->GetName())
+					Log(checkable->GetLoggedInvalidPerfdata() ? LogNotice : LogWarning, GetReflectionType()->GetName())
 						<< "Ignoring invalid perfdata for checkable '"
 						<< checkable->GetName() << "' and command '"
 						<< checkCommand->GetName() << "' with value: " << val;
+
+					checkable->SetLoggedInvalidPerfdata(true);
+					hasInvalidPerfdata = true;
 					continue;
 				}
 			}
@@ -295,6 +300,10 @@ void InfluxdbCommonWriter::CheckResultHandlerWQ(const Checkable::Ptr& checkable,
 
 			SendMetric(checkable, tmpl, pdv->GetLabel(), fields, ts);
 		}
+
+		if (!hasInvalidPerfdata && perfdata->GetLength()) {
+			checkable->SetLoggedInvalidPerfdata(false);
+		}
 	}
 
 	if (GetEnableSendMetadata()) {

diff --git a/lib/perfdata/opentsdbwriter.cpp b/lib/perfdata/opentsdbwriter.cpp
@@ -309,6 +309,7 @@ void OpenTsdbWriter::SendPerfdata(const Checkable::Ptr& checkable, const String&
 
 	CheckCommand::Ptr checkCommand = checkable->GetCheckCommand();
 
+	bool hasInvalidPerfdata = false;
 	ObjectLock olock(perfdata);
 	for (const Value& val : perfdata) {
 		PerfdataValue::Ptr pdv;
@@ -319,10 +320,13 @@ void OpenTsdbWriter::SendPerfdata(const Checkable::Ptr& checkable, const String&
 			try {
 				pdv = PerfdataValue::Parse(val);
 			} catch (const std::exception&) {
-				Log(LogWarning, "OpenTsdbWriter")
+				Log(checkable->GetLoggedInvalidPerfdata() ? LogNotice : LogWarning, "OpenTsdbWriter")
 					<< "Ignoring invalid perfdata for checkable '"
 					<< checkable->GetName() << "' and command '"
 					<< checkCommand->GetName() << "' with value: " << val;
+
+				checkable->SetLoggedInvalidPerfdata(true);
+				hasInvalidPerfdata = true;
 				continue;
 			}
 		}
@@ -353,6 +357,10 @@ void OpenTsdbWriter::SendPerfdata(const Checkable::Ptr& checkable, const String&
 		if (!pdv->GetMax().IsEmpty())
 			SendMetric(checkable, metric_name + "_max", tags_new, pdv->GetMax(), ts);
 	}
+
+	if (!hasInvalidPerfdata && perfdata->GetLength()) {
+		checkable->SetLoggedInvalidPerfdata(false);
+	}
 }
 
 /**

diff --git a/lib/remote/apilistener-configsync.cpp b/lib/remote/apilistener-configsync.cpp
@@ -450,7 +450,7 @@ void ApiListener::SendRuntimeConfigObjects(const JsonRpcConnection::Ptr& aclient
 
 	Zone::Ptr azone = endpoint->GetZone();
 
-	Log(LogInformation, "ApiListener")
+	Log(LogNotice, "ApiListener")
 		<< "Syncing runtime objects to endpoint '" << endpoint->GetName() << "'.";
 
 	for (const Type::Ptr& type : Type::GetAllTypes()) {
@@ -469,6 +469,6 @@ void ApiListener::SendRuntimeConfigObjects(const JsonRpcConnection::Ptr& aclient
 		}
 	}
 
-	Log(LogInformation, "ApiListener")
+	Log(LogNotice, "ApiListener")
 		<< "Finished syncing runtime objects to endpoint '" << endpoint->GetName() << "'.";
 }
diff --git a/lib/remote/apilistener-filesync.cpp b/lib/remote/apilistener-filesync.cpp
@@ -207,7 +207,7 @@ void ApiListener::SendConfigUpdate(const JsonRpcConnection::Ptr& aclient)
 		if (!Utility::PathExists(zoneDir))
 			continue;
 
-		Log(LogInformation, "ApiListener")
+		Log(LogNotice, "ApiListener")
 			<< "Syncing configuration files for " << (zone->IsGlobal() ? "global " : "")
 			<< "zone '" << zoneName << "' to endpoint '" << endpoint->GetName() << "'.";