diff options
author | Richard Mudgett <rmudgett@digium.com> | 2012-01-13 17:36:44 +0000 |
---|---|---|
committer | Richard Mudgett <rmudgett@digium.com> | 2012-01-13 17:36:44 +0000 |
commit | 523c95e1463553e8d9817a6ea2c2024384247149 (patch) | |
tree | 05ffcc9e6c9327f0f182ce78e9e0aa383afd27c7 /configs | |
parent | 9c4821f4683232103e9882a73cbe48da52ede002 (diff) |
Add missing CEL logging fields to various CEL backends.
Multiple revisions 350555,350571
........
r350555 | rmudgett | 2012-01-13 11:12:51 -0600 (Fri, 13 Jan 2012) | 12 lines
Add missing CEL logging fields to various CEL backends.
* Add missing eventextra to cel_psql.c and cel_odbc.c.
* Add missing PeerAccount and EventExtra to cel_manager.c.
* Add missing userdeftype support for cel_custom.conf.sample and
cel_sqlite3_custom.conf.sample.
(closes issue ASTERISK-17190)
Reported by: Bryant Zimmerman
........
r350571 | rmudgett | 2012-01-13 11:23:57 -0600 (Fri, 13 Jan 2012) | 8 lines
Use compatible names for event extra data for various CEL backends.
* Change eventextra to extra in cel_psql.c and cel_odbc.c.
* Change EventExtra to Extra in cel_manager.c.
(issue ASTERISK-17190)
........
Merged revisions 350555,350571 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 350585 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@350605 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'configs')
-rw-r--r-- | configs/cel.conf.sample | 6 | ||||
-rw-r--r-- | configs/cel_custom.conf.sample | 13 | ||||
-rw-r--r-- | configs/cel_odbc.conf.sample | 1 | ||||
-rw-r--r-- | configs/cel_pgsql.conf.sample | 2 | ||||
-rw-r--r-- | configs/cel_sqlite3_custom.conf.sample | 16 |
5 files changed, 29 insertions, 9 deletions
diff --git a/configs/cel.conf.sample b/configs/cel.conf.sample index d9ba90cb5..a17cf6881 100644 --- a/configs/cel.conf.sample +++ b/configs/cel.conf.sample @@ -56,13 +56,17 @@ apps=dial,park ; PARK_END -- Unpark event ; BRIDGE_START -- The time a bridge is started ; BRIDGE_END -- The time a bridge is ended -; 3WAY_START -- When a 3-way conference starts (usually via attended xfer) +; BRIDGE_UPDATE -- This is a replacement channel (Masquerade) +; 3WAY_START -- When a 3-way conference starts (usually via attended transfer) ; 3WAY_END -- When one or all exit a 3-way conference ; BLINDTRANSFER -- When a blind transfer is initiated ; ATTENDEDTRANSFER -- When an attended transfer is initiated ; TRANSFER -- Generic transfer initiated; not used yet...? +; PICKUP -- This channel picked up the peer channel +; FORWARD -- This channel is being forwarded somewhere else ; HOOKFLASH -- So far, when a hookflash event occurs on a DAHDI ; interface +; LINKEDID_END -- The last channel with the given linkedid is retired ; USER_DEFINED -- Triggered from the dialplan, and has a name given by the ; user ; diff --git a/configs/cel_custom.conf.sample b/configs/cel_custom.conf.sample index 37491a48b..59c33dc54 100644 --- a/configs/cel_custom.conf.sample +++ b/configs/cel_custom.conf.sample @@ -22,10 +22,13 @@ ; details from the CEL event. There are also a few variables created by this ; module that can be used in a mapping: ; -; eventtype - The name of the CEL event. -; eventtime - The timestamp of the CEL event. -; eventextra - Extra data included with this CEL event, typically along with -; an event of type USER_DEFINED from CELGenUserEvent(). +; eventtype - The name of the CEL event. +; eventtime - The timestamp of the CEL 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(). +; BRIDGEPEER - Bridged peer channel name at the time of the CEL event. +; CHANNEL(peer) could also be used. ; [mappings] -;Master.csv => ${CSV_QUOTE(${eventtype})},${CSV_QUOTE(${eventtime})},${CSV_QUOTE(${CALLERID(name)})},${CSV_QUOTE(${CALLERID(num)})},${CSV_QUOTE(${CALLERID(ANI)})},${CSV_QUOTE(${CALLERID(RDNIS)})},${CSV_QUOTE(${CALLERID(DNID)})},${CSV_QUOTE(${CHANNEL(exten)})},${CSV_QUOTE(${CHANNEL(context)})},${CSV_QUOTE(${CHANNEL(channame)})},${CSV_QUOTE(${CHANNEL(appname)})},${CSV_QUOTE(${CHANNEL(appdata)})},${CSV_QUOTE(${CHANNEL(amaflags)})},${CSV_QUOTE(${CHANNEL(accountcode)})},${CSV_QUOTE(${CHANNEL(uniqueid)})},${CSV_QUOTE(${CHANNEL(linkedid)})},${CSV_QUOTE(${CHANNEL(peer)})},${CSV_QUOTE(${CHANNEL(userfield)})},${CSV_QUOTE(${eventextra})} +;Master.csv => ${CSV_QUOTE(${eventtype})},${CSV_QUOTE(${eventtime})},${CSV_QUOTE(${CALLERID(name)})},${CSV_QUOTE(${CALLERID(num)})},${CSV_QUOTE(${CALLERID(ANI)})},${CSV_QUOTE(${CALLERID(RDNIS)})},${CSV_QUOTE(${CALLERID(DNID)})},${CSV_QUOTE(${CHANNEL(exten)})},${CSV_QUOTE(${CHANNEL(context)})},${CSV_QUOTE(${CHANNEL(channame)})},${CSV_QUOTE(${CHANNEL(appname)})},${CSV_QUOTE(${CHANNEL(appdata)})},${CSV_QUOTE(${CHANNEL(amaflags)})},${CSV_QUOTE(${CHANNEL(accountcode)})},${CSV_QUOTE(${CHANNEL(uniqueid)})},${CSV_QUOTE(${CHANNEL(linkedid)})},${CSV_QUOTE(${BRIDGEPEER})},${CSV_QUOTE(${CHANNEL(userfield)})},${CSV_QUOTE(${userdeftype})},${CSV_QUOTE(${eventextra})} diff --git a/configs/cel_odbc.conf.sample b/configs/cel_odbc.conf.sample index 5f21326df..68d3b0adb 100644 --- a/configs/cel_odbc.conf.sample +++ b/configs/cel_odbc.conf.sample @@ -64,6 +64,7 @@ ; amaflags (an int) ; userfield ; peer +; extra ; The point of this module is to allow you log whatever you like in terms of the ; CEL variables. Do you want to log uniqueid? Then simply ensure that your diff --git a/configs/cel_pgsql.conf.sample b/configs/cel_pgsql.conf.sample index 67d0574ab..790757162 100644 --- a/configs/cel_pgsql.conf.sample +++ b/configs/cel_pgsql.conf.sample @@ -48,7 +48,7 @@ ; peeraccount ; uniqueid ; linkedid -; amaflag (an int) +; amaflags (an int) ; userfield ; peer ; extra diff --git a/configs/cel_sqlite3_custom.conf.sample b/configs/cel_sqlite3_custom.conf.sample index b1486bd5c..14f2dd228 100644 --- a/configs/cel_sqlite3_custom.conf.sample +++ b/configs/cel_sqlite3_custom.conf.sample @@ -5,7 +5,19 @@ ; ; Mappings for sqlite3 config file ; +; Within a mapping, use the CALLERID() and CHANNEL() functions to retrieve +; details from the CEL event. There are also a few variables created by this +; module that can be used in a mapping: +; +; eventtype - The name of the CEL event. +; eventtime - The timestamp of the CEL 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(). +; BRIDGEPEER - Bridged peer channel name at the time of the CEL event. +; CHANNEL(peer) could also be used. +; ;[master] ; currently, only file "master.db" is supported, with only one table at a time. ;table => cel -;columns => eventtype, eventtime, cidname, cidnum, cidani, cidrdnis, ciddnid, context, exten, channame, appname, appdata, amaflags, accountcode, uniqueid, userfield, peer -;values => '${eventtype}','${eventtime}','${CALLERID(name)}','${CALLERID(num)}','${CALLERID(ANI)}','${CALLERID(RDNIS)}','${CALLERID(DNID)}','${CHANNEL(context)}','${CHANNEL(exten)}','${CHANNEL(channame)}','${CHANNEL(appname)}','${CHANNEL(appdata)}','${CHANNEL(amaflags)}','${CHANNEL(accountcode)}','${CHANNEL(uniqueid)}','${CHANNEL(userfield)}','${CHANNEL(peer)}' +;columns => eventtype, eventtime, cidname, cidnum, cidani, cidrdnis, ciddnid, context, exten, channame, appname, appdata, amaflags, accountcode, uniqueid, userfield, peer, userdeftype, eventextra +;values => '${eventtype}','${eventtime}','${CALLERID(name)}','${CALLERID(num)}','${CALLERID(ANI)}','${CALLERID(RDNIS)}','${CALLERID(DNID)}','${CHANNEL(context)}','${CHANNEL(exten)}','${CHANNEL(channame)}','${CHANNEL(appname)}','${CHANNEL(appdata)}','${CHANNEL(amaflags)}','${CHANNEL(accountcode)}','${CHANNEL(uniqueid)}','${CHANNEL(userfield)}','${BRIDGEPEER}','${userdeftype}','${eventextra}' |