Remove inconsistency in CEL eventtype for user defined events.

The CEL eventtype field for ODBC and PGSQL backends should be USER_DEFINED
instead of the user defined event name supplied by the CELGenUserEvent
application.  If the field is output as a number, the user defined name
does not have a value and is always output as 21 for USER_DEFINED and the
userdeftype field would be required to supply the user defined name.

The following CEL backends (cel_odbc, cel_pgsql, cel_custom, cel_manager,
and cel_sqlite3_custom) can be independently configured to remove this
inconsistency.

* Allows cel_manager, cel_custom, and cel_sqlite3_custom to behave the
same way.

(closes issue ASTERISK-17189)
Reported by: Bryant Zimmerman

Review: https://reviewboard.asterisk.org/r/1669/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@353648 65c4cc65-6c06-0410-ace0-fbb531ad65f3

5 files changed, 22 insertions, 1 deletions

diff --git a/configs/cel.conf.sample b/configs/cel.conf.sample
index a17cf6881..7bd7f89f0 100644
--- a/configs/cel.conf.sample
+++ b/configs/cel.conf.sample
@@ -105,6 +105,13 @@ events=APP_START,CHAN_START,CHAN_END,ANSWER,HANGUP,BRIDGE_START,BRIDGE_END
 ; Default value:   no
 ;enabled=yes
 
+; Use 'show_user_defined' to put "USER_DEFINED" in the EventName header,
+; instead of (by default) just putting the user defined event name there.
+; When enabled the UserDefType header is added for user defined events to
+; provide the user defined event name.
+;
+;show_user_defined=yes
+
 ;
 ; RADIUS CEL Backend 
 ;
diff --git a/configs/cel_custom.conf.sample b/configs/cel_custom.conf.sample
index 59c33dc54..126248aca 100644
--- a/configs/cel_custom.conf.sample
+++ b/configs/cel_custom.conf.sample
@@ -24,6 +24,7 @@
 ;
 ;    eventtype   - The name of the CEL event.
 ;    eventtime   - The timestamp of the CEL event.
+;    eventenum   - Like eventtype but is "USER_DEFINED" for a user defined event.
 ;    userdeftype - User defined event type name from CELGenUserEvent().
 ;    eventextra  - Extra data included with this CEL event, typically along with
 ;                  an event of type USER_DEFINED from CELGenUserEvent().
diff --git a/configs/cel_odbc.conf.sample b/configs/cel_odbc.conf.sample
index 640de4fb6..1c7ff5095 100644
--- a/configs/cel_odbc.conf.sample
+++ b/configs/cel_odbc.conf.sample
@@ -2,6 +2,13 @@
 ; Asterisk Channel Event Logging (CEL) - Adaptive ODBC Backend
 ;
 
+; General module options category.
+[general]
+; Use 'show_user_defined' to put "USER_DEFINED" in the eventtype field,
+; instead of (by default) just putting the user defined event name there.
+;
+;show_user_defined=yes
+
 ; This configuration defines the connections and tables for which CEL records
 ; may be populated.  Each context specifies a different CEL table to be used.
 ;
@@ -90,7 +97,7 @@
 ;alias dst => dest
 ;alias dstchannel => dest_channel
 
-; Any filter specified MUST match exactly or the CE will be discarded
+; Any filter specified MUST match exactly or the event will be discarded
 ;filter accountcode => somename
 ;filter src => 123
 
diff --git a/configs/cel_pgsql.conf.sample b/configs/cel_pgsql.conf.sample
index d71fcc6be..cc9b9ff91 100644
--- a/configs/cel_pgsql.conf.sample
+++ b/configs/cel_pgsql.conf.sample
@@ -54,6 +54,11 @@
 ;	extra
 
 [global]
+; Use 'show_user_defined' to put "USER_DEFINED" in the eventtype field,
+; instead of (by default) just putting the user defined event name there.
+;
+;show_user_defined=yes
+
 ;hostname=localhost
 ;port=5432
 ;dbname=asterisk
diff --git a/configs/cel_sqlite3_custom.conf.sample b/configs/cel_sqlite3_custom.conf.sample
index 14f2dd228..2d9a24fc7 100644
--- a/configs/cel_sqlite3_custom.conf.sample
+++ b/configs/cel_sqlite3_custom.conf.sample
@@ -11,6 +11,7 @@
 ;
 ;    eventtype   - The name of the CEL event.
 ;    eventtime   - The timestamp of the CEL event.
+;    eventenum   - Like eventtype but is "USER_DEFINED" for a user defined event.
 ;    userdeftype - User defined event type name from CELGenUserEvent().
 ;    eventextra  - Extra data included with this CEL event, typically along with
 ;                  an event of type USER_DEFINED from CELGenUserEvent().