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

Swap datasource to proxysql #121

Merged
merged 2 commits into from
Dec 5, 2024
Merged

Swap datasource to proxysql #121

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
5098e36
Swap datasource to proxysql
cmmarslender Dec 5, 2024
75cbf40
DB_HOST var isn't necessary anymore
cmmarslender Dec 5, 2024
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: 0 additions & 1 deletion .github/workflows/build-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ jobs:
token: ${{ env.VAULT_TOKEN }}
secrets: |
secret/data/${{ matrix.colo.region }}/k8s/k8s-${{ matrix.colo.region }} api_server_url | K8S_API_SERVER_URL;
secret/data/${{ matrix.colo.region }}/mysql/db-info host | DB_HOST;
secret/data/${{ matrix.colo.region }}/mysql/users/grafana-read-pub username | GRAFANA_PUB_READ_USERNAME;
secret/data/${{ matrix.colo.region }}/mysql/users/grafana-read-pub password | GRAFANA_PUB_READ_PASSWORD;

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/deploy-review.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ jobs:
token: ${{ env.VAULT_TOKEN }}
secrets: |
secret/data/msp/k8s/k8s-msp api_server_url | K8S_API_SERVER_URL;
secret/data/msp/mysql/db-info host | DB_HOST;
secret/data/msp/mysql/users/grafana-read-pub username | GRAFANA_PUB_READ_USERNAME;
secret/data/msp/mysql/users/grafana-read-pub password | GRAFANA_PUB_READ_PASSWORD;

Expand Down
7 changes: 5 additions & 2 deletions helm/values.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,14 @@ networkPolicy:
- Egress
egressRules:
- to:
- ipBlock:
cidr: "{{ DB_HOST }}/32"
- namespaceSelector:
matchLabels:
kubernetes.io/metadata.name: proxysql
ports:
- protocol: TCP
port: 3306
- protocol: TCP
port: 6033
- to:
- namespaceSelector:
matchLabels:
Expand Down
2 changes: 1 addition & 1 deletion templates/datasources.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ datasources:
editable: False
- name: block-data
type: mysql
url: {{ DB_HOST }}:3306
url: "proxysql-generic.proxysql:3306"
uid: P00A25F4DA48796D5
user: '{{ GRAFANA_PUB_READ_USERNAME }}'
jsonData:
Expand Down
Loading