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.

Sign up for GitHub

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

build: add grafana env #680

Merged
merged 2 commits into from
Jan 26, 2025
Merged

build: add grafana env #680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf7c781
wip: update
ianlnf Jan 26, 2025
edfd84f
wip: update
ianlnf Jan 26, 2025
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
1 change: 1 addition & 0 deletions .github/workflows/cd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ jobs:
firebase_project_id: ${{ secrets.FIREBASE_PROJECT_ID }}
firebase_private_key_base64: ${{ secrets.FIREBASE_PRIVATE_KEY_BASE64 }}
firebase_private_key_base64_gcp_secret_name: optic-firebase-private-key-dev
grafana_environment: development
grafana_otlp_endpoint: ${{ secrets.HUB_GRAFANA_OTLP_ENDPOINT }}
grafana_instance_id: ${{ secrets.HUB_GRAFANA_INSTANCE_ID }}
grafana_api_key: ${{ secrets.HUB_GRAFANA_API_KEY }}
3 changes: 3 additions & 0 deletions .github/workflows/deploy-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ on:
required: true
firebase_private_key_base64_gcp_secret_name:
required: true
grafana_environment:
required: true
grafana_otlp_endpoint:
required: true
grafana_instance_id:
Expand Down Expand Up @@ -72,6 +74,7 @@ jobs:
env_vars: |-
FIREBASE_CLIENT_EMAIL=${{ secrets.FIREBASE_CLIENT_EMAIL }},
FIREBASE_PROJECT_ID=${{ secrets.FIREBASE_PROJECT_ID }}
GRAFANA_ENVIRONMENT=${{ secrets.grafana_environment }},
GRAFANA_OTLP_ENDPOINT=${{ secrets.grafana_otlp_endpoint }},
GRAFANA_INSTANCE_ID=${{ secrets.grafana_instance_id }},
GRAFANA_API_KEY=${{ secrets.grafana_api_key }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/production-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ jobs:
firebase_project_id: ${{ secrets.FIREBASE_PROJECT_ID }}
firebase_private_key_base64: ${{ secrets.FIREBASE_PRIVATE_KEY_BASE64 }}
firebase_private_key_base64_gcp_secret_name: optic-firebase-private-key
grafana_environment: production
grafana_otlp_endpoint: ${{ secrets.HUB_GRAFANA_OTLP_ENDPOINT }}
grafana_instance_id: ${{ secrets.HUB_GRAFANA_INSTANCE_ID }}
grafana_api_key: ${{ secrets.HUB_GRAFANA_API_KEY }}
20 changes: 0 additions & 20 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"lint": "eslint .",
"lint:fix": "eslint . --fix",
"prettier": "prettier --write '**/*.js?(on)'",
"start": "cross-env NODE_ENV=production node --require ./server/instrumentation.js ./server/index.js",
"start": "node --require ./server/instrumentation.js ./server/index.js",
"test": "node --test",
"husky:install": "npx husky",
"husky:uninstall": "git config --unset core.hooksPath"
Expand Down Expand Up @@ -42,7 +42,6 @@
"@commitlint/cli": "^19.6.1",
"@commitlint/config-conventional": "^19.6.0",
"c8": "^10.1.3",
"cross-env": "^7.0.3",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-config-prettier-standard": "^4.0.1",
Expand Down
2 changes: 1 addition & 1 deletion server/instrumentation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const diagnosticsEnabled = process.env.GRAFANA_DIAGNOSTICS_ENABLED === 'true' //
const endpoint = process.env.GRAFANA_OTLP_ENDPOINT
const instanceId = process.env.GRAFANA_INSTANCE_ID
const apiKey = process.env.GRAFANA_API_KEY
const environment = process.env.NODE_ENV ?? 'development'
const environment = process.env.GRAFANA_ENVIRONMENT ?? 'development'

if (!instrumentationEnabled) {
console.warn('Grafana instrumentation disabled, skipping.')
Expand Down
Loading