shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-01-10 01:17:40 +03:00
Code Releases Wiki Activity

F #3859: Rename monitor UDP_LISTENER->NETWORK (#4673)

Browse Source 
Disable dummy driver
Change beacon period to 30 s
This commit is contained in:
Pavel Czerný 2020-05-07 19:12:22 +02:00 committed by GitHub
parent 2d3ef1be41
commit 1bd40f7f27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/im_mad/remotes/common.d/monitord-client.rb
View File

@ -250,9 +250,9 @@ begin
xml_txt = Base64.decode64(xml_txt) if local? hyperv
config = REXML::Document.new(xml_txt).root
host = config.elements['UDP_LISTENER/MONITOR_ADDRESS'].text.to_s
port = config.elements['UDP_LISTENER/PORT'].text.to_s
pubkey = config.elements['UDP_LISTENER/PUBKEY'].text.to_s
host = config.elements['NETWORK/MONITOR_ADDRESS'].text.to_s
port = config.elements['NETWORK/PORT'].text.to_s
pubkey = config.elements['NETWORK/PUBKEY'].text.to_s
hostid = config.elements['HOST_ID'].text.to_s
probes = {

22
src/monitor/etc/monitord.conf
View File

@ -54,7 +54,7 @@ LOG = [
]
#*******************************************************************************
# UDP Listener
# Network
#*******************************************************************************
# Reads messages from monitor agent
#
@ -66,7 +66,7 @@ LOG = [
# pubkey : Absolute path to public key (agents). Empty for no encryption.
# prikey : Absolute path to private key (monitord). Empty for no encryption.
#*******************************************************************************
UDP_LISTENER = [
NETWORK = [
ADDRESS = "0.0.0.0",
MONITOR_ADDRESS = 127.0.0.1,
PORT = 4124,
@ -78,7 +78,7 @@ UDP_LISTENER = [
#*******************************************************************************
# Probes Configuration
#*******************************************************************************
# PORBES_PERIOD: Time in seconds to execute each probe category
# PROBES_PERIOD: Time in seconds to execute each probe category
# beacon_host: heartbeat for the host
# system_host: host static/configuration information
# monitor_host: host variable information
@ -88,7 +88,7 @@ UDP_LISTENER = [
# seconds, send a complete VM report.
#*******************************************************************************
PROBES_PERIOD = [
BEACON_HOST = 5,
BEACON_HOST = 30,
SYSTEM_HOST = 600,
MONITOR_HOST = 120,
STATE_VM = 5,
@ -215,11 +215,11 @@ IM_MAD = [
#-------------------------------------------------------------------------------
# Dummy Information Driver Manager Configuration
#-------------------------------------------------------------------------------
IM_MAD = [
NAME = "dummy",
SUNSTONE_NAME = "Dummy",
EXECUTABLE = "one_im_sh",
ARGUMENTS = "-r 3 -t 15 -w 90 dummy",
THREADS = 0
]
# IM_MAD = [
# NAME = "dummy",
# SUNSTONE_NAME = "Dummy",
# EXECUTABLE = "one_im_sh",
# ARGUMENTS = "-r 3 -t 15 -w 90 dummy",
# THREADS = 0
# ]
#-------------------------------------------------------------------------------

2
src/monitor/src/monitor/Monitor.cc
View File

@ -167,7 +167,7 @@ void Monitor::start()
std::string pub_key;
std::string pri_key;
auto udp_conf = config->get("UDP_LISTENER");
auto udp_conf = config->get("NETWORK");
udp_conf->vector_value("ADDRESS", addr);
udp_conf->vector_value("PORT", port);

4
src/monitor/src/monitor/MonitorConfigTemplate.cc
View File

@ -27,7 +27,7 @@ void MonitorConfigTemplate::set_conf_default()
VM_MONITORING_EXPIRATION_TIME
DB
LOG
UDP_LISTENER
NETWORK
PROBES_PERIOD
*/
@ -43,7 +43,7 @@ void MonitorConfigTemplate::set_conf_default()
va = new VectorAttribute("LOG", {{"SYSTEM", "FILE"}, {"DEBUG_LEVEL", "3"}});
conf_default.insert(make_pair(va->name(), va));
va = new VectorAttribute("UDP_LISTENER", {{"ADDRESS", "0.0.0.0"},
va = new VectorAttribute("NETWORK", {{"ADDRESS", "0.0.0.0"},
{"PORT", "4124"}, {"THREADS", "16"}});
conf_default.insert(make_pair(va->name(), va));