Skip to content

Commit

Permalink
chore: address comments
Browse files Browse the repository at this point in the history
  • Loading branch information
amlannandy committed Jan 8, 2025
1 parent 98a808f commit 579c7cb
Show file tree
Hide file tree
Showing 23 changed files with 30 additions and 241 deletions.
2 changes: 2 additions & 0 deletions frontend/src/components/HostMetricsDetail/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ export enum VIEWS {
TRACES = 'traces',
CONTAINERS = 'containers',
PROCESSES = 'processes',
EVENTS = 'events',
}

export const VIEW_TYPES = {
Expand All @@ -12,4 +13,5 @@ export const VIEW_TYPES = {
TRACES: VIEWS.TRACES,
CONTAINERS: VIEWS.CONTAINERS,
PROCESSES: VIEWS.PROCESSES,
EVENTS: VIEWS.EVENTS,
};
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
}

.hostname-column-value {
color: var(--Vanilla-100, #fff);
color: var(--bg-vanilla-100);
font-family: 'Geist Mono';
font-style: normal;
font-weight: 600;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -272,17 +272,17 @@
.group-by-label {
min-width: max-content;

color: var(--Vanilla-400, #c0c1c3);
color: var(--bg-vanilla-100, #c0c1c3);
font-size: 13px;
font-style: normal;
font-weight: 400;
line-height: 18px; /* 128.571% */
letter-spacing: -0.07px;

border-radius: 2px 0px 0px 2px;
border: 1px solid var(--Slate-400, #1d212d);
border: 1px solid var(--bg-slate-400, #1d212d);
border-right: none;
background: var(--Ink-300, #16181d);
background: var(--bg-ink-100, #16181d);
border-top-right-radius: 0px;
border-bottom-right-radius: 0px;

Expand Down Expand Up @@ -387,7 +387,7 @@
}

.hostname-column-value {
color: var(--Vanilla-100, #fff);
color: var(--bg-vanilla-100);
font-family: 'Geist Mono';
font-style: normal;
font-weight: 600;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import {
} from './constants';
import K8sNodesList from './Nodes/K8sNodesList';
import K8sPodLists from './Pods/K8sPodLists';
import Volumes from './Volumes/Volumes';

export default function InfraMonitoringK8s(): JSX.Element {
const [showFilters, setShowFilters] = useState(true);
Expand Down Expand Up @@ -312,8 +311,6 @@ export default function InfraMonitoringK8s(): JSX.Element {
handleFilterVisibilityChange={handleFilterVisibilityChange}
/>
)}

{selectedCategory === K8sCategories.VOLUMES && <Volumes />}
</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,11 @@ function K8sNodesList({
baseFilters.items.push({
key: {
key: key.key,
type: null,
},
op: '=',
value: groupedByMeta[key.key],
id: key.key,
});
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
}

.nodename-column-value {
color: var(--Vanilla-100, #fff);
color: var(--bg-vanilla-100);
font-family: 'Geist Mono';
font-style: normal;
font-weight: 600;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { Color, Spacing } from '@signozhq/design-tokens';
import { Button, Divider, Drawer, Radio, Tooltip, Typography } from 'antd';
import { RadioChangeEvent } from 'antd/lib';
import logEvent from 'api/common/logEvent';
import { VIEW_TYPES, VIEWS } from 'components/HostMetricsDetail/constants';
import { QueryParams } from 'constants/query';
import {
initialQueryBuilderFormValuesMap,
Expand Down Expand Up @@ -41,7 +42,7 @@ import {
import { GlobalReducer } from 'types/reducer/globalTime';
import { v4 as uuidv4 } from 'uuid';

import { QUERY_KEYS, VIEW_TYPES, VIEWS } from './constants';
import { QUERY_KEYS } from './constants';
import NodeEvents from './Events';
import NodeLogs from './Logs';
import NodeMetrics from './Metrics';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import './NodeTraces.styles.scss';

import { getListColumns } from 'components/HostMetricsDetail/HostMetricTraces/utils';
import { ResizeTable } from 'components/ResizeTable';
import { DEFAULT_ENTITY_VERSION } from 'constants/app';
import { QueryParams } from 'constants/query';
Expand All @@ -25,7 +26,6 @@ import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
import { DataSource } from 'types/common/queryBuilder';

import { getNodeTracesQueryPayload, selectedColumns } from './constants';
import { getListColumns } from './utils';

interface Props {
timeRange: {
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,17 +1,3 @@
export enum VIEWS {
METRICS = 'metrics',
LOGS = 'logs',
TRACES = 'traces',
EVENTS = 'events',
}

export const VIEW_TYPES = {
METRICS: VIEWS.METRICS,
LOGS: VIEWS.LOGS,
TRACES: VIEWS.TRACES,
EVENTS: VIEWS.EVENTS,
};

export const QUERY_KEYS = {
K8S_OBJECT_KIND: 'k8s.object.kind',
K8S_OBJECT_NAME: 'k8s.object.name',
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/container/InfraMonitoringK8s/Nodes/utils.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { Color } from '@signozhq/design-tokens';
import { Tag, Tooltip } from 'antd';
import { ColumnType } from 'antd/es/table';
import {
Expand Down Expand Up @@ -163,7 +164,7 @@ const getGroupByEle = (
return (
<div className="pod-group">
{groupByValues.map((value) => (
<Tag key={value} color="#1D212D" className="pod-group-tag-item">
<Tag key={value} color={Color.BG_SLATE_400} className="pod-group-tag-item">
{value === '' ? '<no-value>' : value}
</Tag>
))}
Expand Down
12 changes: 6 additions & 6 deletions frontend/src/container/InfraMonitoringK8s/Pods/K8sPodLists.tsx

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 579c7cb

Please sign in to comment.