Skip to content

Commit 402fa23

Browse files
committed
Merge branch 'master' into littledata-docs-update
2 parents f7f9417 + 90fb4fd commit 402fa23

File tree

41 files changed

+1319
-1026
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1319
-1026
lines changed

src/_data/catalog/overrides-list.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
items:
22
- hubspot
33
- iterable
4+
- google-ads-gtag
5+
- klaviyo

src/_data/catalog/overrides.yml

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ items:
1616
mobile: true
1717
server: true
1818
summary: >-
19-
is available in device-mode for Analytics.js only, and is availble in cloud-mode for Mobile and Server sources.
19+
is available in device-mode for Analytics.js only, and is availble in cloud-mode for Mobile and Server sources. Page calls are supported from Device-mode connections only.
2020
cmode_type: mixed
2121
case: '6'
2222
- slug: iterable
@@ -37,3 +37,26 @@ items:
3737
accepts cloud-mode data from all Segment source types. It does not offer device-mode connections.
3838
cmode_type: mixed
3939
case: '5'
40+
- slug: google-ads-gtag
41+
previous_names:
42+
- Google AdWords New
43+
- slug: klaviyo
44+
display_name: Klaviyo
45+
components:
46+
- code: 'https://github.com/segment-integrations/analytics.js-integration-klaviyo'
47+
type: browser
48+
- code: 'https://github.com/segmentio/integrations/tree/master/integrations/klaviyo'
49+
type: server
50+
connection_modes:
51+
device:
52+
web: true
53+
mobile: false
54+
server: false
55+
cloud:
56+
web: false
57+
mobile: true
58+
server: true
59+
summary: >-
60+
accepts data in cloud-mode from web and mobile sources, and can accept data in device-mode from Analytics.js sources.
61+
cmode_type: mixed
62+
case: '10'

src/_data/catalog/warehouse.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ items:
8989
name: catalog/warehouse/data-lakes
9090
description: ''
9191
url: connections/storage/catalog/data-lakes
92-
status: PUBLIC_BETA
92+
status: PUBLIC
9393
logo:
9494
url: 'https://cdn.filepicker.io/api/file/YR7dKXAiQWyYvBiVOZNX'
9595
mark:

src/_data/sidenav/main.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,6 @@ sections:
226226
title: Locate Your Write Key
227227
- path: /connections/integration_error_codes
228228
title: Integration Error Codes
229-
- path: /connections/schema-unique-limits
230-
title: Segment Schema Limits
231229
- path: /connections/rate-limits
232230
title: Rate Limits and SLA
233231
- path: /connections/data-residency

src/_includes/content/destination-footer.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
{% if currentIntegration.platforms.server == true %}
77
{% unless page.hide-personas-partial == true %}
8+
{% assign overridesList = site.data.catalog.overrides-list.items %}
9+
810

911
## Personas
1012

@@ -69,10 +71,14 @@ Segment lets you change these destination settings from the Segment app without
6971
## Adding {{ currentIntegration.display_name }} to the integrations object
7072

7173
To add {{ currentIntegration.display_name }} to the `integrations` JSON object (for example, [to filter data from a specific source](/docs/guides/filtering-data/#filtering-with-the-integrations-object)), use one of the following valid names for this integration:
74+
{% if page.name-override %}
75+
{% assign currentIntegration = site.data.catalog.overrides.items | where: "slug", currentSlug | first %}
76+
{% endif %}
7277

7378
{% for valid_name in currentIntegration.previous_names %}
7479
- {{ valid_name }}
7580
{% endfor %}
81+
7682
{% endunless %}
7783
{% endif %}
7884

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
A warehouse is a central repository of data collected from one or more sources. This is what commonly comes to mind you think about a relational database: structured data that fits neatly into rows and columns.
1+
A warehouse is a central repository of data collected from one or more sources. This is what commonly comes to mind when you think about a relational database: structured data that fits neatly into rows and columns.
22

3-
In Segment, a Warehouse is a special type destination. Instead of streaming data to the destination all the time, we load data to them in bulk at a regular intervals. When we load data, we insert and update events and objects, and automatically adjust their schema to fit the data you've sent to Segment.
3+
In Segment, a Warehouse is a special type of destination. Instead of streaming data to the destination all the time, we load data to them in bulk at regular intervals. When we load data, we insert and update events and objects, and automatically adjust their schema to fit the data you've sent to Segment.

src/_sass/components/_markdown.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@
293293

294294
}
295295

296-
a[target="_blank"]:after{
296+
a[target="_blank"]:not(.reference-button):after{
297297
content: url("/docs/images/external-link-alt-solid.svg");
298298
margin-left: 4px;
299299
}

src/config-api/api-design.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ You can manage each resource using standard methods:
4343
| PermissionDenied | 403 Forbidden | 7 | An access token with `write` scope is required for the Create, Update and Delete methods |
4444
| Not Found | 404 Not Found | 5 | The request or resource could not be found. Either the request method or path is incorrect, or the resource does not exist in this workspace (sometimes because of a typo). |
4545
| Already Exists | 409 Conflict | 6 | A resource (e.g. source) already exists with the given name |
46-
| Resource Exhausted | 429 Too Many Requests | 8 | The 60 req / sec rate limit was exhausted |
46+
| Resource Exhausted | 429 Too Many Requests | 8 | The 200 req / min rate limit was exhausted |
4747
| Internal | 500 Internal Server Error | 13 | Segment encountered an error processing the request |
4848
| Unimplemented | 501 Not Implemented | 12 | The method is not supported or implemented |
4949
| Unavailable | 503 Service Unavailable | 14 | The API is down |

src/connections/destinations/add-destination.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,8 @@ Each destination can also have destination settings. These control how Segment t
8888

8989
## Connecting one source to multiple instances of a destination
9090

91-
<!-- LR: 03/04/21 - hiding this for now since it's in limited rollout.
9291
> note ""
9392
> Multiple-destination support is available for all Segment customers on all plan tiers.
94-
-->
95-
96-
97-
> info ""
98-
> Support for connecting to multiple instances of a destination is in public preview. To use this, you must agree to the [(1) Segment First Access](https://segment.com/legal/first-access-beta-preview/) and Beta Terms and Conditions and [(2) Segment Acceptable Use Policy](https://segment.com/legal/acceptable-use-policy/). The feature is being released to different tiers over time. If you see an error message that you can’t connect to multiple instances of the same destination, it is not available yet in your workspace but is coming soon.
9993
10094
Segment allows you to connect a source to multiple instances of a destination. You can use this to set up a single Segment source that sends data into different instances of your analytics and other tools.
10195

@@ -187,7 +181,6 @@ For the following destinations, a single source can connect to up to 10 instance
187181
- [ActiveCampaign](/docs/connections/destinations/catalog/activecampaign/)
188182
- [Akita](/docs/connections/destinations/catalog/akita/)
189183
- [All Aboard](/docs/connections/destinations/catalog/all-aboard/)
190-
- [Amazon EventBridge](/docs/connections/destinations/catalog/amazon-eventbridge/)
191184
- [Amazon Kinesis](/docs/connections/destinations/catalog/amazon-kinesis/)
192185
- [Amazon Kinesis Firehose](/docs/connections/destinations/catalog/amazon-kinesis-firehose/)
193186
- [Amazon Lambda](/docs/connections/destinations/catalog/amazon-lambda/)
145 KB
Loading

0 commit comments

Comments
 (0)