From af03cb49590b7286824a62f9282900b9fdd9964f Mon Sep 17 00:00:00 2001 From: arvindvis Date: Fri, 11 Sep 2015 12:44:24 -0700 Subject: [PATCH] sandesh_send_rate_limit parameter added to config files They are all commented now. Change-Id: I9ff046bf863fde20b363e44d8de45fa940c91242 Closes-Bug: 1469414 --- .../collector/templates/contrail_analytics_api_conf.py | 4 ++++ .../collector/templates/contrail_collector_conf.py | 4 ++++ .../collector/templates/contrail_query_engine_conf.py | 3 +++ .../compute/templates/contrail_vrouter_agent_conf.py | 4 ++++ contrail_provisioning/config/templates/contrail_api_conf.py | 3 +++ .../config/templates/contrail_device_manager_conf.py | 3 +++ .../config/templates/contrail_discovery_conf.py | 5 +++++ .../config/templates/contrail_schema_transformer_conf.py | 3 +++ .../config/templates/contrail_svc_monitor_conf.py | 3 +++ .../control/templates/contrail_control_conf.py | 4 ++++ contrail_provisioning/control/templates/dns_conf.py | 4 ++++ 11 files changed, 40 insertions(+) diff --git a/contrail_provisioning/collector/templates/contrail_analytics_api_conf.py b/contrail_provisioning/collector/templates/contrail_analytics_api_conf.py index fee48536..b3100fcf 100644 --- a/contrail_provisioning/collector/templates/contrail_analytics_api_conf.py +++ b/contrail_provisioning/collector/templates/contrail_analytics_api_conf.py @@ -23,6 +23,10 @@ analytics_statistics_ttl=$__contrail_statistics_ttl__ analytics_flow_ttl=$__contrail_flow_ttl__ +# Sandesh send rate limit can be used to throttle system logs transmitted per +# second. System logs are dropped if the sending rate is exceeded +# sandesh_send_rate_limit=100 + [DISCOVERY] disc_server_ip = $__contrail_discovery_ip__ disc_server_port = $__contrail_discovery_port__ diff --git a/contrail_provisioning/collector/templates/contrail_collector_conf.py b/contrail_provisioning/collector/templates/contrail_collector_conf.py index 4a31f34c..735ae35a 100644 --- a/contrail_provisioning/collector/templates/contrail_collector_conf.py +++ b/contrail_provisioning/collector/templates/contrail_collector_conf.py @@ -63,6 +63,10 @@ # UDP port to listen on for receiving ipfix messages. -1 to disable. # ipfix_port=4739 +# Sandesh send rate limit can be used to throttle system logs transmitted per +# second. System logs are dropped if the sending rate is exceeded +# sandesh_send_rate_limit=100 + [COLLECTOR] # Everything in this section is optional diff --git a/contrail_provisioning/collector/templates/contrail_query_engine_conf.py b/contrail_provisioning/collector/templates/contrail_query_engine_conf.py index 92d35569..bb6fc689 100644 --- a/contrail_provisioning/collector/templates/contrail_query_engine_conf.py +++ b/contrail_provisioning/collector/templates/contrail_query_engine_conf.py @@ -21,6 +21,9 @@ log_level=SYS_NOTICE log_local=1 # test_mode=0 +# Sandesh send rate limit can be used to throttle system logs transmitted per +# second. System logs are dropped if the sending rate is exceeded +# sandesh_send_rate_limit=100 [DISCOVERY] # port=5998 diff --git a/contrail_provisioning/compute/templates/contrail_vrouter_agent_conf.py b/contrail_provisioning/compute/templates/contrail_vrouter_agent_conf.py index b45dd103..bc282713 100644 --- a/contrail_provisioning/compute/templates/contrail_vrouter_agent_conf.py +++ b/contrail_provisioning/compute/templates/contrail_vrouter_agent_conf.py @@ -69,6 +69,10 @@ # MAC address of device used by dpdk physical_interface_mac=$__physical_interface_mac__ +# Sandesh send rate limit can be used to throttle system logs transmitted per +# second. System logs are dropped if the sending rate is exceeded +# sandesh_send_rate_limit=100 + [DISCOVERY] # If COLLECTOR and/or CONTROL-NODE and/or DNS is not specified this section is # mandatory. Else this section is optional diff --git a/contrail_provisioning/config/templates/contrail_api_conf.py b/contrail_provisioning/config/templates/contrail_api_conf.py index 5dc3305f..2e6a04e6 100644 --- a/contrail_provisioning/config/templates/contrail_api_conf.py +++ b/contrail_provisioning/config/templates/contrail_api_conf.py @@ -20,6 +20,9 @@ rabbit_server=$__rabbit_server_ip__ rabbit_port=$__rabbit_server_port__ list_optimization_enabled=True +# Sandesh send rate limit can be used to throttle system logs transmitted per +# second. System logs are dropped if the sending rate is exceeded +# sandesh_send_rate_limit=100 [SECURITY] use_certs=$__contrail_use_certs__ diff --git a/contrail_provisioning/config/templates/contrail_device_manager_conf.py b/contrail_provisioning/config/templates/contrail_device_manager_conf.py index f6464c59..8e0ffb6b 100644 --- a/contrail_provisioning/config/templates/contrail_device_manager_conf.py +++ b/contrail_provisioning/config/templates/contrail_device_manager_conf.py @@ -14,4 +14,7 @@ disc_server_port=$__contrail_disc_server_port__ log_local=1 log_level=SYS_NOTICE +# Sandesh send rate limit can be used to throttle system logs transmitted per +# second. System logs are dropped if the sending rate is exceeded +# sandesh_send_rate_limit=100 """) diff --git a/contrail_provisioning/config/templates/contrail_discovery_conf.py b/contrail_provisioning/config/templates/contrail_discovery_conf.py index fdf5444d..c8968281 100644 --- a/contrail_provisioning/config/templates/contrail_discovery_conf.py +++ b/contrail_provisioning/config/templates/contrail_discovery_conf.py @@ -27,9 +27,14 @@ # use short TTL for agressive rescheduling if all services are not up ttl_short=1 +# Sandesh send rate limit can be used to throttle system logs transmitted per +# second. System logs are dropped if the sending rate is exceeded +# sandesh_send_rate_limit=100 + # for DNS service, we use fixed policy # even when the cluster has more than two control nodes, only two of these # should provide the DNS service + [DNS-SERVER] policy = fixed diff --git a/contrail_provisioning/config/templates/contrail_schema_transformer_conf.py b/contrail_provisioning/config/templates/contrail_schema_transformer_conf.py index 3e5f3d36..cd6ee173 100644 --- a/contrail_provisioning/config/templates/contrail_schema_transformer_conf.py +++ b/contrail_provisioning/config/templates/contrail_schema_transformer_conf.py @@ -16,6 +16,9 @@ disc_server_port=$__contrail_disc_server_port__ log_local=1 log_level=SYS_NOTICE +# Sandesh send rate limit can be used to throttle system logs transmitted per +# second. System logs are dropped if the sending rate is exceeded +# sandesh_send_rate_limit=100 [SECURITY] use_certs=$__contrail_use_certs__ diff --git a/contrail_provisioning/config/templates/contrail_svc_monitor_conf.py b/contrail_provisioning/config/templates/contrail_svc_monitor_conf.py index 41624aa0..05299f44 100644 --- a/contrail_provisioning/config/templates/contrail_svc_monitor_conf.py +++ b/contrail_provisioning/config/templates/contrail_svc_monitor_conf.py @@ -19,6 +19,9 @@ log_level=SYS_NOTICE rabbit_server=$__rabbit_server_ip__ rabbit_port=$__rabbit_server_port__ +# Sandesh send rate limit can be used to throttle system logs transmitted per +# second. System logs are dropped if the sending rate is exceeded +# sandesh_send_rate_limit=100 [SECURITY] use_certs=$__contrail_use_certs__ diff --git a/contrail_provisioning/control/templates/contrail_control_conf.py b/contrail_provisioning/control/templates/contrail_control_conf.py index 8ab9e6cd..0de52589 100644 --- a/contrail_provisioning/control/templates/contrail_control_conf.py +++ b/contrail_provisioning/control/templates/contrail_control_conf.py @@ -23,6 +23,10 @@ # test_mode=0 # xmpp_server_port=5269 +# Sandesh send rate limit can be used to throttle system logs transmitted per +# second. System logs are dropped if the sending rate is exceeded +# sandesh_send_rate_limit=100 + [DISCOVERY] # port=5998 server=$__contrail_discovery_ip__ # discovery-server IP address diff --git a/contrail_provisioning/control/templates/dns_conf.py b/contrail_provisioning/control/templates/dns_conf.py index d1afd327..373e35af 100644 --- a/contrail_provisioning/control/templates/dns_conf.py +++ b/contrail_provisioning/control/templates/dns_conf.py @@ -27,6 +27,10 @@ log_local=1 # test_mode=0 +# Sandesh send rate limit can be used to throttle system logs transmitted per +# second. System logs are dropped if the sending rate is exceeded +# sandesh_send_rate_limit=100 + [DISCOVERY] # port=5998 server=$__contrail_discovery_ip__ # discovery-server IP address