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

⚡ add OTEL_LOGS_EXPORTER #1588

Merged
merged 1 commit into from
Jun 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
44 changes: 26 additions & 18 deletions app/app-config.production.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,14 @@ integrations:
github:
- host: github.com
token: ${GITHUB_TOKEN}
aws:
mainAccount:
profile: development
accounts:
- accountId: ${AWS_ACCOUNT_ID}
accessKeyId: ${AWS_ACCESS_KEY_ID}
secretAccessKey: ${AWS_SECRET_ACCESS_KEY}
profile: development

kubernetes:
serviceLocatorMethod:
Expand Down Expand Up @@ -73,29 +81,29 @@ techdocs:
type: "awsS3"
awsS3:
bucketName: ${TECHDOCS_BUCKET}
accountId: ${AWS_ACCOUNT_ID}
region: ${AWS_REGION}
credentials:
roleArn: ${AWS_ROLE}

proxy:
"/argocd/api":
target: https://argocd.devxp-tech.io/api/v1/
changeOrigin: true
# only if your argocd api has self-signed cert
secure: true
headers:
Cookie:
$env: ARGOCD_AUTH_TOKEN
endpoints:
"/argocd/api":
target: https://argocd.devxp-tech.io/api/v1/
changeOrigin: true
# only if your argocd api has self-signed cert
secure: true
headers:
Cookie:
$env: ARGOCD_AUTH_TOKEN

"/grafana/api":
# May be an internal DNS
target: http://grafana.monitoring.svc/
headers:
Authorization: Bearer ${GRAFANA_TOKEN}
"/grafana/api":
# May be an internal DNS
target: http://grafana.monitoring.svc/
headers:
Authorization: Bearer ${GRAFANA_TOKEN}

"/prometheus/api":
# url to the api and path of your hosted prometheus instance
target: http://prometheus-community-kube-prometheus.monitoring.svc.cluster.local:9090/api/v1/
"/prometheus/api":
# url to the api and path of your hosted prometheus instance
target: http://prometheus-community-kube-prometheus.monitoring.svc.cluster.local:9090/api/v1/

auth:
environment: production
Expand Down
49 changes: 27 additions & 22 deletions app/app-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,14 @@ integrations:
# This is a Personal Access Token or PAT from GitHub. You can find out how to generate this token, and more information
# about setting up the GitHub integration here: https://backstage.io/docs/getting-started/configuration#setting-up-a-github-integration
token: ${GITHUB_TOKEN}
### Example for how to add your GitHub Enterprise instance using the API:
# - host: ghe.example.net
# apiBaseUrl: https://ghe.example.net/api/v3
# token: ${GHE_TOKEN}
aws:
mainAccount:
profile: development
accounts:
- accountId: ${AWS_ACCOUNT_ID}
accessKeyId: ${AWS_ACCESS_KEY_ID}
secretAccessKey: ${AWS_SECRET_ACCESS_KEY}
profile: development

# Reference documentation http://backstage.io/docs/features/techdocs/configuration
# Note: After experimenting with basic setup, use CI/CD to generate docs
Expand All @@ -97,24 +101,25 @@ techdocs:
secretAccessKey: ${AWS_SECRET_ACCESS_KEY}

proxy:
"/argocd/api":
target: https://argocd.devxp-tech.io/api/v1/
changeOrigin: true
# only if your argocd api has self-signed cert
secure: true
headers:
Cookie:
$env: ARGOCD_AUTH_TOKEN

"/grafana/api":
# May be an internal DNS
target: https://grafana.devxp-tech.io/
headers:
Authorization: Bearer ${GRAFANA_TOKEN}

"/prometheus/api":
# url to the api and path of your hosted prometheus instance
target: https://prometheus.devxp-tech.io/api/v1/
endpoints:
"/argocd/api":
target: https://argocd.devxp-tech.io/api/v1/
changeOrigin: true
# only if your argocd api has self-signed cert
secure: true
headers:
Cookie:
$env: ARGOCD_AUTH_TOKEN

"/grafana/api":
# May be an internal DNS
target: https://grafana.devxp-tech.io/
headers:
Authorization: Bearer ${GRAFANA_TOKEN}

"/prometheus/api":
# url to the api and path of your hosted prometheus instance
target: https://prometheus.devxp-tech.io/api/v1/

# '/snyk':
# target: https://snyk.io/api/v1
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ services:
- POSTGRES_USER=postgres
- SONARQUBE_TOKEN=$SONARQUBE_TOKEN
- TECHDOCS_BUCKET=$TECHDOCS_BUCKET
# - AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID
# - AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY
# - AWS_REGION=$AWS_REGION
- AWS_ACCESS_KEY_ID=$TECHDOCS_AWS_ACCESS_KEY_ID
- AWS_SECRET_ACCESS_KEY=$TECHDOCS_AWS_SECRET_ACCESS_KEY
- AWS_REGION=us-east-1
depends_on:
- postgres

Expand Down
Loading