chore: refactor config generator

apecloud · Oct 24, 2023 · 1189cc5 · 1189cc5
1 parent 9c86eca
commit 1189cc5
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 25 deletions.
diff --git a/apis/monitor/v1alpha1/appdatasource_types.go b/apis/monitor/v1alpha1/appdatasource_types.go
@@ -43,9 +43,9 @@ type InputConfig struct {
 }
 
 type LogsDataSource struct {
-	Enable bool `json:"enable,omitempty"`
+	Enable bool `json:"enabled,omitempty"`
 
-	LogCollector *InputConfig `json:"logCollector,omitempty"`
+	LogCollector map[string]InputConfig `json:"logCollector,omitempty"`
 }
 
 // AppDataSourceSpec defines the desired state of AppDataSource

diff --git a/apis/monitor/v1alpha1/zz_generated.deepcopy.go b/apis/monitor/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/monitor.kubeblocks.io_appdatasources.yaml b/config/crd/bases/monitor.kubeblocks.io_appdatasources.yaml
@@ -54,14 +54,16 @@ spec:
               logs:
                 description: LogsConfig is the logs config
                 properties:
-                  enable:
+                  enabled:
                     type: boolean
                   logCollector:
-                    properties:
-                      include:
-                        items:
-                          type: string
-                        type: array
+                    additionalProperties:
+                      properties:
+                        include:
+                          items:
+                            type: string
+                          type: array
+                      type: object
                     type: object
                 type: object
               metrics:

diff --git a/controllers/monitor/reconcile/configmap.go b/controllers/monitor/reconcile/configmap.go
@@ -52,6 +52,10 @@ func ConfigMap(reqCtx types.ReconcileCtx, params types.OTeldParams) error {
 		if configmap != nil {
 			desired = append(desired, configmap)
 		}
+		engineConfig, _ := buildEngineConfigForOteld(deployment, reqCtx.OTeld.Namespace, cg)
+		if engineConfig != nil {
+			desired = append(desired, engineConfig)
+		}
 	}
 
 	if err := expectedConfigMap(reqCtx, params, desired); err != nil {

diff --git a/controllers/monitor/reconcile/oteld.go b/controllers/monitor/reconcile/oteld.go
@@ -95,7 +95,7 @@ func BuildInstanceMapForPipline(datasources *v1alpha1.CollectorDataSourceList, a
 		}
 		oteldInstance.MetricsPipline = append(oteldInstance.MetricsPipline, pipline)
 
-		instanceMap[dataSource.Spec.Mode] = oteldInstance
+		instanceMap[mode] = oteldInstance
 	}
 
 	for _, dataSource := range appDatasources.Items {
@@ -111,7 +111,7 @@ func BuildInstanceMapForPipline(datasources *v1alpha1.CollectorDataSourceList, a
 			oteldInstance.AppDataSources = []v1alpha1.AppDataSource{}
 		}
 		oteldInstance.AppDataSources = append(oteldInstance.AppDataSources, dataSource)
-		instanceMap[dataSource.Spec.Mode] = oteldInstance
+		instanceMap[mode] = oteldInstance
 	}
 	return instanceMap, nil
 }
diff --git a/controllers/monitor/types/otel_config.go b/controllers/monitor/types/otel_config.go
@@ -295,7 +295,7 @@ func (cg *OteldConfigGenerater) GenerateEngineConfiguration(instance *OteldInsta
 	cfg = append(cfg, infraSlice...)
 	defaultConfigSlice := yaml.MapSlice{}
 	for _, dataSource := range instance.AppDataSources {
-		valMap = buildEngineValMap(dataSource, instance)
+		valMap = buildEngineValMap(dataSource)
 		configSlice, err := buildSliceFromCUE(engineTplPath, valMap)
 		if err != nil {
 			return nil, err
@@ -307,19 +307,18 @@ func (cg *OteldConfigGenerater) GenerateEngineConfiguration(instance *OteldInsta
 	return cfg, nil
 }
 
-func buildEngineValMap(source v1alpha1.AppDataSource, instance *OteldInstance) map[string]any {
-	collectorInterval := instance.Oteld.Spec.CollectionInterval
-	if source.Spec.CollectionInterval != "" {
-		collectorInterval = source.Spec.CollectionInterval
-	}
+func buildEngineValMap(source v1alpha1.AppDataSource) map[string]any {
 	return map[string]any{
 		"cluster_name":                source.Spec.ClusterName,
 		"component_name":              source.Spec.ComponentName,
 		"container_name":              source.Spec.ContainerName,
 		"metrics.enabled":             source.Spec.Metrics.Enable,
-		"metrics.collection_interval": collectorInterval,
+		"metrics.collection_interval": source.Spec.Metrics.MetricsCollector.CollectionInterval,
 		"logs.enabled":                source.Spec.Logs.Enable,
+		"metrics.enabled_metrics":     source.Spec.Metrics.MetricsCollector.EnabledMetrics,
+		"logs.include":                source.Spec.Logs.LogCollector,
 	}
+
 }
 
 func buildEngineInfraValMap(instance *OteldInstance) map[string]any {

diff --git a/controllers/monitor/types/types.go b/controllers/monitor/types/types.go
@@ -75,6 +75,7 @@ func NewReconcileTask(name string, task ReconcileFunc) ReconcileTask {
 			},
 			// Config:      reqCtx.Config,
 			// Namespace:   reqCtx.Namespace,
+			OTeld:       reqCtx.OTeld,
 			OteldCfgRef: reqCtx.OteldCfgRef,
 		}
 		return task(reqCtx)

diff --git a/deploy/helm/crds/monitor.kubeblocks.io_appdatasources.yaml b/deploy/helm/crds/monitor.kubeblocks.io_appdatasources.yaml
@@ -54,14 +54,16 @@ spec:
               logs:
                 description: LogsConfig is the logs config
                 properties:
-                  enable:
+                  enabled:
                     type: boolean
                   logCollector:
-                    properties:
-                      include:
-                        items:
-                          type: string
-                        type: array
+                    additionalProperties:
+                      properties:
+                        include:
+                          items:
+                            type: string
+                          type: array
+                      type: object
                     type: object
                 type: object
               metrics: