Skip to content
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

Jump to bottom

Query Browser: Remove unnecessary use of PrometheusGraph #1622

Merged
merged 1 commit into from May 29, 2019
Merged

Query Browser: Remove unnecessary use of PrometheusGraph #1622

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions frontend/public/components/graphs/prometheus-graph.tsx
View file
Open in desktop
Expand Up @@ -25,10 +25,10 @@ const PrometheusGraphLink = connectToURLs(MonitoringRoutes.Prometheus)(
}
);

export const PrometheusGraph: React.FC<PrometheusGraphProps> = ({children, className, linkToPrometheusUI = true, query, title}) => {
export const PrometheusGraph: React.FC<PrometheusGraphProps> = ({children, className, query, title}) => {
return <div className={classNames('graph-wrapper', className)}>
{ title && <h5 className="graph-title graph-title--left">{title}</h5> }
{linkToPrometheusUI ? <PrometheusGraphLink query={query}>{children}</PrometheusGraphLink> : children}
<PrometheusGraphLink query={query}>{children}</PrometheusGraphLink>
</div>;
};

Expand All @@ -39,7 +39,6 @@ type PrometheusGraphLinkProps = {

type PrometheusGraphProps = {
className?: string;
linkToPrometheusUI?: boolean;
query: string;
title?: string;
}
10 changes: 4 additions & 6 deletions frontend/public/components/graphs/query-browser.tsx
View file
Open in desktop
Expand Up @@ -9,7 +9,6 @@ import { Dropdown, humanizeNumber, LoadingInline, useRefWidth } from '../utils';
import { formatPrometheusDuration, parsePrometheusDuration, twentyFourHourTime } from '../utils/datetime';
import { PrometheusEndpoint } from './helpers';
import { usePrometheusPoll } from './prometheus-poll-hook';
import { PrometheusGraph } from './prometheus-graph';
import { areaTheme } from './themes';

const spans = ['5m', '15m', '30m', '1h', '2h', '6h', '12h', '1d', '2d', '1w', '2w'];
Expand Down Expand Up @@ -65,10 +64,10 @@ const SpanControls = ({defaultSpanText, onChange, span}) => {
</React.Fragment>;
};

const Graph: React.FC<GraphProps> = ({colors, domain, data, onZoom, query}) => {
const Graph: React.FC<GraphProps> = ({colors, domain, data, onZoom}) => {
const [containerRef, width] = useRefWidth();

return <PrometheusGraph linkToPrometheusUI={false} query={query}>
return <div className="graph-wrapper">
<div ref={containerRef} style={{width: '100%'}}>
<Chart
containerComponent={<VictorySelectionContainer onSelection={(points, range) => onZoom(range)} />}
Expand All @@ -86,7 +85,7 @@ const Graph: React.FC<GraphProps> = ({colors, domain, data, onZoom, query}) => {
</ChartGroup>
</Chart>
</div>
</PrometheusGraph>;
</div>;
};

export const QueryBrowser: React.FC<QueryBrowserProps> = ({colors, defaultTimespan, GraphLink, metric, onDataUpdate, query, samples, timeout}) => {
Expand Down Expand Up @@ -202,7 +201,7 @@ export const QueryBrowser: React.FC<QueryBrowserProps> = ({colors, defaultTimesp
{!error && !updating && _.isEmpty(graphData) && <div className="alert alert-warning query-browser__error">
<span className="pficon pficon-warning-triangle-o" aria-hidden="true"></span> Query did not return any data
</div>}
<Graph colors={colors} data={graphData} domain={graphDomain} onZoom={onZoom} query={query} />
<Graph colors={colors} data={graphData} domain={graphDomain} onZoom={onZoom} />
</React.Fragment>
: <div className="text-center text-muted">Enter a query in the box below to explore the metrics gathered for this cluster</div>}
</div>;
Expand Down Expand Up @@ -232,7 +231,6 @@ type GraphProps = {
}[];
domain: Domain;
onZoom: (range: Domain) => void;
query: string;
};

type QueryBrowserProps = {
Expand Down