Skip to content

Commit

Permalink
Call recording doc update (2600hz#5038)
Browse files Browse the repository at this point in the history
* add description to schema and docs

* document call recording matrix

* update descritions

* update docs

* fix key
  • Loading branch information
jamesaimonetti authored and lazedo committed Aug 6, 2018
1 parent 520e61d commit 3fb5b7c
Show file tree
Hide file tree
Showing 19 changed files with 145 additions and 78 deletions.
4 changes: 3 additions & 1 deletion .aspell.en.pws
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
personal_ws-1.1 en 1111 utf-8
personal_ws-1.1 en 1113 utf-8
PrivateKeyInfo
cfg
ccv
Expand Down Expand Up @@ -611,6 +611,7 @@ httpclose
param
phonebook
qubicle
multicast
Prepends
BEARERCAPABILITY
eaddrinuse
Expand Down Expand Up @@ -854,6 +855,7 @@ chmod
Whitelabling
smtpd
demonitor
Makefiles
pymdown
dbtext
WORKDIR
Expand Down
12 changes: 6 additions & 6 deletions applications/crossbar/doc/accounts.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ endpoint recording settings

Key | Description | Type | Default | Required | Support Level
--- | ----------- | ---- | ------- | -------- | -------------
`any` | | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |
`inbound` | | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |
`outbound` | | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |
`any` | settings for any calls to/from the endpoint | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |
`inbound` | settings for inbound calls to the endpoint | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |
`outbound` | settings for outbound calls from the endpoint | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |

### call_recording.parameters

Expand All @@ -91,9 +91,9 @@ Key | Description | Type | Default | Required | Support Level

Key | Description | Type | Default | Required | Support Level
--- | ----------- | ---- | ------- | -------- | -------------
`any` | | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |
`offnet` | | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |
`onnet` | | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |
`any` | settings for calls from any network | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |
`offnet` | settings for calls from offnet networks | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |
`onnet` | settings for calls from onnet networks | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |

### call_waiting

Expand Down
14 changes: 7 additions & 7 deletions applications/crossbar/doc/devices.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Key | Description | Type | Default | Required | Support Level
`enabled` | Determines if the device is currently enabled | `boolean()` | `true` | `false` | `supported`
`exclude_from_queues` | Do not ring this device when calling user/agent in queue | `boolean()` | `false` | `false` |
`formatters` | | [#/definitions/formatters](#formatters) | | `false` |
`hotdesk` | The hotdesk status of this device | `object()` | | `false` |
`hotdesk` | The hotdesk status of this device | `object()` | | `false` |
`language` | The language for the device | `string()` | | `false` | `supported`
`mac_address` | The MAC Address of the device (if applicable) | `string()` | | `false` | `supported`
`media` | Configure audio/video/etc media options for this device | [#/definitions/endpoint.media](#endpointmedia) | | `false` |
Expand Down Expand Up @@ -91,9 +91,9 @@ endpoint recording settings

Key | Description | Type | Default | Required | Support Level
--- | ----------- | ---- | ------- | -------- | -------------
`any` | | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |
`inbound` | | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |
`outbound` | | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |
`any` | settings for any calls to/from the endpoint | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |
`inbound` | settings for inbound calls to the endpoint | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |
`outbound` | settings for outbound calls from the endpoint | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |

### call_recording.parameters

Expand All @@ -114,9 +114,9 @@ Key | Description | Type | Default | Required | Support Level

Key | Description | Type | Default | Required | Support Level
--- | ----------- | ---- | ------- | -------- | -------------
`any` | | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |
`offnet` | | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |
`onnet` | | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |
`any` | settings for calls from any network | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |
`offnet` | settings for calls from offnet networks | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |
`onnet` | settings for calls from onnet networks | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |

### call_waiting

Expand Down
12 changes: 6 additions & 6 deletions applications/crossbar/doc/ref/accounts.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ endpoint recording settings

Key | Description | Type | Default | Required | Support Level
--- | ----------- | ---- | ------- | -------- | -------------
`any` | | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |
`inbound` | | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |
`outbound` | | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |
`any` | settings for any calls to/from the endpoint | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |
`inbound` | settings for inbound calls to the endpoint | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |
`outbound` | settings for outbound calls from the endpoint | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |

### call_recording.parameters

Expand All @@ -83,9 +83,9 @@ Key | Description | Type | Default | Required | Support Level

Key | Description | Type | Default | Required | Support Level
--- | ----------- | ---- | ------- | -------- | -------------
`any` | | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |
`offnet` | | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |
`onnet` | | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |
`any` | settings for calls from any network | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |
`offnet` | settings for calls from offnet networks | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |
`onnet` | settings for calls from onnet networks | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |

### call_waiting

Expand Down
12 changes: 6 additions & 6 deletions applications/crossbar/doc/ref/devices.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ endpoint recording settings

Key | Description | Type | Default | Required | Support Level
--- | ----------- | ---- | ------- | -------- | -------------
`any` | | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |
`inbound` | | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |
`outbound` | | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |
`any` | settings for any calls to/from the endpoint | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |
`inbound` | settings for inbound calls to the endpoint | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |
`outbound` | settings for outbound calls from the endpoint | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |

### call_recording.parameters

Expand All @@ -111,9 +111,9 @@ Key | Description | Type | Default | Required | Support Level

Key | Description | Type | Default | Required | Support Level
--- | ----------- | ---- | ------- | -------- | -------------
`any` | | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |
`offnet` | | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |
`onnet` | | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |
`any` | settings for calls from any network | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |
`offnet` | settings for calls from offnet networks | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |
`onnet` | settings for calls from onnet networks | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |

### call_waiting

Expand Down
12 changes: 6 additions & 6 deletions applications/crossbar/doc/ref/users.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ endpoint recording settings

Key | Description | Type | Default | Required | Support Level
--- | ----------- | ---- | ------- | -------- | -------------
`any` | | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |
`inbound` | | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |
`outbound` | | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |
`any` | settings for any calls to/from the endpoint | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |
`inbound` | settings for inbound calls to the endpoint | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |
`outbound` | settings for outbound calls from the endpoint | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |

### call_recording.parameters

Expand All @@ -96,9 +96,9 @@ Key | Description | Type | Default | Required | Support Level

Key | Description | Type | Default | Required | Support Level
--- | ----------- | ---- | ------- | -------- | -------------
`any` | | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |
`offnet` | | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |
`onnet` | | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |
`any` | settings for calls from any network | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |
`offnet` | settings for calls from offnet networks | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |
`onnet` | settings for calls from onnet networks | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |

### call_waiting

Expand Down
12 changes: 6 additions & 6 deletions applications/crossbar/doc/users.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ endpoint recording settings

Key | Description | Type | Default | Required | Support Level
--- | ----------- | ---- | ------- | -------- | -------------
`any` | | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |
`inbound` | | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |
`outbound` | | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |
`any` | settings for any calls to/from the endpoint | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |
`inbound` | settings for inbound calls to the endpoint | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |
`outbound` | settings for outbound calls from the endpoint | [#/definitions/call_recording.source](#call_recordingsource) | | `false` |

### call_recording.parameters

Expand All @@ -98,9 +98,9 @@ Key | Description | Type | Default | Required | Support Level

Key | Description | Type | Default | Required | Support Level
--- | ----------- | ---- | ------- | -------- | -------------
`any` | | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |
`offnet` | | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |
`onnet` | | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |
`any` | settings for calls from any network | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |
`offnet` | settings for calls from offnet networks | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |
`onnet` | settings for calls from onnet networks | [#/definitions/call_recording.parameters](#call_recordingparameters) | | `false` |

### call_waiting

Expand Down
18 changes: 12 additions & 6 deletions applications/crossbar/priv/api/swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -1008,13 +1008,16 @@
"description": "endpoint recording settings",
"properties": {
"any": {
"$ref": "#/definitions/call_recording.source"
"$ref": "#/definitions/call_recording.source",
"description": "settings for any calls to/from the endpoint"
},
"inbound": {
"$ref": "#/definitions/call_recording.source"
"$ref": "#/definitions/call_recording.source",
"description": "settings for inbound calls to the endpoint"
},
"outbound": {
"$ref": "#/definitions/call_recording.source"
"$ref": "#/definitions/call_recording.source",
"description": "settings for outbound calls from the endpoint"
}
},
"type": "object"
Expand Down Expand Up @@ -1066,13 +1069,16 @@
"call_recording.source": {
"properties": {
"any": {
"$ref": "#/definitions/call_recording.parameters"
"$ref": "#/definitions/call_recording.parameters",
"description": "settings for calls from any network"
},
"offnet": {
"$ref": "#/definitions/call_recording.parameters"
"$ref": "#/definitions/call_recording.parameters",
"description": "settings for calls from offnet networks"
},
"onnet": {
"$ref": "#/definitions/call_recording.parameters"
"$ref": "#/definitions/call_recording.parameters",
"description": "settings for calls from onnet networks"
}
},
"type": "object"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,16 @@
"description": "endpoint recording settings",
"properties": {
"any": {
"$ref": "call_recording.source"
"$ref": "call_recording.source",
"description": "settings for any calls to/from the endpoint"
},
"inbound": {
"$ref": "call_recording.source"
"$ref": "call_recording.source",
"description": "settings for inbound calls to the endpoint"
},
"outbound": {
"$ref": "call_recording.source"
"$ref": "call_recording.source",
"description": "settings for outbound calls from the endpoint"
}
},
"type": "object"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,16 @@
"additionalProperties": false,
"properties": {
"any": {
"$ref": "call_recording.parameters"
"$ref": "call_recording.parameters",
"description": "settings for calls from any network"
},
"offnet": {
"$ref": "call_recording.parameters"
"$ref": "call_recording.parameters",
"description": "settings for calls from offnet networks"
},
"onnet": {
"$ref": "call_recording.parameters"
"$ref": "call_recording.parameters",
"description": "settings for calls from onnet networks"
}
},
"type": "object"
Expand Down
1 change: 0 additions & 1 deletion core/kazoo_endpoint/src/kz_endpoint.erl
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,6 @@ merge_call_recording(K, JObj, Acc, List) ->
Fun = fun(K1, V1) -> merge_call_recording(K1, V1, Any) end,
kz_json:set_value(K, lists:foldl(Fun, kz_json:delete_key(<<"any">>, JObj), List), Acc).


-spec get_account_record_call_properties(kz_term:api_object()) -> kz_json:object().
get_account_record_call_properties(JObj) ->
kz_json:foldl(fun(K, V, Acc) ->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Configuring the `system_config/number_manager` document for European Union-based
}
```

#### E164 Convertors
#### E164 Converters

```json
{
Expand Down
2 changes: 1 addition & 1 deletion doc/internationalization/numbers.md
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ If you want a literal '#', 'S', or '*', prefix it with a '\' (so '\#', '\S', and

Users can dial local numbers, just as they do with the PSTN, by providing Kazoo with `dial_plan` regular expressions. These regexes will be used on the dialed numbers to correct them to properly routable numbers.

It is possible to set these regexes on an account, user, or device basis. All that needs doing is adding a `dial_plan` key at the root level of the account, user, or device document. Kazoo will then apply the regexes in order, preferring the calling device's, then user's (if the calling device has an `owner_id` set), and finally the account's dialplan. Failing any of those, the system `e164_convertors` will be employed.
It is possible to set these regexes on an account, user, or device basis. All that needs doing is adding a `dial_plan` key at the root level of the account, user, or device document. Kazoo will then apply the regexes in order, preferring the calling device's, then user's (if the calling device has an `owner_id` set), and finally the account's dialplan. Failing any of those, the system `e164_converters` will be employed.

!!! warning
It is possible that these `dial_plan` rules will interfere with extension dialing within an account. Please take common extension length into consideration when creating these `dial_plan` rules.
Expand Down
Loading

0 comments on commit 3fb5b7c

Please sign in to comment.