Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove dockerfiles for certified python connnectors and use the base image #31377

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
c229325
✨ source-zendesk-support: remove dockerfile
alafanechere Oct 13, 2023
bc76fa7
source-bing-ads: remove dockerfile
alafanechere Oct 13, 2023
d260dd5
source-google-analytics-data-api: remove dockerfile
alafanechere Oct 13, 2023
d097595
source-marketo: remove dockerfile
alafanechere Oct 13, 2023
4e08a8b
source-typeform: remove dockerfile
alafanechere Oct 13, 2023
23d866a
source-google-sheets: remove dockerfile
alafanechere Oct 13, 2023
357b333
source-google-ads: remove dockerfile
alafanechere Oct 13, 2023
85506b2
source-chargebee: remove dockerfile
alafanechere Oct 13, 2023
408801f
source-airtable: remove dockerfile
alafanechere Oct 13, 2023
f875b5b
source-intercom: remove dockerfile
alafanechere Oct 13, 2023
a8e84a0
source-salesforce: remove dockerfile
alafanechere Oct 13, 2023
0cdf40f
source-harvest: remove dockerfile
alafanechere Oct 13, 2023
16ebb7a
source-surveymonkey: remove dockerfile
alafanechere Oct 13, 2023
7407c70
source-mixpanel: remove dockerfile
alafanechere Oct 13, 2023
733294d
source-notion: remove dockerfile
alafanechere Oct 13, 2023
a7d5486
source-slack: remove dockerfile
alafanechere Oct 13, 2023
a96414c
source-file: remove dockerfile
alafanechere Oct 13, 2023
258b765
source-amazon-ads: remove dockerfile
alafanechere Oct 13, 2023
33cb87d
source-sendgrid: remove dockerfile
alafanechere Oct 13, 2023
f1ce124
destination-weaviate: remove dockerfile
alafanechere Oct 13, 2023
94d5fc2
destination-pinecone: remove dockerfile
alafanechere Oct 13, 2023
487c633
destination-milvus: remove dockerfile
alafanechere Oct 13, 2023
167d6f7
source-paypal-transaction: remove dockerfile
alafanechere Oct 13, 2023
8c4f2d4
source-gitlab: remove dockerfile
alafanechere Oct 13, 2023
49011d0
source-zendesk-chat: remove dockerfile
alafanechere Oct 13, 2023
50a636f
source-google-analytics-v4: remove dockerfile
alafanechere Oct 13, 2023
0030b79
Revert "source-salesforce: remove dockerfile"
alafanechere Oct 16, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 66 additions & 0 deletions airbyte-ci/connectors/pipelines/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
version: "3"

networks:
loki:

services:
loki:
image: grafana/loki:2.9.0
ports:
- "3100:3100"
command: -config.file=/etc/loki/local-config.yaml
networks:
- loki

# promtail:
# image: grafana/promtail:2.9.0
# volumes:
# - /var/log:/var/log
# command: -config.file=/etc/promtail/config.yml
# networks:
# - loki

grafana:
environment:
- GF_PATHS_PROVISIONING=/etc/grafana/provisioning
- GF_AUTH_ANONYMOUS_ENABLED=true
- GF_AUTH_ANONYMOUS_ORG_ROLE=Admin
entrypoint:
- sh
- -euc
- |
mkdir -p /etc/grafana/provisioning/datasources
cat <<EOF > /etc/grafana/provisioning/datasources/ds.yaml
apiVersion: 1
datasources:
- name: Loki
type: loki
access: proxy
orgId: 1
url: http://loki:3100
basicAuth: false
isDefault: true
version: 1
editable: false
EOF
/run.sh
image: grafana/grafana:latest
ports:
- "3000:3000"
networks:
- loki
prometheus-container-exporter:
image: prom/container-exporter
ports:
- "9104:9104"
volumes:
- /sys/fs/cgroup:/cgroup
- /var/run/docker.sock:/var/run/docker.sock
prometheus:
image: prom/prometheus
ports:
- "9090:9090"
volumes:
- ./prometheus.yml:/etc/prometheus/prometheus.yml
networks:
- loki
50 changes: 50 additions & 0 deletions airbyte-ci/connectors/pipelines/docker-config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
server:
http_listen_address: 0.0.0.0
http_listen_port: 9080

positions:
filename: /tmp/positions.yaml

clients:
- url: http://loki:3100/loki/api/v1/push

scrape_configs:

- job_name: system
static_configs:
- targets:
- localhost
labels:
job: varlogs
__path__: /var/log/*log

- job_name: containers
entry_parser: raw

static_configs:
- targets:
- localhost
labels:
job: containerlogs
__path__: /var/lib/docker/containers/*/*log

# --log-opt tag="{{.ImageName}}|{{.Name}}|{{.ImageFullID}}|{{.FullID}}"
pipeline_stages:

- json:
expressions:
stream: stream
attrs: attrs
tag: attrs.tag

