fix: support metrics collection with alternate report storage #2856
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
Fixes aquasecurity#2610 When alternate report storage is enabled, reports are saved to filesystem instead of Kubernetes CRDs. The metrics collector was only reading from CRDs, causing all metrics to become unavailable. This commit adds a storage abstraction layer that allows the metrics collector to read from either CRDs (default) or filesystem (when alternate storage is enabled), maintaining full backward compatibility. Additionally, adds validation to skip malformed reports without proper metadata (name/labels), preventing duplicate metric errors from stale files in alternate storage directories. Changes: - Add StorageReader interface for storage backend abstraction - Implement CRDStorageReader for reading from Kubernetes CRDs - Implement FilesystemStorageReader for reading from alternate storage - Add validation to filter out malformed reports without metadata - Update ResourcesMetricsCollector to use StorageReader - Add comprehensive unit tests for both storage backends All report types are supported: VulnerabilityReport, ExposedSecretReport, ConfigAuditReport, RbacAssessmentReport, InfraAssessmentReport, and ClusterComplianceReport.
rzala
force-pushed
the
fix/alternate-storage-metrics
branch
from
cbc0a1b to
0452d01
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Fixes #2610
This PR adds support for Prometheus metrics collection when alternate report storage (filesystem-based) is enabled. Previously, enabling
alternateReportStorage.enabled: truewould cause all metrics liketrivy_image_vulnerabilitiesto stop working because the metrics collector only read from Kubernetes CRDs.Changes
StorageReaderinterface to abstract storage backend operationsCRDStorageReaderfor reading from Kubernetes CRDs (existing default behavior)FilesystemStorageReaderfor reading from alternate storage filesystemResourcesMetricsCollectorto use theStorageReaderabstractionImpact
Testing
Added comprehensive unit tests in
pkg/metrics/storage_reader_test.go:How to Test
With CRD Storage (default):
With Alternate Storage:
alternateReportStorage.enabled: trueChecklist