Merge pull request #40 from integr8ly/fix-extra-json

fix datasource json and secure json fields

deploy/examples/datasources/Prometheus.yaml

@@ -13,4 +13,5 @@ spec:
       version: 1
       editable: true
       jsonData:
+        tlsSkipVerify: true
         timeInterval: "5s"

pkg/apis/integreatly/v1alpha1/grafanadatasource_types.go

@@ -48,23 +48,63 @@ type GrafanaDataSourceList struct {
 }
 
 type GrafanaDataSourceFields struct {
-	Name              string            `json:"name"`
-	Type              string            `json:"type"`
-	Access            string            `json:"access"`
-	OrgId             int               `json:"orgId,omitempty"`
-	Url               string            `json:"url"`
-	Password          string            `json:"password,omitempty"`
-	User              string            `json:"user,omitempty"`
-	Database          string            `json:"database,omitempty"`
-	BasicAuth         bool              `json:"basicAuth,omitempty"`
-	BasicAuthUser     string            `json:"basicAuthUser,omitempty"`
-	BasicAuthPassword string            `json:"basicAuthPassword,omitempty"`
-	WithCredentials   bool              `json:"withCredentials,omitempty"`
-	IsDefault         bool              `json:"isDefault,omitempty"`
-	JsonData          map[string]string `json:"jsonData,omitempty"`
-	SecureJsonData    map[string]string `json:"secureJsonData,omitempty"`
-	Version           int               `json:"version,omitempty"`
-	Editable          bool              `json:"editable,omitempty"`
+	Name              string                          `json:"name"`
+	Type              string                          `json:"type"`
+	Access            string                          `json:"access"`
+	OrgId             int                             `json:"orgId,omitempty"`
+	Url               string                          `json:"url"`
+	Password          string                          `json:"password,omitempty"`
+	User              string                          `json:"user,omitempty"`
+	Database          string                          `json:"database,omitempty"`
+	BasicAuth         bool                            `json:"basicAuth,omitempty"`
+	BasicAuthUser     string                          `json:"basicAuthUser,omitempty"`
+	BasicAuthPassword string                          `json:"basicAuthPassword,omitempty"`
+	WithCredentials   bool                            `json:"withCredentials,omitempty"`
+	IsDefault         bool                            `json:"isDefault,omitempty"`
+	JsonData          GrafanaDataSourceJsonData       `json:"jsonData,omitempty"`
+	SecureJsonData    GrafanaDataSourceSecureJsonData `json:"secureJsonData,omitempty"`
+	Version           int                             `json:"version,omitempty"`
+	Editable          bool                            `json:"editable,omitempty"`
+}
+
+// The most common json options
+// See https://grafana.com/docs/administration/provisioning/#datasources
+type GrafanaDataSourceJsonData struct {
+	TlsAuth                 bool   `json:"tlsAuth,omitempty"`
+	TlsAuthWithCACert       bool   `json:"tlsAuthWithCACert,omitempty"`
+	TlsSkipVerify           bool   `json:"tlsSkipVerify,omitempty"`
+	GraphiteVersion         string `json:"graphiteVersion,omitempty"`
+	TimeInterval            string `json:"timeInterval,omitempty"`
+	EsVersion               int    `json:"esVersion,omitempty"`
+	TimeField               string `json:"timeField,omitempty"`
+	Interval                string `json:"interval,omitempty"`
+	LogMessageField         string `json:"logMessageField,omitempty"`
+	LogLevelField           string `json:"logLevelField,omitempty"`
+	AuthType                string `json:"authType,omitempty"`
+	AssumeRoleArn           string `json:"assumeRoleArn,omitempty"`
+	DefaultRegion           string `json:"defaultRegion,omitempty"`
+	CustomMetricsNamespaces string `json:"customMetricsNamespaces,omitempty"`
+	TsdbVersion             string `json:"tsdbVersion,omitempty"`
+	TsdbResolution          string `json:"tsdbResolution,omitempty"`
+	Sslmode                 string `json:"sslmode,omitempty"`
+	Encrypt                 string `json:"encrypt,omitempty"`
+	PostgresVersion         int    `json:"postgresVersion,omitempty"`
+	Timescaledb             bool   `json:"timescaledb,omitempty"`
+	MaxOpenConns            int    `json:"maxOpenConns,omitempty"`
+	MaxIdleConns            int    `json:"maxIdleConns,omitempty"`
+	ConnMaxLifetime         int    `json:"connMaxLifetime,omitempty"`
+}
+
+// The most common secure json options
+// See https://grafana.com/docs/administration/provisioning/#datasources
+type GrafanaDataSourceSecureJsonData struct {
+	TlsCaCert         string `json:"tlsCACert,omitempty"`
+	TlsClientCert     string `json:"tlsClientCert,omitempty"`
+	TlsClientKey      string `json:"tlsClientKey,omitempty"`
+	Password          string `json:"password,omitempty"`
+	BasicAuthPassword string `json:"basicAuthPassword,omitempty"`
+	AccessKey         string `json:"accessKey,omitempty"`
+	SecretKey         string `json:"secretKey,omitempty"`
 }
 
 func init() {