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

Jump to bottom

fix: system_config in mysql #386

Merged
merged 4 commits into from
Feb 16, 2023
Merged

fix: system_config in mysql #386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ba2d0bd
modify read me
Feb 16, 2023
4631d76
Merge branch 'master' of https://github.com/douyu/juno
Feb 16, 2023
b2d21e6
fix test config
Feb 16, 2023
fa46572
adjust sql
Feb 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
8 changes: 4 additions & 4 deletions deployment/install.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2705,7 +2705,7 @@ data:
COLLATE utf8mb4_bin NOT NULL,\n `content` longtext COLLATE utf8mb4_bin NOT NULL,\n
\ `create_time` bigint(20) NOT NULL,\n `update_time` bigint(20) NOT NULL,\n PRIMARY
KEY (`name`)\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;\n\nINSERT
INTO `system_config` (`name`, `content`, `create_time`, `update_time`) VALUES\n('etcd',\t'[{\\\"prefix\\\":\\\"/prometheus/job/\\\",\\\"info\\\":\\\"监控查询\\\"},{\\\"prefix\\\":\\\"grpc:\\\",\\\"info\\\":\\\"grpc\\\"},{\\\"prefix\\\":\\\"http:\\\",\\\"info\\\":\\\"http\\\"}]',\t1673061016,\t1675836035),\n('grafana',\t'{\\\"host\\\":\\\"http://grafana:3000\\\",\\\"scheme\\\":\\\"http\\\",\\\"header_name\\\":\\\"X-WEBAUTH-USER\\\"}',\t1673061016,\t1675836436),\n('version',\t'[{\\\"name\\\":\\\"jupiter1.0\\\",\\\"version\\\":\\\"v1.0\\\",\\\"versionKey\\\":\\\"jupiter1.0\\\",\\\"host\\\":\\\"http://127.0.0.1:3000\\\",\\\"header_name\\\":\\\"X-WEBAUTH-USER\\\",\\\"dashboards\\\":[{\\\"name\\\":\\\"API监控面板地址\\\",\\\"value\\\":\\\"/grafana/d/api\\\"},{\\\"name\\\":\\\"实例监控面板\\\",\\\"value\\\":\\\"/grafana/d/instance\\\"},{\\\"name\\\":\\\"概览监控面板\\\",\\\"value\\\":\\\"/grafana/d/overview\\\"}]}]',\t1673061016,\t0);\n\nDROP
INTO `system_config` (`name`, `content`, `create_time`, `update_time`) VALUES\n('etcd',\t'[{\\\"prefix\\\":\\\"/prometheus/job/\\\",\\\"info\\\":\\\"监控查询\\\"},{\\\"prefix\\\":\\\"grpc:\\\",\\\"info\\\":\\\"grpc\\\"},{\\\"prefix\\\":\\\"http:\\\",\\\"info\\\":\\\"http\\\"}]',\t1673061016,\t1675836035),\n('grafana',\t'{\\\"host\\\":\\\"grafana:3000\\\",\\\"scheme\\\":\\\"http\\\",\\\"header_name\\\":\\\"X-WEBAUTH-USER\\\"}',\t1673061016,\t1676546139),\n('version',\t'[{\\\"name\\\":\\\"jupiter1.0\\\",\\\"version\\\":\\\"v1.0\\\",\\\"versionKey\\\":\\\"jupiter1.0\\\",\\\"dashboards\\\":[{\\\"name\\\":\\\"API监控面板地址\\\",\\\"value\\\":\\\"/grafana/d/api/api?orgId=1\\\"},{\\\"name\\\":\\\"实例监控面板\\\",\\\"value\\\":\\\"/grafana/d/instance/instance?orgId=1\\\"},{\\\"name\\\":\\\"概览监控面板\\\",\\\"value\\\":\\\"/grafana/d/overview/overview?orgId=1\\\"}]}]',\t1673061016,\t1676546237);\n\nDROP
TABLE IF EXISTS `test_pipeline`;\nCREATE TABLE `test_pipeline` (\n `id` bigint(20)
unsigned NOT NULL AUTO_INCREMENT,\n `created_at` datetime(3) DEFAULT NULL,\n
\ `updated_at` datetime(3) DEFAULT NULL,\n `deleted_at` datetime(3) DEFAULT NULL,\n
Expand Down Expand Up @@ -4481,12 +4481,12 @@ spec:
resources: {}
volumeMounts:
- mountPath: /docker-entrypoint-initdb.d
name: test-config
name: db-cm0
restartPolicy: Always
volumes:
- configMap:
name: test-config
name: test-config
name: db-cm0
name: db-cm0
status: {}
---
apiVersion: apps/v1
Expand Down
4 changes: 2 additions & 2 deletions deployment/juno/data/config/initdb/juno.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,8 +879,8 @@ CREATE TABLE `system_config` (

INSERT INTO `system_config` (`name`, `content`, `create_time`, `update_time`) VALUES
('etcd', '[{\"prefix\":\"/prometheus/job/\",\"info\":\"监控查询\"},{\"prefix\":\"grpc:\",\"info\":\"grpc\"},{\"prefix\":\"http:\",\"info\":\"http\"}]', 1673061016, 1675836035),
('grafana', '{\"host\":\"http://grafana:3000\",\"scheme\":\"http\",\"header_name\":\"X-WEBAUTH-USER\"}', 1673061016, 1675836436),
('version', '[{\"name\":\"jupiter1.0\",\"version\":\"v1.0\",\"versionKey\":\"jupiter1.0\",\"host\":\"http://127.0.0.1:3000\",\"header_name\":\"X-WEBAUTH-USER\",\"dashboards\":[{\"name\":\"API监控面板地址\",\"value\":\"/grafana/d/api\"},{\"name\":\"实例监控面板\",\"value\":\"/grafana/d/instance\"},{\"name\":\"概览监控面板\",\"value\":\"/grafana/d/overview\"}]}]', 1673061016, 0);
('grafana', '{\"host\":\"grafana:3000\",\"scheme\":\"http\",\"header_name\":\"X-WEBAUTH-USER\"}', 1673061016, 1676546139),
('version', '[{\"name\":\"jupiter1.0\",\"version\":\"v1.0\",\"versionKey\":\"jupiter1.0\",\"dashboards\":[{\"name\":\"API监控面板地址\",\"value\":\"/grafana/d/api/api?orgId=1\"},{\"name\":\"实例监控面板\",\"value\":\"/grafana/d/instance/instance?orgId=1\"},{\"name\":\"概览监控面板\",\"value\":\"/grafana/d/overview/overview?orgId=1\"}]}]', 1673061016, 1676546237);

DROP TABLE IF EXISTS `test_pipeline`;
CREATE TABLE `test_pipeline` (
Expand Down
6 changes: 3 additions & 3 deletions deployment/juno/install.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,12 +492,12 @@ spec:
resources: {}
volumeMounts:
- mountPath: /docker-entrypoint-initdb.d
name: test-config
name: db-cm0
restartPolicy: Always
volumes:
- configMap:
name: test-config
name: test-config
name: db-cm0
name: db-cm0
status: {}
---
apiVersion: apps/v1
Expand Down