Skip to content

feat: add monitoring-plugin stream 0.4 and 0.5 #747

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 22, 2025
Merged

feat: add monitoring-plugin stream 0.4 and 0.5 #747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cmd/operator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,10 @@ var defaultImages = map[string]string{
"ui-distributed-tracing": "quay.io/openshift-observability-ui/distributed-tracing-console-plugin:v1.0.0",
"ui-logging-pf4": "quay.io/openshift-observability-ui/logging-view-plugin:v6.0.0",
"ui-logging": "quay.io/openshift-observability-ui/logging-view-plugin:v6.1.0",
"ui-monitoring": "quay.io/openshift-observability-ui/monitoring-console-plugin:release-coo-1.1",
"korrel8r": "quay.io/korrel8r/korrel8r:release-coo-1.2",
"health-analyzer": "quay.io/openshiftanalytics/cluster-health-analyzer:v0.5.0",
"ui-monitoring-pf5": "quay.io/openshift-observability-ui/monitoring-console-plugin:v0.4.0",
"ui-monitoring": "quay.io/openshift-observability-ui/monitoring-console-plugin:v0.5.0",
"perses": "quay.io/persesdev/perses:v0.50.3",
}

Expand Down
10 changes: 10 additions & 0 deletions pkg/controllers/uiplugin/compatibility_matrix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,16 @@ var compatibilityMatrix = []CompatibilityEntry{
{
PluginType: uiv1alpha1.TypeMonitoring,
MinClusterVersion: "v4.15",
MaxClusterVersion: "v4.19",
ImageKey: "ui-monitoring-pf5",
SupportLevel: TechPreview,
// feature flags for montioring are dynamically injected
// based on the cluster version and and UIPlugin CR configurations
Features: []string{},
},
{
PluginType: uiv1alpha1.TypeMonitoring,
MinClusterVersion: "v4.19",
MaxClusterVersion: "",
ImageKey: "ui-monitoring",
SupportLevel: TechPreview,
Expand Down
16 changes: 15 additions & 1 deletion pkg/controllers/uiplugin/compatibility_matrix_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,13 +262,27 @@ func TestLookupImageAndFeatures(t *testing.T) {
{
pluginType: uiv1alpha1.TypeMonitoring,
clusterVersion: "v4.15",
expectedKey: "ui-monitoring",
expectedKey: "ui-monitoring-pf5",
expectedFeatures: []string{},
expectedErr: nil,
},
{
pluginType: uiv1alpha1.TypeMonitoring,
clusterVersion: "v4.15.0-0.nightly-2024-06-06-064349",
expectedKey: "ui-monitoring-pf5",
expectedFeatures: []string{},
expectedErr: nil,
},
{
pluginType: uiv1alpha1.TypeMonitoring,
clusterVersion: "v4.19",
expectedKey: "ui-monitoring",
expectedFeatures: []string{},
expectedErr: nil,
},
{
pluginType: uiv1alpha1.TypeMonitoring,
clusterVersion: "v4.19.0-0.nightly-2024-06-06-064349",
expectedKey: "ui-monitoring",
expectedFeatures: []string{},
expectedErr: nil,
Expand Down
Loading