STRLCPY/CVE-2023-22480_KubeOperator

fix(tool): grafana 安装配置调整
ssongliu committed 2 years ago

c3aba310

1 parent 9e14abb9

Revision indexing in progress... (symbol navigation in revisions will be accurate after indexed)

■ ■ ■ ■ ■ ■

migration/110_upgrade_tools.up.sql

		skipped 67 lines
68	68		'6.19.0',
69	69		'all',
70	70		NULL,
71		-	'{"grafana_image_name":"grafana/grafana","grafana_image_tag":"8.3.1","bats_image_name":"bats/bats","bats_image_tag":"v1.4.1","busybox_image_name":"busybox","busybox_image_tag":"1.31.1","curl_image_name":"curlimages/curl","curl_image_tag":"7.73.0"}',
	71	+	'{"grafana_image_name":"grafana/grafana","grafana_image_tag":"8.3.1","busybox_image_name":"kubeoperator/busybox","busybox_image_tag":"1.31.1","curl_image_name":"curlimages/curl","curl_image_tag":"7.73.0"}',
72	72		date_add(now(), interval 8 HOUR),
73	73		date_add(now(), interval 8 HOUR)
74	74		);
		skipped 1 lines
76	76		UPDATE
77	77		`ko`.`ko_cluster_tool_detail`
78	78		SET
79		-	vars = '{"grafana_image_name":"grafana/grafana","grafana_image_tag":"7.3.3","bats_image_name":"bats/bats","bats_image_tag":"v1.1.0","busybox_image_name":"kubeoperator/busybox","busybox_image_tag":"1.28","curl_image_name":"curlimages/curl","curl_image_tag":"7.73.0"}'
	79	+	vars = '{"grafana_image_name":"grafana/grafana","grafana_image_tag":"7.3.3","busybox_image_name":"kubeoperator/busybox","busybox_image_tag":"1.28","curl_image_name":"curlimages/curl","curl_image_tag":"7.73.0"}'
80	80		WHERE
81	81		name = 'grafana'
82	82		AND version = 'v7.3.3';
		skipped 37 lines

■ ■ ■ ■ ■ ■

pkg/service/cluster/tools/grafana.go

		skipped 41 lines
42	42		values["initChownData.image.tag"] = imageMap["busybox_image_tag"]
43	43		values["downloadDashboardsImage.repository"] = fmt.Sprintf("%s:%d/%s", g.LocalHostName, g.LocalRepositoryPort, imageMap["curl_image_name"])
44	44		values["downloadDashboardsImage.tag"] = imageMap["curl_image_tag"]
45		-	values["testFramework.image"] = fmt.Sprintf("%s:%d/%s", g.LocalHostName, g.LocalRepositoryPort, imageMap["bats_image_name"])
46		-	values["testFramework.tag"] = imageMap["bats_image_tag"]
47	45
48	46		if isInstall {
49	47		values["grafana\\.ini.server.root_url"] = "%(protocol)s://%(domain)s:%(http_port)s/proxy/grafana/" + g.Cluster.Name + "/"
50	48		values["grafana\\.ini.server.serve_from_sub_path"] = true
51	49
52		-	values["datasources.'datasources\\.yaml'.apiVersion"] = 1
	50	+	values["datasources.datasources\\.yaml.apiVersion"] = 1
53	51
54	52		if len(g.prometheusNs) != 0 {
55		-	values["datasources.'datasources\\.yaml'.datasources[0].name"] = "MYDS_Prometheus"
56		-	values["datasources.'datasources\\.yaml'.datasources[0].type"] = "prometheus"
57		-	values["datasources.'datasources\\.yaml'.datasources[0].url"] = "http://prometheus-server." + g.prometheusNs
58		-	values["datasources.'datasources\\.yaml'.datasources[0].access"] = "proxy"
59		-	values["datasources.'datasources\\.yaml'.datasources[0].isDefault"] = true
	53	+	values["datasources.datasources\\.yaml.datasources[0].name"] = "MYDS_Prometheus"
	54	+	values["datasources.datasources\\.yaml.datasources[0].type"] = "prometheus"
	55	+	values["datasources.datasources\\.yaml.datasources[0].url"] = "http://prometheus-server." + g.prometheusNs
	56	+	values["datasources.datasources\\.yaml.datasources[0].access"] = "proxy"
	57	+	values["datasources.datasources\\.yaml.datasources[0].isDefault"] = true
60	58		}
61	59		if len(g.lokiNs) != 0 {
62		-	values["datasources.'datasources\\.yaml'.datasources[1].name"] = "Loki"
63		-	values["datasources.'datasources\\.yaml'.datasources[1].type"] = "loki"
64		-	values["datasources.'datasources\\.yaml'.datasources[1].url"] = "http://loki." + g.lokiNs + ":3100"
65		-	values["datasources.'datasources\\.yaml'.datasources[1].access"] = "proxy"
	60	+	values["datasources.datasources\\.yaml.datasources[1].name"] = "Loki"
	61	+	values["datasources.datasources\\.yaml.datasources[1].type"] = "loki"
	62	+	values["datasources.datasources\\.yaml.datasources[1].url"] = "http://loki." + g.lokiNs + ":3100"
	63	+	values["datasources.datasources\\.yaml.datasources[1].access"] = "proxy"
66	64		}
67	65
68		-	values["dashboardProviders.'dashboardproviders\\.yaml'.apiVersion"] = 1
69		-	values["dashboardProviders.'dashboardproviders\\.yaml'.providers[0].name"] = "default"
70		-	values["dashboardProviders.'dashboardproviders\\.yaml'.providers[0].orgId"] = 1
71		-	values["dashboardProviders.'dashboardproviders\\.yaml'.providers[0].folder"] = ""
72		-	values["dashboardProviders.'dashboardproviders\\.yaml'.providers[0].type"] = "file"
73		-	values["dashboardProviders.'dashboardproviders\\.yaml'.providers[0].disableDeletion"] = false
74		-	values["dashboardProviders.'dashboardproviders\\.yaml'.providers[0].editable"] = true
75		-	values["dashboardProviders.'dashboardproviders\\.yaml'.providers[0].options.path"] = "/var/lib/grafana/dashboards/default"
	66	+	values["dashboardProviders.dashboardproviders\\.yaml.apiVersion"] = 1
	67	+	values["dashboardProviders.dashboardproviders\\.yaml.providers[0].name"] = "default"
	68	+	values["dashboardProviders.dashboardproviders\\.yaml.providers[0].orgId"] = 1
	69	+	values["dashboardProviders.dashboardproviders\\.yaml.providers[0].type"] = "file"
	70	+	values["dashboardProviders.dashboardproviders\\.yaml.providers[0].disableDeletion"] = false
	71	+	values["dashboardProviders.dashboardproviders\\.yaml.providers[0].editable"] = true
	72	+	values["dashboardProviders.dashboardproviders\\.yaml.providers[0].options.path"] = "/var/lib/grafana/dashboards/default"
76	73		values["dashboards.default.custom-dashboard.file"] = "dashboards/custom-dashboard.json"
77	74
78	75		if _, ok := values["persistence.size"]; ok {
		skipped 36 lines

fix(tool): grafana 安装配置调整