opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7776 from zexi/feature/k8s-componet-grafana

Browse Source 
climc: k8s cluster grafana componet support subpath
This commit is contained in:
Zexi Li
2020-09-05 15:37:42 +08:00
committed by GitHub
parent b9b7134262 930a726670
commit 8416e52ab8
1 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/mcclient/options/k8s/cluster.go
+26 -4
View File
@@ -292,10 +292,18 @@ type ClusterComponentMonitorStorage struct {
ClassName string `help:"Storage class name" json:"storageClassName"`
}
type ClusterComponentMonitorGrafanaTlsOpt struct {
CertificateFile string `help:"TLS certificate file" json:"-"`
KeyFile string `help:"TLS key file" json:"-"`
}
type ClusterComponentMonitorGrafana struct {
AdminUser string `help:"Grafana admin user" default:"admin" json:"adminUser"`
AdminPassword string `help:"Grafana admin user password" json:"adminPassword"`
Storage ClusterComponentMonitorStorage `help:"Storage setting"`
AdminUser string `help:"Grafana admin user" default:"admin" json:"adminUser"`
AdminPassword string `help:"Grafana admin user password" json:"adminPassword"`
Storage ClusterComponentMonitorStorage `help:"Storage setting"`
PublicAddress string `help:"Grafana expose public IP address or domain hostname" json:"publicAddress"`
Host string `help:"Grafana ingress host domain name" json:"host"`
Tls ClusterComponentMonitorGrafanaTlsOpt `help:"TLS setting"`
}
type ClusterComponentMonitorLoki struct {
@@ -321,10 +329,24 @@ type ClusterEnableComponentMonitorOpt struct {
ClusterComponentMonitorSetting
}
func (o ClusterEnableComponentMonitorOpt) Params() (*jsonutils.JSONDict, error) {
func (o ClusterEnableComponentMonitorOpt) Params() (jsonutils.JSONObject, error) {
params := o.ClusterComponentOptions.Params("monitor")
setting := jsonutils.Marshal(o.ClusterComponentMonitorSetting)
params.Add(setting, "monitor")
certFile := o.Grafana.Tls.CertificateFile
keyFile := o.Grafana.Tls.KeyFile
if certFile != "" {
cert, err := ioutil.ReadFile(certFile)
if err != nil {
return nil, errors.Wrap(err, "read grafana tls certFile")
}
key, err := ioutil.ReadFile(keyFile)
if err != nil {
return nil, errors.Wrap(err, "read grafana tls keyFile")
}
params.Add(jsonutils.NewString(string(cert)), "monitor", "grafana", "tlsKeyPair", "certificate")
params.Add(jsonutils.NewString(string(key)), "monitor", "grafana", "tlsKeyPair", "key")
}
return params, nil
}