tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implement recursive includes for the cluster component. 

Fixes #5304
This commit is contained in:
Gunnar Beutner 2014-02-11 09:42:48 +01:00
parent 95f7de123e
commit 42f664e4c6
4 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/cluster/cluster-type.conf
View File

@ -48,6 +48,14 @@ type Endpoint {
%attribute string "*" %attribute string "*"
}, },
%attribute array "config_files_recursive" {
%attribute string "*",
%attribute dictionary "*" {
%attribute string "path",
%attribute string "pattern"
}
},
%attribute array "accept_config" { %attribute array "accept_config" {
%attribute name(Endpoint) "*" %attribute name(Endpoint) "*"
} }

17
components/cluster/clusterlistener.cpp
View File

@ -538,6 +538,23 @@ void ClusterListener::NewClientHandler(const Socket::Ptr& client, TlsRole role)
} }
} }
Array::Ptr configFilesRecursive = endpoint->GetConfigFilesRecursive();
if (configFilesRecursive) {
ObjectLock olock(configFilesRecursive);
BOOST_FOREACH(const Value& configFile, configFilesRecursive) {
if (configFile.IsObjectType<Dictionary>()) {
Dictionary::Ptr configFileDict = configFile;
String path = configFileDict->Get("path");
String pattern = configFileDict->Get("pattern");
Utility::GlobRecursive(path, pattern, boost::bind(&ClusterListener::ConfigGlobHandler, boost::cref(config), _1, false), GlobFile);
} else {
String configFilePath = configFile;
Utility::GlobRecursive(configFilePath, "*.conf", boost::bind(&ClusterListener::ConfigGlobHandler, boost::cref(config), _1, false), GlobFile);
}
}
}
Log(LogInformation, "cluster", "Sending " + Convert::ToString(static_cast<long>(config->GetLength())) + " config files to endpoint '" + endpoint->GetName() + "'."); Log(LogInformation, "cluster", "Sending " + Convert::ToString(static_cast<long>(config->GetLength())) + " config files to endpoint '" + endpoint->GetName() + "'.");
Dictionary::Ptr params = make_shared<Dictionary>(); Dictionary::Ptr params = make_shared<Dictionary>();

1
components/cluster/endpoint.ti
View File

@ -8,6 +8,7 @@ class Endpoint : DynamicObject
[config] String host; [config] String host;
[config] String port; [config] String port;
[config] Array::Ptr config_files; [config] Array::Ptr config_files;
[config] Array::Ptr config_files_recursive;
[config] Array::Ptr accept_config; [config] Array::Ptr accept_config;
[state] double seen; [state] double seen;

8
doc/4.3-object-types.md
View File

@ -873,6 +873,13 @@ Example:
object Endpoint "icinga-c2" { object Endpoint "icinga-c2" {
host = "192.168.5.46", host = "192.168.5.46",
port = 7777, port = 7777,
config_files = [ "/etc/icinga2/cluster.d/*" ],
config_files_recursive = [
"/etc/icinga2/cluster2",
{ path = "/etc/icinga2/cluster3", pattern = "*.myconf" }
]
} }
Attributes: Attributes:
@ -882,6 +889,7 @@ Attributes:
host |**Required.** The hostname/IP address of the remote Icinga 2 instance. host |**Required.** The hostname/IP address of the remote Icinga 2 instance.
port |**Required.** The service name/port of the remote Icinga 2 instance. port |**Required.** The service name/port of the remote Icinga 2 instance.
config\_files |**Optional.** A list of configuration files sent to remote peers (wildcards possible). config\_files |**Optional.** A list of configuration files sent to remote peers (wildcards possible).
config_files_recursive |**Optional.** A list of configuration files sent to remote peers. Array elements can either be a string (in which case all files in that directory matching the pattern *.conf are included) or a dictionary with elements "path" and "pattern".
accept\_config |**Optional.** A list of endpoint names from which this endpoint accepts configuration files. accept\_config |**Optional.** A list of endpoint names from which this endpoint accepts configuration files.
### <a id="objecttype-domain"></a> Domain ### <a id="objecttype-domain"></a> Domain