From f63d38bade7a5f3033fda02ae9440ea4311a393e Mon Sep 17 00:00:00 2001 From: lazedo Date: Thu, 9 Apr 2015 22:25:10 +0100 Subject: [PATCH 1/5] KAZOO-3530 nodes role to provide info to backend --- kamailio/default.cfg | 3 +++ kamailio/local.cfg | 1 + kamailio/nodes-role.cfg | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+) create mode 100644 kamailio/nodes-role.cfg diff --git a/kamailio/default.cfg b/kamailio/default.cfg index 5b98c32..bda83b0 100644 --- a/kamailio/default.cfg +++ b/kamailio/default.cfg @@ -199,6 +199,9 @@ include_file "antiflood-role.cfg" #!ifdef TRAFFIC-FILTER-ROLE include_file "traffic-filter-role.cfg" #!endif +#!ifdef NODES-ROLE +include_file "nodes-role.cfg" +#!endif ####### Permissions module ########## loadmodule "permissions.so" diff --git a/kamailio/local.cfg b/kamailio/local.cfg index e6534ce..4f34a41 100644 --- a/kamailio/local.cfg +++ b/kamailio/local.cfg @@ -18,6 +18,7 @@ debug = L_INFO # # #!trydef TLS-ROLE # # #!trydef ANTIFLOOD-ROLE # # #!trydef MESSAGE-ROLE +# # #!trydef NODES-ROLE ################################################################################ ## SERVER INFORMATION diff --git a/kamailio/nodes-role.cfg b/kamailio/nodes-role.cfg new file mode 100644 index 0000000..7f8d7f9 --- /dev/null +++ b/kamailio/nodes-role.cfg @@ -0,0 +1,18 @@ +######## Nodes role - pushes info to kazoo ######## +#!ifndef TIMER-LOADED +loadmodule "timer.so" +#!endif +#!ifndef STATISTICS-LOADED +loadmodule "statistics.so" +#!endif +modparam("timer", "declare_timer", "NODES_TIMER=NODES_TIMER_ROUTE,5000,slow,enable"); + +#!trydef UNIX_TO_GREGORIAN 62167219200 +####### NODES Logic ######## +route[NODES_TIMER_ROUTE] +{ + $var(Payload) = '{"Event-Category" : "nodes", "Event-Name" : "advertise", "Expires" : 5000, "Used-Memory" : $(stat(real_used_size){s.int}), "Registrations" : $(stat(registered_users){s.int}), "WhApps" : {"kamailio" : {"Startup" : $Tb }} }'; + kazoo_publish("nodes", "", $var(Payload)); +} + +# vim: tabstop=4 softtabstop=4 shiftwidth=4 expandtab From f43b367a0df46ef67807e3b00174b9f4768930d9 Mon Sep 17 00:00:00 2001 From: lazedo Date: Thu, 9 Apr 2015 22:32:00 +0100 Subject: [PATCH 2/5] KAZOO-3530 merge conflicts --- kamailio/default.cfg | 3 +++ kamailio/local.cfg | 1 + kamailio/nodes-role.cfg | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+) create mode 100644 kamailio/nodes-role.cfg diff --git a/kamailio/default.cfg b/kamailio/default.cfg index f17230c..ebc6f85 100644 --- a/kamailio/default.cfg +++ b/kamailio/default.cfg @@ -204,6 +204,9 @@ include_file "pusher-role.cfg" #!ifdef RESPONDER-ROLE include_file "responder-role.cfg" #!endif +#!ifdef NODES-ROLE +include_file "nodes-role.cfg" +#!endif ####### Permissions module ########## loadmodule "permissions.so" diff --git a/kamailio/local.cfg b/kamailio/local.cfg index 51b7ee7..38fbd6b 100644 --- a/kamailio/local.cfg +++ b/kamailio/local.cfg @@ -12,6 +12,7 @@ debug = L_INFO #!trydef REGISTRAR-ROLE #!trydef PRESENCE-ROLE #!trydef RESPONDER-ROLE +#!trydef NODES-ROLE ## Disabled Roles - remove all but the last '#' to enable # # #!trydef TRAFFIC-FILTER-ROLE diff --git a/kamailio/nodes-role.cfg b/kamailio/nodes-role.cfg new file mode 100644 index 0000000..7f8d7f9 --- /dev/null +++ b/kamailio/nodes-role.cfg @@ -0,0 +1,18 @@ +######## Nodes role - pushes info to kazoo ######## +#!ifndef TIMER-LOADED +loadmodule "timer.so" +#!endif +#!ifndef STATISTICS-LOADED +loadmodule "statistics.so" +#!endif +modparam("timer", "declare_timer", "NODES_TIMER=NODES_TIMER_ROUTE,5000,slow,enable"); + +#!trydef UNIX_TO_GREGORIAN 62167219200 +####### NODES Logic ######## +route[NODES_TIMER_ROUTE] +{ + $var(Payload) = '{"Event-Category" : "nodes", "Event-Name" : "advertise", "Expires" : 5000, "Used-Memory" : $(stat(real_used_size){s.int}), "Registrations" : $(stat(registered_users){s.int}), "WhApps" : {"kamailio" : {"Startup" : $Tb }} }'; + kazoo_publish("nodes", "", $var(Payload)); +} + +# vim: tabstop=4 softtabstop=4 shiftwidth=4 expandtab From 952de0af6e9a39e1fe3e18e7dab3934278c900de Mon Sep 17 00:00:00 2001 From: lazedo Date: Thu, 9 Apr 2015 22:38:54 +0100 Subject: [PATCH 3/5] KAZOO-3530 duplicate entry from merge --- kamailio/default.cfg | 3 --- 1 file changed, 3 deletions(-) diff --git a/kamailio/default.cfg b/kamailio/default.cfg index 58f0705..ebc6f85 100644 --- a/kamailio/default.cfg +++ b/kamailio/default.cfg @@ -207,9 +207,6 @@ include_file "responder-role.cfg" #!ifdef NODES-ROLE include_file "nodes-role.cfg" #!endif -#!ifdef NODES-ROLE -include_file "nodes-role.cfg" -#!endif ####### Permissions module ########## loadmodule "permissions.so" From e5a0499cc827dc9044994e0527f6c90d08ee11de Mon Sep 17 00:00:00 2001 From: lazedo Date: Thu, 9 Apr 2015 22:46:17 +0100 Subject: [PATCH 4/5] KAZOO-3530 no need for statistics module --- kamailio/nodes-role.cfg | 3 --- 1 file changed, 3 deletions(-) diff --git a/kamailio/nodes-role.cfg b/kamailio/nodes-role.cfg index 7f8d7f9..549c0b8 100644 --- a/kamailio/nodes-role.cfg +++ b/kamailio/nodes-role.cfg @@ -2,9 +2,6 @@ #!ifndef TIMER-LOADED loadmodule "timer.so" #!endif -#!ifndef STATISTICS-LOADED -loadmodule "statistics.so" -#!endif modparam("timer", "declare_timer", "NODES_TIMER=NODES_TIMER_ROUTE,5000,slow,enable"); #!trydef UNIX_TO_GREGORIAN 62167219200 From fd0f4e8a653184116e52b88b6e3be23b6517c078 Mon Sep 17 00:00:00 2001 From: lazedo Date: Thu, 9 Apr 2015 22:47:16 +0100 Subject: [PATCH 5/5] KAZOO-3530 cleanup --- kamailio/nodes-role.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/kamailio/nodes-role.cfg b/kamailio/nodes-role.cfg index 549c0b8..88f8c96 100644 --- a/kamailio/nodes-role.cfg +++ b/kamailio/nodes-role.cfg @@ -4,7 +4,6 @@ loadmodule "timer.so" #!endif modparam("timer", "declare_timer", "NODES_TIMER=NODES_TIMER_ROUTE,5000,slow,enable"); -#!trydef UNIX_TO_GREGORIAN 62167219200 ####### NODES Logic ######## route[NODES_TIMER_ROUTE] {