- regex:
expression: (?P<image_name>(?:[^|]*[^|])).(?P<container_name>(?:[^|]*[^|])).(?P<image_id>(?:[^|]*[^|])).(?P<container_id>(?:[^|]*[^|]))
source: "tag"

- labels:
tag:
stream:
image_name:
container_name:
image_id:
container_id:
11 changes: 11 additions & 0 deletions airbyte-ci/connectors/pipelines/prometheus.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
global:
scrape_interval: 15s

scrape_configs:
- job_name: 'prometheus'
static_configs:
- targets: ['prometheus:9090']

- job_name: 'container-exporter'
static_configs:
- targets: ['prometheus-container-exporter:9104']
41 changes: 0 additions & 41 deletions airbyte-integrations/connectors/destination-milvus/Dockerfile

This file was deleted.

39 changes: 20 additions & 19 deletions airbyte-integrations/connectors/destination-milvus/metadata.yaml
Original file line number Diff line number Diff line change
@@ -1,38 +1,39 @@
data:
ab_internal:
ql: 300
sl: 200
allowedHosts:
hosts:
- "${indexing.host}"
- ${indexing.host}
- api.openai.com
- api.cohere.ai
- "${embedding.api_base}"
- ${embedding.api_base}
connectorBuildOptions:
baseImage: docker.io/airbyte/python-connector-base:1.0.0@sha256:dd17e347fbda94f7c3abff539be298a65af2d7fc27a307d89297df1081a45c27
connectorSubtype: database
connectorType: destination
definitionId: 65de8962-48c9-11ee-be56-0242ac120002
dockerImageTag: 0.0.5
dockerRepository: airbyte/destination-milvus
documentationUrl: https://docs.airbyte.com/integrations/destinations/milvus
githubIssueLabel: destination-milvus
icon: milvus.svg
license: MIT
name: Milvus
registries:
cloud:
enabled: true
oss:
enabled: true
releaseDate: 2023-08-15
releaseStage: alpha
resourceRequirements:
jobSpecific:
- jobType: sync
# TODO: Remove once https://github.com/airbytehq/airbyte/issues/30611 is resolved
resourceRequirements:
memory_limit: 2Gi
memory_request: 2Gi
connectorSubtype: database
connectorType: destination
definitionId: 65de8962-48c9-11ee-be56-0242ac120002
dockerImageTag: 0.0.4
dockerRepository: airbyte/destination-milvus
githubIssueLabel: destination-milvus
icon: milvus.svg
license: MIT
name: Milvus
releaseDate: 2023-08-15
releaseStage: alpha
documentationUrl: https://docs.airbyte.com/integrations/destinations/milvus
supportLevel: certified
tags:
- language:python
ab_internal:
sl: 200
ql: 300
supportLevel: certified
metadataSpecVersion: "1.0"
43 changes: 0 additions & 43 deletions airbyte-integrations/connectors/destination-pinecone/Dockerfile

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,38 +1,39 @@
data:
ab_internal:
ql: 300
sl: 200
allowedHosts:
hosts:
- "*.${indexing.pinecone_environment}.pinecone.io"
- api.openai.com
- api.cohere.ai
- "${embedding.api_base}"
- ${embedding.api_base}
connectorBuildOptions:
baseImage: docker.io/airbyte/python-connector-base:1.0.0@sha256:dd17e347fbda94f7c3abff539be298a65af2d7fc27a307d89297df1081a45c27
connectorSubtype: database
connectorType: destination
definitionId: 3d2b6f84-7f0d-4e3f-a5e5-7c7d4b50eabd
dockerImageTag: 0.0.16
dockerRepository: airbyte/destination-pinecone
documentationUrl: https://docs.airbyte.com/integrations/destinations/pinecone
githubIssueLabel: destination-pinecone
icon: pinecone.svg
license: MIT
name: Pinecone
registries:
cloud:
enabled: true
oss:
enabled: true
releaseDate: 2023-08-15
releaseStage: beta
resourceRequirements:
jobSpecific:
- jobType: sync
# TODO: Remove once https://github.com/airbytehq/airbyte/issues/30611 is resolved
resourceRequirements:
memory_limit: 2Gi
memory_request: 2Gi
connectorSubtype: database
connectorType: destination
definitionId: 3d2b6f84-7f0d-4e3f-a5e5-7c7d4b50eabd
dockerImageTag: 0.0.15
dockerRepository: airbyte/destination-pinecone
githubIssueLabel: destination-pinecone
icon: pinecone.svg
license: MIT
name: Pinecone
releaseDate: 2023-08-15
releaseStage: beta
documentationUrl: https://docs.airbyte.com/integrations/destinations/pinecone
supportLevel: certified
tags:
- language:python
ab_internal:
sl: 200
ql: 300
supportLevel: certified
metadataSpecVersion: "1.0"
41 changes: 0 additions & 41 deletions airbyte-integrations/connectors/destination-weaviate/Dockerfile

This file was deleted.

Loading
Loading