added mod_graylog2 and mod_mongo to RPM package. Added graylog.conf.xml to vanilla...

diff --git a/conf/vanilla/autoload_configs/graylog2.conf.xml b/conf/vanilla/autoload_configs/graylog2.conf.xml
new file mode 100644 (file)
index 0000000..0a05482
--- /dev/null
+++ b/conf/vanilla/autoload_configs/graylog2.conf.xml
@@ -0,0 +1,24 @@
+<configuration name="graylog2.conf" description="Graylog2 Logger">
+  <!-- emerg   - system is unusable  -->
+  <!-- alert   - action must be taken immediately  -->
+  <!-- crit    - critical conditions  -->
+  <!-- err     - error conditions  -->
+  <!-- warning - warning conditions  -->
+  <!-- notice  - normal, but significant, condition  -->
+  <!-- info    - informational message  -->
+  <!-- debug   - debug-level message -->
+  <settings>
+    <param name="server-host" value="192.168.0.69"/>
+    <param name="server-port" value="12201"/>
+    <param name="loglevel" value="warning"/>
+    <!-- Uncomment if using logstash w/ gelf.rb -->
+    <!--param name="send-uncompressed-header" value="true"/-->
+
+    <!-- fields to add to every log associated w/ a session -->
+    <fields>
+      <!-- for example: channel variable "customer_account_number" will be the data source for the customer field in graylog2 -->
+      <!--field name="customer" variable="customer_account_number"/-->
+    </fields>
+  </settings>
+</configuration>
+

diff --git a/conf/vanilla/autoload_configs/modules.conf.xml b/conf/vanilla/autoload_configs/modules.conf.xml
index e5a297e8af59ed2685fa00a670b8a0146bc929d4..092372d68c5f27f267400c44ae7981296e0477f4 100644 (file)
--- a/conf/vanilla/autoload_configs/modules.conf.xml
+++ b/conf/vanilla/autoload_configs/modules.conf.xml
@@ -3,6 +3,7 @@
     
     <!-- Loggers (I'd load these first) -->
     <load module="mod_console"/>
+    <!-- <load module="mod_graylog2"/> -->
     <load module="mod_logfile"/>
     <!-- <load module="mod_syslog"/> -->
 
@@ -53,6 +54,7 @@
     <load module="mod_expr"/>
     <load module="mod_fifo"/>
     <load module="mod_hash"/>
+    <!--<load module="mod_mongo"/> -->
     <load module="mod_voicemail"/>
     <!--<load module="mod_directory"/>-->
     <!--<load module="mod_distributor"/>-->

diff --git a/freeswitch.spec b/freeswitch.spec
index 37cf8111b92130ccfdee3c50e0dd7c011bc244c2..08596a8f4f9b053cbbe6fa0bf3cd847174dfbfc7 100644 (file)
--- a/freeswitch.spec
+++ b/freeswitch.spec
@@ -482,6 +482,14 @@ is a "high-performance, distributed memory object caching system, generic in
 nature, but intended for use in speeding up dynamic web applications by 
 alleviating database load." 
 
+%package application-mongo
+Summary:       FreeSWITCH mod_mongo
+Group:         System/Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description application-mongo
+Provides FreeSWITCH mod_mongo, which implements an API interface to mongodb.
+
 %package application-nibblebill
 Summary:       FreeSWITCH mod_nibblebill
 Group:          System/Libraries
@@ -1028,6 +1036,18 @@ BuildRequires:   net-snmp-devel
 %description event-snmp
 SNMP stats reporter for the FreeSWITCH open source telephony platform
 
+######################################################################################################################
+#                              FreeSWITCH Logger Modules
+######################################################################################################################
+
+%package logger-graylog2
+Summary:       GELF logger for Graylog2 and Logstash
+Group:         System/Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description logger-graylog2
+GELF logger for Graylog2 and Logstash
+
 ######################################################################################################################
 #                              FreeSWITCH Media Format Modules
 ######################################################################################################################
@@ -1371,7 +1391,7 @@ APPLICATION_MODULES_DE+="applications/mod_esl"
 
 APPLICATION_MODULES_FR="applications/mod_fifo applications/mod_fsk applications/mod_fsv applications/mod_hash \
                        applications/mod_httapi applications/mod_http_cache applications/mod_lcr applications/mod_limit \
-                       applications/mod_memcache applications/mod_nibblebill applications/mod_redis applications/mod_rss" 
+                       applications/mod_memcache applications/mod_mongo applications/mod_nibblebill applications/mod_redis applications/mod_rss" 
 
 APPLICATION_MODULES_SZ="applications/mod_sms applications/mod_snapshot applications/mod_snom applications/mod_soundtouch \
                        applications/mod_spandsp applications/mod_spy applications/mod_stress \
@@ -1463,7 +1483,7 @@ LANGUAGES_MODULES="languages/mod_lua languages/mod_perl languages/mod_python "
 #                                              Logging Modules
 #
 ######################################################################################################################
-LOGGERS_MODULES="loggers/mod_console loggers/mod_logfile loggers/mod_syslog"
+LOGGERS_MODULES="loggers/mod_console loggers/mod_graylog2 loggers/mod_logfile loggers/mod_syslog"
 
 ######################################################################################################################
 #
@@ -1807,6 +1827,7 @@ fi
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/fax.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/fifo.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/format_cdr.conf.xml
+%config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/graylog2.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/hash.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/httapi.conf.xml
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/autoload_configs/http_cache.conf.xml
@@ -1968,6 +1989,9 @@ fi
 %files application-memcache
 %{MODINSTDIR}/mod_memcache.so*
 
+%files application-mongo
+%{MODINSTDIR}/mod_mongo.so*
+
 %files application-nibblebill
 %{MODINSTDIR}/mod_nibblebill.so*
 
@@ -2339,6 +2363,15 @@ fi
 %config(noreplace) %attr(0640, freeswitch, daemon) %{sysconfdir}/lang/sv/vm/*.xml
 %{MODINSTDIR}/mod_say_sv.so*
 
+######################################################################################################################
+#
+#                                              Logger Modules
+#
+######################################################################################################################
+
+%files logger-graylog2
+%{MODINSTDIR}/mod_graylog2.so*
+
 ######################################################################################################################
 #
 #                                      Timer Modules
@@ -2371,6 +2404,8 @@ fi
 #
 ######################################################################################################################
 %changelog
+* Tue Nov 04 2014 - crienzo@grasshopper.com
+- add mod_graylog2 and mod_mongo
 * Thu Sep 11 2014 - krice@freeswitch.org
 - add and fix mod_verto and mod_rtc
 * Mon Jun 02 2014 - krice@freeswitch.org