tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-09-22 09:17:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Create /var/lib/icinga2/api/zones/*/.checksum

Browse Source 
refs #8210
This commit is contained in:
Alexander A. Klimov 2020-09-08 10:55:05 +02:00
parent a0285769dd
commit f6db26f683
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/remote/apilistener-filesync.cpp
View File

@ -3,6 +3,7 @@
#include "remote/apilistener.hpp" #include "remote/apilistener.hpp"
#include "remote/apifunction.hpp" #include "remote/apifunction.hpp"
#include "config/configcompiler.hpp" #include "config/configcompiler.hpp"
#include "base/object-packer.hpp"
#include "base/tlsutility.hpp" #include "base/tlsutility.hpp"
#include "base/json.hpp" #include "base/json.hpp"
#include "base/configtype.hpp" #include "base/configtype.hpp"
@ -59,10 +60,11 @@ void ApiListener::SyncLocalZoneDir(const Zone::Ptr& zone) const
newConfigInfo.Checksums = new Dictionary(); newConfigInfo.Checksums = new Dictionary();
String zoneName = zone->GetName(); String zoneName = zone->GetName();
Dictionary::Ptr contents = new Dictionary();
// Load registered zone paths, e.g. '_etc', '_api' and user packages. // Load registered zone paths, e.g. '_etc', '_api' and user packages.
for (const ZoneFragment& zf : ConfigCompiler::GetZoneDirs(zoneName)) { for (const ZoneFragment& zf : ConfigCompiler::GetZoneDirs(zoneName)) {
ConfigDirInformation newConfigPart = LoadConfigDir(zf.Path); ConfigDirInformation newConfigPart = LoadConfigDir(zf.Path, contents);
// Config files '*.conf'. // Config files '*.conf'.
{ {
@ -164,6 +166,19 @@ void ApiListener::SyncLocalZoneDir(const Zone::Ptr& zone) const
fp << std::fixed << JsonEncode(newConfigInfo.Checksums); fp << std::fixed << JsonEncode(newConfigInfo.Checksums);
fp.close(); fp.close();
// Checksum.
String checksumPath = productionZonesDir + "/.checksum";
if (Utility::PathExists(checksumPath))
Utility::Remove(checksumPath);
{
std::ofstream fp(checksumPath.CStr(), std::ofstream::out | std::ostream::trunc);
fp << GetChecksum(PackObject(contents));
fp.close();
}
Log(LogNotice, "ApiListener") Log(LogNotice, "ApiListener")
<< "Updated meta data for cluster config sync. Checksum: '" << checksumsPath << "Updated meta data for cluster config sync. Checksum: '" << checksumsPath
<< "', timestamp: '" << tsPath << "', auth: '" << authPath << "'."; << "', timestamp: '" << tsPath << "', auth: '" << authPath << "'.";
@ -781,14 +796,15 @@ bool ApiListener::CheckConfigChange(const ConfigDirInformation& oldConfig, const
* @param dir Path to the config directory. * @param dir Path to the config directory.
* @returns ConfigDirInformation structure. * @returns ConfigDirInformation structure.
*/ */
ConfigDirInformation ApiListener::LoadConfigDir(const String& dir) ConfigDirInformation ApiListener::LoadConfigDir(const String& dir, const Dictionary::Ptr& contents)
{ {
ConfigDirInformation config; ConfigDirInformation config;
config.UpdateV1 = new Dictionary(); config.UpdateV1 = new Dictionary();
config.UpdateV2 = new Dictionary(); config.UpdateV2 = new Dictionary();
config.Checksums = new Dictionary(); config.Checksums = new Dictionary();
Utility::GlobRecursive(dir, "*", std::bind(&ApiListener::ConfigGlobHandler, std::ref(config), dir, _1), GlobFile); Utility::GlobRecursive(dir, "*", std::bind(&ApiListener::ConfigGlobHandler, std::ref(config), std::ref(contents), dir, _1), GlobFile);
return config; return config;
} }
@ -800,7 +816,7 @@ ConfigDirInformation ApiListener::LoadConfigDir(const String& dir)
* @param path File path. * @param path File path.
* @param file Full file name. * @param file Full file name.
*/ */
void ApiListener::ConfigGlobHandler(ConfigDirInformation& config, const String& path, const String& file) void ApiListener::ConfigGlobHandler(ConfigDirInformation& config, const Dictionary::Ptr& contents, const String& path, const String& file)
{ {
// Avoid loading the authoritative marker for syncs at all cost. // Avoid loading the authoritative marker for syncs at all cost.
if (Utility::BaseName(file) == ".authoritative") if (Utility::BaseName(file) == ".authoritative")
@ -854,6 +870,10 @@ void ApiListener::ConfigGlobHandler(ConfigDirInformation& config, const String&
* IMPORTANT: Ignore the .authoritative file above, this must not be synced. * IMPORTANT: Ignore the .authoritative file above, this must not be synced.
* */ * */
config.Checksums->Set(relativePath, GetChecksum(content)); config.Checksums->Set(relativePath, GetChecksum(content));
if (contents) {
contents->Set(relativePath, content);
}
} }
/** /**

4
lib/remote/apilistener.hpp
View File

@ -197,8 +197,8 @@ private:
static Dictionary::Ptr MergeConfigUpdate(const ConfigDirInformation& config); static Dictionary::Ptr MergeConfigUpdate(const ConfigDirInformation& config);
static ConfigDirInformation LoadConfigDir(const String& dir); static ConfigDirInformation LoadConfigDir(const String& dir, const Dictionary::Ptr& contents = nullptr);
static void ConfigGlobHandler(ConfigDirInformation& config, const String& path, const String& file); static void ConfigGlobHandler(ConfigDirInformation& config, const Dictionary::Ptr& contents, const String& path, const String& file);
static void TryActivateZonesStageCallback(const ProcessResult& pr, static void TryActivateZonesStageCallback(const ProcessResult& pr,
const std::vector<String>& relativePaths); const std::vector<String>& relativePaths);