feat: Add support for all workloads: Deployment, Daemonset, Jobs, Sta…

…tefulsets (#1530) Co-authored-by: Korbinian Stoemmer <[email protected]> Co-authored-by: Hisar Balik <[email protected]> Co-authored-by: Mostafa Shorim <[email protected]>
kyma-project · Oct 28, 2024 · 849cdec · 849cdec
1 parent 82dc218
commit 849cdec
Show file tree

Hide file tree

Showing 34 changed files with 1,814 additions and 708 deletions.
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -183,8 +183,8 @@ linters-settings:
   gocyclo:
     # Minimal code complexity to report.
     # Default: 30
-    # The max complexity while enabling this linter is 15. Please check if this can be reduced. Increase the threshold only if it is absolutely necessary.
-    min-complexity: 15
+    # The max complexity while enabling this linter is 17. Please check if this can be reduced. Increase the threshold only if it is absolutely necessary.
+    min-complexity: 17
 
   wsl:
     allow-trailing-comment: true
@@ -228,7 +228,7 @@ issues:
     - linters: [ errcheck ]
       path: test/testkit/otel/traces/traces.go
     - linters: [ dupl ]
-      path: test/testkit/assert/(deployment|daemon_set|metrics|traces).go
+      path: test/testkit/assert/(deployment|daemon_set|metrics|traces|stateful_set|jobs).go
     - linters: [ dupl ]
       path: main.go
     - linters:

diff --git a/apis/telemetry/v1alpha1/metricpipeline_types.go b/apis/telemetry/v1alpha1/metricpipeline_types.go
@@ -102,7 +102,7 @@ type MetricPipelineRuntimeInput struct {
 	Namespaces *NamespaceSelector `json:"namespaces,omitempty"`
 	// Describes the Kubernetes resources for which runtime metrics are scraped.
 	// +optional
-	// +kubebuilder:default={pod: {enabled: true}, container: {enabled: true}, node: {enabled: false}, volume: {enabled: false}}
+	// +kubebuilder:default={pod: {enabled: true}, container: {enabled: true}, node: {enabled: false}, volume: {enabled: false}, daemonset: {enabled: false}, deployment: {enabled: false}, statefulset: {enabled: false}, job: {enabled: false}}
 	Resources *MetricPipelineRuntimeInputResources `json:"resources,omitempty"`
 }
 
@@ -124,6 +124,22 @@ type MetricPipelineRuntimeInputResources struct {
 	// +optional
 	// +kubebuilder:default={enabled: false}
 	Volume *MetricPipelineRuntimeInputResourceDisabledByDefault `json:"volume,omitempty"`
+	// Configures DaemonSet runtime metrics scraping.
+	// +optional
+	// +kubebuilder:default={enabled: false}
+	DaemonSet *MetricPipelineRuntimeInputResourceDisabledByDefault `json:"daemonset,omitempty"`
+	// Configures Deployment runtime metrics scraping.
+	// +optional
+	// +kubebuilder:default={enabled: false}
+	Deployment *MetricPipelineRuntimeInputResourceDisabledByDefault `json:"deployment,omitempty"`
+	// Configures StatefulSet runtime metrics scraping.
+	// +optional
+	// +kubebuilder:default={enabled: false}
+	StatefulSet *MetricPipelineRuntimeInputResourceDisabledByDefault `json:"statefulset,omitempty"`
+	// Configures Job runtime metrics scraping.
+	// +optional
+	// +kubebuilder:default={enabled: false}
+	Job *MetricPipelineRuntimeInputResourceDisabledByDefault `json:"job,omitempty"`
 }
 
 // MetricPipelineRuntimeInputResourceEnabledByDefault defines if the scraping of runtime metrics is enabled for a specific resource. The scraping is enabled by default.

diff --git a/apis/telemetry/v1alpha1/zz_generated.deepcopy.go b/apis/telemetry/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/telemetry/v1beta1/metricpipeline_types.go b/apis/telemetry/v1beta1/metricpipeline_types.go
@@ -102,7 +102,7 @@ type MetricPipelineRuntimeInput struct {
 	Namespaces *NamespaceSelector `json:"namespaces,omitempty"`
 	// Describes the Kubernetes resources for which runtime metrics are scraped.
 	// +optional
-	// +kubebuilder:default={pod: {enabled: true}, container: {enabled: true}, node: {enabled: false}, volume: {enabled: false}}
+	// +kubebuilder:default={pod: {enabled: true}, container: {enabled: true}, node: {enabled: false}, volume: {enabled: false}, daemonset: {enabled: false}, deployment: {enabled: false}, statefulset: {enabled: false}, job: {enabled: false}}
 	Resources *MetricPipelineRuntimeInputResources `json:"resources,omitempty"`
 }
 
@@ -124,6 +124,22 @@ type MetricPipelineRuntimeInputResources struct {
 	// +optional
 	// +kubebuilder:default={enabled: false}
 	Volume *MetricPipelineRuntimeInputResourceDisabledByDefault `json:"volume,omitempty"`
+	// Configures DaemonSet runtime metrics scraping.
+	// +optional
+	// +kubebuilder:default={enabled: false}
+	DaemonSet *MetricPipelineRuntimeInputResourceDisabledByDefault `json:"daemonset,omitempty"`
+	// Configures Deployment runtime metrics scraping.
+	// +optional
+	// +kubebuilder:default={enabled: false}
+	Deployment *MetricPipelineRuntimeInputResourceDisabledByDefault `json:"deployment,omitempty"`
+	// Configures StatefulSet runtime metrics scraping.
+	// +optional
+	// +kubebuilder:default={enabled: false}
+	StatefulSet *MetricPipelineRuntimeInputResourceDisabledByDefault `json:"statefulset,omitempty"`
+	// Configures Job runtime metrics scraping.
+	// +optional
+	// +kubebuilder:default={enabled: false}
+	Job *MetricPipelineRuntimeInputResourceDisabledByDefault `json:"job,omitempty"`
 }
 
 // MetricPipelineRuntimeInputResourceEnabledByDefault defines if the scraping of runtime metrics is enabled for a specific resource. The scraping is enabled by default.

diff --git a/apis/telemetry/v1beta1/zz_generated.deepcopy.go b/apis/telemetry/v1beta1/zz_generated.deepcopy.go
diff --git a/config/busola/metricpipeline_busola_extension_cm.yaml b/config/busola/metricpipeline_busola_extension_cm.yaml
@@ -115,6 +115,18 @@ data:
                   - name: Volume
                     visibility: $exists(spec.input.runtime.resources.volume)
                     source: spec.input.runtime.resources.volume.enabled
+                  - name: DaemonSet
+                    visibility: $exists(spec.input.runtime.resources.daemonset)
+                    source: spec.input.runtime.resources.daemonset.enabled
+                  - name: Deployment
+                    visibility: $exists(spec.input.runtime.resources.deployment)
+                    source: spec.input.runtime.resources.deployment.enabled
+                  - name: StatefulSet
+                    visibility: $exists(spec.input.runtime.resources.statefulset)
+                    source: spec.input.runtime.resources.statefulset.enabled
+                  - name: Job
+                    visibility: $exists(spec.input.runtime.resources.job)
+                    source: spec.input.runtime.resources.job.enabled
           - name: OTLP
             widget: Panel
             visibility: $exists(spec.input.otlp)
@@ -350,6 +362,18 @@ data:
               - name: Enable Volume Metrics
                 path: volume.enabled
                 simple: true
+              - name: Enable DaemonSet Metrics
+                path: daemonset.enabled
+                simple: true
+              - name: Enable Deployment Metrics
+                path: deployment.enabled
+                simple: true
+              - name: Enable StatefulSet Metrics
+                path: statefulset.enabled
+                simple: true
+              - name: Enable Job Metrics
+                path: job.enabled
+                simple: true
         - name: OTLP
           path: otlp
           widget: FormGroup

diff --git a/config/crd/bases/telemetry.kyma-project.io_metricpipelines.yaml b/config/crd/bases/telemetry.kyma-project.io_metricpipelines.yaml
@@ -219,10 +219,18 @@ spec:
                         default:
                           container:
                             enabled: true
+                          daemonset:
+                            enabled: false
+                          deployment:
+                            enabled: false
+                          job:
+                            enabled: false
                           node:
                             enabled: false
                           pod:
                             enabled: true
+                          statefulset:
+                            enabled: false
                           volume:
                             enabled: false
                         description: Describes the Kubernetes resources for which
@@ -239,6 +247,39 @@ spec:
                                   resource are scraped. The default is `true`.
                                 type: boolean
                             type: object
+                          daemonset:
+                            default:
+                              enabled: false
+                            description: Configures DaemonSet runtime metrics scraping.
+                            properties:
+                              enabled:
+                                default: false
+                                description: If enabled, the runtime metrics for the
+                                  resource are scraped. The default is `false`.
+                                type: boolean
+                            type: object
+                          deployment:
+                            default:
+                              enabled: false
+                            description: Configures Deployment runtime metrics scraping.
+                            properties:
+                              enabled:
+                                default: false
+                                description: If enabled, the runtime metrics for the
+                                  resource are scraped. The default is `false`.
+                                type: boolean
+                            type: object
+                          job:
+                            default:
+                              enabled: false
+                            description: Configures Job runtime metrics scraping.
+                            properties:
+                              enabled:
+                                default: false
+                                description: If enabled, the runtime metrics for the
+                                  resource are scraped. The default is `false`.
+                                type: boolean
+                            type: object
                           node:
                             default:
                               enabled: false
@@ -261,6 +302,17 @@ spec:
                                   resource are scraped. The default is `true`.
                                 type: boolean
                             type: object
+                          statefulset:
+                            default:
+                              enabled: false
+                            description: Configures StatefulSet runtime metrics scraping.
+                            properties:
+                              enabled:
+                                default: false
+                                description: If enabled, the runtime metrics for the
+                                  resource are scraped. The default is `false`.
+                                type: boolean
+                            type: object
                           volume:
                             default:
                               enabled: false