Skip to content

OU-731: feat: add otel for quering support and plugin configuration #277

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 11, 2025
Merged

OU-731: feat: add otel for quering support and plugin configuration #277

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
1 change: 1 addition & 0 deletions pkg/server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ type PluginConfig struct {
AlertingRuleNamespaceLabelKey string `json:"alertingRuleNamespaceLabelKey,omitempty" yaml:"alertingRuleNamespaceLabelKey,omitempty"`
Timeout time.Duration `json:"timeout,omitempty" yaml:"timeout,omitempty"`
LogsLimit int `json:"logsLimit,omitempty" yaml:"logsLimit,omitempty"`
Schema string `json:"schema,omitempty" yaml:"schema,omitempty"`
}

func (pluginConfig *PluginConfig) MarshalJSON() ([]byte, error) {
Expand Down
20 changes: 5 additions & 15 deletions web/cypress/integration/logs-dev-page.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,7 @@ describe('Logs Dev Page', () => {
cy.wait('@queryRangeStreams').then(({ request }) => {
const url = new URL(request.url);
const query = url.searchParams.get('query');
expect(query).to.equal(
'{ log_type="application", kubernetes_namespace_name="my-namespace" } | json',
);
expect(query).to.equal('{ kubernetes_namespace_name="my-namespace" } | json');
});
});

Expand All @@ -186,9 +184,7 @@ describe('Logs Dev Page', () => {
cy.wait('@queryRangeStreams').then(({ request }) => {
const url = new URL(request.url);
const query = url.searchParams.get('query');
expect(query).to.equal(
'{ log_type="application", kubernetes_namespace_name="my-namespace" } | json',
);
expect(query).to.equal('{ kubernetes_namespace_name="my-namespace" } | json');
});

cy.getByTestId(TestIds.NamespaceToggle).click();
Expand All @@ -197,9 +193,7 @@ describe('Logs Dev Page', () => {
cy.wait('@queryRangeStreams').then(({ request }) => {
const url = new URL(request.url);
const query = url.searchParams.get('query');
expect(query).to.equal(
'{ log_type="application", kubernetes_namespace_name="my-namespace-two" } | json',
);
expect(query).to.equal('{ kubernetes_namespace_name="my-namespace-two" } | json');
});
});

Expand Down Expand Up @@ -231,9 +225,7 @@ describe('Logs Dev Page', () => {
cy.wait('@queryRangeStreams').then(({ request }) => {
const url = new URL(request.url);
const query = url.searchParams.get('query');
expect(query).to.equal(
'{ log_type="application", kubernetes_namespace_name="my-namespace" } | json',
);
expect(query).to.equal('{ kubernetes_namespace_name="my-namespace" } | json');
});

cy.getByTestId(TestIds.NamespaceToggle).click();
Expand All @@ -246,9 +238,7 @@ describe('Logs Dev Page', () => {
'/api/proxy/plugin/logging-view-plugin/backend/api/logs/v1/infrastructure/loki/api/v1/query_range',
);
const query = url.searchParams.get('query');
expect(query).to.equal(
'{ log_type="infrastructure", kubernetes_namespace_name="openshift-cluster-version" } | json',
);
expect(query).to.equal('{ kubernetes_namespace_name="openshift-cluster-version" } | json');
});
});

Expand Down
4 changes: 2 additions & 2 deletions web/cypress/integration/logs-page.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ describe('Logs Page', () => {
.invoke('val')
.should(
'equal',
'{ log_type="application", kubernetes_namespace_name="gitops" } |= `line filter` | json | level=~"error|err|eror|info|inf|information|notice"',
'{ kubernetes_namespace_name="gitops" } |= `line filter` | json | level=~"error|err|eror|info|inf|information|notice"',
);
});

Expand Down Expand Up @@ -682,7 +682,7 @@ describe('Logs Page', () => {
.invoke('val')
.should(
'equal',
'{ log_type="application", kubernetes_container_name="operator", kubernetes_pod_name="my-pod-2" } | json',
'{ kubernetes_container_name="operator", kubernetes_pod_name="my-pod-2" } | json',
);
});

Expand Down
2 changes: 1 addition & 1 deletion web/locales/en/plugin__logging-view-plugin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"No datapoints found": "No datapoints found",
"No data": "No data",
"Invalid data": "Invalid data",
"Invalid log stream selector. Please select a namespace, pod or container as filter, or add a log stream selector like: ": "Invalid log stream selector. Please select a namespace, pod or container as filter, or add a log stream selector like: ",
"Invalid log stream selector. Please select a namespace, pod or container as filter.": "Invalid log stream selector. Please select a namespace, pod or container as filter.",
"Show Resources": "Show Resources",
"Hide Resources": "Hide Resources",
"Show Stats": "Show Stats",
Expand Down
Loading