Merge branch 'main' of github.com:kyma-project/telemetry-manager into…

… remove-legacy-status-conditions

config/busola/logpipeline_busola_extension_cm.yaml

@@ -24,7 +24,7 @@ data:
         highlights:
           positive:
             - 'false'
-          negative:
+          critical:
             - 'true'
     body:
       - source: status.conditions
@@ -37,9 +37,9 @@ data:
             name: Status
             widget: Badge
             highlights:
-              success:
+              positive:
                 - 'True'
-              error:
+              critical:
                 - 'False'
           - source: reason
             name: Reason
@@ -431,7 +431,7 @@ data:
       highlights:
         positive:
           - 'false'
-        negative:
+        critical:
           - 'true'
     - name: Status
       source: status.conditions
@@ -444,7 +444,7 @@ data:
           source: status
           widget: Badge
           highlights:
-            success:
+            positive:
               - 'True'
-            error:
+            critical:
               - 'False'

config/busola/metricpipeline_busola_extension_cm.yaml

@@ -28,9 +28,9 @@ data:
             name: Status
             widget: Badge
             highlights:
-              success:
+              positive:
                 - 'True'
-              error:
+              critical:
                 - 'False'
           - source: reason
             name: Reason
@@ -547,7 +547,7 @@ data:
           source: status
           widget: Badge
           highlights:
-            success:
+            positive:
               - 'True'
-            error:
+            critical:
               - 'False'

config/busola/telemetry_busola_extension_cm.yaml

@@ -51,9 +51,9 @@ data:
             name: Status
             widget: Badge
             highlights:
-              success:
+              positive:
                 - 'True'
-              error:
+              critical:
                 - 'False'
           - source: reason
             name: Reason

config/busola/tracepipeline_busola_extension_cm.yaml

@@ -28,9 +28,9 @@ data:
             name: Status
             widget: Badge
             highlights:
-              success:
+              positive:
                 - 'True'
-              error:
+              critical:
                 - 'False'
           - source: reason
             name: Reason
@@ -379,7 +379,7 @@ data:
           source: status
           widget: Badge
           highlights:
-            success:
+            positive:
               - 'True'
-            error:
+            critical:
               - 'False'

docs/contributor/benchmarks/README.md

@@ -307,6 +307,7 @@ Each test scenario has its own test scripts responsible for preparing the test s
 | 3.0.7 (new metrics) |                  4036                   |                   7173                   |              31689              |       825,852        |    0.1,0.1    |                  2481                   |                   1852                   |             104689              |       747,395        |     0.1,0     |                   1520                   |                   484                    |              37907              |       561,731        |    0.1,0.1    |                   807                    |                    58                    |              94365              |       544,211        |      0,0      |
 |         3.0.7 (new) |                  9514                   |                  30273                   |              30263              |       105, 113       |     1, 1      |                  9027                   |                  23850                   |             1521511             |       186, 552       |    1, 0.7     |                   7285                   |                   8357                   |             1891569             |       662, 668       |   0.8, 0.8    |                   5602                   |                   2619                   |             5249308             |       680, 713       |   0.5, 0.5    |
 
+
 </div>
 
 ## Self Monitor
@@ -352,11 +353,12 @@ Configured memory, CPU limits, and storage are based on this base value and will
 
 <div class="table-wrapper" markdown="block">
 
-| Version/Test |      Default       |                      |                               |                      |               | 
-|-------------:|:------------------:|:--------------------:|:-----------------------------:|:--------------------:|:-------------:|
-|              | Scrape Samples/sec | Total Series Created | Head Chunk Storage Size/bytes | Pod Memory Usage(MB) | Pod CPU Usage | 
-|       2.45.5 |        15.4        |         157          |            131072             |          62          |       0       | 
-|  2.45.5(new) |        15.4        |         239          |            131072             |          42          |       0       | 
+| Version/Test |Default (ci-self-monitor)|                 |                                  |                      |               | 
+|-------------:|:------------------:|:--------------------:|:--------------------------------:|:--------------------:|:-------------:|
+|              | Scrape Samples/sec | Total Series Created | Head Chunk Storage Size in bytes | Pod Memory Usage(MB) | Pod CPU Usage | 
+|       2.45.5 |        15.4        |         157          |            131072                |          62          |       0       | 
+|  2.45.5(new) |        15.4        |         239          |            131072                |          42          |       0       | 
+|       2.53.0 |        20.4        |         210          |                 0                |          36          |       0       |
 
 
 </div>

go.mod

