
@@ -23,6 +23,6 @@ export default function FullViewHeader({
);
}
-FullViewHeader.defaultProps = {
+FullScreenHeader.defaultProps = {
overrideRoute: '/',
};
diff --git a/frontend/src/container/GridCardLayout/GridCard/FullView/index.tsx b/frontend/src/container/GridCardLayout/GridCard/FullView/index.tsx
index 20f493f666..786ef738d6 100644
--- a/frontend/src/container/GridCardLayout/GridCard/FullView/index.tsx
+++ b/frontend/src/container/GridCardLayout/GridCard/FullView/index.tsx
@@ -105,7 +105,7 @@ function FullView({
panelTypeAndGraphManagerVisibility: PANEL_TYPES_VS_FULL_VIEW_TABLE,
});
- const chartData = getUPlotChartData(response?.data?.payload);
+ const chartData = getUPlotChartData(response?.data?.payload, widget.fillSpans);
const isDarkMode = useIsDarkMode();
diff --git a/frontend/src/container/GridCardLayout/GridCardLayout.tsx b/frontend/src/container/GridCardLayout/GridCardLayout.tsx
index ed93df3a07..80221a3ef8 100644
--- a/frontend/src/container/GridCardLayout/GridCardLayout.tsx
+++ b/frontend/src/container/GridCardLayout/GridCardLayout.tsx
@@ -196,6 +196,7 @@ function GraphLayout({ onAddPanelHandler }: GraphLayoutProps): JSX.Element {
name={currentWidget?.id || ''}
headerMenuList={widgetActions}
variables={variables}
+ fillSpans={currentWidget?.fillSpans}
/>
diff --git a/frontend/src/container/ListOfDashboard/utils.ts b/frontend/src/container/ListOfDashboard/utils.ts
index 199b356581..ec3e1016d6 100644
--- a/frontend/src/container/ListOfDashboard/utils.ts
+++ b/frontend/src/container/ListOfDashboard/utils.ts
@@ -3,18 +3,25 @@ import { Dashboard } from 'types/api/dashboard/getAll';
export const filterDashboard = (
searchValue: string,
dashboardList: Dashboard[],
-): any[] => {
- // Convert the searchValue to lowercase for case-insensitive search
- const searchValueLowerCase = searchValue.toLowerCase();
+): Dashboard[] => {
+ const searchValueLowerCase = searchValue?.toLowerCase();
- // Use the filter method to find matching objects
+ // Filter by title, description, tags
return dashboardList.filter((item: Dashboard) => {
- // Convert each property value to lowercase for case-insensitive search
- const itemValues = Object.values(item?.data).map((value) =>
- value.toString().toLowerCase(),
- );
+ const { title, description, tags } = item.data;
+ const itemValuesNew = [title, description];
+
+ if (tags && tags.length > 0) {
+ itemValuesNew.push(...tags);
+ }
// Check if any property value contains the searchValue
- return itemValues.some((value) => value.includes(searchValueLowerCase));
+ return itemValuesNew.some((value) => {
+ if (value) {
+ return value.toLowerCase().includes(searchValueLowerCase);
+ }
+
+ return false;
+ });
});
};
diff --git a/frontend/src/container/LiveLogs/LiveLogsList/index.tsx b/frontend/src/container/LiveLogs/LiveLogsList/index.tsx
index be3ec95657..39fd297bea 100644
--- a/frontend/src/container/LiveLogs/LiveLogsList/index.tsx
+++ b/frontend/src/container/LiveLogs/LiveLogsList/index.tsx
@@ -70,7 +70,12 @@ function LiveLogsList({ logs }: LiveLogsListProps): JSX.Element {
(_: number, log: ILog): JSX.Element => {
if (options.format === 'raw') {
return (
-
+
);
}
diff --git a/frontend/src/container/LogsExplorerList/index.tsx b/frontend/src/container/LogsExplorerList/index.tsx
index 7a2e273736..361f3a49b6 100644
--- a/frontend/src/container/LogsExplorerList/index.tsx
+++ b/frontend/src/container/LogsExplorerList/index.tsx
@@ -80,7 +80,12 @@ function LogsExplorerList({
(_: number, log: ILog): JSX.Element => {
if (options.format === 'raw') {
return (
-
+
);
}
diff --git a/frontend/src/container/LogsTable/index.tsx b/frontend/src/container/LogsTable/index.tsx
index 19680662c7..73ad2c7eb9 100644
--- a/frontend/src/container/LogsTable/index.tsx
+++ b/frontend/src/container/LogsTable/index.tsx
@@ -72,7 +72,14 @@ function LogsTable(props: LogsTableProps): JSX.Element {
const log = logs[index];
if (viewMode === 'raw') {
- return
;
+ return (
+
+ );
}
return (
diff --git a/frontend/src/container/OnboardingContainer/OnboardingContainer.tsx b/frontend/src/container/OnboardingContainer/OnboardingContainer.tsx
index dfe2f7affe..797e3b396b 100644
--- a/frontend/src/container/OnboardingContainer/OnboardingContainer.tsx
+++ b/frontend/src/container/OnboardingContainer/OnboardingContainer.tsx
@@ -6,7 +6,7 @@ import { ArrowRightOutlined } from '@ant-design/icons';
import { Button, Card, Typography } from 'antd';
import getIngestionData from 'api/settings/getIngestionData';
import cx from 'classnames';
-import FullViewHeader from 'container/FullViewHeader/FullViewHeader';
+import FullScreenHeader from 'container/FullScreenHeader/FullScreenHeader';
import useAnalytics from 'hooks/analytics/useAnalytics';
import { useIsDarkMode } from 'hooks/useDarkMode';
import { useEffect, useState } from 'react';
@@ -211,7 +211,7 @@ export default function Onboarding(): JSX.Element {
{activeStep === 1 && (
<>
-
+
Select a use-case to get started
diff --git a/frontend/src/container/OnboardingContainer/Steps/DataSource/DataSource.tsx b/frontend/src/container/OnboardingContainer/Steps/DataSource/DataSource.tsx
index a52113c572..13296671ec 100644
--- a/frontend/src/container/OnboardingContainer/Steps/DataSource/DataSource.tsx
+++ b/frontend/src/container/OnboardingContainer/Steps/DataSource/DataSource.tsx
@@ -30,6 +30,7 @@ export default function DataSource(): JSX.Element {
selectedDataSource,
selectedFramework,
updateSelectedDataSource,
+ updateSelectedEnvironment,
updateServiceName,
updateSelectedFramework,
} = useOnboardingContext();
@@ -89,6 +90,7 @@ export default function DataSource(): JSX.Element {
key={dataSource.name}
onClick={(): void => {
updateSelectedFramework(null);
+ updateSelectedEnvironment(null);
updateSelectedDataSource(dataSource);
form.setFieldsValue({ selectFramework: null });
}}
diff --git a/frontend/src/container/OptionsMenu/MaxLinesField/styles.ts b/frontend/src/container/OptionsMenu/MaxLinesField/styles.ts
index 6c177ff5a4..207da256a2 100644
--- a/frontend/src/container/OptionsMenu/MaxLinesField/styles.ts
+++ b/frontend/src/container/OptionsMenu/MaxLinesField/styles.ts
@@ -5,6 +5,7 @@ export const MaxLinesFieldWrapper = styled.div`
display: flex;
justify-content: space-between;
align-items: center;
+ margin-bottom: 1.125rem;
`;
export const MaxLinesInput = styled(InputNumber)`
diff --git a/frontend/src/container/OptionsMenu/index.tsx b/frontend/src/container/OptionsMenu/index.tsx
index 66eeb4eb57..b097a9553a 100644
--- a/frontend/src/container/OptionsMenu/index.tsx
+++ b/frontend/src/container/OptionsMenu/index.tsx
@@ -31,9 +31,7 @@ function OptionsMenu({
{selectedOptionFormat === OptionFormatTypes.RAW && config?.maxLines && (
)}
- {(selectedOptionFormat === OptionFormatTypes.LIST ||
- selectedOptionFormat === OptionFormatTypes.TABLE) &&
- config?.addColumn &&
}
+ {config?.addColumn &&
}
),
[config, selectedOptionFormat],
diff --git a/frontend/src/container/SideNav/SideNav.tsx b/frontend/src/container/SideNav/SideNav.tsx
index 3fd937a52f..7f29b96c3a 100644
--- a/frontend/src/container/SideNav/SideNav.tsx
+++ b/frontend/src/container/SideNav/SideNav.tsx
@@ -199,10 +199,7 @@ function SideNav({
useEffect(() => {
if (isCloudUser() || isEECloudUser()) {
- const updatedUserManagementMenuItems = [
- helpSupportMenuItem,
- manageLicenseMenuItem,
- ];
+ const updatedUserManagementMenuItems = [helpSupportMenuItem];
setUserManagementMenuItems(updatedUserManagementMenuItems);
} else if (currentVersion && latestVersion) {
diff --git a/frontend/src/container/TopNav/DateTimeSelection/DateTimeSelection.styles.scss b/frontend/src/container/TopNav/DateTimeSelection/DateTimeSelection.styles.scss
new file mode 100644
index 0000000000..ea853553f0
--- /dev/null
+++ b/frontend/src/container/TopNav/DateTimeSelection/DateTimeSelection.styles.scss
@@ -0,0 +1,3 @@
+.date-time-selection-container {
+ margin-bottom: 16px;
+}
diff --git a/frontend/src/container/TopNav/DateTimeSelection/index.tsx b/frontend/src/container/TopNav/DateTimeSelection/index.tsx
index 785f65da8f..d776eb25e2 100644
--- a/frontend/src/container/TopNav/DateTimeSelection/index.tsx
+++ b/frontend/src/container/TopNav/DateTimeSelection/index.tsx
@@ -1,3 +1,5 @@
+import './DateTimeSelection.styles.scss';
+
import { SyncOutlined } from '@ant-design/icons';
import { Button } from 'antd';
import getLocalStorageKey from 'api/browser/localstorage/get';
@@ -211,7 +213,6 @@ function DateTimeSelection({
};
const onCustomDateHandler = (dateTimeRange: DateTimeRangeType): void => {
- console.log('dateTimeRange', dateTimeRange);
if (dateTimeRange !== null) {
const [startTimeMoment, endTimeMoment] = dateTimeRange;
if (startTimeMoment && endTimeMoment) {
@@ -295,7 +296,7 @@ function DateTimeSelection({
}, [location.pathname, updateTimeInterval, globalTimeLoading]);
return (
- <>
+
- {!hasSelectedTimeError && (
+ {!hasSelectedTimeError && selectedTime !== 'custom' && (
- >
+
);
}
diff --git a/frontend/src/container/TopNav/DateTimeSelection/styles.ts b/frontend/src/container/TopNav/DateTimeSelection/styles.ts
index e87f2ff92a..67cfa33083 100644
--- a/frontend/src/container/TopNav/DateTimeSelection/styles.ts
+++ b/frontend/src/container/TopNav/DateTimeSelection/styles.ts
@@ -24,7 +24,6 @@ interface Props {
}
export const RefreshTextContainer = styled.div
`
- min-height: 2rem;
visibility: ${({ refreshButtonHidden }): string =>
refreshButtonHidden ? 'hidden' : 'visible'};
`;
diff --git a/frontend/src/pages/WorkspaceLocked/WorkspaceLocked.tsx b/frontend/src/pages/WorkspaceLocked/WorkspaceLocked.tsx
index d9df5265df..eab934c69c 100644
--- a/frontend/src/pages/WorkspaceLocked/WorkspaceLocked.tsx
+++ b/frontend/src/pages/WorkspaceLocked/WorkspaceLocked.tsx
@@ -10,7 +10,7 @@ import { Button, Card, Skeleton, Typography } from 'antd';
import updateCreditCardApi from 'api/billing/checkout';
import { SOMETHING_WENT_WRONG } from 'constants/api';
import ROUTES from 'constants/routes';
-import FullViewHeader from 'container/FullViewHeader/FullViewHeader';
+import FullScreenHeader from 'container/FullScreenHeader/FullScreenHeader';
import useAnalytics from 'hooks/analytics/useAnalytics';
import useLicense from 'hooks/useLicense';
import { useNotifications } from 'hooks/useNotifications';
@@ -106,7 +106,7 @@ export default function WorkspaceBlocked(): JSX.Element {
return (
<>
-
+
{isLoadingLicenseData || !licensesData?.payload?.workSpaceBlock ? (
diff --git a/go.mod b/go.mod
index 23505f3f98..eeb6e05ec9 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.21
require (
github.com/ClickHouse/clickhouse-go/v2 v2.15.0
github.com/SigNoz/govaluate v0.0.0-20220522085550-d19c08c206cb
- github.com/SigNoz/signoz-otel-collector v0.88.8
+ github.com/SigNoz/signoz-otel-collector v0.88.9
github.com/SigNoz/zap_otlp/zap_otlp_encoder v0.0.0-20230822164844-1b861a431974
github.com/SigNoz/zap_otlp/zap_otlp_sync v0.0.0-20230822164844-1b861a431974
github.com/antonmedv/expr v1.15.3
diff --git a/go.sum b/go.sum
index b7c5de4e09..5d28bc873e 100644
--- a/go.sum
+++ b/go.sum
@@ -98,8 +98,8 @@ github.com/SigNoz/govaluate v0.0.0-20220522085550-d19c08c206cb h1:bneLSKPf9YUSFm
github.com/SigNoz/govaluate v0.0.0-20220522085550-d19c08c206cb/go.mod h1:JznGDNg9x1cujDKa22RaQOimOvvEfy3nxzDGd8XDgmA=
github.com/SigNoz/prometheus v1.9.78 h1:bB3yuDrRzi/Mv00kWayR9DZbyjTuGfendSqISyDcXiY=
github.com/SigNoz/prometheus v1.9.78/go.mod h1:MffmFu2qFILQrOHehx3D0XjYtaZMVfI+Ppeiv98x4Ww=
-github.com/SigNoz/signoz-otel-collector v0.88.8 h1:oa/0gSfkGhjzXtz1htzWBQx3p4VhBPs5iwMRxqfa2uo=
-github.com/SigNoz/signoz-otel-collector v0.88.8/go.mod h1:7I4FWwraVSnDywsPNbo8TdHDsPxShtYkGU5usr6dTtk=
+github.com/SigNoz/signoz-otel-collector v0.88.9 h1:7bbJSXrSZcQsdEVVLsjsNXm/bWe9MhKu8qfXp8MlXQM=
+github.com/SigNoz/signoz-otel-collector v0.88.9/go.mod h1:7I4FWwraVSnDywsPNbo8TdHDsPxShtYkGU5usr6dTtk=
github.com/SigNoz/zap_otlp v0.1.0 h1:T7rRcFN87GavY8lDGZj0Z3Xv6OhJA6Pj3I9dNPmqvRc=
github.com/SigNoz/zap_otlp v0.1.0/go.mod h1:lcHvbDbRgvDnPxo9lDlaL1JK2PyOyouP/C3ynnYIvyo=
github.com/SigNoz/zap_otlp/zap_otlp_encoder v0.0.0-20230822164844-1b861a431974 h1:PKVgdf83Yw+lZJbFtNGBgqXiXNf3+kOXW2qZ7Ms7OaY=
diff --git a/pkg/query-service/tests/test-deploy/docker-compose.yaml b/pkg/query-service/tests/test-deploy/docker-compose.yaml
index 9017f9326e..7ce3107dbd 100644
--- a/pkg/query-service/tests/test-deploy/docker-compose.yaml
+++ b/pkg/query-service/tests/test-deploy/docker-compose.yaml
@@ -192,7 +192,7 @@ services:
<<: *db-depend
otel-collector-migrator:
- image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.88.8}
+ image: signoz/signoz-schema-migrator:${OTELCOL_TAG:-0.88.9}
container_name: otel-migrator
command:
- "--dsn=tcp://clickhouse:9000"
@@ -205,7 +205,7 @@ services:
# condition: service_healthy
otel-collector:
- image: signoz/signoz-otel-collector:0.88.8
+ image: signoz/signoz-otel-collector:0.88.9
container_name: signoz-otel-collector
command:
[