@@ -12,7 +12,7 @@ require (
 	github.com/prometheus/client_model v0.6.1
 	github.com/prometheus/common v0.54.0
 	github.com/stretchr/testify v1.9.0
-	go.opentelemetry.io/collector/pdata v1.9.0
+	go.opentelemetry.io/collector/pdata v1.10.0
 	go.uber.org/zap v1.27.0
 	google.golang.org/protobuf v1.34.2
 	gopkg.in/yaml.v3 v3.0.1

go.sum

@@ -109,8 +109,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-go.opentelemetry.io/collector/pdata v1.9.0 h1:qyXe3HEVYYxerIYu0rzgo1Tx2d1Zs6iF+TCckbHLFOw=
-go.opentelemetry.io/collector/pdata v1.9.0/go.mod h1:vk7LrfpyVpGZrRWcpjyy0DDZzL3SZiYMQxfap25551w=
+go.opentelemetry.io/collector/pdata v1.10.0 h1:oLyPLGvPTQrcRT64ZVruwvmH/u3SHTfNo01pteS4WOE=
+go.opentelemetry.io/collector/pdata v1.10.0/go.mod h1:IHxHsp+Jq/xfjORQMDJjSH6jvedOSTOyu3nbxqhWSYE=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=

hack/load-tests/run-load-test.sh

@@ -361,11 +361,11 @@ function get_result_and_cleanup_fluentbit() {
 # shellcheck disable=SC2112
 function get_result_and_cleanup_selfmonitor() {
    # ingestion rate per second for scrape samples https://valyala.medium.com/prometheus-storage-technical-terms-for-humans-4ab4de6c3d48
-   SCRAPESAMPLES=$(curl -fs --data-urlencode 'query=sum_over_time(scrape_samples_scraped{service="telemetry-self-monitor-metrics"}[20m]) / 1200' localhost:9090/api/v1/query | jq -r '.data.result[] | .value[1]')
+   SCRAPESAMPLES=$(curl -fs --data-urlencode 'query=round(sum(sum_over_time(scrape_samples_scraped{service="telemetry-self-monitor-metrics"}[20m]) / 1200))' localhost:9090/api/v1/query | jq -r '.data.result[] | .value[1]')
 
-   SERIESCREATED=$(curl -fs --data-urlencode 'query=max(prometheus_tsdb_head_series{service="telemetry-self-monitor-metrics"})' localhost:9090/api/v1/query | jq -r '.data.result[] | .value[1]')
+   SERIESCREATED=$(curl -fs --data-urlencode 'query=round(sum(max_over_time(prometheus_tsdb_head_series{service="telemetry-self-monitor-metrics"}[20m])))' localhost:9090/api/v1/query | jq -r '.data.result[] | .value[1]')
 
-   HEADSTORAGESIZE=$(curl -fs --data-urlencode 'query=max(prometheus_tsdb_head_chunks_storage_size_bytes{service="telemetry-self-monitor-metrics"})' localhost:9090/api/v1/query | jq -r '.data.result[] | .value[1]')
+   HEADSTORAGESIZE=$(curl -fs --data-urlencode 'query=round(sum(max_over_time(prometheus_tsdb_head_chunks_storage_size_bytes{service="telemetry-self-monitor-metrics"}[20m])))' localhost:9090/api/v1/query | jq -r '.data.result[] | .value[1]')
 
    MEMORY=$(curl -fs --data-urlencode 'query=round(sum(avg_over_time(container_memory_working_set_bytes{namespace="kyma-system", container="self-monitor"}[20m]) * on(namespace,pod) group_left(workload) avg_over_time(namespace_workload_pod:kube_pod_owner:relabel{namespace="kyma-system", workload="telemetry-self-monitor"}[20m])) by (pod) / 1024 / 1024)' localhost:9090/api/v1/query | jq -r '.data.result[] | .value[1]')
 

internal/reconciler/logpipeline/reconciler.go

@@ -223,11 +223,7 @@ func (r *Reconciler) reconcileFluentBit(ctx context.Context, pipeline *telemetry
 		return fmt.Errorf("failed to reconcile fluent bit metrics service: %w", err)
 	}
 
-	includeSections := true
-	if len(pipelines) == 0 {
-		includeSections = false
-	}
-	cm := fluentbit.MakeConfigMap(r.config.DaemonSet, includeSections)
+	cm := fluentbit.MakeConfigMap(r.config.DaemonSet)
 	if err := k8sutils.CreateOrUpdateConfigMap(ctx, ownerRefSetter, cm); err != nil {
 		return fmt.Errorf("failed to reconcile fluent bit configmap: %w", err)
 	}

internal/reconciler/metricpipeline/reconciler.go

@@ -48,12 +48,14 @@ type GatewayConfigBuilder interface {
 	Build(ctx context.Context, pipelines []telemetryv1alpha1.MetricPipeline) (*gateway.Config, otlpexporter.EnvVars, error)
 }
 
-type AgentResourcesHandler interface {
+//go:generate mockery --name AgentApplierDeleter --filename agent_applier_deleter.go
+type AgentApplierDeleter interface {
 	ApplyResources(ctx context.Context, c client.Client, opts otelcollector.AgentApplyOptions) error
 	DeleteResources(ctx context.Context, c client.Client) error
 }
 
-type GatewayResourcesHandler interface {
+//go:generate mockery --name GatewayApplierDeleter --filename gateway_applier_deleter.go
+type GatewayApplierDeleter interface {
 	ApplyResources(ctx context.Context, c client.Client, opts otelcollector.GatewayApplyOptions) error
 	DeleteResources(ctx context.Context, c client.Client, isIstioActive bool) error
 }
@@ -97,17 +99,17 @@ type Reconciler struct {
 	client.Client
 	config Config
 
-	agentConfigBuilder      AgentConfigBuilder
-	gatewayConfigBuilder    GatewayConfigBuilder
-	agentResourcesHandler   AgentResourcesHandler
-	gatewayResourcesHandler GatewayResourcesHandler
-	pipelineLock            PipelineLock
-	gatewayProber           DeploymentProber
-	agentProber             DaemonSetProber
-	flowHealthProber        FlowHealthProber
-	tlsCertValidator        TLSCertValidator
-	overridesHandler        OverridesHandler
-	istioStatusChecker      IstioStatusChecker
+	agentConfigBuilder    AgentConfigBuilder
+	gatewayConfigBuilder  GatewayConfigBuilder
+	agentApplierDeleter   AgentApplierDeleter
+	gatewayApplierDeleter GatewayApplierDeleter
+	pipelineLock          PipelineLock
+	gatewayProber         DeploymentProber
+	agentProber           DaemonSetProber
+	flowHealthProber      FlowHealthProber
+	tlsCertValidator      TLSCertValidator
+	overridesHandler      OverridesHandler
+	istioStatusChecker    IstioStatusChecker
 }
 
 func NewReconciler(
@@ -132,10 +134,10 @@ func NewReconciler(
 				},
 			},
 		},
-		gatewayResourcesHandler: &otelcollector.GatewayResourcesHandler{
+		gatewayApplierDeleter: &otelcollector.GatewayApplierDeleter{
 			Config: config.Gateway,
 		},
-		agentResourcesHandler: &otelcollector.AgentResourcesHandler{
+		agentApplierDeleter: &otelcollector.AgentApplierDeleter{
 			Config: config.Agent,
 		},
 		pipelineLock: resourcelock.New(client, types.NamespacedName{
@@ -203,10 +205,10 @@ func (r *Reconciler) doReconcile(ctx context.Context, pipeline *telemetryv1alpha
 
 	if len(reconcilablePipelines) == 0 {
 		logf.FromContext(ctx).V(1).Info("cleaning up metric pipeline resources: all metric pipelines are non-reconcilable")
-		if err = r.gatewayResourcesHandler.DeleteResources(ctx, r.Client, r.istioStatusChecker.IsIstioActive(ctx)); err != nil {
+		if err = r.gatewayApplierDeleter.DeleteResources(ctx, r.Client, r.istioStatusChecker.IsIstioActive(ctx)); err != nil {
 			return fmt.Errorf("failed to delete gateway resources: %w", err)
 		}
-		if err = r.agentResourcesHandler.DeleteResources(ctx, r.Client); err != nil {
+		if err = r.agentApplierDeleter.DeleteResources(ctx, r.Client); err != nil {
 			return fmt.Errorf("failed to delete agent resources: %w", err)
 		}
 		return nil
@@ -308,7 +310,7 @@ func (r *Reconciler) reconcileMetricGateway(ctx context.Context, pipeline *telem
 		ResourceRequirementsMultiplier: len(allPipelines),
 	}
 
-	if err := r.gatewayResourcesHandler.ApplyResources(
+	if err := r.gatewayApplierDeleter.ApplyResources(
 		ctx,
 		k8sutils.NewOwnerReferenceSetter(r.Client, pipeline),
 		opts,
@@ -337,7 +339,7 @@ func (r *Reconciler) reconcileMetricAgents(ctx context.Context, pipeline *teleme
 		allowedPorts = append(allowedPorts, ports.IstioEnvoy)
 	}
 
-	if err := r.agentResourcesHandler.ApplyResources(
+	if err := r.agentApplierDeleter.ApplyResources(
 		ctx,
 		k8sutils.NewOwnerReferenceSetter(r.Client, pipeline),
 		otelcollector.AgentApplyOptions{